6840420 misc files missing from X packages
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Wed, 13 May 2009 16:52:41 -0700
changeset 702 1c8695b0715f
parent 701 04f093a048fc
child 703 e05ab2a49ec2
6840420 misc files missing from X packages 6840423 Move client library headers from SUNWxorg-headers to SUNWxwinc, docs to SUNWxwpmn
make_release_packages
open-src/util/build-tools/find-build-errors
packages/SUNW0xpmn/Makefile
packages/SUNWfreetype2/prototype
packages/SUNWxorg-devel-docs/copyright.add
packages/SUNWxorg-devel-docs/depend
packages/SUNWxorg-devel-docs/pkginfo.tmpl
packages/SUNWxorg-devel-docs/prototype
packages/SUNWxorg-headers/depend
packages/SUNWxorg-headers/depend.tmpl
packages/SUNWxorg-headers/pkginfo.tmpl
packages/SUNWxorg-headers/prototype
packages/SUNWxwdem/prototype
packages/SUNWxwfsw/prototype_com
packages/SUNWxwinc/copyright.add
packages/SUNWxwinc/depend.tmpl
packages/SUNWxwinc/prototype
packages/SUNWxwopt/prototype
packages/SUNWxwplt/prototype_com
packages/SUNWxwpmn/copyright.add
packages/SUNWxwpmn/prototype
packages/upgrade-X
--- a/make_release_packages	Wed May 13 07:31:10 2009 -0700
+++ b/make_release_packages	Wed May 13 16:52:41 2009 -0700
@@ -27,7 +27,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-# @(#)make_release_packages	1.69	09/03/09
+# @(#)make_release_packages	1.70	09/05/13
 #
 #	Create and fill a package staging area for X
 #
@@ -58,7 +58,7 @@
     SUNWttf-google-droid
     SUNWpciaccess SUNWpixman SUNWfreetype2 SUNWvncviewer SUNWxcursor-themes
     SUNWxorg-cfg SUNWxorg-client-docs SUNWxorg-client-programs
-    SUNWxorg-clientlibs SUNWxorg-compatlinks SUNWxorg-devel-docs
+    SUNWxorg-clientlibs SUNWxorg-compatlinks
     SUNWxorg-graphics-ddx SUNWxorg-headers
     SUNWxorg-server SUNWxorg-tsol-module 
     SUNWxscreensaver-hacks SUNWxscreensaver-hacks-gl SUNWxsun-server
--- a/open-src/util/build-tools/find-build-errors	Wed May 13 07:31:10 2009 -0700
+++ b/open-src/util/build-tools/find-build-errors	Wed May 13 16:52:41 2009 -0700
@@ -1,7 +1,7 @@
 #! /usr/perl5/bin/perl -w
 
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,7 +29,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)find-build-errors 1.2     09/01/11 SMI"
+# ident "@(#)find-build-errors 1.3     09/05/13 SMI"
 #
 
 require 5.005;				# minimal Perl version required
@@ -236,10 +236,16 @@
       @pkglines = ();
     }
 
-    if ($l =~ m{(Packaging was not successful.|was not found ; skipping)}ms) {
+    # Warnings we can ignore
+    next if $l =~ m{^WARNING: parameter \<PSTAMP\> set}ms;
+    next if $l =~ m{^WARNING: parameter \<CLASSES\> set to "none"}ms;
+
+    push @pkglines, $l;
+
+    if (($l =~ m{(Packaging was not successful.|was not found ; skipping)}ms)
+	|| ($l =~ m{^WARNING: }ms)) {
       print join('', @pkglines);
-    } else {
-      push @pkglines, $l;
+      @pkglines = ();
     }
   }
 
--- a/packages/SUNW0xpmn/Makefile	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNW0xpmn/Makefile	Wed May 13 16:52:41 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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
@@ -27,14 +27,13 @@
 # of the copyright holder.
 #
 #
-# ident "@(#)Makefile	1.3    07/01/31 SMI"
+# ident "@(#)Makefile	1.4    09/05/13 SMI"
 #
 
 SOURCEDIR=../../packages
 
 PROTO_SOURCES = \
 	$(SOURCEDIR)/SUNWxwpmn/prototype			\
-	$(SOURCEDIR)/SUNWxorg-devel-docs/prototype		\
 	$(SOURCEDIR)/SUNWfontconfig-docs/prototype
 
 all: prototype
--- a/packages/SUNWfreetype2/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWfreetype2/prototype	Wed May 13 16:52:41 2009 -0700
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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.19	08/11/04 SMI
+#	@(#)prototype	1.20	09/05/13 SMI
 #
 #  FreeType 2 package
 
@@ -71,6 +71,7 @@
 f none include/freetype2/freetype/ftbitmap.h			0444 root bin
 f none include/freetype2/freetype/ftcache.h			0444 root bin
 f none include/freetype2/freetype/ftchapters.h			0444 root bin
+f none include/freetype2/freetype/ftcid.h			0444 root bin
 f none include/freetype2/freetype/fterrdef.h			0444 root bin
 f none include/freetype2/freetype/fterrors.h			0444 root bin
 f none include/freetype2/freetype/ftgasp.h			0444 root bin
