Mercurial Mercurial > upstream > oracle > xnv / 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.
6654827 Replace xprop with the opensrc version from X.Org
authorNiveditha Rau <Niveditha.Rau@Sun.COM>
Thu, 24 Jan 2008 15:59:01 -0800
changeset 295 ae94314169f7
parent 294 2c88146a951a
child 296 3dd6fa60e7a8
6654827 Replace xprop with the opensrc version from X.Org
open-src/app/Makefile file | annotate | diff | comparison | revisions
open-src/app/xprop/Makefile file | annotate | diff | comparison | revisions
packages/SUNW0xwplt/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwman/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwplt/prototype_com file | annotate | diff | comparison | revisions 
--- a/open-src/app/Makefile	Thu Jan 24 15:06:03 2008 -0800
+++ b/open-src/app/Makefile	Thu Jan 24 15:59:01 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.18	08/01/23
+# @(#)Makefile	1.19	08/01/24
 #
 ###############################################################################
 
@@ -47,6 +47,7 @@
 	xmag \
 	xmodmap \
 	xpm \
+	xprop \
 	xrandr \
 	xrefresh \
 	xset \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xprop/Makefile	Thu Jan 24 15:59:01 2008 -0800
@@ -0,0 +1,50 @@
+##############################################################################
+#
+# xprop 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/01/24
+#
+
+# Package name used in tarballs
+APP_NAME=xprop
+
+# 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/SUNW0xwplt/prototype	Thu Jan 24 15:06:03 2008 -0800
+++ b/packages/SUNW0xwplt/prototype	Thu Jan 24 15:59:01 2008 -0800
@@ -29,7 +29,7 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.10     08/01/23 SMI"
+# ident "@(#)prototype 1.11     08/01/25 SMI"
 #
 # X Window System required core package localizable files
 
@@ -39,6 +39,10 @@
 
 !HOME=../usr
 
+d none X11                                              0755 root bin
+d none X11/lib                                          0755 root bin
+d none X11/lib/X11                                      0755 root bin
+
 !search      $HOME/openwin/lib/X11/app-defaults
 d none openwin 0755 root bin
 d none openwin/lib                      0755 root bin
@@ -51,8 +55,6 @@
 f none openwin/lib/locale/C/app-defaults/Chooser 0644 root bin
 f none openwin/lib/locale/C/app-defaults/Editres 0644 root bin
 f none openwin/lib/locale/C/app-defaults/Editres-color 0644 root bin
-f none openwin/lib/locale/C/app-defaults/XCalc 0644 root bin
-f none openwin/lib/locale/C/app-defaults/XCalc-color 0644 root bin
 f none openwin/lib/locale/C/app-defaults/XClipboard 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
@@ -61,7 +63,6 @@
 f none openwin/lib/locale/C/app-defaults/XLogo-color 0644 root bin
 f none openwin/lib/locale/C/app-defaults/XTerm 0644 root bin
 f none openwin/lib/locale/C/app-defaults/Xfd 0644 root bin
-f none openwin/lib/locale/C/app-defaults/Xmag 0644 root bin
 f none openwin/lib/locale/C/app-defaults/Xmh 0644 root bin
 
 !search      $HOME/openwin/lib/locale/C/LC_MESSAGES
@@ -69,11 +70,20 @@
 f none openwin/lib/locale/C/LC_MESSAGES/xfd.po 		0644 root bin
 
 !search      $HOME/X11/share/locale/C/LC_MESSAGES
+d none X11/share					0755 root bin
+d none X11/share/locale					0755 root bin
+d none X11/share/locale/C				0755 root bin
 d none X11/share/locale/C/LC_MESSAGES 			0755 root bin
 f none X11/share/locale/C/LC_MESSAGES/cxpm.po		0444 root bin
 f none X11/share/locale/C/LC_MESSAGES/sxpm.po 		0444 root bin
-f none X11/share/locale/C/LC_MESSAGES/xhost.po	0644 root bin
+f none X11/share/locale/C/LC_MESSAGES/xhost.po		0644 root bin
 
+!search      $HOME/X11/lib/X11/app-defaults
+d none X11/lib/X11/app-defaults                         0755 root bin
+d none X11/lib/X11/app-defaults/C                       0755 root bin
+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/Xmag			0444 root bin
 
 # RBAC help files
 d none lib 0755 root bin
--- a/packages/SUNWxwman/prototype_com	Thu Jan 24 15:06:03 2008 -0800
+++ b/packages/SUNWxwman/prototype_com	Thu Jan 24 15:59:01 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.42     08/01/23 SMI"
+# ident "@(#)prototype_com 35.43     08/01/24 SMI"
 #
 #  X Window System online user man pages
 
