--- a/open-src/app/Makefile	Wed Jan 02 16:39:53 2008 -0800
+++ b/open-src/app/Makefile	Wed Jan 16 15:57:48 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.11	07/12/14
+# @(#)Makefile	1.13	08/01/09
 #
 ###############################################################################
 
@@ -40,9 +40,11 @@
 	xdpyinfo \
 	xgamma \
 	xkbcomp \
+	xkill \
 	xpm \
 	xrandr \
 	xrefresh \
+	xset \
 	xvidtune \
 	xvinfo \
 	xscreensaver

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xkill/Makefile	Wed Jan 16 15:57:48 2008 -0800
@@ -0,0 +1,48 @@
+###############################################################################
+#
+# xkill 1.x Makefile
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+
+# Package name used in tarballs
+APP_NAME=xkill
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+SUNTOUCH_MAN_FLAGS=
+
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xset/Makefile	Wed Jan 16 15:57:48 2008 -0800
@@ -0,0 +1,48 @@
+###############################################################################
+#
+# xset 1.x Makefile
+#
+# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+#
+
+# Package name used in tarballs
+APP_NAME=xset
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = xsetfbpm.patch xsetman.patch
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=
+SUNTOUCH_MAN_FLAGS=
+
+include ../Makefile.inc

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xset/xsetfbpm.patch	Wed Jan 16 15:57:48 2008 -0800
@@ -0,0 +1,143 @@
+--- xset.c	Mon Aug 27 15:54:07 2007
++++ xset.c	Tue Jan 15 16:13:13 2008
+@@ -74,6 +74,10 @@
+ #endif
+ #ifdef DPMSExtension
+ #include <X11/extensions/dpms.h>
++#define FBPM
++#ifdef FBPM
++#include <X11/extensions/fbpm.h>
++#endif
+ #ifdef WIN32
+ #define BOOL wBOOL
+ #ifdef Status
+@@ -182,7 +186,7 @@
+ static void xkbset_repeatrate(Display *dpy, int delay, int rate);
+ #endif
+ 
+-int
++void
+ main(int argc, char *argv[])
+ {
+ register char *arg;
+@@ -651,6 +655,56 @@
+       }
+ }
+ #endif /* DPMSExtension */
++#ifdef FBPM
++		else if (strcmp(arg, "+fbpm") == 0) {	/* turn on FBPM */
++			int             dummy;
++			if (FBPMQueryExtension(dpy, &dummy, &dummy))
++				FBPMEnable(dpy, 0);
++			else
++				fprintf(stderr, "server does not have extension for +fbpm option\n");
++		} else if (strcmp(arg, "-fbpm") == 0) {	/* shut off FBPM	 */
++			int             dummy;
++			if (FBPMQueryExtension(dpy, &dummy, &dummy))
++				FBPMDisable(dpy);
++			else
++				fprintf(stderr, "server does not have extension for -fbpm option\n");
++
++		} else if (strcmp(arg, "fbpm") == 0) {	/* planing for force
++							 * fbpm */
++			int             dummy;
++
++			if ((i + 1) >= argc) {
++				usage("missing arguments to -fpbm", NULL);
++			} else {
++				/*
++				 * we are skipping the word 'force'... just
++				 * check to make sure its there
++				 */
++				arg = nextarg(i, argv);
++				if (strcmp(arg, "force") != 0) {	/* ack ! */
++					fprintf(stderr, "bad parameter %s [needs force]\n", arg);
++					break;
++				}
++			}
++			i++;
++			arg = nextarg(i, argv);
++			i++;
++			if (FBPMQueryExtension(dpy, &dummy, &dummy)) {
++				if (strcmp(arg, "on") == 0) {
++					FBPMEnable(dpy, FBPMModeOn);
++				} else if (strcmp(arg, "standby") == 0) {
++					FBPMEnable(dpy, FBPMModeStandby);
++				} else if (strcmp(arg, "suspend") == 0) {
++					FBPMEnable(dpy, FBPMModeSuspend);
++				} else if (strcmp(arg, "off") == 0) {
++					FBPMEnable(dpy, FBPMModeOff);
++				} else {
++					fprintf(stderr, "bad parameter %s\n", arg);
++				}
++			} else
++				fprintf(stderr, "server does not have extension for fbpm option\n");
++		}
++#endif
+   else if (strcmp(arg, "s") == 0) {
+     if (i >= argc) {
+       set_saver(dpy, ALL, 0);  /* Set everything to default  */
+@@ -1412,6 +1466,44 @@
+       }
+ }
+ #endif
++#ifdef FBPM
++	{
++		int             dummy;
++		CARD16          standby, suspend, off;
++		BOOL            onoff;
++		CARD16          state;
++
++		printf("FBPM (Frame Buffer Power Management):\n");
++		if (FBPMQueryExtension(dpy, &dummy, &dummy)) {
++			if (FBPMCapable(dpy)) {
++				FBPMInfo(dpy, &state, &onoff);
++				if (onoff) {
++					printf("  FBPM is enabled\n");
++					switch (state) {
++					case FBPMModeOn:
++						printf("  Frame Buffer is on\n");
++						break;
++					case FBPMModeStandby:
++						printf("  Frame Buffer is in standby\n");
++						break;
++					case FBPMModeSuspend:
++						printf("  Frame Buffer is in suspend\n");
++						break;
++					case FBPMModeOff:
++						printf("  Frame Buffer is off\n");
++						break;
++					default:
++						printf("  Unrecognized response from server\n");
++					}
++				} else
++					printf("  FBPM is disabled\n");
++			} else
++				printf("  System is not capable of FBPM\n");
++		} else {
++			printf("  Server does not have the FBPM Extension\n");
++		}
++	}
++#endif
+ #ifdef FONTCACHE
+ {
+     int dummy;
+@@ -1542,7 +1634,18 @@
+     fprintf (stderr, "\t      force on \n");
+     fprintf (stderr, "\t      (also implicitly enables DPMS features) \n");
+     fprintf (stderr, "\t      a timeout value of zero disables the mode \n");
++#ifdef FBPM
++
++	fprintf(stderr, "    To control Frame Buffer Power Management (FBPM) features:\n");
++	fprintf(stderr, "\t-fbpm      Frame Buffer Power Management features off\n");
++	fprintf(stderr, "\t+fbpm      Frame Buffer Power Management features on\n");
++	fprintf(stderr, "\t fbpm force on     \n");
++	fprintf(stderr, "\t      force standby \n");
++	fprintf(stderr, "\t      force suspend \n");
++	fprintf(stderr, "\t      force off \n");
++	fprintf(stderr, "\t      (also implicitly enables FBPM features) \n");
+ #endif
++#endif
+ #ifdef FONTCACHE
+     fprintf (stderr, "    To control font cache:\n");
+     fprintf (stderr, "\t fc [hi-mark [low-mark [balance]]]\n");

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xset/xsetman.patch	Wed Jan 16 15:57:48 2008 -0800
@@ -0,0 +1,83 @@
+--- xset.man	Tue Aug 21 16:05:32 2007
++++ filemerge.out	Mon Jan 14 13:59:18 2008
+@@ -1,5 +1,6 @@
+ .\" $Xorg: xset.man,v 1.4 2001/02/09 02:05:59 xorgcvs Exp $
+ .\" Copyright 1988, 1998  The Open Group
++.\" Copyright (c) 1997, 1999  Sun Microsystems, Inc.
+ .\" 
+ .\" Permission to use, copy, modify, distribute, and sell this software and its
+ .\" documentation for any purpose is hereby granted without fee, provided that
+@@ -43,6 +44,10 @@
+ 	[dpms \fIstandby\fP [\fI suspend\fP [\fI off\fP]]] 
+ 	[dpms force {standby|suspend|off|on}]
+ .br
++[+fbpm] [-fbpm]
++.br
++	[fbpm force {standby|suspend|off|on}]
++.br
+ [fp=\fIpathlist\fP] 
+ [-fp=\fIpathlist\fP] 
+ [+fp=\fIpathlist\fP] 
+@@ -124,7 +129,9 @@
+ The \fB\-dpms\fP option disables DPMS (Energy Star) features.
+ .TP 8
+ .B +dpms
+-The \fB+dpms\fP option enables DPMS (Energy Star) features.
++Enable Energy Star mode. Default times are standby = 1440, suspend = 1620, and
++off = 1800 seconds.
++.PP
+ .TP 8
+ .B dpms \fIflags...\fP
+ The \fBdpms\fP option allows the DPMS (Energy Star) parameters to be
+@@ -140,6 +147,51 @@
+ values implicitly enables the DPMS features.  A value of zero disables
+ a particular mode.
+ .TP 8
++.B dpms force standby
++Force server to Energy Star standby mode.
++.PP
++.TP 8
++.B dpms force suspend
++Force server to Energy Star suspend mode.
++.PP
++.TP 8
++.B dpms force off
++Force server to Energy Star off mode.
++.PP
++.TP 8
++.B dpms force on
++Force server to Energy Star on mode.
++.PP
++.TP 8
++.B dpms [standby] [[suspend] [[off]]]
++Set Energy Star timers. The command can take the form, dpms [standby], or dpms [standby] [suspend] or dpms [standby] [suspend] [off]. 
++Note that standby is less than suspend is less than off, if this condition is not met, an error is produced.
++.PP
++.TP 8
++.B +fbpm
++Enable frame buffer power management. NOTE: FBPM timing is linked to DPMS, See DMPS for default timeout values.
++.PP
++.TP 8
++.B -fbpm
++Disable frame buffer power management. NOTE: Does not affect DPMS timeouts.
++.PP
++.TP 8
++.B fbpm force standby
++Force to standby power level.
++.PP
++.TP 8
++.B fbpm force suspend
++Force to suspend power level.
++.PP
++.TP 8
++.B fbpm force off
++Force power to off.
++.PP
++.TP 8
++.B fbpm force on
++Force power to on.
++.PP
++.TP 8
+ .B fp= \fIpath,...\fP
+ The \fBfp=\fP sets the font path to the entries given in the path argument.
+ The entries are interpreted by the server, not by the client.

--- a/packages/SUNWxwman/prototype_com	Wed Jan 02 16:39:53 2008 -0800
+++ b/packages/SUNWxwman/prototype_com	Wed Jan 16 15:57:48 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.35     07/12/14 SMI"
+# ident "@(#)prototype_com 35.37     08/01/17 SMI"
 #
 #  X Window System online user man pages
 
@@ -123,7 +123,6 @@
 f none openwin/share/man/man1/xfs.1 0444 root bin
 f none openwin/share/man/man1/xhost.1 0444 root bin
 f none openwin/share/man/man1/xinit.1 0444 root bin
-f none openwin/share/man/man1/xkill.1 0444 root bin
 f none openwin/share/man/man1/xload.1 0444 root bin
 f none openwin/share/man/man1/xlock.1 0444 root bin
 f none openwin/share/man/man1/xlogo.1 0444 root bin
@@ -140,7 +139,6 @@
 f none openwin/share/man/man1/xpr.1 0444 root bin
 f none openwin/share/man/man1/xprop.1 0444 root bin
 f none openwin/share/man/man1/xrdb.1 0444 root bin
-f none openwin/share/man/man1/xset.1 0444 root bin
 f none openwin/share/man/man1/xsetroot.1 0444 root bin
 f none openwin/share/man/man1/xstdcmap.1 0444 root bin
 f none openwin/share/man/man1/xterm.1 0444 root bin
@@ -206,3 +204,8 @@
 # open-src/app/xrefresh
 f none X11/share/man/man1/xrefresh.1 	0444 root bin
 
+# open-src/app/xset
+f none X11/share/man/man1/xset.1 	0444 root bin
+
+# open-src/app/xkill
+f none X11/share/man/man1/xkill.1 	0444 root bin

--- a/packages/SUNWxwopt/prototype	Wed Jan 02 16:39:53 2008 -0800
+++ b/packages/SUNWxwopt/prototype	Wed Jan 16 15:57:48 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.35	07/08/29 SMI"
+# ident "@(#)prototype	35.36	08/01/09 SMI"
 ##
 #  nonessential X core clients and server extensions
 
@@ -70,7 +70,6 @@
 f none openwin/bin/xdmshell	0755 root bin
 f none openwin/bin/xedit	0755 root bin
 f none openwin/bin/xfontsel	0755 root bin
-f none openwin/bin/xkill	0755 root bin
 f none openwin/bin/xload	0755 root sys
 f none openwin/bin/xman		0755 root bin
 f none openwin/bin/xmh		0755 root bin
@@ -171,3 +170,6 @@
 d none X11					0755 root bin
 d none X11/bin					0755 root bin
 f none X11/bin/xcursorgen			0755 root bin
+f none X11/bin/xkill				0755 root bin
+s none openwin/bin/xkill=../../X11/bin/xkill
+