6651429 Replace xwininfo with the opensrc version from X.Org
6651430 Replace xsetroot with the opensrc version from X.Org
--- a/open-src/app/Makefile Thu Jan 17 14:25:02 2008 -0800
+++ b/open-src/app/Makefile Thu Jan 17 14:48:11 2008 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.13 08/01/09
+# @(#)Makefile 1.14 08/01/17
#
###############################################################################
@@ -45,8 +45,10 @@
xrandr \
xrefresh \
xset \
+ xsetroot \
xvidtune \
xvinfo \
+ xwininfo \
xscreensaver
OS_SUBDIRS_sparc = $(OS_SUBDIRS_common)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xsetroot/Makefile Thu Jan 17 14:48:11 2008 -0800
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xsetroot 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.
+#
+#
+
+# Package name used in tarballs
+APP_NAME=xsetroot
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xwininfo/Makefile Thu Jan 17 14:48:11 2008 -0800
@@ -0,0 +1,49 @@
+###############################################################################
+#
+# xwininfo 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.
+#
+#
+
+# Package name used in tarballs
+APP_NAME=xwininfo
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# 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/SUNWxwman/prototype_com Thu Jan 17 14:25:02 2008 -0800
+++ b/packages/SUNWxwman/prototype_com Thu Jan 17 14:48:11 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.37 08/01/17 SMI"
+# ident "@(#)prototype_com 35.38 08/01/17 SMI"
#
# X Window System online user man pages
@@ -139,11 +139,9 @@
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/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
f none openwin/share/man/man1/xwd.1 0444 root bin
-f none openwin/share/man/man1/xwininfo.1 0444 root bin
f none openwin/share/man/man1/xwud.1 0444 root bin
!search $HOME/man4
@@ -207,5 +205,11 @@
# open-src/app/xset
f none X11/share/man/man1/xset.1 0444 root bin
+# open-src/app/xsetroot
+f none X11/share/man/man1/xsetroot.1 0444 root bin
+
# open-src/app/xkill
f none X11/share/man/man1/xkill.1 0444 root bin
+
+# open-src/app/xwininfo
+f none X11/share/man/man1/xwininfo.1 0444 root bin
--- a/packages/SUNWxwplt/prototype_com Thu Jan 17 14:25:02 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com Thu Jan 17 14:48:11 2008 -0800
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.137 08/01/16 Sun Microsystems"
+# "@(#)prototype_com 35.138 08/01/17 Sun Microsystems"
#
# X Window System required core package
@@ -83,10 +83,8 @@
f none openwin/bin/xprop 0755 root bin
f none openwin/bin/xrdb 0755 root bin
f none openwin/bin/xset 0755 root bin
-f none openwin/bin/xsetroot 0755 root bin
f none openwin/bin/xstdcmap 0755 root bin
f none openwin/bin/xwd 0755 root bin
-f none openwin/bin/xwininfo 0755 root bin
f none openwin/bin/xwud 0755 root bin
#
# X11R6.4 upgrade changes
@@ -128,6 +126,14 @@
f none X11/bin/xrefresh 0755 root bin
s none openwin/bin/xrefresh=../../X11/bin/xrefresh
+# open-src/app/xsetroot
+f none X11/bin/xsetroot 0755 root bin
+s none openwin/bin/xsetroot=../../X11/bin/xsetroot
+
+# open-src/app/xwininfo
+f none X11/bin/xwininfo 0755 root bin
+s none openwin/bin/xwininfo=../../X11/bin/xwininfo
+
d none openwin/lib 0755 root bin
!search $HOME/openwin/lib
#