Mercurial Mercurial > upstream > oracle > xnv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6672824 Copyright/license notices from X.Org software should be included in SVR4 package copyrights
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Fri, 07 Mar 2008 15:12:44 -0800
changeset 355 a3a81e9c227d
parent 354 c5722f7db2ea
child 356 8b3a0e1c13fa
6672824 Copyright/license notices from X.Org software should be included in SVR4 package copyrights
make_release_packages file | annotate | diff | comparison | revisions
open-src/app/Makefile.inc file | annotate | diff | comparison | revisions
open-src/app/mesa-demos/Makefile file | annotate | diff | comparison | revisions
open-src/app/xfd/Makefile file | annotate | diff | comparison | revisions
open-src/app/xhost/Makefile file | annotate | diff | comparison | revisions
open-src/app/xpm/Makefile file | annotate | diff | comparison | revisions
open-src/app/xscreensaver/Makefile file | annotate | diff | comparison | revisions
open-src/common/Makefile.inc file | annotate | diff | comparison | revisions
open-src/doc/docbook-utils/Makefile file | annotate | diff | comparison | revisions
open-src/font/bitstream-vera/Makefile file | annotate | diff | comparison | revisions
open-src/font/deja-vu/Makefile file | annotate | diff | comparison | revisions
open-src/font/xfree86-type1/Makefile file | annotate | diff | comparison | revisions
open-src/lib/freetype/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libdrm/Makefile file | annotate | diff | comparison | revisions
open-src/lib/mesa/Makefile file | annotate | diff | comparison | revisions
open-src/util/lndir/Makefile file | annotate | diff | comparison | revisions
open-src/util/util-macros/Makefile file | annotate | diff | comparison | revisions
open-src/xserver/xorg/Makefile file | annotate | diff | comparison | revisions
open-src/xserver/xvnc/Makefile file | annotate | diff | comparison | revisions
packages/SUNW0xacx/prototype file | annotate | diff | comparison | revisions
packages/SUNW0xwopt/prototype file | annotate | diff | comparison | revisions
packages/SUNW0xwplt/prototype file | annotate | diff | comparison | revisions
packages/SUNWfontconfig-docs/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWfontconfig-root/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWfontconfig/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWfreetype2/prototype file | annotate | diff | comparison | revisions
packages/SUNWi1of/prototype file | annotate | diff | comparison | revisions
packages/SUNWxcursor-themes/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxcursor-themes/prototype file | annotate | diff | comparison | revisions
packages/SUNWxorg-cfg/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-client-docs/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-client-programs/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-clientlibs/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-doc/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-graphics-ddx/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-headers/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxorg-server/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwacx/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwcft/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwdem/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwdem/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwdim/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwfnt/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwfnt/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwfs/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwfsw/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwfsw/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwhl/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwice/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwice/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwinc/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwinc/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwman/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwman/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwmod/prototype_i386 file | annotate | diff | comparison | revisions
packages/SUNWxwmod/prototype_sparc file | annotate | diff | comparison | revisions
packages/SUNWxwoft/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwopt/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwopt/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwpft/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwplt/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwplt/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwpmn/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwpmn/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwrtl/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwslb/prototype_com file | annotate | diff | comparison | revisions
packages/SUNWxwsrc/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwsrv/prototype file | annotate | diff | comparison | revisions
packages/SUNWxwxft/copyright.add file | annotate | diff | comparison | revisions
packages/SUNWxwxft/prototype file | annotate | diff | comparison | revisions 
--- a/make_release_packages	Fri Mar 07 15:38:30 2008 -0800
+++ b/make_release_packages	Fri Mar 07 15:12:44 2008 -0800
@@ -27,7 +27,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-# @(#)make_release_packages	1.55 07/11/06
+# @(#)make_release_packages	1.56 08/03/07
 #
 #	Create and fill a package staging area for X
 #
@@ -134,6 +134,12 @@
 DECIMAL_BUILD=`echo ${BUILD} | awk '{print $1 / 100.0}'`
 echo "Building packages for X11 version ${VERSION} build ${DECIMAL_BUILD}"
 
+if [ "$MACH" = "sparc" ]; then
+    PROTODIR=$SOURCEDIR/proto-sun4-svr4
+else
+    PROTODIR=$SOURCEDIR/proto-${MACH}-svr4
+fi
+
 #   Next, create the staging area.  Make sure that the logs directory
 #   is writeable by everyone because it is likely that we will need to
 #   write into it as root across an NFS link...
@@ -174,10 +180,18 @@
     # We keep the master copyright in the top-level copyright file
     # Packages that need additional copyright have copyright.add files
     # that we then merge here
+    cp ../copyright $PACKAGE_DIR/$package/copyright
+    
     if [ -f copyright.add ] ; then
-	cat ../copyright copyright.add > $PACKAGE_DIR/$package/copyright
-    else
-	cp ../copyright $PACKAGE_DIR/$package/copyright
+	chmod +w $PACKAGE_DIR/$package/copyright
+	PROTODIR=$PROTODIR nawk \
+'BEGIN   { PROTODIR = ENVIRON [ "PROTODIR" ]; }
+/^include / {
+        system("cat " PROTODIR "/licenses/" $2)
+        next
+}
+{ print }' \
+	    copyright.add >> $PACKAGE_DIR/$package/copyright
     fi
     cd ..
 done
@@ -186,13 +200,7 @@
 #   Now move into the package staging area and build the packages.
 cd $PACKAGE_DIR
 
-if [ "$MACH" = "sparc" ]; then
-    PROTODIR=$SOURCEDIR/proto-sun4-svr4
-else
-    PROTODIR=$SOURCEDIR/proto-${MACH}-svr4
-fi
-
-for D in etc usr var lib ; do
+for D in etc usr var lib licenses ; do
     /bin/rm -f $D
     /bin/ln -s $PROTODIR/$D $D
 done
--- a/open-src/app/Makefile.inc	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/Makefile.inc	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.7	08/01/24
+# @(#)Makefile.inc	1.8	08/03/07
 #
 
 PWD:sh=pwd
@@ -73,5 +73,5 @@
 $(APP_BIN): $(SOURCE_DIR)/Makefile
 	(cd $(SOURCE_DIR) ; $(LIBPATHS) LD_OPTIONS="$(LIB_LD_OPTIONS)" $(MAKE) $(MFLAGS) )
 
-install_gen: $(APP_BIN)
+install_gen:: $(APP_BIN)
 	(cd $(SOURCE_DIR) ; $(LIBPATHS) LD_OPTIONS="$(LIB_LD_OPTIONS)" $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
--- a/open-src/app/mesa-demos/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/mesa-demos/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.7	07/10/08
+# @(#)Makefile	1.8	08/03/07
 #
 
 PWD:sh=pwd
@@ -112,7 +112,7 @@
 all-xdemos:
 	$(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) all-xdemos_gen
 
-install_gen: $(INSTALL_TARGETS)
+install_gen:: $(INSTALL_TARGETS)
 
 install_glxgears: $(GLXGEARS_BIN)
 	mkdir -p $(MESA_prefix)/bin
--- a/open-src/app/xfd/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/xfd/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1 08/02/26
+# @(#)Makefile	1.2 08/03/07
 #
 
 # Package name used in tarballs
@@ -51,7 +51,7 @@
 
 include ../Makefile.inc
 
-install_gen: install_po
+install_gen:: install_po
 install_po:
 	mkdir -p $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
-	cp xfd.po $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
+	cp -f xfd.po $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
--- a/open-src/app/xhost/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/xhost/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -48,7 +48,7 @@
 
 include ../Makefile.inc
 
-install_gen: install_po
+install_gen:: install_po
 install_po:
 	mkdir -p $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
-	cp xhost.po $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
+	cp -f xhost.po $(PROTODIR)/usr/X11/share/locale/C/LC_MESSAGES
--- a/open-src/app/xpm/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/xpm/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.6	07/07/20
+# @(#)Makefile	1.7	08/03/07
 #
 
 PWD:sh=pwd
@@ -87,9 +87,9 @@
 $(APP_BIN): $(SOURCE_DIR)/Makefile
 	(cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS))
 
