--- a/open-src/app/Makefile Fri Feb 08 13:25:54 2008 -0800
+++ b/open-src/app/Makefile Fri Feb 08 14:36:23 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.21 08/01/31
+# @(#)Makefile 1.22 08/02/08
#
###############################################################################
@@ -39,6 +39,7 @@
mkfontscale \
xcalc \
xclipboard \
+ xconsole \
xcursorgen \
xdpyinfo \
xgamma \
@@ -55,6 +56,7 @@
xrefresh \
xset \
xsetroot \
+ xstdcmap \
xvidtune \
xvinfo \
xwininfo \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xconsole/Makefile Fri Feb 08 14:36:23 2008 -0800
@@ -0,0 +1,52 @@
+###############################################################################
+#
+# xconsole 1.x Makefile
+#
+# Copyright 2008 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.
+#
+# @(#)Makefile 1.1 08/02/08
+#
+
+# Package name used in tarballs
+APP_NAME=xconsole
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+LIB_ADD_LD_OPTIONS += -L$(PROTODIR)$(X11_DIR)/lib/xorgcfg
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Availability, SUNWxwopt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xstdcmap/6661101.patch Fri Feb 08 14:36:23 2008 -0800
@@ -0,0 +1,87 @@
+--- xstdcmap.c.orig Thu Feb 7 13:18:40 2008
++++ xstdcmap.c Thu Feb 7 13:22:03 2008
+@@ -107,6 +107,15 @@
+ };
+ #define NOPTIONS (sizeof optionTable / sizeof optionTable[0])
+
++#ifdef __sun
++/* we don't define this on the command line */
++#define SUNSOFT_BUYBACK 1
++#endif
++
++#ifdef SUNSOFT_BUYBACK
++static void maybeDeleteDefaultGrayMap();
++#endif
++
+ static void usage(Status status);
+
+ static void
+@@ -283,6 +292,22 @@
+ for (i=0; i < NPROPERTIES; i++) {
+
+ if (propertyTable[i].delete) {
++#ifdef SUNSOFT_BUYBACK
++ if (i == DEFAULT) {
++ /*
++ * REMIND: We are deleting the RGB_DEFAULT_MAPs
++ * these might have been set up by a DPS client.
++ * If so there may be a DEFAULT_GRAY map with
++ * the same kilid. So if we kill that client to
++ * delete the color ramps, we delete the pixels
++ * of the grayramp but not the property.
++ * See if this is going to happen and if so,
++ * delete the DEFAULT_GRAY property. (1195388)
++ */
++ maybeDeleteDefaultGrayMap();
++ }
++#endif /* SUNSOFT_BUYBACK */
++
+ XmuDeleteStandardColormap(dpy, screen, propertyTable[i].property);
+ if (verbose)
+ fprintf(stderr, "%s: %s was deleted or did not exist.\n",
+@@ -373,3 +398,45 @@
+ /* Muffle compiler */
+ return 0;
+ }
++
++#ifdef SUNSOFT_BUYBACK
++static void
++maybeDeleteDefaultGrayMap()
++{
++ Atom atom = XInternAtom(dpy, "DEFAULT_GRAY", True);
++ int i, count;
++ XStandardColormap *defaultMaps;
++ XStandardColormap *pGray;
++
++ if (atom == None)
++ return;
++
++ if (!XGetRGBColormaps(dpy, DefaultRootWindow(dpy), &pGray, &count,
++ atom)) {
++ return;
++ }
++ /* We found DEFAULT_GRAY property */
++ if (XGetRGBColormaps(dpy, DefaultRootWindow(dpy), &defaultMaps, &count,
++ XA_RGB_DEFAULT_MAP)) {
++ /*
++ * we found some XA_RGB_DEFAULT_MAPs, see if any of them have
++ * the same killid as the gray ramp we found above
++ */
++ for (i=0; i<count; i++) {
++ if (pGray->killid == defaultMaps[i].killid) {
++ /*
++ * Got one.
++ * Delete the property, deleting the rgb map will free
++ * the pixels (it calls XKillClient())
++ */
++ XDeleteProperty(dpy, DefaultRootWindow(dpy), atom);
++ break;
++ }
++ }
++ XFree(defaultMaps);
++ }
++
++ XFree(pGray);
++}
++#endif /* SUNSOFT_BUYBACK */
++
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xstdcmap/Makefile Fri Feb 08 14:36:23 2008 -0800
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# xstdcmap 1.x Makefile
+#
+# Copyright 2008 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.
+#
+# @(#)Makefile 1.1 08/02/08
+#
+
+# Package name used in tarballs
+APP_NAME=xstdcmap
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = 6661101.patch
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- a/packages/SUNW0xwplt/prototype Fri Feb 08 13:25:54 2008 -0800
+++ b/packages/SUNW0xwplt/prototype Fri Feb 08 14:36:23 2008 -0800
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.12 08/01/31 SMI"
+# ident "@(#)prototype 1.13 08/02/08 SMI"
#
# X Window System required core package localizable files
@@ -54,7 +54,6 @@
f none openwin/lib/locale/C/app-defaults/Clock-color 0644 root bin
f none openwin/lib/locale/C/app-defaults/Chooser 0644 root bin
f none openwin/lib/locale/C/app-defaults/XClock 0644 root bin
-f none openwin/lib/locale/C/app-defaults/XConsole 0644 root bin
f none openwin/lib/locale/C/app-defaults/XLock 0644 root bin
f none openwin/lib/locale/C/app-defaults/XLogo 0644 root bin
f none openwin/lib/locale/C/app-defaults/XLogo-color 0644 root bin
@@ -83,6 +82,7 @@
f none X11/lib/X11/app-defaults/C/XCalc 0444 root bin
f none X11/lib/X11/app-defaults/C/XCalc-color 0444 root bin
f none X11/lib/X11/app-defaults/C/XClipboard 0444 root bin
+f none X11/lib/X11/app-defaults/C/XConsole 0444 root bin
f none X11/lib/X11/app-defaults/C/Xmag 0444 root bin
# RBAC help files
--- a/packages/SUNWxwman/prototype_com Fri Feb 08 13:25:54 2008 -0800
+++ b/packages/SUNWxwman/prototype_com Fri Feb 08 14:36:23 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.47 08/01/31 SMI"
+# ident "@(#)prototype_com 35.48 08/02/08 SMI"
#
# X Window System online user man pages
@@ -109,7 +109,6 @@
f none openwin/share/man/man1/xclock.1 0444 root bin
f none openwin/share/man/man1/xcmsdb.1 0444 root bin
f none openwin/share/man/man1/xcolor.1 0444 root bin
-f none openwin/share/man/man1/xconsole.1 0444 root bin
f none openwin/share/man/man1/xditview.1 0444 root bin
f none openwin/share/man/man1/xdm.1 0444 root bin
f none openwin/share/man/man1/xdpr.1 0444 root bin
@@ -129,7 +128,6 @@
f none openwin/share/man/man1/xmh.1 0444 root bin
f none openwin/share/man/man1/xmkmf.1 0444 root bin
f none openwin/share/man/man1/xpr.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
f none openwin/share/man/man1/xwd.1 0444 root bin
f none openwin/share/man/man1/xwud.1 0444 root bin
@@ -188,6 +186,9 @@
# open-src/app/xcalc
f none X11/share/man/man1/xclipboard.1 0444 root bin
+# open-src/app/xconsole
+f none X11/share/man/man1/xconsole.1 0444 root bin
+
# open-src/app/xcursorgen
f none X11/share/man/man1/xcursorgen.1 0444 root bin
@@ -225,6 +226,9 @@
# open-src/app/xsetroot
f none X11/share/man/man1/xsetroot.1 0444 root bin
+# open-src/app/xstdcmap
+f none X11/share/man/man1/xstdcmap.1 0444 root bin
+
# open-src/app/xkill
f none X11/share/man/man1/xkill.1 0444 root bin
--- a/packages/SUNWxwopt/prototype Fri Feb 08 13:25:54 2008 -0800
+++ b/packages/SUNWxwopt/prototype Fri Feb 08 14:36:23 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 35.37 08/01/31 SMI"
+# ident "@(#)prototype 35.38 08/02/08 SMI"
##
# nonessential X core clients and server extensions
@@ -61,7 +61,6 @@
f none openwin/bin/xclock 0755 root bin
f none openwin/bin/xcmsdb 0755 root bin
f none openwin/bin/xcolor 0755 root bin
-f none openwin/bin/xconsole 0755 root bin
f none openwin/bin/xditview 0755 root bin
f none openwin/bin/xdm 0755 root bin
f none openwin/bin/xdmshell 0755 root bin
@@ -170,9 +169,11 @@
f none X11/bin/xcursorgen 0755 root bin
f none X11/bin/xkill 0755 root bin
f none X11/bin/xclipboard 0755 root bin
+f none X11/bin/xconsole 0755 root bin
f none X11/bin/xcutsel 0755 root bin
s none openwin/bin/editres=../../X11/bin/editres
s none openwin/bin/xkill=../../X11/bin/xkill
s none openwin/bin/xclipboard=../../X11/bin/xclipboard
+s none openwin/bin/xconsole=../../X11/bin/xconsole
s none openwin/bin/xcutsel=../../X11/bin/xcutsel
--- a/packages/SUNWxwplt/prototype_com Fri Feb 08 13:25:54 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com Fri Feb 08 14:36:23 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.148 08/01/31 Sun Microsystems"
+# "@(#)prototype_com 35.149 08/02/08 Sun Microsystems"
#
# X Window System required core package
@@ -75,7 +75,6 @@
f none openwin/bin/xlswins 0755 root bin
f none openwin/bin/xmakemap 0755 root bin
f none openwin/bin/xpr 0755 root bin
-f none openwin/bin/xstdcmap 0755 root bin
f none openwin/bin/xwd 0755 root bin
f none openwin/bin/xwud 0755 root bin
#
@@ -132,6 +131,10 @@
f none X11/bin/xset 0755 root bin
s none openwin/bin/xset=../../X11/bin/xset
+# open-src/app/xstdcmap
+f none X11/bin/xstdcmap 0755 root bin
+s none openwin/bin/xstdcmap=../../X11/bin/xstdcmap
+
# open-src/app/xpm
f none X11/bin/cxpm 0755 root bin
f none X11/bin/sxpm 0755 root bin
@@ -421,7 +424,6 @@
f none openwin/lib/app-defaults/Clock-color 0644 root bin
f none openwin/lib/app-defaults/Chooser 0644 root bin
f none openwin/lib/app-defaults/XClock 0644 root bin
-f none openwin/lib/app-defaults/XConsole 0644 root bin
f none openwin/lib/app-defaults/XLock 0644 root bin
f none openwin/lib/app-defaults/XLogo 0644 root bin
f none openwin/lib/app-defaults/XLogo-color 0644 root bin
@@ -685,6 +687,7 @@
f none X11/lib/X11/app-defaults/XCalc 0644 root bin
f none X11/lib/X11/app-defaults/XCalc-color 0644 root bin
f none X11/lib/X11/app-defaults/XClipboard 0644 root bin
+f none X11/lib/X11/app-defaults/XConsole 0644 root bin
f none X11/lib/X11/app-defaults/Xmag 0644 root bin
# Create links back to openwin
@@ -693,4 +696,5 @@
s none openwin/lib/app-defaults/XCalc=../../../X11/lib/X11/app-defaults/XCalc
s none openwin/lib/app-defaults/XCalc-color=../../../X11/lib/X11/app-defaults/XCalc-color
s none openwin/lib/app-defaults/XClipboard=../../../X11/lib/X11/app-defaults/XClipboard
+s none openwin/lib/app-defaults/XConsole=../../../X11/lib/X11/app-defaults/XConsole
s none openwin/lib/app-defaults/Xmag=../../../X11/lib/X11/app-defaults/Xmag