Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6669356 Replace viewres, oclock with the opensrc version from X.Org
authorNiveditha Rau <Niveditha.Rau@Sun.COM>
Fri, 29 Feb 2008 12:13:05 -0800
changeset 347 13e749282c98
parent 346 3bbe5e7f703b
child 348 5196d852a4fd
6669356 Replace viewres, oclock with the opensrc version from X.Org
open-src/app/Makefile file | annotate | diff | comparison | revisions
open-src/app/oclock/Makefile file | annotate | diff | comparison | revisions
open-src/app/viewres/Makefile file | annotate | diff | comparison | revisions
packages/SUNW0xwopt/prototype file | annotate | diff | comparison | revisions
packages/SUNW0xwplt/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwman/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwopt/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwplt/prototype_com file | annotate | diff | comparison | revisions 
--- a/open-src/app/Makefile	Fri Feb 29 07:06:16 2008 -0800
+++ b/open-src/app/Makefile	Fri Feb 29 12:13:05 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.34	08/02/29
+# @(#)Makefile	1.35	08/02/29
 #
 ###############################################################################
 
@@ -42,8 +42,10 @@
 	luit \
 	mesa-demos \
 	mkfontscale \
+	oclock \
         setxkbmap \
 	twm \
+	viewres \
 	x11perf \
 	xauth \
 	xcalc \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/oclock/Makefile	Fri Feb 29 12:13:05 2008 -0800
@@ -0,0 +1,52 @@
+###############################################################################
+#
+# oclock 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/28
+#
+
+# Package name used in tarballs
+APP_NAME=oclock
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# 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/viewres/Makefile	Fri Feb 29 12:13:05 2008 -0800
@@ -0,0 +1,52 @@
+###############################################################################
+#
+# viewres 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/28
+#
+
+# Package name used in tarballs
+APP_NAME=viewres
+
+# Version number (used in path names)
+APP_VERS=1.0.1
+
+# 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
--- a/packages/SUNW0xwopt/prototype	Fri Feb 29 07:06:16 2008 -0800
+++ b/packages/SUNW0xwopt/prototype	Fri Feb 29 12:13:05 2008 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@
 #
 ###########################################################################
 #
-#       "@(#)prototype	1.8	07/11/05   Sun Microsystems" 
+#       "@(#)prototype	1.10	08/02/29   Sun Microsystems" 
 #
 # X Window System optional client localizable files
 
@@ -47,7 +47,6 @@
 d none openwin/lib/locale       0755 root bin
 d none openwin/lib/locale/C     0755 root bin
 d none openwin/lib/locale/C/app-defaults 0755 root bin
-f none openwin/lib/locale/C/app-defaults/Viewres 0644 root bin
 f none openwin/lib/locale/C/app-defaults/XFontSel 0644 root bin
 f none openwin/lib/locale/C/app-defaults/XLoad 0644 root bin
 f none openwin/lib/locale/C/app-defaults/Xditview 0644 root bin
@@ -65,3 +64,10 @@
 f none openwin/lib/locale/C/LC_MESSAGES/xload.po 0644 root bin
 f none openwin/lib/locale/C/LC_MESSAGES/xman.po 0644 root bin
 
+!search $HOME/../usr/X11/lib/X11/app-defaults
+d none X11				0755 root bin
+d none X11/lib				0755 root bin
+d none X11/lib/X11			0755 root bin
+d none X11/lib/X11/app-defaults		0755 root bin
+f none X11/lib/X11/app-defaults/Viewres 0644 root bin
+
--- a/packages/SUNW0xwplt/prototype	Fri Feb 29 07:06:16 2008 -0800
+++ b/packages/SUNW0xwplt/prototype	Fri Feb 29 12:13:05 2008 -0800
@@ -29,7 +29,7 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.15     08/02/26 SMI"
+# ident "@(#)prototype 1.16     08/02/29 SMI"
 #
 # X Window System required core package localizable files
 
@@ -49,7 +49,6 @@
 d none openwin/lib/locale               0755 root bin
 d none openwin/lib/locale/C               0755 root bin
 d none openwin/lib/locale/C/app-defaults 0755 root bin