--- a/packages/SUNWxorg-devel-docs/copyright.add	Wed May 13 07:31:10 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-
---------------------------------------------------------------------
-
-Files from the lib/libXevie package are covered by the following notice:
-
-include lib/libXevie/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXfixes package are covered by the following notice:
-
-include lib/libXfixes/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXft package are covered by the following notice:
-
-include lib/libXft/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXrandr package are covered by the following notice:
-
-include lib/libXrandr/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXv package are covered by the following notice:
-
-include lib/libXv/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXxf86misc package are covered by the following notice:
-
-include lib/libXxf86misc/COPYING
-
---------------------------------------------------------------------
-
-Files from the lib/libXxf86vm package are covered by the following notice:
-
-include lib/libXxf86vm/COPYING
-
--- a/packages/SUNWxorg-devel-docs/depend	Wed May 13 07:31:10 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-##########################################################################
-#
-# Copyright 2005 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
-# "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.
-#
-##########################################################################
-#
-# ident "@(#)depend 1.2     05/11/07 SMI"
-#
-# X.Org Foundation client libraries developer documentation
-
-P SUNWcsr       Core Solaris, (Root)
-P SUNWcsu       Core Solaris, (Usr)
-P SUNWcsl       Core Solaris, (Shared Libs)
-
-
--- a/packages/SUNWxorg-devel-docs/pkginfo.tmpl	Wed May 13 07:31:10 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-##########################################################################
-#
-# Copyright 2005 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
-# "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.
-#
-##########################################################################
-#
-# ident "@(#)pkginfo.tmpl 1.2     05/11/07 SMI"
-#
-
-PKG="SUNWxorg-devel-docs"
-NAME="X.Org Foundation client API documentation"
-ARCH="ISA"
-VERSION=0.1,REV=0.2000.02.02
-CATEGORY="system"
-DESC="Documentation for programming clients using X Window System libraries based on X.Org Foundation open source release"
-BASEDIR="/usr"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-MAXINST="1000"
-SUNW_PKGVERS=1.0
-SUNW_PRODNAME="X.Org Foundation X11 for Solaris"
-SUNW_PRODVERS=1.0
-SUNW_PKGTYPE=usr
--- a/packages/SUNWxorg-devel-docs/prototype	Wed May 13 07:31:10 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 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
-# "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.
-#
-###########################################################################
-#
-# ident "@(#)prototype 1.5     09/05/07 SMI"
-#
-# X.Org Foundation X client library documentation for Solaris
-
-!HOME=../usr/X11
-
-i pkginfo
-i depend
-i copyright
-
-d none X11 0755 root bin
-d none X11/share 0755 root bin
-d none X11/share/man 0755 root bin
-s none X11/man=share/man
-
-!search $HOME/share/man/man3
-d none X11/share/man/man3 0755 root bin
-f none X11/share/man/man3/Xfixes.3 0444 root bin
-f none X11/share/man/man3/Xft.3 0444 root bin
-
-!search $HOME/share/man/man3Xrandr
-d none X11/share/man/man3Xrandr 0755 root bin
-f none X11/share/man/man3Xrandr/Xrandr.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigCurrentConfiguration.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigCurrentRate.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigRates.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigRotations.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigSizes.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRConfigTimes.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRFreeScreenConfigInfo.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRGetScreenInfo.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRQueryExtension.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRQueryVersion.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRRootToScreen.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRSelectInput.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRSetScreenConfig.3Xrandr 0444 root bin
-f none X11/share/man/man3Xrandr/XRRSetScreenConfigAndRate.3Xrandr 0444 root bin
-
-#!search $HOME/share/man/man3Xevie
-#d none X11/share/man/man3Xevie 0755 root bin
-#f none X11/share/man/man3Xevie/Xevie.3Xevie 0444 root bin
-#f none X11/share/man/man3Xevie/XevieEnd.3Xevie 0444 root bin
-#f none X11/share/man/man3Xevie/XevieQueryVersion.3Xevie 0444 root bin
-#f none X11/share/man/man3Xevie/XevieSelectInput.3Xevie 0444 root bin
-#f none X11/share/man/man3Xevie/XevieSendEvent.3Xevie 0444 root bin
-#f none X11/share/man/man3Xevie/XevieStart.3Xevie 0444 root bin
-
-!search $HOME/share/man/man3Xv
-d none X11/share/man/man3Xv 0755 root bin
-f none X11/share/man/man3Xv/Xv.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvFreeAdaptorInfo.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvFreeEncodingInfo.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvGetPortAttribute.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvGetStill.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvGetVideo.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvGrabPort.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvPortNotify.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvPutStill.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvPutVideo.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvQueryAdaptors.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvQueryBestSize.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvQueryEncodings.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvQueryExtension.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvSelectPortNotify.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvSelectVideoNotify.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvSetPortAttribute.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvStopVideo.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvUngrabPort.3Xv 0444 root bin
-f none X11/share/man/man3Xv/XvVideoNotify.3Xv 0444 root bin
-
-!search $HOME/share/man/man3Xxf86vm
-d none X11/share/man/man3Xxf86vm 0755 root bin
-f none X11/share/man/man3Xxf86vm/XF86VM.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeDeleteModeLine.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetAllModeLines.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetDotClocks.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetGamma.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetGammaRamp.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetGammaRampSize.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetModeLine.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetMonitor.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetPermissions.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeGetViewPort.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeLockModeSwitch.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeModModeLine.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeQueryExtension.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeQueryVersion.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSetClientVersion.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSetGamma.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSetGammaRamp.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSetViewPort.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSwitchMode.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeSwitchToMode.3Xxf86vm 0444 root bin
-f none X11/share/man/man3Xxf86vm/XF86VidModeValidateModeLine.3Xxf86vm 0444 root bin
-
-!search $HOME/share/man/man3Xxf86misc
-d none X11/share/man/man3Xxf86misc 0755 root bin
-f none X11/share/man/man3Xxf86misc/XF86Misc.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscGetKbdSettings.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscGetMouseSettings.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscQueryExtension.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscQueryVersion.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscSetKbdSettings.3Xxf86misc 0444 root bin
-f none X11/share/man/man3Xxf86misc/XF86MiscSetMouseSettings.3Xxf86misc 0444 root bin
-
--- a/packages/SUNWxorg-headers/depend	Wed May 13 07:31:10 2009 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-##########################################################################
-#
-# Copyright 2004 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
-# "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.
-#
-##########################################################################
-#
-# ident "@(#)depend 1.3     05/11/07 SMI"
-#
-# Header files for X.Org Foundation X libraries for Solaris
-
-P SUNWcsr	Core Solaris, (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsl	Core Solaris, (Shared Libs)
-P SUNWxwinc	X Window System include files
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-headers/depend.tmpl	Wed May 13 16:52:41 2009 -0700
@@ -0,0 +1,43 @@
+##########################################################################
+#
+# Copyright 2009 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
+# "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.
+#
+##########################################################################
+#
+# ident "@(#)depend.tmpl 1.4     09/05/13 SMI"
+#
+# Header files for Xorg Server SDK
+
+P SUNWhea	SunOS Header Files
+P SUNWlibm	Math & Microtasking Library Headers & Lint Files (Usr)
+P SUNWxwinc	X Window System include files
+P SUNWpciaccess	PCI bus access library and tools
+P SUNWpixman	Pixman library
+
+# common dependencies
+include ../depend
--- a/packages/SUNWxorg-headers/pkginfo.tmpl	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxorg-headers/pkginfo.tmpl	Wed May 13 16:52:41 2009 -0700
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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,19 +29,20 @@
 #
 ##########################################################################
 #
-# ident "@(#)pkginfo.tmpl 1.3     05/11/07 SMI"
+# ident "@(#)pkginfo.tmpl 1.4     09/05/13 SMI"
 
 PKG="SUNWxorg-headers"
-NAME="X.Org Foundation X11 client headers"
+NAME="Xorg server SDK headers"
 ARCH="ISA"
 VERSION=0.1,REV=0.2000.02.02
 CATEGORY="system"
-DESC="X Window System client library header files based on X.Org Foundation open source release"
+DESC="Header files and other files needed for building loadable modules for the Xorg X server"
 BASEDIR="/usr"
 VENDOR="Sun Microsystems, Inc."
 HOTLINE="Please contact your local service provider"
 EMAIL=""
 MAXINST="1000"
+CLASSES="none"
 SUNW_PKGVERS=1.0
 SUNW_PRODNAME="X.Org Foundation X11 for Solaris"
 SUNW_PRODVERS=1.0
--- a/packages/SUNWxorg-headers/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxorg-headers/prototype	Wed May 13 16:52:41 2009 -0700
@@ -29,9 +29,9 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.12     09/01/14 SMI"
+# ident "@(#)prototype 1.13     09/05/13 SMI"
 #
-# X.Org Foundation X client libraries for Solaris
+# Xorg server DDK headers
 
 !HOME=../usr
 
@@ -39,114 +39,12 @@
 i depend
 i copyright
 
-d none X11 0755 root bin
-
-d none X11/include				0755 root bin
-d none X11/include/X11				0755 root bin
-d none X11/include/xorg				0755 root bin
-
-!search $HOME/X11/include/X11/extensions
-d none X11/include/X11/extensions		0755 root bin
-f none X11/include/X11/extensions/Xv.h		0444 root bin
-f none X11/include/X11/extensions/Xvlib.h	0444 root bin
-f none X11/include/X11/extensions/Xvproto.h	0444 root bin
-f none X11/include/X11/extensions/XvMC.h	0444 root bin
-f none X11/include/X11/extensions/XvMClib.h	0444 root bin
-f none X11/include/X11/extensions/XvMCproto.h	0444 root bin
-
-f none X11/include/X11/extensions/Xrandr.h	0444 root bin
-f none X11/include/X11/extensions/randr.h	0444 root bin
-f none X11/include/X11/extensions/randrproto.h	0444 root bin
-
-# libxkbfile
-f none X11/include/X11/extensions/XKBbells.h    0444 root bin
-f none X11/include/X11/extensions/XKBconfig.h   0444 root bin
-f none X11/include/X11/extensions/XKBfile.h     0444 root bin
-f none X11/include/X11/extensions/XKBrules.h    0444 root bin
-f none X11/include/X11/extensions/XKBsrv.h      0444 root bin
-
-f none X11/include/X11/extensions/xf86dgastr.h  0444 root bin
-f none X11/include/X11/extensions/xf86dga1str.h 0444 root bin
-f none X11/include/X11/extensions/xf86misc.h    0444 root bin
-f none X11/include/X11/extensions/xf86mscstr.h  0444 root bin
-f none X11/include/X11/extensions/xf86vmode.h   0444 root bin
-f none X11/include/X11/extensions/xf86vmstr.h   0444 root bin
- 
-f none X11/include/X11/extensions/panoramiXproto.h   0444 root bin
+d none X11						0755 root bin
 
-!search $HOME/X11/include/X11/fonts
-d none X11/include/X11/fonts               	0755 root bin
-f none X11/include/X11/fonts/font.h        	0444 root bin
-f none X11/include/X11/fonts/FS.h       	0444 root bin
-f none X11/include/X11/fonts/FSlib.h       	0444 root bin
-f none X11/include/X11/fonts/FSproto.h     	0444 root bin
-f none X11/include/X11/fonts/bdfint.h        	0444 root bin
-f none X11/include/X11/fonts/bitmap.h     	0444 root bin
-f none X11/include/X11/fonts/bufio.h   		0444 root bin
-f none X11/include/X11/fonts/fntfil.h      	0444 root bin
-f none X11/include/X11/fonts/fntfilio.h       	0444 root bin
-f none X11/include/X11/fonts/fntfilst.h  	0444 root bin
-f none X11/include/X11/fonts/fontconf.h  	0444 root bin
-f none X11/include/X11/fonts/fontenc.h  	0444 root bin
-f none X11/include/X11/fonts/fontencc.h  	0444 root bin
-f none X11/include/X11/fonts/fontmisc.h  	0444 root bin
-f none X11/include/X11/fonts/fontmod.h  	0444 root bin
-f none X11/include/X11/fonts/fontproto.h  	0444 root bin
-f none X11/include/X11/fonts/fontshow.h  	0444 root bin
-f none X11/include/X11/fonts/fontstruct.h  	0444 root bin
-f none X11/include/X11/fonts/fontutil.h  	0444 root bin
-f none X11/include/X11/fonts/fontxlfd.h  	0444 root bin
-f none X11/include/X11/fonts/fsmasks.h  	0444 root bin
-f none X11/include/X11/fonts/ft.h  		0444 root bin
-f none X11/include/X11/fonts/ftfuncs.h  	0444 root bin
-f none X11/include/X11/fonts/pcf.h  		0444 root bin
-
-# pkgconfig data files for X modular protocols & libraries
-
-## 32-bit versions
-!search $HOME/lib/pkgconfig
-d none lib					0755 root bin
-d none lib/pkgconfig				0755 root other
-
-# Protocol headers
-f none lib/pkgconfig/randrproto.pc		0444 root bin
-f none lib/pkgconfig/videoproto.pc		0444 root bin
-f none lib/pkgconfig/xf86miscproto.pc		0444 root bin
-f none lib/pkgconfig/xf86vidmodeproto.pc	0444 root bin
-
-# Libraries
-
-f none lib/pkgconfig/libfs.pc			0444 root bin
-f none lib/pkgconfig/xrandr.pc			0444 root bin
-f none lib/pkgconfig/xv.pc			0444 root bin
-f none lib/pkgconfig/xvmc.pc			0444 root bin
-f none lib/pkgconfig/xxf86misc.pc		0444 root bin
-f none lib/pkgconfig/xxf86vm.pc			0444 root bin
-f none lib/pkgconfig/xorg-server.pc		0444 root bin
-
-## 64-bit versions
-!search $HOME/lib/$plat_64/pkgconfig
-d none lib/$plat_64					0755 root bin
-d none lib/$plat_64/pkgconfig				0755 root other
-
-# Protocol headers are the same in 32-bit & 64-bit
-s none lib/$plat_64/pkgconfig/randrproto.pc=../../pkgconfig/randrproto.pc
-s none lib/$plat_64/pkgconfig/videoproto.pc=../../pkgconfig/videoproto.pc
-s none lib/$plat_64/pkgconfig/xf86miscproto.pc=../../pkgconfig/xf86miscproto.pc
-s none lib/$plat_64/pkgconfig/xf86vidmodeproto.pc=../../pkgconfig/xf86vidmodeproto.pc
-
-# Libraries need separate ones for 64-bit to get library paths right
-
-f none lib/$plat_64/pkgconfig/libfs.pc			0444 root bin
-f none lib/$plat_64/pkgconfig/xrandr.pc			0444 root bin
-f none lib/$plat_64/pkgconfig/xv.pc			0444 root bin
-f none lib/$plat_64/pkgconfig/xvmc.pc			0444 root bin
-f none lib/$plat_64/pkgconfig/xxf86misc.pc		0444 root bin
-f none lib/$plat_64/pkgconfig/xxf86vm.pc		0444 root bin
-f none lib/$plat_64/pkgconfig/xorg-server.pc		0444 root bin
-
-# Headers needed to build a Xorg ddx
+# Headers needed to build a Xorg loadable module
 !search $HOME/X11/include/xorg
+d none X11/include					0755 root bin
+d none X11/include/xorg					0755 root bin
 f none X11/include/xorg/BT.h				0444 root bin
 f none X11/include/xorg/IBM.h				0444 root bin
 f none X11/include/xorg/TI.h				0444 root bin
@@ -304,3 +202,23 @@
 f none X11/include/xorg/xorgVersion.h			0444 root bin
 f none X11/include/xorg/xvdix.h				0444 root bin
 f none X11/include/xorg/xvmcext.h			0444 root bin
+
+# pkgconfig data files
+
+## 32-bit versions
+!search $HOME/lib/pkgconfig
+d none lib						0755 root bin
+d none lib/pkgconfig					0755 root other
+f none lib/pkgconfig/xorg-server.pc			0444 root bin
+
+## 64-bit versions
+!search $HOME/lib/$plat_64/pkgconfig
+d none lib/$plat_64					0755 root bin
+d none lib/$plat_64/pkgconfig				0755 root other
+f none lib/$plat_64/pkgconfig/xorg-server.pc		0444 root bin
+
+# Autoconf macro files
+!search $HOME/X11/share/aclocal
+d none share						0755 root sys
+d none share/aclocal					0755 root other
+f none share/aclocal/xorg-server.m4			0444 root bin
--- a/packages/SUNWxwdem/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwdem/prototype	Wed May 13 16:52:41 2009 -0700
@@ -75,3 +75,9 @@
 # open-src/app/xscope
 f none X11/bin/xscope 		0755 root bin
 s none openwin/demo/xscope=../../X11/bin/xscope
+
+!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/Xgc		0444 root bin
--- a/packages/SUNWxwfsw/prototype_com	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwfsw/prototype_com	Wed May 13 16:52:41 2009 -0700
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype_com 1.8     08/09/15 SMI"
+# ident "@(#)prototype_com 1.9     09/05/13 SMI"
 #
 #  X Window System required core font software package
 
@@ -88,6 +88,7 @@
 f none X11/lib/X11/fonts/encodings/mulearabic-1.enc 0444 root bin
 f none X11/lib/X11/fonts/encodings/mulearabic-2.enc 0444 root bin
 f none X11/lib/X11/fonts/encodings/mulelao-1.enc 0444 root bin
+f none X11/lib/X11/fonts/encodings/suneu-greek.enc 0444 root bin
 f none X11/lib/X11/fonts/encodings/tcvn-0.enc 0444 root bin
 f none X11/lib/X11/fonts/encodings/tis620-2.enc 0444 root bin
 f none X11/lib/X11/fonts/encodings/viscii1.1-1.enc 0444 root bin
@@ -96,7 +97,11 @@
 d none X11/lib/X11/fonts/encodings/large 0755 root bin
 f none X11/lib/X11/fonts/encodings/large/big5.eten-0.enc.gz 0444 root bin
 f none X11/lib/X11/fonts/encodings/large/big5hkscs-0.enc.gz 0444 root bin
+f none X11/lib/X11/fonts/encodings/large/cns11643-1.enc.gz 0444 root bin
+f none X11/lib/X11/fonts/encodings/large/cns11643-2.enc.gz 0444 root bin
+f none X11/lib/X11/fonts/encodings/large/cns11643-3.enc.gz 0444 root bin
 f none X11/lib/X11/fonts/encodings/large/encodings.dir 0444 root bin
+f none X11/lib/X11/fonts/encodings/large/gb18030-0.enc.gz 0444 root bin
 f none X11/lib/X11/fonts/encodings/large/gb18030.2000-0.enc.gz 0444 root bin
 f none X11/lib/X11/fonts/encodings/large/gb18030.2000-1.enc.gz 0444 root bin
 f none X11/lib/X11/fonts/encodings/large/gb2312.1980-0.enc.gz 0444 root bin
--- a/packages/SUNWxwinc/copyright.add	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwinc/copyright.add	Wed May 13 16:52:41 2009 -0700
@@ -175,6 +175,18 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libfontenc package are covered by the following notice:
+
+include lib/libfontenc/COPYING
+
+--------------------------------------------------------------------
+
+Files from the lib/libFS package are covered by the following notice:
+
+include lib/libFS/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libICE package are covered by the following notice:
 
 include lib/libICE/COPYING
@@ -235,12 +247,24 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libXfont package are covered by the following notice:
+
+include lib/libXfont/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libXlg3d package are covered by the following notice:
 
 include lib/libXlg3d/COPYING
 
 --------------------------------------------------------------------
 
+Files from the lib/libxkbfile package are covered by the following notice:
+
+include lib/libxkbfile/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libXmu package are covered by the following notice:
 
 include lib/libXmu/COPYING
@@ -271,6 +295,12 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libXrandr package are covered by the following notice:
+
+include lib/libXrandr/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libXrender package are covered by the following notice:
 
 include lib/libXrender/COPYING
@@ -295,6 +325,24 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libxtrans package are covered by the following notice:
+
+include lib/libxtrans/COPYING
+
+--------------------------------------------------------------------
+
+Files from the lib/libXv package are covered by the following notice:
+
+include lib/libXv/COPYING
+
+--------------------------------------------------------------------
+
+Files from the lib/libXvMC package are covered by the following notice:
+
+include lib/libXvMC/COPYING
+
+--------------------------------------------------------------------
+
 Files from the util/util-macros package are covered by the following notice:
 
 include util/util-macros/COPYING
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwinc/depend.tmpl	Wed May 13 16:52:41 2009 -0700
@@ -0,0 +1,40 @@
+##########################################################################
+#
+# Copyright 2009 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
+# "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.
+#
+##########################################################################
+#
+# ident "@(#)depend.tmpl 1.1     09/05/13 SMI"
+#
+# Header files for Xorg Server SDK
+
+P SUNWhea	SunOS Header Files
+P SUNWlibm	Math & Microtasking Library Headers & Lint Files (Usr)
+
+# common dependencies
+include ../depend
--- a/packages/SUNWxwinc/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwinc/prototype	Wed May 13 16:52:41 2009 -0700
@@ -27,13 +27,13 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	35.94	09/03/09 SMI"
+# ident	"@(#)prototype	35.95	09/05/13 SMI"
 #
 #  X Window System include files
 
 i pkginfo
 i copyright
-i depend=../depend
+i depend
 
 !HOME=../usr
 
@@ -73,6 +73,7 @@
 f none X11/include/X11/Xproto.h		0444 root bin
 f none X11/include/X11/Xprotostr.h	0444 root bin
 f none X11/include/X11/Xthreads.h	0444 root bin
+f none X11/include/X11/Xvarargs.h	0444 root bin
 f none X11/include/X11/ap_keysym.h	0444 root bin
 f none X11/include/X11/keysym.h		0444 root bin
 f none X11/include/X11/keysymdef.h	0444 root bin
@@ -314,6 +315,7 @@
 f none X11/include/X11/Xmu/Error.h		0444 root bin
 f none X11/include/X11/Xmu/ExtAgent.h		0444 root bin
 f none X11/include/X11/Xmu/Initer.h		0444 root bin
+f none X11/include/X11/Xmu/Lookup.h		0444 root bin
 f none X11/include/X11/Xmu/Misc.h		0444 root bin
 f none X11/include/X11/Xmu/StdCmap.h		0444 root bin
 f none X11/include/X11/Xmu/StdSel.h		0444 root bin
@@ -431,6 +433,7 @@
 f none X11/include/X11/extensions/Xeviestr.h 	0444 root bin
 f none X11/include/X11/extensions/Xext.h 	0444 root bin
 f none X11/include/X11/extensions/Xinerama.h 	0444 root bin
+f none X11/include/X11/extensions/bigreqstr.h	0444 root bin
 f none X11/include/X11/extensions/composite.h	0444 root bin
 f none X11/include/X11/extensions/compositeproto.h 0444 root bin
 f none X11/include/X11/extensions/damageproto.h 0444 root bin
@@ -450,6 +453,7 @@
 f none X11/include/X11/extensions/multibuf.h 	0444 root bin
 f none X11/include/X11/extensions/multibufst.h 	0444 root bin
 f none X11/include/X11/extensions/panoramiXext.h 0444 root bin
+f none X11/include/X11/extensions/panoramiXproto.h   0444 root bin
 f none X11/include/X11/extensions/record.h 	0444 root bin
 f none X11/include/X11/extensions/recordstr.h 	0444 root bin
 f none X11/include/X11/extensions/render.h 	0444 root bin
@@ -471,8 +475,12 @@
 f none X11/include/X11/extensions/xteststr.h 	0444 root bin
 
 # extension headers from open-src/proto/sun-ext-protos
+f none X11/include/X11/extensions/XInteractive.h	0444 root bin
+f none X11/include/X11/extensions/interactive.h		0444 root bin
+f none X11/include/X11/extensions/interactiveCommon.h	0444 root bin
 f none X11/include/X11/extensions/allplanes.h	0444 root bin
 f none X11/include/X11/extensions/allplanesstr.h 0444 root bin
+f none X11/include/X11/extensions/sme.h		0444 root bin
 f none X11/include/X11/extensions/transovl.h 	0444 root bin
 f none X11/include/X11/extensions/transovlstr.h	0444 root bin
 f none X11/include/X11/extensions/fbpm.h	0444 root bin
@@ -508,6 +516,20 @@
 # open-src/lib/libXlg3d
 f none X11/include/X11/extensions/Xlge.h 0444 root bin
 
+# open-src/lib/libxkbfile
+f none X11/include/X11/extensions/XKBbells.h    0444 root bin
+f none X11/include/X11/extensions/XKBconfig.h   0444 root bin
+f none X11/include/X11/extensions/XKBfile.h     0444 root bin
+f none X11/include/X11/extensions/XKBrules.h    0444 root bin
+f none X11/include/X11/extensions/XKBsrv.h      0444 root bin
+
+# open-src/proto/randrproto
+f none X11/include/X11/extensions/randr.h	0444 root bin
+f none X11/include/X11/extensions/randrproto.h	0444 root bin
+
+# open-src/lib/libXrandr
+f none X11/include/X11/extensions/Xrandr.h	0444 root bin
+
 # open-src/lib/libXrender
 s none openwin/share/include/X11/extensions/Xrender.h=../../../../../X11/include/X11/extensions/Xrender.h
 f none X11/include/X11/extensions/Xrender.h 0444 root bin
@@ -522,6 +544,70 @@
 f none X11/include/X11/extensions/Xtsol.h 0444 root bin
 f none X11/include/X11/extensions/Xtsolproto.h 0444 root bin
 
+# open-src/proto/videoproto
+f none X11/include/X11/extensions/Xv.h		0444 root bin
+f none X11/include/X11/extensions/Xvproto.h	0444 root bin
+f none X11/include/X11/extensions/XvMC.h	0444 root bin
+f none X11/include/X11/extensions/XvMCproto.h	0444 root bin
+
+# open-src/lib/libXv
+f none X11/include/X11/extensions/Xvlib.h	0444 root bin
+
+# open-src/lib/libXvMC
+f none X11/include/X11/extensions/XvMClib.h	0444 root bin
+
+# open-src/driver/xf86-video-openchrome
+f none X11/include/X11/extensions/vldXvMC.h	0444 root bin
+
+
+# open-src/proto/xf86dgaproto
+f none X11/include/X11/extensions/xf86dgastr.h  0444 root bin
+f none X11/include/X11/extensions/xf86dga1str.h 0444 root bin
+
+# open-src/proto/xf86miscproto
+f none X11/include/X11/extensions/xf86misc.h    0444 root bin
+f none X11/include/X11/extensions/xf86mscstr.h  0444 root bin
+
+# open-src/proto/xf86vidmodeproto
+f none X11/include/X11/extensions/xf86vmode.h   0444 root bin
+f none X11/include/X11/extensions/xf86vmstr.h   0444 root bin
+
+
+!search $HOME/X11/include/X11/fonts
+d none X11/include/X11/fonts               	0755 root bin
+
+# open-src/proto/fontsproto
+f none X11/include/X11/fonts/FS.h       	0444 root bin
+f none X11/include/X11/fonts/FSproto.h     	0444 root bin
+f none X11/include/X11/fonts/font.h        	0444 root bin
+f none X11/include/X11/fonts/fontproto.h  	0444 root bin
+f none X11/include/X11/fonts/fontstruct.h  	0444 root bin
+f none X11/include/X11/fonts/fsmasks.h  	0444 root bin
+
+# open-src/lib/libXfont
+f none X11/include/X11/fonts/bdfint.h        	0444 root bin
+f none X11/include/X11/fonts/bitmap.h     	0444 root bin
+f none X11/include/X11/fonts/bufio.h   		0444 root bin
+f none X11/include/X11/fonts/fntfil.h      	0444 root bin
+f none X11/include/X11/fonts/fntfilio.h       	0444 root bin
+f none X11/include/X11/fonts/fntfilst.h  	0444 root bin
+f none X11/include/X11/fonts/fontconf.h  	0444 root bin
+f none X11/include/X11/fonts/fontencc.h  	0444 root bin
+f none X11/include/X11/fonts/fontmisc.h  	0444 root bin
+f none X11/include/X11/fonts/fontmod.h  	0444 root bin
+f none X11/include/X11/fonts/fontshow.h  	0444 root bin
+f none X11/include/X11/fonts/fontutil.h  	0444 root bin
+f none X11/include/X11/fonts/fontxlfd.h  	0444 root bin
+f none X11/include/X11/fonts/ft.h  		0444 root bin
+f none X11/include/X11/fonts/ftfuncs.h  	0444 root bin
+f none X11/include/X11/fonts/pcf.h  		0444 root bin
+
+# open-src/lib/libfontenc
+f none X11/include/X11/fonts/fontenc.h  	0444 root bin
+
+# open-src/lib/libFS
+f none X11/include/X11/fonts/FSlib.h       	0444 root bin
+
 !search                $HOME/X11/include/X11/XprintAppUtil
 d none X11/include/X11/XprintAppUtil		0755 root bin
 f none X11/include/X11/XprintAppUtil/xpapputil.h	0444 root bin
@@ -530,6 +616,12 @@
 d none X11/include/X11/XprintUtil		0755 root bin
 f none X11/include/X11/XprintUtil/xprintutil.h	0444 root bin
 
+# open-src/proto/pmproto
+!search                $HOME/X11/include/X11/PM
+d none X11/include/X11/PM			0755 root bin
+f none X11/include/X11/PM/PM.h			0444 root bin
+f none X11/include/X11/PM/PMproto.h		0444 root bin
+
 # open-src/lib/libSM
 d none openwin/share/include/X11/SM 0755 root bin
 s none openwin/share/include/X11/SM/SM.h=../../../../../X11/include/X11/SM/SM.h
@@ -558,6 +650,18 @@
 f none X11/include/X11/ICE/ICEconn.h 0644 root bin
 f none X11/include/X11/ICE/ICEutil.h 0644 root bin
 
+# open-src/lib/libxtrans
+!search                $HOME/X11/include/X11/Xtrans
+d none X11/include/X11/Xtrans			0755 root bin
+f none X11/include/X11/Xtrans/Xtrans.c		0444 root bin
+f none X11/include/X11/Xtrans/Xtrans.h		0444 root bin
+f none X11/include/X11/Xtrans/Xtransint.h	0444 root bin
+f none X11/include/X11/Xtrans/Xtranslcl.c	0444 root bin
+f none X11/include/X11/Xtrans/Xtranssock.c	0444 root bin
+f none X11/include/X11/Xtrans/Xtranstli.c	0444 root bin
+f none X11/include/X11/Xtrans/Xtransutil.c	0444 root bin
+f none X11/include/X11/Xtrans/transport.c	0444 root bin
+
 d none openwin/share/include/dga 0755 root bin
 !search                $HOME/openwin/include/dga
 f none openwin/share/include/dga/dga.h 0644 root bin
@@ -692,14 +796,19 @@
 f none lib/pkgconfig/kbproto.pc			0444 root bin
 f none lib/pkgconfig/lg3dproto.pc		0444 root bin
 f none lib/pkgconfig/printproto.pc		0444 root bin
+f none lib/pkgconfig/randrproto.pc		0444 root bin
 f none lib/pkgconfig/recordproto.pc		0444 root bin
 f none lib/pkgconfig/renderproto.pc		0444 root bin
 f none lib/pkgconfig/resourceproto.pc		0444 root bin
 f none lib/pkgconfig/scrnsaverproto.pc		0444 root bin
+f none lib/pkgconfig/videoproto.pc		0444 root bin
 f none lib/pkgconfig/xcmiscproto.pc		0444 root bin
 f none lib/pkgconfig/xextproto.pc		0444 root bin
 f none lib/pkgconfig/xf86bigfontproto.pc	0444 root bin
+f none lib/pkgconfig/xf86dgaproto.pc		0444 root bin
 f none lib/pkgconfig/xf86driproto.pc		0444 root bin
+f none lib/pkgconfig/xf86miscproto.pc		0444 root bin
+f none lib/pkgconfig/xf86vidmodeproto.pc	0444 root bin
 f none lib/pkgconfig/xineramaproto.pc		0444 root bin
 f none lib/pkgconfig/xproto.pc			0444 root bin
 f none lib/pkgconfig/xproxymngproto.pc		0444 root bin
@@ -707,6 +816,8 @@
 
 # Libraries
 
+f none lib/pkgconfig/fontenc.pc			0444 root bin
+f none lib/pkgconfig/libfs.pc			0444 root bin
 f none lib/pkgconfig/ice.pc			0444 root bin
 f none lib/pkgconfig/lbxutil.pc			0444 root bin
 f none lib/pkgconfig/pthread-stubs.pc		0444 root bin
@@ -721,20 +832,28 @@
 f none lib/pkgconfig/xevie.pc			0444 root bin
 f none lib/pkgconfig/xext.pc			0444 root bin
 f none lib/pkgconfig/xfixes.pc			0444 root bin
+f none lib/pkgconfig/xfont.pc			0444 root bin
 f none lib/pkgconfig/xi.pc			0444 root bin
 f none lib/pkgconfig/xinerama.pc		0444 root bin
 f none lib/pkgconfig/xlg3d.pc			0444 root bin
+f none lib/pkgconfig/xkbfile.pc			0444 root bin
 f none lib/pkgconfig/xmu.pc			0444 root bin
 f none lib/pkgconfig/xmuu.pc			0444 root bin
 f none lib/pkgconfig/xpm.pc			0444 root bin
 f none lib/pkgconfig/xp.pc                      0444 root bin
 f none lib/pkgconfig/xprintapputil.pc           0444 root bin
 f none lib/pkgconfig/xprintutil.pc              0444 root bin
+f none lib/pkgconfig/xrandr.pc			0444 root bin
 f none lib/pkgconfig/xrender.pc			0444 root bin
 f none lib/pkgconfig/xres.pc			0444 root bin
 f none lib/pkgconfig/xscrnsaver.pc		0444 root bin
 f none lib/pkgconfig/xt.pc			0444 root bin
+f none lib/pkgconfig/xtrans.pc			0444 root bin
 f none lib/pkgconfig/xtst.pc			0444 root bin
+f none lib/pkgconfig/xv.pc			0444 root bin
+f none lib/pkgconfig/xvmc.pc			0444 root bin
+f none lib/pkgconfig/xxf86misc.pc		0444 root bin
+f none lib/pkgconfig/xxf86vm.pc			0444 root bin
 
 # Data files & other miscellany
 
@@ -758,14 +877,19 @@
 s none lib/$plat_64/pkgconfig/kbproto.pc=../../pkgconfig/kbproto.pc
 s none lib/$plat_64/pkgconfig/lg3dproto.pc=../../pkgconfig/lg3dproto.pc
 s none lib/$plat_64/pkgconfig/printproto.pc=../../pkgconfig/printproto.pc
+s none lib/$plat_64/pkgconfig/randrproto.pc=../../pkgconfig/randrproto.pc
 s none lib/$plat_64/pkgconfig/recordproto.pc=../../pkgconfig/recordproto.pc
 s none lib/$plat_64/pkgconfig/renderproto.pc=../../pkgconfig/renderproto.pc
 s none lib/$plat_64/pkgconfig/resourceproto.pc=../../pkgconfig/resourceproto.pc
 s none lib/$plat_64/pkgconfig/scrnsaverproto.pc=../../pkgconfig/scrnsaverproto.pc
+s none lib/$plat_64/pkgconfig/videoproto.pc=../../pkgconfig/videoproto.pc
 s none lib/$plat_64/pkgconfig/xcmiscproto.pc=../../pkgconfig/xcmiscproto.pc
 s none lib/$plat_64/pkgconfig/xextproto.pc=../../pkgconfig/xextproto.pc
 s none lib/$plat_64/pkgconfig/xf86bigfontproto.pc=../../pkgconfig/xf86bigfontproto.pc
 s none lib/$plat_64/pkgconfig/xf86driproto.pc=../../pkgconfig/xf86driproto.pc
+s none lib/$plat_64/pkgconfig/xf86dgaproto.pc=../../pkgconfig/xf86driproto.pc
+s none lib/$plat_64/pkgconfig/xf86miscproto.pc=../../pkgconfig/xf86miscproto.pc
+s none lib/$plat_64/pkgconfig/xf86vidmodeproto.pc=../../pkgconfig/xf86vidmodeproto.pc
 s none lib/$plat_64/pkgconfig/xineramaproto.pc=../../pkgconfig/xineramaproto.pc
 s none lib/$plat_64/pkgconfig/xproto.pc=../../pkgconfig/xproto.pc
 s none lib/$plat_64/pkgconfig/xproxymngproto.pc=../../pkgconfig/xproxymngproto.pc
@@ -773,6 +897,8 @@
 # Libraries need separate ones for 64-bit to get library paths right
 
 !search $HOME/lib/$plat_64/pkgconfig
+f none lib/$plat_64/pkgconfig/fontenc.pc		0444 root bin
+f none lib/$plat_64/pkgconfig/libfs.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/ice.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/lbxutil.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/pthread-stubs.pc		0444 root bin
@@ -787,20 +913,28 @@
 f none lib/$plat_64/pkgconfig/xevie.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xext.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xfixes.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xfont.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xi.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xinerama.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xlg3d.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xkbfile.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xpm.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xmu.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xmuu.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xp.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xprintapputil.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xprintutil.pc		0444 root bin
+f none lib/$plat_64/pkgconfig/xrandr.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xrender.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xres.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xscrnsaver.pc		0444 root bin
 f none lib/$plat_64/pkgconfig/xt.pc 			0444 root bin
+f none lib/$plat_64/pkgconfig/xtrans.pc			0444 root bin
 f none lib/$plat_64/pkgconfig/xtst.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xv.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xvmc.pc			0444 root bin
+f none lib/$plat_64/pkgconfig/xxf86misc.pc		0444 root bin
+f none lib/$plat_64/pkgconfig/xxf86vm.pc		0444 root bin
 
 # Data files & other miscellany are the same for both
 
@@ -811,3 +945,4 @@
 d none share						0755 root sys
 d none share/aclocal					0755 root other
 f none share/aclocal/xorg-macros.m4			0444 root bin
+f none share/aclocal/xtrans.m4				0444 root bin
--- a/packages/SUNWxwopt/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwopt/prototype	Wed May 13 16:52:41 2009 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.71	09/02/04 SMI"
+# ident "@(#)prototype	35.72	09/05/13 SMI"
 ##
 #  nonessential X core clients and server extensions
 
@@ -237,8 +237,10 @@
 f none X11/lib/X11/app-defaults/Xman		0644 root bin
 f none X11/lib/X11/app-defaults/Viewres		0644 root bin
 f none X11/lib/X11/app-defaults/Xedit 		0644 root bin
+f none X11/lib/X11/app-defaults/Xedit-color	0644 root bin
 f none X11/lib/X11/app-defaults/XFontSel 	0644 root bin
 f none X11/lib/X11/app-defaults/Xditview 	0644 root bin
+f none X11/lib/X11/app-defaults/Xditview-chrtr 	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	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwplt/prototype_com	Wed May 13 16:52:41 2009 -0700
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.211    09/04/15   Sun Microsystems"
+#      "@(#)prototype_com	35.212    09/05/13   Sun Microsystems"
 #
 # X Window System required core package
 
@@ -1084,6 +1084,7 @@
 f none X11/include/X11/bitmaps/left_ptr			0444 root bin
 f none X11/include/X11/bitmaps/left_ptrmsk		0444 root bin
 f none X11/include/X11/bitmaps/letters			0444 root bin
+f none X11/include/X11/bitmaps/ldblarrow		0444 root bin
 f none X11/include/X11/bitmaps/light_gray		0444 root bin
 f none X11/include/X11/bitmaps/mailempty		0444 root bin
 f none X11/include/X11/bitmaps/mailemptymsk		0444 root bin
@@ -1099,6 +1100,7 @@
 f none X11/include/X11/bitmaps/opendot			0444 root bin
 f none X11/include/X11/bitmaps/opendotMask		0444 root bin
 f none X11/include/X11/bitmaps/plaid			0444 root bin
+f none X11/include/X11/bitmaps/rdblarrow		0444 root bin
 f none X11/include/X11/bitmaps/right_ptr		0444 root bin
 f none X11/include/X11/bitmaps/right_ptrmsk		0444 root bin
 f none X11/include/X11/bitmaps/root_weave		0444 root bin
@@ -1298,6 +1300,7 @@
 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/XClock		0644 root bin
+f none X11/lib/X11/app-defaults/XClock-color	0644 root bin
 f none X11/lib/X11/app-defaults/XConsole	0644 root bin
 f none X11/lib/X11/app-defaults/Xfd		0644 root bin
 f none X11/lib/X11/app-defaults/XLogo		0644 root bin
--- a/packages/SUNWxwpmn/copyright.add	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwpmn/copyright.add	Wed May 13 16:52:41 2009 -0700
@@ -31,6 +31,18 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libXfixes package are covered by the following notice:
+
+include lib/libXfixes/COPYING
+
+--------------------------------------------------------------------
+
+Files from the lib/libXft package are covered by the following notice:
+
+include lib/libXft/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libXi package are covered by the following notice:
 
 include lib/libXi/COPYING
@@ -55,6 +67,12 @@
 
 --------------------------------------------------------------------
 
+Files from the lib/libXrandr package are covered by the following notice:
+
+include lib/libXrandr/COPYING
+
+--------------------------------------------------------------------
+
 Files from the lib/libXScrnSaver package are covered by the following notice:
 
 include lib/libXScrnSaver/COPYING
@@ -71,3 +89,8 @@
 
 include lib/libXtst/COPYING
 
+--------------------------------------------------------------------
+
+Files from the lib/libXv package are covered by the following notice:
+
+include lib/libXv/COPYING
--- a/packages/SUNWxwpmn/prototype	Wed May 13 07:31:10 2009 -0700
+++ b/packages/SUNWxwpmn/prototype	Wed May 13 16:52:41 2009 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 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
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#	"@(#)prototype	35.46	08/10/05   Sun Microsystems" 
+#	"@(#)prototype	35.47	09/05/13   Sun Microsystems" 
 #
 #  X Window System programmers man pages
 
@@ -34,15 +34,24 @@
 i copyright
 i depend=../depend
 
-!HOME=../usr
+!HOME=../usr/X11/share/man
 
 d none X11 0755 root bin
 d none X11/share 0755 root bin
 d none X11/share/man 0755 root bin
 s none X11/man=share/man
 
+!search $HOME/man3
+d none X11/share/man/man3 0755 root bin
+
+# open-src/lib/libXfixes
+f none X11/share/man/man3/Xfixes.3 0444 root bin
+
+# open-src/lib/libXft
+f none X11/share/man/man3/Xft.3 0444 root bin
+
 # open-src/lib/libX11
-!search            $HOME/X11/share/man/man3X11
+!search            $HOME/man3X11
 d none X11/share/man/man3X11  0755 root bin
 f none X11/share/man/man3X11/AllPlanes.3X11			0444 root bin
 f none X11/share/man/man3X11/BitmapBitOrder.3X11		0444 root bin
@@ -859,7 +868,7 @@
 f none X11/share/man/man3X11/XwcTextPropertyToTextList.3X11	0444 root bin
 
 # open-src/lib/libXevie
-!search            $HOME/X11/share/man/man3Xevie
+!search $HOME/man3Xevie
 d none X11/share/man/man3Xevie  0755 root bin
 f none X11/share/man/man3Xevie/Xevie.3Xevie			0444 root bin
 f none X11/share/man/man3Xevie/XevieEnd.3Xevie			0444 root bin
@@ -869,7 +878,7 @@
 f none X11/share/man/man3Xevie/XevieStart.3Xevie		0444 root bin
 
 # open-src/lib/libXext
-!search            $HOME/X11/share/man/man3Xext
+!search            $HOME/man3Xext
 d none X11/share/man/man3Xext  0755 root bin
 f none X11/share/man/man3Xext/DBE.3Xext				0444 root bin
 f none X11/share/man/man3Xext/DPMSCapable.3Xext			0444 root bin
@@ -943,7 +952,7 @@
 f none X11/share/man/man3Xext/XmbufGetWindowAttributes.3Xext	0444 root bin
 f none X11/share/man/man3Xext/XmbufQueryExtension.3Xext		0444 root bin
 
-!search            $HOME/X11/share/man/man3XRes
+!search            $HOME/man3XRes
 d none X11/share/man/man3XRes					0755 root bin
 f none X11/share/man/man3XRes/XRes.3XRes			0444 root bin
 f none X11/share/man/man3XRes/XResQueryExtension.3XRes		0444 root bin
@@ -952,9 +961,10 @@
 f none X11/share/man/man3XRes/XResQueryClientResources.3XRes	0444 root bin
 f none X11/share/man/man3XRes/XResQueryClientPixmapBytes.3XRes	0444 root bin
 
-!search            $HOME/X11/share/man/man3Xi
+!search            $HOME/man3Xi
 d none X11/share/man/man3Xi   0755 root bin
 f none X11/share/man/man3Xi/XAllowDeviceEvents.3Xi  0444 root bin
+f none X11/share/man/man3Xi/XChangeDeviceControl.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XChangeDeviceDontPropagateList.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XChangeDeviceKeyMapping.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XChangeFeedbackControl.3Xi  0444 root bin
@@ -965,11 +975,13 @@
 f none X11/share/man/man3Xi/XDeviceTimeCoord.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XFreeDeviceList.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceButtonMapping.3Xi  0444 root bin
+f none X11/share/man/man3Xi/XGetDeviceControl.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceDontPropagateList.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceFocus.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceKeyMapping.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceModifierMapping.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetDeviceMotionEvents.3Xi  0444 root bin
+f none X11/share/man/man3Xi/XGetExtensionVersion.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetFeedbackControl.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGetSelectedExtensionEvents.3Xi  0444 root bin
 f none X11/share/man/man3Xi/XGrabDevice.3Xi  0444 root bin
@@ -990,13 +1002,13 @@
 f none X11/share/man/man3Xi/XUngrabDeviceKey.3Xi  0444 root bin
 
 # open-src/lib/libXmu
-!search            $HOME/X11/share/man/man3Xmu
+!search            $HOME/man3Xmu
 d none X11/share/man/man3Xmu  0755 root bin
 f none X11/share/man/man3Xmu/XSolarisCheckColormapEquivalence.3Xmu  0444 root bin
 f none X11/share/man/man3Xmu/XSolarisGetVisualGamma.3Xmu  0444 root bin
 
 # open-src/lib/libXp
-!search            $HOME/X11/share/man/man3Xp
+!search            $HOME/man3Xp
 d none X11/share/man/man3Xp   0755 root bin
 f none X11/share/man/man3Xp/XpCancelDoc.3Xp  0444 root bin
 f none X11/share/man/man3Xp/XpCancelJob.3Xp  0444 root bin
@@ -1033,8 +1045,27 @@
 f none X11/share/man/man3Xp/XpStartPage.3Xp  0444 root bin
 f none X11/share/man/man3Xp/libXp.3Xp  0444 root bin
 
+# open-src/lib/libXrandr
+!search $HOME/man3Xrandr
+d none X11/share/man/man3Xrandr 0755 root bin
+f none X11/share/man/man3Xrandr/Xrandr.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigCurrentConfiguration.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigCurrentRate.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigRates.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigRotations.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigSizes.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRConfigTimes.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRFreeScreenConfigInfo.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRGetScreenInfo.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRQueryExtension.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRQueryVersion.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRRootToScreen.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRSelectInput.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRSetScreenConfig.3Xrandr 0444 root bin
+f none X11/share/man/man3Xrandr/XRRSetScreenConfigAndRate.3Xrandr 0444 root bin
+
 # open-src/lib/libXScrnSaver
-!search            $HOME/X11/share/man/man3Xss
+!search            $HOME/man3Xss
 d none X11/share/man/man3Xss   0755 root bin
 f none X11/share/man/man3Xss/XScreenSaverAllocInfo.3Xss		0444 root bin
 f none X11/share/man/man3Xss/XScreenSaverGetRegistered.3Xss	0444 root bin
@@ -1050,7 +1081,7 @@
 f none X11/share/man/man3Xss/Xss.3Xss				0444 root bin
 
 # open-src/lib/libXt
-!search            $HOME/X11/share/man/man3Xt
+!search            $HOME/man3Xt
 d none X11/share/man/man3Xt   0755 root bin
 f none X11/share/man/man3Xt/MenuPopdown.3Xt  0444 root bin
 f none X11/share/man/man3Xt/MenuPopup.3Xt  0444 root bin
@@ -1190,6 +1221,7 @@
 f none X11/share/man/man3Xt/XtIsRealized.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtIsRectObj.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtIsSensitive.3Xt  0444 root bin
+f none X11/share/man/man3Xt/XtIsSessionShell.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtIsShell.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtIsSubclass.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtIsTopLevelShell.3Xt  0444 root bin
@@ -1307,8 +1339,10 @@
 f none X11/share/man/man3Xt/XtVaCreateWidget.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtVaGetApplicationResources.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtVaGetSubresources.3Xt  0444 root bin
+f none X11/share/man/man3Xt/XtVaGetSubvalues.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtVaGetValues.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtVaOpenApplication.3Xt  0444 root bin
+f none X11/share/man/man3Xt/XtVaSetSubvalues.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtVaSetValues.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtWarning.3Xt  0444 root bin
 f none X11/share/man/man3Xt/XtWarningMsg.3Xt  0444 root bin
@@ -1318,24 +1352,25 @@
 f none X11/share/man/man3Xt/XtWindowToWidget.3Xt  0444 root bin
 
 # open-src/lib/libXau
-!search            $HOME/X11/share/man/man3Xau
+!search            $HOME/man3Xau
 d none X11/share/man/man3Xau				0755 root bin
 f none X11/share/man/man3Xau/Xau.3Xau  			0444 root bin
 f none X11/share/man/man3Xau/XauDisposeAuth.3Xau	0444 root bin
 f none X11/share/man/man3Xau/XauFileName.3Xau		0444 root bin
 f none X11/share/man/man3Xau/XauGetAuthByAddr.3Xau	0444 root bin
+f none X11/share/man/man3Xau/XauGetBestAuthByAddr.3Xau	0444 root bin
 f none X11/share/man/man3Xau/XauLockAuth.3Xau		0444 root bin
 f none X11/share/man/man3Xau/XauReadAuth.3Xau		0444 root bin
 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
+!search            $HOME/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
+!search $HOME/man3Xcomposite
 d none X11/share/man/man3Xcomposite 0755 root bin
 f none X11/share/man/man3Xcomposite/Xcomposite.3Xcomposite 0444 root bin
 f none X11/share/man/man3Xcomposite/XCompositeCreateRegionFromBorderClip.3Xcomposite 0444 root bin
@@ -1350,7 +1385,8 @@
 f none X11/share/man/man3Xcomposite/XCompositeUnredirectWindow.3Xcomposite 0444 root bin
 f none X11/share/man/man3Xcomposite/XCompositeVersion.3Xcomposite 0444 root bin
 
-!search $HOME/X11/share/man/man3Xcursor
+# open-src/lib/libXcursor
+!search $HOME/man3Xcursor
 d none X11/share/man/man3Xcursor 0755 root bin
 f none X11/share/man/man3Xcursor/Xcursor.3Xcursor 0444 root bin
 f none X11/share/man/man3Xcursor/XcursorCursorsCreate.3Xcursor 0444 root bin
@@ -1386,7 +1422,7 @@
 f none X11/share/man/man3Xcursor/XcursorXcFileSave.3Xcursor 0444 root bin
 
 # open-src/lib/libXinerama
-!search            $HOME/X11/share/man/man3Xinerama
+!search            $HOME/man3Xinerama
 d none X11/share/man/man3Xinerama			0755 root bin
 f none X11/share/man/man3Xinerama/Xinerama.3Xinerama	0444 root bin
 f none X11/share/man/man3Xinerama/XineramaIsActive.3Xinerama		0444 root bin
@@ -1395,7 +1431,7 @@
 f none X11/share/man/man3Xinerama/XineramaQueryVersion.3Xinerama	0444 root bin
 
 # open-src/lib/libXtst
-!search            $HOME/X11/share/man/man3Xtst
+!search            $HOME/man3Xtst
 d none X11/share/man/man3Xtst				0755 root bin
 f none X11/share/man/man3Xtst/XTestCompareCurrentCursorWithWindow.3Xtst 0444 root bin
 f none X11/share/man/man3Xtst/XTestCompareCursorWithWindow.3Xtst 0444 root bin
@@ -1408,3 +1444,66 @@
 f none X11/share/man/man3Xtst/XTestQueryExtension.3Xtst 0444 root bin
 f none X11/share/man/man3Xtst/XTestSetGContextOfGC.3Xtst 0444 root bin
 f none X11/share/man/man3Xtst/XTestSetVisualIDOfVisual.3Xtst 0444 root bin
+
+# open-src/lib/libXv
+!search $HOME/man3Xv
+d none X11/share/man/man3Xv 0755 root bin
+f none X11/share/man/man3Xv/Xv.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvFreeAdaptorInfo.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvFreeEncodingInfo.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvGetPortAttribute.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvGetStill.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvGetVideo.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvGrabPort.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvPortNotify.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvPutStill.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvPutVideo.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvQueryAdaptors.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvQueryBestSize.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvQueryEncodings.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvQueryExtension.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvSelectPortNotify.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvSelectVideoNotify.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvSetPortAttribute.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvStopVideo.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvUngrabPort.3Xv 0444 root bin
+f none X11/share/man/man3Xv/XvVideoNotify.3Xv 0444 root bin
+
+# open-src/lib/libXxf86misc
+!search $HOME/man3Xxf86misc
+d none X11/share/man/man3Xxf86misc 0755 root bin
+f none X11/share/man/man3Xxf86misc/XF86Misc.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscGetKbdSettings.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscGetMouseSettings.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscGetSaver.3Xxf86misc	0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscQueryExtension.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscQueryVersion.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscSetKbdSettings.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscSetMouseSettings.3Xxf86misc 0444 root bin
+f none X11/share/man/man3Xxf86misc/XF86MiscSetSaver.3Xxf86misc	0444 root bin
+
+# open-src/lib/libXxf86vm
+!search $HOME/man3Xxf86vm
+d none X11/share/man/man3Xxf86vm 0755 root bin
+f none X11/share/man/man3Xxf86vm/XF86VM.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeDeleteModeLine.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetAllModeLines.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetDotClocks.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetGamma.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetGammaRamp.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetGammaRampSize.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetModeLine.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetMonitor.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetPermissions.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeGetViewPort.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeLockModeSwitch.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeModModeLine.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeQueryExtension.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeQueryVersion.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSetClientVersion.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSetGamma.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSetGammaRamp.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSetViewPort.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSwitchMode.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeSwitchToMode.3Xxf86vm 0444 root bin
+f none X11/share/man/man3Xxf86vm/XF86VidModeValidateModeLine.3Xxf86vm 0444 root bin
--- a/packages/upgrade-X	Wed May 13 07:31:10 2009 -0700
+++ b/packages/upgrade-X	Wed May 13 16:52:41 2009 -0700
@@ -2,7 +2,7 @@
 
 ###
 #
-# @(#)upgrade-X	1.50 09/03/09
+# @(#)upgrade-X	1.51 09/05/13
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 #
@@ -178,7 +178,6 @@
 	SUNWxorg-client-programs
 	SUNWxorg-clientlibs
 	SUNWxorg-compatlinks
-	SUNWxorg-devel-docs
 	SUNWxorg-graphics-ddx
 	SUNWxorg-headers
 	SUNWxorg-server
@@ -273,6 +272,9 @@
 # snv_111: 6815064 Merge SUNWxwhl into SUNWxwinc
 REM_PKGS+=" SUNWxwhl"
 
+# snv_116: 6840423 Move headers from SUNWxorg-headers to SUNWxwinc,
+#		   merge SUNWxorg-devel-docs into SUNWxwpmn
+REM_PKGS+=" SUNWxorg-headers SUNWxorg-devel-docs"
 
 # Various compatibility links in SUNWxorg-server have been replaced with
 # files in other packages, so we need to remove SUNWxorg-server first