-install_gen: $(APP_BIN)
+install_gen:: $(APP_BIN)
 	(cd $(SOURCE_DIR)/cxpm ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
 	(cd $(SOURCE_DIR)/sxpm ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
 	mkdir -p $(PROTODIR)$(X11_LC_MESSAGES_DIR)
-	(cd $(SOURCE_DIR)/cxpm ; cp -p cxpm.po $(PROTODIR)$(X11_LC_MESSAGES_DIR))
-	(cd $(SOURCE_DIR)/sxpm ; cp -p sxpm.po $(PROTODIR)$(X11_LC_MESSAGES_DIR))
+	(cd $(SOURCE_DIR)/cxpm ; cp -pf cxpm.po $(PROTODIR)$(X11_LC_MESSAGES_DIR))
+	(cd $(SOURCE_DIR)/sxpm ; cp -pf sxpm.po $(PROTODIR)$(X11_LC_MESSAGES_DIR))
--- a/open-src/app/xscreensaver/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/app/xscreensaver/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.87	08/02/27
+# @(#)Makefile	1.88	08/03/07
 #
 
 PWD:sh=pwd
@@ -192,7 +192,7 @@
 	    -a '{Availability, SUNWxscreensaver-hacks-gl} {Interface Stability, Private}' \
 		-p /usr/X11/lib/xscreensaver/hacks/ $(SOURCE_DIR)/hacks/glx/*.man
 
-install_gen: $(XS_BIN) $(XS_MAN) $(XS_POT)
+install_gen:: $(XS_BIN) $(XS_MAN) $(XS_POT)
 	chmod +w $(SOURCE_DIR)/hacks/vidwhacker \
 		$(SOURCE_DIR)/hacks/webcollage \
 		$(SOURCE_DIR)/driver/xscreensaver-getimage-file \
--- a/open-src/common/Makefile.inc	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/common/Makefile.inc	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.86	08/03/06
+# @(#)Makefile.inc	1.87	08/03/07
 #
 
 # Borrowed from Solaris OS/Net makefile.master:
@@ -205,6 +205,8 @@
 build_64::
 	$(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_64) ARCH_FLAGS="$(ARCH64_FLAGS)" LIBSUBDIR=/$(SUBDIR64) ARCHLIBSUBDIR=/$(SUBDIR64) $(BUILD_64_FLAGS) build_gen
 
+install_gen:: install_license
+
 install_32:: build_32
 	$(MAKE) $(MFLAGS) BUILD_DIR=$(BUILD_DIR_32) ARCH_FLAGS="$(ARCH32_FLAGS)" $(BUILD_32_FLAGS) install_gen
 
@@ -379,3 +381,22 @@
 	    CUR_LIST="$${CUR_LIST} new/$$p" ; \
 	done
 	rm -rf tmp-regen
+
+### Licensing files
+
+# Default license file name is COPYING (X.Org & GNU autoconf default)
+# For other license file names, set LICENSE_FILE to the file name
+# and set LICENSE_FILE_SET=yes
+LICENSE_FILE_DEFAULT	= $(LICENSE_FILE_SET:yes=$(POUND_SIGN))
+$(LICENSE_FILE_DEFAULT)	LICENSE_FILE=COPYING
+
+LICENSE_DEST = $(PROTODIR)/licenses
+
+install_license:
+	case '$(MFLAGS)' in *[ik]*) set +e;; esac; \
+	if [ -f $(SOURCE_DIR)/$(LICENSE_FILE) ] ; then \
+		THIS_MODULE=`echo $(PWD) | sed 's|.*/open-src/||'` ; \
+		mkdir -p $(LICENSE_DEST)/$${THIS_MODULE}/ ; \
+		cp -pf $(SOURCE_DIR)/$(LICENSE_FILE) \
+			$(LICENSE_DEST)/$${THIS_MODULE}/COPYING ; \
+	fi
--- a/open-src/doc/docbook-utils/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/doc/docbook-utils/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	07/06/11
+# @(#)Makefile	1.4	08/03/07
 #
 
 PWD:sh=pwd
@@ -84,7 +84,7 @@
 $(APP_BIN): $(SOURCE_DIR)/Makefile
 	(cd $(SOURCE_DIR) ; $(GNUMAKE) $(MFLAGS) )
 
-install_gen: $(APP_BIN) $(CATALOG)
+install_gen:: $(APP_BIN) $(CATALOG)
 	(cd $(SOURCE_DIR) ; $(GNUMAKE) $(MFLAGS) install)
 	cp -p $(CATALOG) $(PROTODIR)$(TOOLS_DIR)/share/sgml
 
--- a/open-src/font/bitstream-vera/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/font/bitstream-vera/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	07/09/14
+# @(#)Makefile	1.4	08/03/07
 #
 
 PWD:sh=pwd
@@ -58,6 +58,10 @@
 # Directory to install to
 DEST_DIR=$(PROTODIR)$(TRUETYPE_DIR)
 
+# License file
+LICENSE_FILE=COPYRIGHT.TXT
+LICENSE_FILE_SET=yes
+
 ### Include common rulesets
 include $(TOP)/common/Makefile.inc
 
@@ -82,7 +86,7 @@
 	 LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	 $(PROTODIR)$(X11_DIR)/bin/mkfontscale . )
 
-install_gen: $(BUILD_TARGETS)
+install_gen:: $(BUILD_TARGETS)
 	mkdir -p $(DEST_DIR)
 	-( cd $(DEST_DIR) ; rm -f $(VERA_FONT_FILES) VeraFontsCopyright.txt )
 	( cd $(SOURCE_DIR) ; cp -p $(VERA_FONT_FILES) $(DEST_DIR) )
--- a/open-src/font/deja-vu/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/font/deja-vu/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -2,7 +2,7 @@
 #
 # Deja Vu Fonts Makefile
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	07/09/14
+# @(#)Makefile	1.2	08/03/07
 #
 
 PWD:sh=pwd
@@ -58,6 +58,10 @@
 # Directory to install to
 DEST_DIR=$(PROTODIR)$(TRUETYPE_DIR)
 
+# License file
+LICENSE_FILE=LICENSE
+LICENSE_FILE_SET=yes
+
 ### Include common rulesets
 include $(TOP)/common/Makefile.inc
 
@@ -93,7 +97,7 @@
 	 LD_LIBRARY_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
 	 $(PROTODIR)$(X11_DIR)/bin/mkfontscale . )
 
-install_gen: $(BUILD_TARGETS)
+install_gen:: $(BUILD_TARGETS)
 	mkdir -p $(DEST_DIR)
 	-( cd $(DEST_DIR) ; rm -f $(DEJAVU_FONT_FILES) DejaVuFontsCopyright.txt )
 	( cd $(SOURCE_DIR) ; cp -p $(DEJAVU_FONT_FILES) $(DEST_DIR) )
--- a/open-src/font/xfree86-type1/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/font/xfree86-type1/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,14 +28,14 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	08/02/04 SMI
+# @(#)Makefile	1.2	08/03/07 SMI
 #
 
 # Package name used in tarballs
 FONT_NAME=font-xfree86-type1
 
 # Version number (used in path names)