-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/XLock 0644 root bin
@@ -77,6 +76,7 @@
 f none X11/lib/X11/app-defaults/C/Bitmap		0444 root bin
 f none X11/lib/X11/app-defaults/C/Bitmap-color		0444 root bin
 f none X11/lib/X11/app-defaults/C/Bitmap-nocase		0444 root bin
+f none X11/lib/X11/app-defaults/C/Clock-color		0444 root bin
 f none X11/lib/X11/app-defaults/C/Editres		0444 root bin
 f none X11/lib/X11/app-defaults/C/Editres-color		0444 root bin
 f none X11/lib/X11/app-defaults/C/XCalc			0444 root bin
--- a/packages/SUNWxwman/prototype_com	Fri Feb 29 07:06:16 2008 -0800
+++ b/packages/SUNWxwman/prototype_com	Fri Feb 29 12:13:05 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.58     08/02/26 SMI"
+# ident "@(#)prototype_com 35.61     08/02/29 SMI"
 #
 #  X Window System online user man pages
 
@@ -87,7 +87,6 @@
 f none openwin/share/man/man1/makepsres.1 0444 root bin
 f none openwin/share/man/man1/mkdirhier.1 0444 root bin
 f none openwin/share/man/man1/mkfontdir.1 0444 root bin
-f none openwin/share/man/man1/oclock.1 0444 root bin
 f none openwin/share/man/man1/pswrap.1 0444 root bin
 f none openwin/share/man/man1/redxblue.1 0444 root bin
 f none openwin/share/man/man1/resize.1 0444 root bin
@@ -96,7 +95,6 @@
 f none openwin/share/man/man1/showfont.1 0444 root bin
 f none openwin/share/man/man1/showrgb.1 0444 root bin
 f none openwin/share/man/man1/showsnf.1 0444 root bin
-f none openwin/share/man/man1/viewres.1 0444 root bin
 f none openwin/share/man/man1/winsysck.1 0444 root bin
 f none openwin/share/man/man1/xbiff.1 0444 root bin
 f none openwin/share/man/man1/xclock.1 0444 root bin
@@ -186,12 +184,18 @@
 # open-src/app/luit
 f none X11/share/man/man1/luit.1 	0444 root bin
 
+# open-src/app/oclock
+f none X11/share/man/man1/oclock.1 	0444 root bin
+
 # open-src/app/setxkbmap
 f none X11/share/man/man1/setxkbmap.1   0444 root bin
 
 # open-src/app/twm
 f none X11/share/man/man1/twm.1 	0444 root bin
 
+# open-src/app/viewres
+f none X11/share/man/man1/viewres.1 	0444 root bin
+
 # open-src/app/x11perf
 f none X11/share/man/man1/x11perf.1 	0444 root bin
 f none X11/share/man/man1/x11perfcomp.1	0444 root bin
--- a/packages/SUNWxwopt/prototype	Fri Feb 29 07:06:16 2008 -0800
+++ b/packages/SUNWxwopt/prototype	Fri Feb 29 12:13:05 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.43	08/02/24 SMI"
+# ident "@(#)prototype	35.44	08/02/29 SMI"
 ##
 #  nonessential X core clients and server extensions
 
@@ -44,13 +44,11 @@
 f none openwin/bin/imake	0755 root bin
 f none openwin/bin/makedepend	0755 root bin
 f none openwin/bin/mkdirhier	0755 root bin
-f none openwin/bin/oclock	0755 root bin
 f none openwin/bin/pswrap	0755 root bin
 f none openwin/bin/resize	0755 root bin
 f none openwin/bin/rgb		0755 root bin
 f none openwin/bin/sessreg	0755 root bin
 f none openwin/bin/showsnf	0755 root bin
-f none openwin/bin/viewres	0755 root bin
 f none openwin/bin/xbiff	0755 root bin
 f none openwin/bin/xclock	0755 root bin
 f none openwin/bin/xcolor	0755 root bin
@@ -71,7 +69,6 @@
 s none openwin/lib/X11/app-defaults/= ../app-defaults
 
 !search  $HOME/openwin/lib/X11/app-defaults
