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.
6755420 Make libXaw.so.7 public [LSARC/2008/609]
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Sun, 05 Oct 2008 09:55:12 -0700
changeset 559 894681074118
parent 558 8097cb4241b6
child 560 5e6bb0a1bfc0
6755420 Make libXaw.so.7 public [LSARC/2008/609]
open-src/app/xterm/Makefile file | annotate | diff | comparison | revisions
open-src/common/Makefile.init file | annotate | diff | comparison | revisions
open-src/common/pc-files/build_32/xaw7.pc file | annotate | diff | comparison | revisions
open-src/common/pc-files/build_64/xaw7.pc file | annotate | diff | comparison | revisions
open-src/lib/libXaw/Makefile file | annotate | diff | comparison | revisions
packages/SUNWxwinc/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwplt/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwpmn/pkginfo.tmpl file | annotate | diff | comparison | revisions
packages/SUNWxwpmn/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwrtl/prototype_com file | annotate | diff | comparison | revisions 
--- a/open-src/app/xterm/Makefile	Sun Oct 05 09:44:11 2008 -0700
+++ b/open-src/app/xterm/Makefile	Sun Oct 05 09:55:12 2008 -0700
@@ -74,8 +74,4 @@
 # Tell configure where to find luit binary
 MODULE_CONFIG_ENV = LUIT=/usr/X11/bin/luit
 
-# Use new libXaw
-MODULE_LD_OPTIONS = -L$(PROTODIR)$(X11_DIR)/lib/xorgcfg \
-			-R$(X11_DIR)/lib/xorgcfg
-
 include ../Makefile.inc
--- a/open-src/common/Makefile.init	Sun Oct 05 09:44:11 2008 -0700
+++ b/open-src/common/Makefile.init	Sun Oct 05 09:55:12 2008 -0700
@@ -29,7 +29,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.init	1.3	08/10/04
+# @(#)Makefile.init	1.4	08/10/05
 #
 
 # Use ksh93 for shell commands in Makefiles so that builds are the same
@@ -198,8 +198,8 @@
 
 ## Commonly added options
 
-# Link with X.Org current libXaw, even though it's not the default libXaw
-XAW_LDFLAGS = -L$(PROTODIR)$(X11_DIR)/lib/xorgcfg$(ARCHLIBSUBDIR)
+# No longer needed, since X.Org libXaw is now default
+XAW_LDFLAGS = 
 
 # Link with X server private libraries like libXfont & libfontenc
 X11_SERVERLIBS_LDFLAGS= -L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
--- a/open-src/common/pc-files/build_32/xaw7.pc	Sun Oct 05 09:44:11 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-prefix=/usr/openwin
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: Xaw
-Description: X Athena Widgets Library
-Version: 0.1
-Requires: xproto xt xmu
-Requires.private: x11 xext xt xmu
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXaw
--- a/open-src/common/pc-files/build_64/xaw7.pc	Sun Oct 05 09:44:11 2008 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-prefix=/usr/openwin
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/64
-includedir=${prefix}/include
-
-Name: Xaw
-Description: X Athena Widgets Library
-Version: 0.1
-Requires: xproto xt xmu
-Requires.private: x11 xext xt xmu
-Cflags: -I${includedir}
-Libs: -L${libdir} -lXaw
--- a/open-src/lib/libXaw/Makefile	Sun Oct 05 09:44:11 2008 -0700
+++ b/open-src/lib/libXaw/Makefile	Sun Oct 05 09:55:12 2008 -0700
@@ -30,14 +30,9 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	08/08/08
+# @(#)Makefile	1.4	08/10/05
 #
 
-## For now, this libXaw is installed to a private directory for the use
-## of xorgcfg only.   Further evaluation is needed of the differences 
-## between the current Solaris libXaw & this one before it can become the
-## default/public libXaw.
-
 # Package name used in tarballs
 MODULE_NAME=libXaw
 
@@ -51,12 +46,10 @@
 LIBNAME=Xaw
 
 # Library man pages to apply Sun footer to & attributes to list