@@ -132,7 +132,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/xprop.1 0444 root bin
 f none openwin/share/man/man1/xrdb.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,6 +205,9 @@
 f none X11/share/man/man1/cxpm.1	0444 root bin
 f none X11/share/man/man1/sxpm.1 	0444 root bin
 
+# open-src/app/xprop
+f none X11/share/man/man1/xprop.1 	0444 root bin
+
 # open-src/app/xrefresh
 f none X11/share/man/man1/xrefresh.1 	0444 root bin
 
--- a/packages/SUNWxwplt/prototype_com	Thu Jan 24 15:06:03 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com	Thu Jan 24 15:59:01 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#	"@(#)prototype_com	35.143	08/01/23   Sun Microsystems" 
+#	"@(#)prototype_com	35.146	08/01/25   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/xprop 	0755 root bin
 f none openwin/bin/xrdb 	0755 root bin
 f none openwin/bin/xstdcmap 	0755 root bin
 f none openwin/bin/xwd 		0755 root bin
@@ -136,6 +135,10 @@
 s none openwin/bin/cxpm=../../X11/bin/cxpm
 s none openwin/bin/sxpm=../../X11/bin/sxpm
 
+# open-src/app/xprop
+f none X11/bin/xprop 		0755 root bin
+s none openwin/bin/xprop=../../X11/bin/xprop
+
 # open-src/app/xrefresh
 f none X11/bin/xrefresh 		0755 root bin
 s none openwin/bin/xrefresh=../../X11/bin/xrefresh
@@ -213,11 +216,6 @@
 s none X11/lib/libXau.so=./libXau.so.6
 f none X11/lib/libXau.so.6			0555 root bin
 
-# $HOME/lib/xorgcfg
-s none X11/lib/xorgcfg/libXaw7.so=./libXaw7.so.7
-s none X11/lib/xorgcfg/libXaw7.so.7=./libXaw.so.7
-f none X11/lib/xorgcfg/libXaw.so.7		0444 root bin
-
 # open-src/lib/libXcomposite (never delivered into /usr/openwin/lib)
 f none X11/lib/libXcomposite.so.1 		0644 root bin
 s none X11/lib/libXcomposite.so=libXcomposite.so.1
@@ -279,6 +277,12 @@
 s none X11/lib/libXtst.so=./libXtst.so.1
 f none X11/lib/libXtst.so.1			0755 root bin
 
+!search $HOME/X11/lib/xorgcfg
+d none X11/lib/xorgcfg                  0755 root bin
+s none X11/lib/xorgcfg/libXaw7.so=./libXaw7.so.7
+s none X11/lib/xorgcfg/libXaw7.so.7=./libXaw.so.7
+f none X11/lib/xorgcfg/libXaw.so.7		0444 root bin
+
 ## 64-bit versions
 
 !search $HOME/X11/lib/$plat_64
@@ -415,8 +419,6 @@
 f none openwin/lib/app-defaults/Chooser		0644 root bin
 f none openwin/lib/app-defaults/Editres		0644 root bin
 f none openwin/lib/app-defaults/Editres-color	0644 root bin
-f none openwin/lib/app-defaults/XCalc		0644 root bin
-f none openwin/lib/app-defaults/XCalc-color	0644 root bin
 f none openwin/lib/app-defaults/XClipboard	0644 root bin
 f none openwin/lib/app-defaults/XClock		0644 root bin
 f none openwin/lib/app-defaults/XConsole	0644 root bin
@@ -425,10 +427,8 @@
 f none openwin/lib/app-defaults/XLogo-color	0644 root bin
 f none openwin/lib/app-defaults/XTerm		0644 root bin
 f none openwin/lib/app-defaults/Xfd		0644 root bin
-f none openwin/lib/app-defaults/Xmag		0644 root bin
 f none openwin/lib/app-defaults/Xmh		0644 root bin
 
-
 !search  $HOME/openwin/share
 d none openwin/share 				0755 root bin
 
@@ -676,3 +676,15 @@
 d none lib/help/profiles/locale/C 755 root bin
 !search ../usr/lib/help/profiles/locale/C
 f none lib/help/profiles/locale/C/RtDesktopConfiguration.html 444 root bin
+
+!search      $HOME/X11/lib/X11/app-defaults
+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/XCalc		0644 root bin
+f none X11/lib/X11/app-defaults/XCalc-color	0644 root bin
+f none X11/lib/X11/app-defaults/Xmag		0644 root bin
+
+# Create links back to openwin
+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/Xmag=../../../X11/lib/X11/app-defaults/Xmag
upstream/oracle/xnv