-f none openwin/lib/app-defaults/Viewres 0644 root bin
 f none openwin/lib/app-defaults/XFontSel 0644 root bin
 f none openwin/lib/app-defaults/XLoad 0644 root bin
 f none openwin/lib/app-defaults/Xditview 0644 root bin
@@ -164,6 +161,8 @@
 f none X11/bin/bitmap				0755 root bin
 f none X11/bin/bmtoa				0755 root bin
 f none X11/bin/editres				0755 root bin
+f none X11/bin/oclock				0755 root bin
+f none X11/bin/viewres				0755 root bin
 f none X11/bin/xcursorgen			0755 root bin
 f none X11/bin/xkill				0755 root bin
 f none X11/bin/xclipboard			0755 root bin
@@ -175,6 +174,8 @@
 s none openwin/bin/bitmap=../../X11/bin/bitmap
 s none openwin/bin/bmtoa=../../X11/bin/bmtoa
 s none openwin/bin/editres=../../X11/bin/editres
+s none openwin/bin/oclock=../../X11/bin/oclock
+s none openwin/bin/viewres=../../X11/bin/viewres
 s none openwin/bin/xkill=../../X11/bin/xkill
 s none openwin/bin/xclipboard=../../X11/bin/xclipboard
 s none openwin/bin/xcmsdb=../../X11/bin/xcmsdb
@@ -193,3 +194,13 @@
 # no openwin link since it was never delivered into /usr/openwin
 f none X11/bin/luit				0755 root bin
 
+!search $HOME/X11/lib/X11/app-defaults
+d none X11/lib                                  0755 root bin
+d none X11/lib/X11		                0755 root bin
+d none X11/lib/X11/app-defaults		        0755 root bin
+f none X11/lib/X11/app-defaults/Viewres		0644 root bin
+
+# Create links back to openwin
+s none openwin/lib/app-defaults/Viewres=../../../X11/lib/X11/app-defaults/Viewres
+
+
--- a/packages/SUNWxwplt/prototype_com	Fri Feb 29 07:06:16 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com	Fri Feb 29 12:13:05 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.162    08/02/29   Sun Microsystems"
+#      "@(#)prototype_com	35.163    08/02/29   Sun Microsystems"
 #
 # X Window System required core package
 
@@ -464,7 +464,6 @@
 !search  $HOME/openwin/lib/X11/app-defaults
 d none openwin/lib/app-defaults 		0755 root bin
 s none openwin/lib/X11/app-defaults=../app-defaults
-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/XLock		0644 root bin
@@ -1128,6 +1127,7 @@
 f none X11/lib/X11/app-defaults/Bitmap		0644 root bin
 f none X11/lib/X11/app-defaults/Bitmap-color	0644 root bin
 f none X11/lib/X11/app-defaults/Bitmap-nocase	0644 root bin
+f none X11/lib/X11/app-defaults/Clock-color	0644 root bin
 f none X11/lib/X11/app-defaults/Editres		0644 root bin
 f none X11/lib/X11/app-defaults/Editres-color	0644 root bin
 f none X11/lib/X11/app-defaults/XCalc		0644 root bin
@@ -1148,6 +1148,7 @@
 s none openwin/lib/app-defaults/Bitmap=../../../X11/lib/X11/app-defaults/Bitmap
 s none openwin/lib/app-defaults/Bitmap-color=../../../X11/lib/X11/app-defaults/Bitmap-color
 s none openwin/lib/app-defaults/Bitmap-nocase=../../../X11/lib/X11/app-defaults/Bitmap-nocase
+s none openwin/lib/app-defaults/Clock-color=../../../X11/lib/X11/app-defaults/Clock-color
 s none openwin/lib/app-defaults/Editres=../../../X11/lib/X11/app-defaults/Editres
 s none openwin/lib/app-defaults/Editres-color=../../../X11/lib/X11/app-defaults/Editres-color
 s none openwin/lib/app-defaults/XCalc=../../../X11/lib/X11/app-defaults/XCalc
upstream/oracle/x-cons/x-s12-clone