-VERSION=1.0.0
+VERSION=1.0.1
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=
--- a/open-src/lib/freetype/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/lib/freetype/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.71	08/02/23
+# @(#)Makefile	1.72	08/03/07
 #
 
 PWD:sh=pwd
@@ -97,6 +97,10 @@
 # GNU make wants bash
 SHELL = /bin/bash
 
+# License file
+LICENSE_FILE=docs/FTL.TXT
+LICENSE_FILE_SET=yes
+
 ### Rules specific to this directory:
 
 # Run configure script (Freetype helpfully does this the first time you call
@@ -140,7 +144,7 @@
 	    INSTALL="$(TOP)/common/install-sh -c" \
 	    $(GNUMAKE) )
 
-install_gen: $(FT_LIB)
+install_gen:: $(FT_LIB)
 	mkdir -p $(PROTODIR)/usr/bin$(ARCHLIBSUBDIR)
 	(cd $(SOURCE_DIR) ; $(GNUMAKE) prefix=$(PROTODIR)$(FT_prefix) libdir=$(PROTODIR)$(FT_libdir) bindir=$(PROTODIR)$(FT_bindir) install )
 
--- a/open-src/lib/libdrm/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/lib/libdrm/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -27,7 +27,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.6	07/05/15
+# @(#)Makefile	1.7	08/03/07
 #
 
 PWD:sh=pwd
@@ -110,5 +110,5 @@
 	(cd $(SOURCE_DIR) ; LD_OPTIONS="$(LIB_REQUIRED_LDFLAGS) $(LIB_ADD_LD_OPTIONS)" $(MAKE) $(MFLAGS) )
 
 
-install_gen: $(LIB_BUILT)
+install_gen:: $(LIB_BUILT)
 	(cd $(SOURCE_DIR) ; $(LIBPATHS) LD_OPTIONS="$(LIB_REQUIRED_LDFLAGS) $(LIB_ADD_LD_OPTIONS)" $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) libdir=$(LIB_prefix)/lib$(LIB_ADD_SUBDIR)$(ARCHLIBSUBDIR) install pkgconfigdir=/usr/lib$(ARCHLIBSUBDIR)/pkgconfig)
--- a/open-src/lib/mesa/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/lib/mesa/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.9	07/07/11
+# @(#)Makefile	1.10	08/03/07
 #
 
 PWD:sh=pwd
@@ -120,7 +120,7 @@
 	(cd $(SOURCE_DIR)/configs && rm -f current && ln -s $(MESA_CFG) current)
 	(cd $(SOURCE_DIR) && $(MESA_MAKEENV) $(GNUMAKE) $(MFLAGS) -e $(MESA_MAKEVARS) default)
 
-install_gen: $(MESA_LIB)
+install_gen:: $(MESA_LIB)
 	(cd $(SOURCE_DIR) && $(GNUMAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) ARCHLIBSUBDIR=$(ARCHLIBSUBDIR) install )
 
 
--- a/open-src/util/lndir/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/util/lndir/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.3	07/05/15
+# @(#)Makefile	1.4	08/03/07
 #
 
 PWD:sh=pwd
@@ -64,5 +64,5 @@
 	 CC=$(CC) CFLAGS="$(LIB_CFLAGS)" LD="$(CC) $(PROG_CFLAGS) $(LDFLAGS)" LDFLAGS="$(PROG_LDFLAGS)" PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/pkgconfig:$(PROTODIR)/usr/X11/lib/pkgconfig ./configure $(LNDIR_CFG) )
 
 # Install
-install_gen: $(SOURCE_DIR)/Makefile
+install_gen:: $(SOURCE_DIR)/Makefile
 	(cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
--- a/open-src/util/util-macros/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/util/util-macros/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.1	07/06/13
+# @(#)Makefile	1.2	08/03/07
 #
 
 PWD:sh=pwd
@@ -66,5 +66,5 @@
 	 ./configure $(CONFIG_OPTS) )
 
 # Install
-install_gen: $(SOURCE_DIR)/Makefile
+install_gen:: $(SOURCE_DIR)/Makefile
 	(cd $(SOURCE_DIR) ; $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) install)
--- a/open-src/xserver/xorg/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/xserver/xorg/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.62	08/02/28
+# @(#)Makefile	1.63	08/03/07
 #
 
 # Build 32-bit or 64-bit?
@@ -117,7 +117,7 @@
 EXTRA_INSTALL_i386=
 EXTRA_INSTALL=$(EXTRA_INSTALL_$(MACH))
 
-install_gen: $(XORGSERVER_BIN) $(EXTRA_INSTALL)
+install_gen:: $(XORGSERVER_BIN) $(EXTRA_INSTALL)
 	(cd $(SOURCE_DIR) ;  $(BUILD_ENV) $(MAKE) $(MFLAGS) -e install \
 	 DESTDIR=$(PROTODIR) CPPROG="cp -p" \
 	 pkgconfigdir=/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig )
--- a/open-src/xserver/xvnc/Makefile	Fri Mar 07 15:38:30 2008 -0800
+++ b/open-src/xserver/xvnc/Makefile	Fri Mar 07 15:12:44 2008 -0800
@@ -31,7 +31,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.6	07/12/13
+# @(#)Makefile	1.7	08/03/07
 #
 
 # Package name used in tarballs
@@ -100,6 +100,10 @@
 
 BUILD_TARGETS=$(XVNCSERVER_BIN)
 
+# License file
+LICENSE_FILE=LICENCE.txt
+LICENSE_FILE_SET=yes
+
 default: all
 
 # Merge in additional sources from Xorg tarball & sun-src directory