-# SUNTOUCHED_MANPAGES=
+SUNTOUCHED_MANPAGES=man/*.man
 SUN_PACKAGE=SUNWxwplt
 MODULE_STABILITY=Uncommitted
-LIB_MAN_SUFFIX=3
-
-
+LIB_MAN_SUFFIX=3Xaw
 
 # Link with version mapfile
 # MODULE_LD_OPTIONS = -M $(PWD)/mapfile-vers
@@ -65,10 +58,10 @@
 FIX_PC_FILES=xaw*.pc.in
 
 # Additional arguments to pass to configure
+# We only ship libXaw.so.7 right now, since we don't need to maintain binary
+# compatibility with the libXaw.so.6 version we never shipped, and never
+# started shipping the now-dropped-by-X.Org libXaw.so.8 (Xaw + Xprint)
 MODULE_CONFIG_OPTS= --disable-xaw6 --disable-xaw8
 
-# Install in private subdir for xorgcfg
-MODULE_ADD_LIB_SUBDIR=/xorgcfg
-
 include ../Makefile.inc
 
--- a/packages/SUNWxwinc/prototype	Sun Oct 05 09:44:11 2008 -0700
+++ b/packages/SUNWxwinc/prototype	Sun Oct 05 09:55:12 2008 -0700
@@ -27,7 +27,7 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	35.88	08/09/16 SMI"
+# ident	"@(#)prototype	35.89	08/10/05 SMI"
 #
 #  X Window System include files
 
@@ -216,87 +216,82 @@
 f none openwin/share/include/X11/DPS/dpsops.h 0644 root bin
 f none openwin/share/include/X11/DPS/psops.h 0644 root bin
 
+# open-src/lib/libXaw
+!search                $HOME/X11/include/X11/Xaw
+d none X11/include/X11/Xaw 			0755 root bin
+s none openwin/share/include/X11/Xaw=../../../../X11/include/X11/Xaw
+f none X11/include/X11/Xaw/AllWidgets.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiSink.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiSinkP.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiSrc.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiSrcP.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiText.h		0444 root bin
+f none X11/include/X11/Xaw/AsciiTextP.h		0444 root bin
+f none X11/include/X11/Xaw/Box.h		0444 root bin
+f none X11/include/X11/Xaw/BoxP.h		0444 root bin
+f none X11/include/X11/Xaw/Cardinals.h		0444 root bin
+f none X11/include/X11/Xaw/Command.h		0444 root bin
+f none X11/include/X11/Xaw/CommandP.h		0444 root bin
+f none X11/include/X11/Xaw/Dialog.h		0444 root bin
+f none X11/include/X11/Xaw/DialogP.h		0444 root bin
+f none X11/include/X11/Xaw/Form.h		0444 root bin
+f none X11/include/X11/Xaw/FormP.h		0444 root bin
+f none X11/include/X11/Xaw/Grip.h		0444 root bin
+f none X11/include/X11/Xaw/GripP.h		0444 root bin
+f none X11/include/X11/Xaw/Label.h		0444 root bin
+f none X11/include/X11/Xaw/LabelP.h		0444 root bin
+f none X11/include/X11/Xaw/List.h		0444 root bin
+f none X11/include/X11/Xaw/ListP.h		0444 root bin
+f none X11/include/X11/Xaw/MenuButtoP.h		0444 root bin
+f none X11/include/X11/Xaw/MenuButton.h		0444 root bin
+f none X11/include/X11/Xaw/MultiSink.h		0444 root bin
+f none X11/include/X11/Xaw/MultiSinkP.h		0444 root bin
+f none X11/include/X11/Xaw/MultiSrc.h		0444 root bin
+f none X11/include/X11/Xaw/MultiSrcP.h		0444 root bin
+f none X11/include/X11/Xaw/Paned.h		0444 root bin
+f none X11/include/X11/Xaw/PanedP.h		0444 root bin
+f none X11/include/X11/Xaw/Panner.h		0444 root bin
+f none X11/include/X11/Xaw/PannerP.h		0444 root bin
+f none X11/include/X11/Xaw/Porthole.h		0444 root bin
+f none X11/include/X11/Xaw/PortholeP.h		0444 root bin
+f none X11/include/X11/Xaw/Repeater.h		0444 root bin
+f none X11/include/X11/Xaw/RepeaterP.h		0444 root bin
+f none X11/include/X11/Xaw/Reports.h		0444 root bin
+f none X11/include/X11/Xaw/Scrollbar.h		0444 root bin
+f none X11/include/X11/Xaw/ScrollbarP.h		0444 root bin
+f none X11/include/X11/Xaw/Simple.h		0444 root bin
+f none X11/include/X11/Xaw/SimpleMenP.h		0444 root bin
+f none X11/include/X11/Xaw/SimpleMenu.h		0444 root bin
+f none X11/include/X11/Xaw/SimpleP.h		0444 root bin
+f none X11/include/X11/Xaw/Sme.h		0444 root bin
+f none X11/include/X11/Xaw/SmeBSB.h		0444 root bin
+f none X11/include/X11/Xaw/SmeBSBP.h		0444 root bin
+f none X11/include/X11/Xaw/SmeLine.h		0444 root bin
+f none X11/include/X11/Xaw/SmeLineP.h		0444 root bin
+f none X11/include/X11/Xaw/SmeP.h		0444 root bin
+f none X11/include/X11/Xaw/StripCharP.h		0444 root bin
+f none X11/include/X11/Xaw/StripChart.h		0444 root bin
+f none X11/include/X11/Xaw/Template.c		0444 root bin
+f none X11/include/X11/Xaw/Template.h		0444 root bin
+f none X11/include/X11/Xaw/TemplateP.h		0444 root bin
+f none X11/include/X11/Xaw/Text.h		0444 root bin
+f none X11/include/X11/Xaw/TextP.h		0444 root bin
+f none X11/include/X11/Xaw/TextSink.h		0444 root bin
+f none X11/include/X11/Xaw/TextSinkP.h		0444 root bin
+f none X11/include/X11/Xaw/TextSrc.h		0444 root bin
+f none X11/include/X11/Xaw/TextSrcP.h		0444 root bin
+f none X11/include/X11/Xaw/Tip.h		0444 root bin
+f none X11/include/X11/Xaw/TipP.h		0444 root bin
+f none X11/include/X11/Xaw/Toggle.h		0444 root bin
+f none X11/include/X11/Xaw/ToggleP.h		0444 root bin
+f none X11/include/X11/Xaw/Tree.h		0444 root bin
+f none X11/include/X11/Xaw/TreeP.h		0444 root bin
+f none X11/include/X11/Xaw/VendorEP.h		0444 root bin
+f none X11/include/X11/Xaw/Viewport.h		0444 root bin
+f none X11/include/X11/Xaw/ViewportP.h		0444 root bin
+f none X11/include/X11/Xaw/XawImP.h		0444 root bin
+f none X11/include/X11/Xaw/XawInit.h		0444 root bin
 
-d none openwin/share/include/X11/Xaw 0755 root bin
-!search                $HOME/openwin/include/X11/Xaw
-f none openwin/share/include/X11/Xaw/AllWidgets.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiSink.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiSinkP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiSrc.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiSrcP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiText.h 0644 root bin
-f none openwin/share/include/X11/Xaw/AsciiTextP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Box.h 0644 root bin
-f none openwin/share/include/X11/Xaw/BoxP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Cardinals.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Clock.h 0644 root bin
-f none openwin/share/include/X11/Xaw/ClockP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Command.h 0644 root bin
-f none openwin/share/include/X11/Xaw/CommandP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Dialog.h 0644 root bin
-f none openwin/share/include/X11/Xaw/DialogP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Form.h 0644 root bin
-f none openwin/share/include/X11/Xaw/FormP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Grip.h 0644 root bin
-f none openwin/share/include/X11/Xaw/GripP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Label.h 0644 root bin
-f none openwin/share/include/X11/Xaw/LabelP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/List.h 0644 root bin
-f none openwin/share/include/X11/Xaw/ListP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Logo.h 0644 root bin
-f none openwin/share/include/X11/Xaw/LogoP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Mailbox.h 0644 root bin
-f none openwin/share/include/X11/Xaw/MailboxP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/MenuButtoP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/MenuButton.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Paned.h 0644 root bin
-f none openwin/share/include/X11/Xaw/PanedP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Panner.h 0644 root bin
-f none openwin/share/include/X11/Xaw/PannerP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Porthole.h 0644 root bin
-f none openwin/share/include/X11/Xaw/PortholeP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Repeater.h 0644 root bin
-f none openwin/share/include/X11/Xaw/RepeaterP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Reports.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Scrollbar.h 0644 root bin
-f none openwin/share/include/X11/Xaw/ScrollbarP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Simple.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SimpleMenP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SimpleMenu.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SimpleP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Sme.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SmeBSB.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SmeBSBP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SmeLine.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SmeLineP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/SmeP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/StripCharP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/StripChart.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Template.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TemplateP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Text.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TextP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TextSink.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TextSinkP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TextSrc.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TextSrcP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Toggle.h 0644 root bin
-f none openwin/share/include/X11/Xaw/ToggleP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Tree.h 0644 root bin
-f none openwin/share/include/X11/Xaw/TreeP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/Viewport.h 0644 root bin
-f none openwin/share/include/X11/Xaw/ViewportP.h 0644 root bin
-f none openwin/share/include/X11/Xaw/XawInit.h 0644 root bin
-#
-#	R6
-#
-f none openwin/share/include/X11/Xaw/MultiSink.h  0644 root bin
-f none openwin/share/include/X11/Xaw/MultiSinkP.h  0644 root bin
-f none openwin/share/include/X11/Xaw/MultiSrc.h  0644 root bin
-f none openwin/share/include/X11/Xaw/MultiSrcP.h  0644 root bin
-f none openwin/share/include/X11/Xaw/Template.c  0644 root bin
-f none openwin/share/include/X11/Xaw/VendorEP.h  0644 root bin
-f none openwin/share/include/X11/Xaw/XawImP.h  0644 root bin
 
 # open-src/lib/libXmu
 d none X11/include/X11/Xmu 			0755 root bin
@@ -709,6 +704,7 @@
 f none lib/pkgconfig/sm.pc			0444 root bin
 f none lib/pkgconfig/x11.pc			0444 root bin
 f none lib/pkgconfig/xau.pc			0444 root bin
+f none lib/pkgconfig/xaw7.pc			0444 root bin
 f none lib/pkgconfig/xcomposite.pc		0444 root bin
 f none lib/pkgconfig/xcursor.pc			0444 root bin
 f none lib/pkgconfig/xdamage.pc			0444 root bin
@@ -767,6 +763,7 @@
 f none lib/$plat_64/pkgconfig/sm.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/x11.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xau.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xaw7.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xcomposite.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xcursor.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xdamage.pc		0444 root bin
--- a/packages/SUNWxwplt/prototype_com	Sun Oct 05 09:44:11 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com	Sun Oct 05 09:55:12 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.207    08/10/03   Sun Microsystems"
+#      "@(#)prototype_com	35.208    08/10/05   Sun Microsystems"
 #
 # X Window System required core package
 
@@ -283,7 +283,6 @@
 s none openwin/lib/rgb.dir=X11/rgb.dir
 s none openwin/lib/rgb.txt=X11/rgb.txt
 
-s none openwin/lib/libXaw.so=./libXaw.so.5
 f none openwin/lib/libXaw.so.5 		0755 root bin
 f none openwin/lib/libXaw.so.4 		0755 root bin
 # Symlink removed to prevent compiling new programs - library is left
@@ -323,6 +322,15 @@
 s none X11/lib/libXau.so=./libXau.so.6
 f none X11/lib/libXau.so.6			0555 root bin
 
+# open-src/lib/libXaw
+# The libXaw.so link from /usr/openwin/lib is redirected,
+# but libXaw.so.7 was never delivered there, so it is not linked
+s none openwin/lib/libXaw.so=../../X11/lib/libXaw.so
+s none X11/lib/libXaw.so=./libXaw7.so.7
+s none X11/lib/libXaw.so.7=./libXaw7.so.7
+s none X11/lib/libXaw7.so=./libXaw7.so.7
+f none X11/lib/libXaw7.so.7			0555 root bin
+
 # open-src/lib/libFS
 s none openwin/lib/libFS.so.5=../../X11/lib/libFS.so.5
 s none openwin/lib/libFS.so=../../X11/lib/libFS.so.5
@@ -436,12 +444,6 @@
 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
@@ -463,6 +465,15 @@
 s none X11/lib/$plat_64/libXau.so=./libXau.so.6
 f none X11/lib/$plat_64/libXau.so.6		0555 root bin
 
+# open-src/lib/libXaw
+# The libXaw.so link from /usr/openwin/lib is redirected,
+# but libXaw.so.7 was never delivered there, so it is not linked
+s none openwin/lib/$plat_64/libXaw.so=../../../X11/lib/64/libXaw.so
+s none X11/lib/$plat_64/libXaw.so=./libXaw7.so.7
+s none X11/lib/$plat_64/libXaw.so.7=./libXaw7.so.7
+s none X11/lib/$plat_64/libXaw7.so=./libXaw7.so.7
+f none X11/lib/$plat_64/libXaw7.so.7			0555 root bin
+
 # open-src/lib/libFS - never delivered into openwin in 64-bit version
 s none X11/lib/$plat_64/libFS.so=./libFS.so.5
 f none X11/lib/$plat_64/libFS.so.5		0555 root bin
@@ -1200,7 +1211,6 @@
 !search  $HOME/openwin/lib/$plat_64
 d none openwin/lib/$plat_64 			0755 root bin
 s none openwin/lib/64=$plat_64
-s none openwin/lib/$plat_64/libXaw.so=./libXaw.so.5
 f none openwin/lib/$plat_64/libXaw.so.5 		0755 root bin
 s none openwin/lib/$plat_64/libxkbfile.so=./libxkbfile.so.4
 f none openwin/lib/$plat_64/libxkbfile.so.4 	0755 root bin
--- a/packages/SUNWxwpmn/pkginfo.tmpl	Sun Oct 05 09:44:11 2008 -0700
+++ b/packages/SUNWxwpmn/pkginfo.tmpl	Sun Oct 05 09:55:12 2008 -0700
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2000 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,21 +29,21 @@
 #
 ###########################################################################
 #
-#	@(#)pkginfo.tmpl	35.75	11/05/07 (c) Sun Microsystems, Inc.
+#	@(#)pkginfo.tmpl	35.76	10/05/08 (c) Sun Microsystems, Inc.
 
 PKG="SUNWxwpmn"
-NAME="X Window System online programmers man pages"
+NAME="X Window System programmers man pages"
 ARCH="ISA"
 VERSION=6.4.2.0,REV=0.2000.02.02
 CATEGORY="system"
 SUNW_PRODNAME="Solaris X11"
 SUNW_PRODVERS=6.4.2
-DESC="X Window System online programmers man pages"
+DESC="X Window System programmers reference manual pages"
 BASEDIR="/usr"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
 MAXINST="1000"
-SUNW_PKGTYPE="ow"
+SUNW_PKGTYPE="usr"
 SUNW_PKGVERS=1.0
 
--- a/packages/SUNWxwpmn/prototype	Sun Oct 05 09:44:11 2008 -0700
+++ b/packages/SUNWxwpmn/prototype	Sun Oct 05 09:55:12 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#	"@(#)prototype	35.45	08/09/15   Sun Microsystems" 
+#	"@(#)prototype	35.46	08/10/05   Sun Microsystems" 
 #
 #  X Window System programmers man pages
 
@@ -36,10 +36,6 @@
 
 !HOME=../usr
 
-d none openwin 0755 root bin
-d none openwin/share 0755 root bin
-d none openwin/share/man 0755 root bin
-
 d none X11 0755 root bin
 d none X11/share 0755 root bin
 d none X11/share/man 0755 root bin
@@ -1333,6 +1329,11 @@
 f none X11/share/man/man3Xau/XauUnlockAuth.3Xau		0444 root bin
 f none X11/share/man/man3Xau/XauWriteAuth.3Xau		0444 root bin
 
+# open-src/lib/libXaw
+!search            $HOME/X11/share/man/man3Xaw
+d none X11/share/man/man3Xaw				0755 root bin
+f none X11/share/man/man3Xaw/Xaw.3Xaw  			0444 root bin
+
 # open-src/lib/libXcomposite
 !search $HOME/X11/share/man/man3Xcomposite
 d none X11/share/man/man3Xcomposite 0755 root bin
--- a/packages/SUNWxwrtl/prototype_com	Sun Oct 05 09:44:11 2008 -0700
+++ b/packages/SUNWxwrtl/prototype_com	Sun Oct 05 09:55:12 2008 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 1.50     08/09/15 SMI"
+# ident "@(#)prototype_com 1.51     08/10/05 SMI"
 #
 #  X Window System Runtime Compatability Package
 #
@@ -85,9 +85,13 @@
 s none lib/libXIE.so=./libXIE.so.6
 s none lib/libXIE.so.6=../openwin/lib/libXIE.so.6
 
-s none lib/libXaw.so=./libXaw.so.5
+s none lib/libXaw.so=../X11/lib/libXaw.so
 s none lib/libXaw.so.4=../openwin/lib/libXaw.so.4
 s none lib/libXaw.so.5=../openwin/lib/libXaw.so.5
+s none lib/libXaw.so.7=../X11/lib/libXaw.so.7
+
+s none lib/libXaw7.so=./libXaw7.so.7
+s none lib/libXaw7.so.7=../X11/lib/libXaw7.so.7
 
 s none lib/libXt.so=./libXt.so.4
 s none lib/libXt.so.4=../X11/lib/libXt.so.4
@@ -206,8 +210,12 @@
 s none lib/$plat_64/libSM.so=./libSM.so.6
 s none lib/$plat_64/libSM.so.6=../../X11/lib/64/libSM.so.6
 
-s none lib/$plat_64/libXaw.so=./libXaw.so.5
+s none lib/$plat_64/libXaw.so=../../X11/lib/64/libXaw.so
 s none lib/$plat_64/libXaw.so.5=../../openwin/lib/64/libXaw.so.5
+s none lib/$plat_64/libXaw.so.7=../../X11/lib/64/libXaw.so.7
+
+s none lib/$plat_64/libXaw7.so=./libXaw7.so.7
+s none lib/$plat_64/libXaw7.so.7=../../X11/lib/64/libXaw7.so.7
 
 s none lib/$plat_64/libXt.so=./libXt.so.4
 s none lib/$plat_64/libXt.so.4=../../X11/lib/64/libXt.so.4
upstream/oracle/x-cons/x-s12-clone