@@ -202,7 +206,7 @@
 	(cd $(SOURCE_DIR)/unix ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
 	(cd $(XORG_BUILD_DIR) ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
 
-install_gen: $(XVNCSERVER_BIN)
+install_gen:: $(XVNCSERVER_BIN)
 	(cd $(XORG_BUILD_DIR)/hw/vnc \
 	 &&  $(BUILD_ENV) $(MAKE) $(MFLAGS) -e install \
 	 DESTDIR=$(PROTODIR) CPPROG="cp -p" )
--- a/packages/SUNW0xacx/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNW0xacx/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#       @(#)prototype	35.17     07/11/05 (c) Sun Microsystems, Inc.
+#       @(#)prototype	35.18     08/03/07 (c) Sun Microsystems, Inc.
 #
 #  AccessX and associated files
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../openwin
--- a/packages/SUNW0xwopt/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNW0xwopt/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#       "@(#)prototype	1.10	08/02/29   Sun Microsystems" 
+#       "@(#)prototype	1.11	08/03/07   Sun Microsystems" 
 #
 # X Window System optional client localizable files
 
 i pkginfo
-i copyright=../copyright
+i copyright
 #i depend
 
 !HOME=../openwin
--- a/packages/SUNW0xwplt/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNW0xwplt/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.16     08/02/29 SMI"
+# ident "@(#)prototype 1.17     08/03/07 SMI"
 #
 # X Window System required core package localizable files
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../usr
--- a/packages/SUNWfontconfig-docs/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWfontconfig-docs/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -1,22 +1,1 @@
-$Id: COPYING,v 1.3 2003/04/04 20:17:40 keithp Exp $
-
-Copyright � 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR 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.
-
+include lib/fontconfig/COPYING
--- a/packages/SUNWfontconfig-root/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWfontconfig-root/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -1,22 +1,1 @@
-$Id: COPYING,v 1.3 2003/04/04 20:17:40 keithp Exp $
-
-Copyright � 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR 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.
-
+include lib/fontconfig/COPYING
--- a/packages/SUNWfontconfig/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWfontconfig/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -1,22 +1,1 @@
-$Id: COPYING,v 1.3 2003/04/04 20:17:40 keithp Exp $
-
-Copyright � 2001,2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission.  Keith Packard makes no
-representations about the suitability of this software for any purpose.  It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR 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.
-
+include lib/fontconfig/COPYING
--- a/packages/SUNWfreetype2/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWfreetype2/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	1.15	08/02/22 SMI
+#	@(#)prototype	1.16	08/03/07 SMI
 #
 #  FreeType 2 package
 
 i pkginfo
-i copyright=copyright
+i copyright
 i depend
 
 !HOME=../usr
--- a/packages/SUNWi1of/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWi1of/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -30,14 +30,14 @@
 ###########################################################################
 
 #
-# ident "@(#)prototype 1.22     08/02/26 SMI"
+# ident "@(#)prototype 1.23     08/03/07 SMI"
 #
 #  ISO-8859-1 (Latin-1) Optional Fonts
 
 i pkginfo
 i postinstall
 i postremove
-i copyright=../copyright
+i copyright
 i depend=../depend
 i i.fontsdir
 i r.fontsdir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxcursor-themes/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,3 @@
+Files from the data/xcursor-themes package are covered by the following notice:
+
+include data/xcursor-themes/COPYING
--- a/packages/SUNWxcursor-themes/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxcursor-themes/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,14 +29,14 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype 1.1     07/08/28 SMI"
+# ident "@(#)prototype 1.2     08/03/07 SMI"
 #
 # X.Org Foundation X cursor themes for Solaris
 
 !HOME=../usr/share/icons
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 d none share						  0755 root sys
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-cfg/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,5 @@
+------------------------------------------------------------------------------
+Files from the lib/libxkbui package are covered by the following notice:
+
+include lib/libxkbui/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-client-docs/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,17 @@
+------------------------------------------------------------------------------
+Files from the app/xgamma package are covered by the following notice:
+
+include app/xgamma/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrandr package are covered by the following notice:
+
+include app/xrandr/COPYING
+------------------------------------------------------------------------------
+Files from the app/xvidtune package are covered by the following notice:
+
+include app/xvidtune/COPYING
+------------------------------------------------------------------------------
+Files from the app/xvinfo package are covered by the following notice:
+
+include app/xvinfo/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-client-programs/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,17 @@
+------------------------------------------------------------------------------
+Files from the app/xgamma package are covered by the following notice:
+
+include app/xgamma/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrandr package are covered by the following notice:
+
+include app/xrandr/COPYING
+------------------------------------------------------------------------------
+Files from the app/xvidtune package are covered by the following notice:
+
+include app/xvidtune/COPYING
+------------------------------------------------------------------------------
+Files from the app/xvinfo package are covered by the following notice:
+
+include app/xvinfo/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-clientlibs/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,25 @@
+------------------------------------------------------------------------------
+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/libXvMC package are covered by the following notice:
+
+include lib/libXvMC/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
+------------------------------------------------------------------------------
+Files from the lib/libxkbfile package are covered by the following notice:
+
+include lib/libxkbfile/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-doc/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,5 @@
+------------------------------------------------------------------------------
+Files from the app/xkbcomp package are covered by the following notice:
+
+include app/xkbcomp/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-graphics-ddx/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,125 @@
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-apm package are covered by the following notice:
+
+include driver/xf86-video-apm/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-ark package are covered by the following notice:
+
+include driver/xf86-video-ark/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-ast package are covered by the following notice:
+
+include driver/xf86-video-ast/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-ati package are covered by the following notice:
+
+include driver/xf86-video-ati/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-chips package are covered by the following notice:
+
+include driver/xf86-video-chips/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-cirrus package are covered by the following notice:
+
+include driver/xf86-video-cirrus/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-cyrix package are covered by the following notice:
+
+include driver/xf86-video-cyrix/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-dummy package are covered by the following notice:
+
+include driver/xf86-video-dummy/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-glint package are covered by the following notice:
+
+include driver/xf86-video-glint/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-i128 package are covered by the following notice:
+
+include driver/xf86-video-i128/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-i740 package are covered by the following notice:
+
+include driver/xf86-video-i740/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-intel package are covered by the following notice:
+
+include driver/xf86-video-intel/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-mga package are covered by the following notice:
+
+include driver/xf86-video-mga/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-neomagic package are covered by the following notice:
+
+include driver/xf86-video-neomagic/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-nsc package are covered by the following notice:
+
+include driver/xf86-video-nsc/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-nv package are covered by the following notice:
+
+include driver/xf86-video-nv/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-radeonhd package are covered by the following notice:
+
+include driver/xf86-video-radeonhd/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-rendition package are covered by the following notice:
+
+include driver/xf86-video-rendition/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-s3 package are covered by the following notice:
+
+include driver/xf86-video-s3/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-s3virge package are covered by the following notice:
+
+include driver/xf86-video-s3virge/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-savage package are covered by the following notice:
+
+include driver/xf86-video-savage/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-siliconmotion package are covered by the following notice:
+
+include driver/xf86-video-siliconmotion/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-sis package are covered by the following notice:
+
+include driver/xf86-video-sis/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-tdfx package are covered by the following notice:
+
+include driver/xf86-video-tdfx/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-tga package are covered by the following notice:
+
+include driver/xf86-video-tga/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-trident package are covered by the following notice:
+
+include driver/xf86-video-trident/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-tseng package are covered by the following notice:
+
+include driver/xf86-video-tseng/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-vesa package are covered by the following notice:
+
+include driver/xf86-video-vesa/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-vga package are covered by the following notice:
+
+include driver/xf86-video-vga/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-via package are covered by the following notice:
+
+include driver/xf86-video-via/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-video-vmware package are covered by the following notice:
+
+include driver/xf86-video-vmware/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-headers/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,5 @@
+------------------------------------------------------------------------------
+Files from the lib/libxkbfile package are covered by the following notice:
+
+include lib/libxkbfile/COPYING
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxorg-server/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,97 @@
+------------------------------------------------------------------------------
+Files from the X.Org xserver package are covered by the following notice:
+
+include xserver/xorg/COPYING
+------------------------------------------------------------------------------
+Files from the app/xkbcomp package are covered by the following notice:
+
+include app/xkbcomp/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-acecad package are covered by the following notice:
+
+include driver/xf86-input-acecad/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-calcomp package are covered by the following notice:
+
+include driver/xf86-input-calcomp/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-citron package are covered by the following notice:
+
+include driver/xf86-input-citron/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-digitaledge package are covered by the following notice:
+
+include driver/xf86-input-digitaledge/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-dmc package are covered by the following notice:
+
+include driver/xf86-input-dmc/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-dynapro package are covered by the following notice:
+
+include driver/xf86-input-dynapro/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-elographics package are covered by the following notice:
+
+include driver/xf86-input-elographics/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-fpit package are covered by the following notice:
+
+include driver/xf86-input-fpit/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-hyperpen package are covered by the following notice:
+
+include driver/xf86-input-hyperpen/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-jamstudio package are covered by the following notice:
+
+include driver/xf86-input-jamstudio/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-keyboard package are covered by the following notice:
+
+include driver/xf86-input-keyboard/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-magellan package are covered by the following notice:
+
+include driver/xf86-input-magellan/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-microtouch package are covered by the following notice:
+
+include driver/xf86-input-microtouch/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-mouse package are covered by the following notice:
+
+include driver/xf86-input-mouse/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-mutouch package are covered by the following notice:
+
+include driver/xf86-input-mutouch/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-palmax package are covered by the following notice:
+
+include driver/xf86-input-palmax/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-penmount package are covered by the following notice:
+
+include driver/xf86-input-penmount/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-spaceorb package are covered by the following notice:
+
+include driver/xf86-input-spaceorb/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-summa package are covered by the following notice:
+
+include driver/xf86-input-summa/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-tek4957 package are covered by the following notice:
+
+include driver/xf86-input-tek4957/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-vmmouse package are covered by the following notice:
+
+include driver/xf86-input-vmmouse/COPYING
+------------------------------------------------------------------------------
+Files from the driver/xf86-input-void package are covered by the following notice:
+
+include driver/xf86-input-void/COPYING
+
--- a/packages/SUNWxwacx/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwacx/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.21	07/11/05
+#	@(#)prototype	35.22	08/03/07
 #
 #  AccessX and associated files
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../openwin
--- a/packages/SUNWxwcft/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwcft/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -6,22 +6,7 @@
  UTBI____.afm  UTB_____.afm  UTI_____.afm  UTRG____.afm  
  UTBI____.pfa  UTB_____.pfa  UTI_____.pfa  UTRG____.pfa  
 
-Permission to use, reproduce, display and distribute the listed typefaces
-is hereby granted, provided that the Adobe Copyright notice appears in all
-whole and partial copies of the software and that the following trademark
-symbol and attribution appear in all unmodified copies of the software:
-
-        Copyright (c) 1989 Adobe Systems Incorporated
-        Utopia (R)
-        Utopia is a registered trademark of Adobe Systems Incorporated
-
-The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font Metric
-files) donated are:
-
-        Utopia Regular
-        Utopia Italic
-        Utopia Bold
-        Utopia Bold Italic
+include font/adobe-utopia-type1/COPYING
 
 ------------------------------------------------------------------------------
 For these font files in /usr/X11/lib/X11/fonts/Type1:
@@ -30,59 +15,18 @@
  c0582bt_.afm  c0611bt_.afm  c0633bt_.afm  c0649bt_.afm  
  c0582bt_.pfb  c0611bt_.pfb  c0633bt_.pfb  c0649bt_.pfb  
 
-(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
-
-You are hereby granted permission under all Bitstream propriety rights
-to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
-Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
-for any purpose and without restriction; provided, that this notice is
-left intact on all copies of such fonts and that Bitstream's trademark
-is acknowledged as shown below on all unmodified copies of the 4 Charter
-Type 1 fonts.
-
-BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+include font/bitstream-type1/COPYING
 ------------------------------------------------------------------------------
 For these font files in /usr/X11/lib/X11/fonts/Type1:
  cour.afm    courb.afm   courbi.afm  couri.afm   
  cour.pfa    courb.pfa   courbi.pfa  couri.pfa 
 
-IBM Courier - Copyright (c) IBM Corporation 1990, 1991
-
-You are hereby granted permission under the terms of the IBM/MIT X Consortium
-Courier Typefont agreement to execute, reproduce, distribute, display, market,
-sell and otherwise transfer copies of the IBM Courier font to third parties.
-
-The font is provided "AS IS" without charge.  NO WARRANTIES OR INDEMNIFICATION
-ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+include font/ibm-type1/COPYING
 ------------------------------------------------------------------------------
 For these font files in /usr/X11/lib/X11/fonts/Type1:
  cursor.pfa
 
-Copyright (C) 2000 The XFree86 Project, 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, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is fur-
-nished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
-NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
-NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of the XFree86 Project shall not
-be used in advertising or otherwise to promote the sale, use or other deal-
-ings in this Software without prior written authorization from the XFree86
-Project.
-
+include font/xfree86-type1/COPYING
 ------------------------------------------------------------------------------
 For these font files in /usr/X11/lib/X11/fonts/Type1:
  l047013t.afm  l047033t.pfa  l048016t.afm  l048036t.pfa  l049033t.afm 
@@ -91,45 +35,5 @@
  l047016t.pfa  l048013t.afm  l048033t.pfa  l049016t.afm  l049036t.pfa 
  l047033t.afm  l048013t.pfa  l048036t.afm  l049016t.pfa  
 
-Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font 
-instruction code copyright (c) 2001 by URW++ GmbH. All Rights 
-Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining 
-a copy of these Fonts and associated documentation files (the "Font 
-Software"), to deal in the Font Software, including without 
-limitation the rights to use, copy, merge, publish, distribute, 
-sublicense, and/or sell copies of the Font Software, and to permit 
-persons to whom the Font Software is furnished to do so, subject to 
-the following conditions:
-
-The above copyright and trademark notices and this permission notice 
-shall be included in all copies of one or more of the Font Software.
-
-The Font Software may not be modified, altered, or added to, and in 
-particular the designs of glyphs or characters in the Fonts may not 
-be modified nor may additional glyphs or characters be added to the 
-Fonts. This License becomes null and void when the Fonts or Font 
-Software have been modified.
+include font/bh-type1/COPYING
 
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT 
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL 
-BIGELOW & HOLMES INC. OR URW++ GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES 
-OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, 
-INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR 
-INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT 
-SOFTWARE.
-
-Except as contained in this notice, the names of Bigelow & Holmes 
-Inc. and URW++ GmbH. shall not be used in advertising or otherwise to 
-promote the sale, use or other dealings in this Font Software without 
-prior written authorization from Bigelow & Holmes Inc. and URW++ GmbH.
-
-For further information, contact:
-
[email protected]
-or
[email protected]
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwdem/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,9 @@
+------------------------------------------------------------------------------
+Files from the app/xev package are covered by the following notice:
+
+include app/xev/COPYING
+------------------------------------------------------------------------------
+Files from the app/xmag package are covered by the following notice:
+
+include app/xmag/COPYING
+
--- a/packages/SUNWxwdem/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwdem/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.18	08/02/22
+#	@(#)prototype	35.19	08/03/07
 #
 #  X Window System demo programs
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 i postinstall
 
--- a/packages/SUNWxwdim/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwdim/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.10	07/11/05
+#	@(#)prototype	35.11	08/03/07
 #
 #  X Window System demo images
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../openwin/share/images
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwfnt/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,27 @@
+Fonts in this package are covered under a variety of open source and
+commercial licenses, including, but not limited to the following licenses.
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/TrueType:
+
+ Vera.ttf      VeraBd.ttf    VeraMoBI.ttf  VeraMoIt.ttf  VeraSe.ttf 
+ VeraBI.ttf    VeraIt.ttf    VeraMoBd.ttf  VeraMono.ttf  VeraSeBd.ttf 
+
+include font/bitstream-vera/COPYING
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/TrueType:
+
+ DejaVuSans-Bold.ttf                  DejaVuSansMono-Oblique.ttf 
+ DejaVuSans-BoldOblique.ttf           DejaVuSansMono.ttf 
+ DejaVuSans-ExtraLight.ttf            DejaVuSerif-Bold.ttf 
+ DejaVuSans-Oblique.ttf               DejaVuSerif-BoldItalic.ttf 
+ DejaVuSans.ttf                       DejaVuSerif-Italic.ttf 
+ DejaVuSansCondensed-Bold.ttf         DejaVuSerif.ttf 
+ DejaVuSansCondensed-BoldOblique.ttf  DejaVuSerifCondensed-Bold.ttf 
+ DejaVuSansCondensed-Oblique.ttf      DejaVuSerifCondensed-BoldItalic.ttf 
+ DejaVuSansCondensed.ttf              DejaVuSerifCondensed-Italic.ttf 
+ DejaVuSansMono-Bold.ttf              DejaVuSerifCondensed.ttf 
+ DejaVuSansMono-BoldOblique.ttf  
+
+include font/deja-vu/COPYING
--- a/packages/SUNWxwfnt/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwfnt/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype_com	35.49	08/02/26	Sun Microsystems
+#	@(#)prototype_com	35.50	08/03/07	Sun Microsystems
 #
 #  X Window System required core fonts package
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 i postremove
 i postinstall
--- a/packages/SUNWxwfs/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwfs/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#       @(#)prototype	35.12	07/11/05  (c) Sun Microsystems, Inc.
+#       @(#)prototype	35.13	08/03/07  (c) Sun Microsystems, Inc.
 #
 #  font server and associated files.
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../openwin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwfsw/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,20 @@
+The files in this package are covered under a variety of open source and
+commercial licenses, including, but not limited to the following licenses.
+
+------------------------------------------------------------------------------
+
+The files in /usr/X11/lib/X11/fonts/encodings are covered by this license:
+
+include font/encodings/COPYING
+
+------------------------------------------------------------------------------
+
+libfontenc.so.1 is covered by this license:
+
+include lib/libfontenc/COPYING
+
+------------------------------------------------------------------------------
+libXfont.so.1 is covered by this license:
+
+include lib/libXfont/COPYING
+
--- a/packages/SUNWxwfsw/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwfsw/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -1,6 +1,6 @@
 ##########################################################################
 #
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
@@ -29,12 +29,12 @@
 #
 ##########################################################################
 #
-# ident "@(#)prototype_com 1.4     07/11/06 SMI"
+# ident "@(#)prototype_com 1.5     08/03/07 SMI"
 #
 #  X Window System required core font software package
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 i i.encodingsdir
 i r.encodingsdir
--- a/packages/SUNWxwhl/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwhl/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -30,13 +30,13 @@
 ###########################################################################
 #
 #
-#		  "@(#)prototype	1.13    07/11/05 SMI"
+#		  "@(#)prototype	1.14    08/03/07 SMI"
 #
 #  X Window System Header Compatability Links Package
 #
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 d none include 0755 root bin
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwice/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,9 @@
+------------------------------------------------------------------------------
+Files from the app/iceauth package are covered by the following notice:
+
+include app/iceauth/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libICE package are covered by the following notice:
+
+include lib/libICE/COPYING
+
--- a/packages/SUNWxwice/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwice/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-# ident "@(#)prototype 1.14     08/03/03 SMI"
+# ident "@(#)prototype 1.15     08/03/07 SMI"
 #
 #    X Window System ICE library
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../usr/X11
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwinc/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,177 @@
+------------------------------------------------------------------------------
+Files from the proto/bigreqsproto package are covered by the following notice:
+
+include proto/bigreqsproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/compositeproto package are covered by the following notice:
+
+include proto/compositeproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/damageproto package are covered by the following notice:
+
+include proto/damageproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/evieproto package are covered by the following notice:
+
+include proto/evieproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/fixesproto package are covered by the following notice:
+
+include proto/fixesproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/fontcacheproto package are covered by the following notice:
+
+include proto/fontcacheproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/fontsproto package are covered by the following notice:
+
+include proto/fontsproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/inputproto package are covered by the following notice:
+
+include proto/inputproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/kbproto package are covered by the following notice:
+
+include proto/kbproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/lg3dproto package are covered by the following notice:
+
+include proto/lg3dproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/pmproto package are covered by the following notice:
+
+include proto/pmproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/randrproto package are covered by the following notice:
+
+include proto/randrproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/recordproto package are covered by the following notice:
+
+include proto/recordproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/renderproto package are covered by the following notice:
+
+include proto/renderproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/resourceproto package are covered by the following notice:
+
+include proto/resourceproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/scrnsaverproto package are covered by the following notice:
+
+include proto/scrnsaverproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/trapproto package are covered by the following notice:
+
+include proto/trapproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/videoproto package are covered by the following notice:
+
+include proto/videoproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/x11proto package are covered by the following notice:
+
+include proto/x11proto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xcmiscproto package are covered by the following notice:
+
+include proto/xcmiscproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xextproto package are covered by the following notice:
+
+include proto/xextproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xf86bigfontproto package are covered by the following notice:
+
+include proto/xf86bigfontproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xf86dgaproto package are covered by the following notice:
+
+include proto/xf86dgaproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xf86driproto package are covered by the following notice:
+
+include proto/xf86driproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xf86miscproto package are covered by the following notice:
+
+include proto/xf86miscproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xf86vidmodeproto package are covered by the following notice:
+
+include proto/xf86vidmodeproto/COPYING
+------------------------------------------------------------------------------
+Files from the proto/xineramaproto package are covered by the following notice:
+
+include proto/xineramaproto/COPYING
+------------------------------------------------------------------------------
+Files from the data/xbitmaps package are covered by the following notice:
+
+include data/xbitmaps/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libICE package are covered by the following notice:
+
+include lib/libICE/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libSM package are covered by the following notice:
+
+include lib/libSM/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libX11 package are covered by the following notice:
+
+include lib/libX11/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXau package are covered by the following notice:
+
+include lib/libXau/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXcomposite package are covered by the following notice:
+
+include lib/libXcomposite/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXcursor package are covered by the following notice:
+
+include lib/libXcursor/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXdamage package are covered by the following notice:
+
+include lib/libXdamage/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXdmcp package are covered by the following notice:
+
+include lib/libXdmcp/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXfixes package are covered by the following notice:
+
+include lib/libXfixes/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXlg3d package are covered by the following notice:
+
+include lib/libXlg3d/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXmu package are covered by the following notice:
+
+include lib/libXmu/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXpm package are covered by the following notice:
+
+include lib/libXpm/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXrender package are covered by the following notice:
+
+include lib/libXrender/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXres package are covered by the following notice:
+
+include lib/libXres/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXt package are covered by the following notice:
+
+include lib/libXt/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXtst package are covered by the following notice:
+
+include lib/libXtst/COPYING
+
--- a/packages/SUNWxwinc/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwinc/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -27,12 +27,12 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype	35.79	08/02/27 SMI"
+# ident	"@(#)prototype	35.81	08/03/07 SMI"
 #
 #  X Window System include files
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../usr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwman/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,153 @@
+------------------------------------------------------------------------------
+Files from the app/appres package are covered by the following notice:
+
+include app/appres/COPYING
+------------------------------------------------------------------------------
+Files from the app/bdftopcf package are covered by the following notice:
+
+include app/bdftopcf/COPYING
+------------------------------------------------------------------------------
+Files from the app/bitmap package are covered by the following notice:
+
+include app/bitmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/constype package are covered by the following notice:
+
+include app/constype/COPYING
+------------------------------------------------------------------------------
+Files from the app/editres package are covered by the following notice:
+
+include app/editres/COPYING
+------------------------------------------------------------------------------
+Files from the app/iceauth package are covered by the following notice:
+
+include app/iceauth/COPYING
+------------------------------------------------------------------------------
+Files from the app/listres package are covered by the following notice:
+
+include app/listres/COPYING
+------------------------------------------------------------------------------
+Files from the app/luit package are covered by the following notice:
+
+include app/luit/COPYING
+------------------------------------------------------------------------------
+Files from the app/oclock package are covered by the following notice:
+
+include app/oclock/COPYING
+------------------------------------------------------------------------------
+Files from the app/setxkbmap package are covered by the following notice:
+
+include app/setxkbmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/twm package are covered by the following notice:
+
+include app/twm/COPYING
+------------------------------------------------------------------------------
+Files from the app/viewres package are covered by the following notice:
+
+include app/viewres/COPYING
+------------------------------------------------------------------------------
+Files from the app/x11perf package are covered by the following notice:
+
+include app/x11perf/COPYING
+------------------------------------------------------------------------------
+Files from the app/xauth package are covered by the following notice:
+
+include app/xauth/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcalc package are covered by the following notice:
+
+include app/xcalc/COPYING
+------------------------------------------------------------------------------
+Files from the app/xclipboard package are covered by the following notice:
+
+include app/xclipboard/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcmsdb package are covered by the following notice:
+
+include app/xcmsdb/COPYING
+------------------------------------------------------------------------------
+Files from the app/xconsole package are covered by the following notice:
+
+include app/xconsole/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcursorgen package are covered by the following notice:
+
+include app/xcursorgen/COPYING
+------------------------------------------------------------------------------
+Files from the app/xdpyinfo package are covered by the following notice:
+
+include app/xdpyinfo/COPYING
+------------------------------------------------------------------------------
+Files from the app/xev package are covered by the following notice:
+
+include app/xev/COPYING
+------------------------------------------------------------------------------
+Files from the app/xfd package are covered by the following notice:
+
+include app/xfd/COPYING
+------------------------------------------------------------------------------
+Files from the app/xhost package are covered by the following notice:
+
+include app/xhost/COPYING
+------------------------------------------------------------------------------
+Files from the app/xkill package are covered by the following notice:
+
+include app/xkill/COPYING
+------------------------------------------------------------------------------
+Files from the app/xlsatoms package are covered by the following notice:
+
+include app/xlsatoms/COPYING
+------------------------------------------------------------------------------
+Files from the app/xlsclients package are covered by the following notice:
+
+include app/xlsclients/COPYING
+------------------------------------------------------------------------------
+Files from the app/xmag package are covered by the following notice:
+
+include app/xmag/COPYING
+------------------------------------------------------------------------------
+Files from the app/xmodmap package are covered by the following notice:
+
+include app/xmodmap/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXpm package are covered by the following notice:
+
+include lib/libXpm/COPYING
+------------------------------------------------------------------------------
+Files from the app/xprop package are covered by the following notice:
+
+include app/xprop/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrdb package are covered by the following notice:
+
+include app/xrdb/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrefresh package are covered by the following notice:
+
+include app/xrefresh/COPYING
+------------------------------------------------------------------------------
+Files from the app/xset package are covered by the following notice:
+
+include app/xset/COPYING
+------------------------------------------------------------------------------
+Files from the app/xsetroot package are covered by the following notice:
+
+include app/xsetroot/COPYING
+------------------------------------------------------------------------------
+Files from the app/xstdcmap package are covered by the following notice:
+
+include app/xstdcmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwd package are covered by the following notice:
+
+include app/xwd/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwininfo package are covered by the following notice:
+
+include app/xwininfo/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwud package are covered by the following notice:
+
+include app/xwud/COPYING
+
--- a/packages/SUNWxwman/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwman/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -26,12 +26,12 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 35.61     08/02/29 SMI"
+# ident "@(#)prototype_com 35.62     08/03/07 SMI"
 #
 #  X Window System online user man pages
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../usr/openwin/share/man
--- a/packages/SUNWxwmod/prototype_i386	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwmod/prototype_i386	Fri Mar 07 15:12:44 2008 -0800
@@ -31,7 +31,7 @@
 #
 # Hardware Cursor Kernel modules
 
-i copyright=../copyright
+i copyright
 i pkginfo
 i depend
  
--- a/packages/SUNWxwmod/prototype_sparc	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwmod/prototype_sparc	Fri Mar 07 15:12:44 2008 -0800
@@ -29,11 +29,11 @@
 #
 ###########################################################################
 #
-#       @(#)prototype_sparc	1.5	07/11/05 (c) Sun Microsystems, Inc.
+#       @(#)prototype_sparc	1.6	08/03/07 (c) Sun Microsystems, Inc.
 #
 #  X Window System 64-bit Kernel modules
 
-i copyright=../copyright
+i copyright
 i pkginfo
 i depend
  
--- a/packages/SUNWxwoft/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwoft/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,14 +29,14 @@
 #
 ###########################################################################
 #
-# ident "@(#)prototype 35.18     08/02/26 SMI"
+# ident "@(#)prototype 35.19     08/03/07 SMI"
 #
 #  X Window System optional fonts
 
 i pkginfo
 i postinstall
 i postremove
-i copyright=../copyright
+i copyright
 i depend=../depend
 i i.fontsdir
 i r.fontsdir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwopt/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,61 @@
+------------------------------------------------------------------------------
+Files from the app/appres package are covered by the following notice:
+
+include app/appres/COPYING
+------------------------------------------------------------------------------
+Files from the app/bitmap package are covered by the following notice:
+
+include app/bitmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/editres package are covered by the following notice:
+
+include app/editres/COPYING
+------------------------------------------------------------------------------
+Files from the app/listres package are covered by the following notice:
+
+include app/listres/COPYING
+------------------------------------------------------------------------------
+Files from the app/luit package are covered by the following notice:
+
+include app/luit/COPYING
+------------------------------------------------------------------------------
+Files from the app/oclock package are covered by the following notice:
+
+include app/oclock/COPYING
+------------------------------------------------------------------------------
+Files from the app/twm package are covered by the following notice:
+
+include app/twm/COPYING
+------------------------------------------------------------------------------
+Files from the app/viewres package are covered by the following notice:
+
+include app/viewres/COPYING
+------------------------------------------------------------------------------
+Files from the app/xclipboard package are covered by the following notice:
+
+include app/xclipboard/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcmsdb package are covered by the following notice:
+
+include app/xcmsdb/COPYING
+------------------------------------------------------------------------------
+Files from the app/xconsole package are covered by the following notice:
+
+include app/xconsole/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcursorgen package are covered by the following notice:
+
+include app/xcursorgen/COPYING
+------------------------------------------------------------------------------
+Files from the app/xkill package are covered by the following notice:
+
+include app/xkill/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrdb package are covered by the following notice:
+
+include app/xrdb/COPYING
+------------------------------------------------------------------------------
+Files from the app/xset package are covered by the following notice:
+
+include app/xset/COPYING
+
--- a/packages/SUNWxwopt/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwopt/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -26,12 +26,12 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype	35.44	08/02/29 SMI"
+# ident "@(#)prototype	35.45	08/03/07 SMI"
 ##
 #  nonessential X core clients and server extensions
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend
 
 !HOME=../usr
--- a/packages/SUNWxwpft/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwpft/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	"@(#)prototype	1.2	07/11/05   Sun Microsystems" 
+#	"@(#)prototype	1.3	08/03/07   Sun Microsystems" 
 #
 # X Window System Printer Fonts 
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../openwin
--- a/packages/SUNWxwplt/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwplt/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -145,3 +145,175 @@
 used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from GROUPE BULL.
 
+------------------------------------------------------------------------------
+Files from the app/bdftopcf package are covered by the following notice:
+
+include app/bdftopcf/COPYING
+------------------------------------------------------------------------------
+Files from the app/constype package are covered by the following notice:
+
+include app/constype/COPYING
+------------------------------------------------------------------------------
+Files from the app/editres package are covered by the following notice:
+
+include app/editres/COPYING
+------------------------------------------------------------------------------
+Files from the app/setxkbmap package are covered by the following notice:
+
+include app/setxkbmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/x11perf package are covered by the following notice:
+
+include app/x11perf/COPYING
+------------------------------------------------------------------------------
+Files from the app/xauth package are covered by the following notice:
+
+include app/xauth/COPYING
+------------------------------------------------------------------------------
+Files from the app/xcalc package are covered by the following notice:
+
+include app/xcalc/COPYING
+------------------------------------------------------------------------------
+Files from the app/xclipboard package are covered by the following notice:
+
+include app/xclipboard/COPYING
+------------------------------------------------------------------------------
+Files from the app/xconsole package are covered by the following notice:
+
+include app/xconsole/COPYING
+------------------------------------------------------------------------------
+Files from the app/xdpyinfo package are covered by the following notice:
+
+include app/xdpyinfo/COPYING
+------------------------------------------------------------------------------
+Files from the app/xfd package are covered by the following notice:
+
+include app/xfd/COPYING
+------------------------------------------------------------------------------
+Files from the app/xhost package are covered by the following notice:
+
+include app/xhost/COPYING
+------------------------------------------------------------------------------
+Files from the app/xlsatoms package are covered by the following notice:
+
+include app/xlsatoms/COPYING
+------------------------------------------------------------------------------
+Files from the app/xlsclients package are covered by the following notice:
+
+include app/xlsclients/COPYING
+------------------------------------------------------------------------------
+Files from the app/xmag package are covered by the following notice:
+
+include app/xmag/COPYING
+------------------------------------------------------------------------------
+Files from the app/xmodmap package are covered by the following notice:
+
+include app/xmodmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/xprop package are covered by the following notice:
+
+include app/xprop/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrdb package are covered by the following notice:
+
+include app/xrdb/COPYING
+------------------------------------------------------------------------------
+Files from the app/xrefresh package are covered by the following notice:
+
+include app/xrefresh/COPYING
+------------------------------------------------------------------------------
+Files from the app/xset package are covered by the following notice:
+
+include app/xset/COPYING
+------------------------------------------------------------------------------
+Files from the app/xsetroot package are covered by the following notice:
+
+include app/xsetroot/COPYING
+------------------------------------------------------------------------------
+Files from the app/xstdcmap package are covered by the following notice:
+
+include app/xstdcmap/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwd package are covered by the following notice:
+
+include app/xwd/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwininfo package are covered by the following notice:
+
+include app/xwininfo/COPYING
+------------------------------------------------------------------------------
+Files from the app/xwud package are covered by the following notice:
+
+include app/xwud/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libSM package are covered by the following notice:
+
+include lib/libSM/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libX11 package are covered by the following notice:
+
+include lib/libX11/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXau package are covered by the following notice:
+
+include lib/libXau/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXaw package are covered by the following notice:
+
+include lib/libXaw/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXcomposite package are covered by the following notice:
+
+include lib/libXcomposite/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXcursor package are covered by the following notice:
+
+include lib/libXcursor/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXdamage package are covered by the following notice:
+
+include lib/libXdamage/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXdmcp package are covered by the following notice:
+
+include lib/libXdmcp/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXfixes package are covered by the following notice:
+
+include lib/libXfixes/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXi package are covered by the following notice:
+
+include lib/libXi/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXinerama package are covered by the following notice:
+
+include lib/libXinerama/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXlg3d package are covered by the following notice:
+
+include lib/libXlg3d/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXmu package are covered by the following notice:
+
+include lib/libXmu/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXpm package are covered by the following notice:
+
+include lib/libXpm/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXrender package are covered by the following notice:
+
+include lib/libXrender/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXres package are covered by the following notice:
+
+include lib/libXres/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXt package are covered by the following notice:
+
+include lib/libXt/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXtst package are covered by the following notice:
+
+include lib/libXtst/COPYING
--- a/packages/SUNWxwplt/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwplt/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -26,12 +26,12 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#      "@(#)prototype_com	35.166    08/03/06   Sun Microsystems"
+#      "@(#)prototype_com	35.167    08/03/07   Sun Microsystems"
 #
 # X Window System required core package
 
 i pkginfo
-i copyright=copyright
+i copyright
 i depend
 
 !HOME=../usr
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwpmn/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -0,0 +1,37 @@
+------------------------------------------------------------------------------
+Files from the app/xrefresh package are covered by the following notice:
+
+include app/xrefresh/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libX11 package are covered by the following notice:
+
+include lib/libX11/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXau package are covered by the following notice:
+
+include lib/libXau/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXcomposite package are covered by the following notice:
+
+include lib/libXcomposite/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXi package are covered by the following notice:
+
+include lib/libXi/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXinerama package are covered by the following notice:
+
+include lib/libXinerama/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXmu package are covered by the following notice:
+
+include lib/libXmu/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXt package are covered by the following notice:
+
+include lib/libXt/COPYING
+------------------------------------------------------------------------------
+Files from the lib/libXtst package are covered by the following notice:
+
+include lib/libXtst/COPYING
+
--- a/packages/SUNWxwpmn/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwpmn/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -26,12 +26,12 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 # 
-#	"@(#)prototype	35.41	08/03/05   Sun Microsystems" 
+#	"@(#)prototype	35.42	08/03/07   Sun Microsystems" 
 #
 #  X Window System programmers man pages
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../usr
--- a/packages/SUNWxwrtl/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwrtl/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -26,7 +26,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident "@(#)prototype_com 1.45     08/03/05 SMI"
+# ident "@(#)prototype_com 1.46     08/03/07 SMI"
 #
 #  X Window System Runtime Compatability Package
 #
@@ -34,7 +34,7 @@
 ! sixty_four=$plat_64
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend 
 
 d none lib 0755 root bin
--- a/packages/SUNWxwslb/prototype_com	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwslb/prototype_com	Fri Mar 07 15:12:44 2008 -0800
@@ -27,12 +27,12 @@
 # of the copyright holder.
 # 
 #
-# ident	"@(#)prototype_com	35.18	08/03/05 SMI"
+# ident	"@(#)prototype_com	35.19	08/03/07 SMI"
 #
 #  X Window System lint libraries
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../usr
--- a/packages/SUNWxwsrc/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwsrc/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	35.10	07/11/05 Sun Microsystems, Inc.
+#	@(#)prototype	35.11	08/03/07 Sun Microsystems, Inc.
 #
 #  X Window System sample source
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=../depend
 
 !HOME=../openwin
--- a/packages/SUNWxwsrv/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwsrv/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -29,12 +29,12 @@
 #
 ###########################################################################
 #
-#	"@(#)prototype	1.3	07/11/05   Sun Microsystems" 
+#	"@(#)prototype	1.4	08/03/07   Sun Microsystems" 
 #
 # X Window System Virtual Servers
 
 i pkginfo
-i copyright=../copyright
+i copyright
 i depend=depend
 
 !HOME=../openwin
--- a/packages/SUNWxwxft/copyright.add	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwxft/copyright.add	Fri Mar 07 15:12:44 2008 -0800
@@ -18,3 +18,7 @@
 TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 
+------------------------------------------------------------------------------
+Files from the lib/libXft package are covered by the following notice:
+
+include lib/libXft/COPYING
--- a/packages/SUNWxwxft/prototype	Fri Mar 07 15:38:30 2008 -0800
+++ b/packages/SUNWxwxft/prototype	Fri Mar 07 15:12:44 2008 -0800
@@ -26,12 +26,12 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-#	"@(#)prototype	1.8	07/09/18   Sun Microsystems" 
+#	"@(#)prototype	1.9	08/03/07   Sun Microsystems" 
 #
 # Xft
 
 i pkginfo
-i copyright=copyright
+i copyright
 i depend
 
 !HOME=../usr
upstream/oracle/xnv