--- a/open-src/app/Makefile Fri May 30 14:36:03 2008 -0700
+++ b/open-src/app/Makefile Fri May 30 18:42:13 2008 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.47 08/05/30
+# @(#)Makefile 1.48 08/05/30
#
###############################################################################
@@ -40,6 +40,8 @@
bitmap \
constype \
editres \
+ fslsfonts \
+ fstobdf \
iceauth \
listres \
luit \
@@ -47,6 +49,7 @@
mkfontscale \
oclock \
setxkbmap \
+ showfont \
twm \
viewres \
x11perf \
@@ -60,6 +63,7 @@
xdriinfo \
xev \
xfd \
+ xfsinfo \
xfwp \
xgamma \
xgc \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/fslsfonts/Makefile Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# fslsfonts Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/05/28
+#
+
+# Package name used in tarballs
+APP_NAME=fslsfonts
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= -p $(X11_DIR)/bin/ \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/fstobdf/Makefile Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# fstobdf Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/05/28
+#
+
+# Package name used in tarballs
+APP_NAME=fstobdf
+
+# Version number (used in path names)
+APP_VERS=1.0.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= -p $(X11_DIR)/bin/ \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/showfont/Makefile Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# showfont Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/05/28
+#
+
+# Package name used in tarballs
+APP_NAME=showfont
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= -p $(X11_DIR)/bin/ \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/app/xfsinfo/Makefile Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,50 @@
+###############################################################################
+#
+# xfsinfo Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/05/28
+#
+
+# Package name used in tarballs
+APP_NAME=xfsinfo
+
+# Version number (used in path names)
+APP_VERS=1.0.2
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES =
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=*.man
+SUNTOUCH_MAN_FLAGS= -p $(X11_DIR)/bin/ \
+ -a '{Availability, SUNWxwplt} {Interface Stability, Committed}'
+
+include ../Makefile.inc
--- a/open-src/lib/Makefile Fri May 30 14:36:03 2008 -0700
+++ b/open-src/lib/Makefile Fri May 30 18:42:13 2008 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.18 08/03/25
+# @(#)Makefile 1.19 08/05/30
#
###############################################################################
@@ -53,6 +53,7 @@
libX11 \
libXext \
libfontenc \
+ libFS \
libICE \
libSM \
libXt \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libFS/Makefile Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,66 @@
+###############################################################################
+#
+# libFS Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/05/28
+#
+
+# Package name used in tarballs
+LIB_MODULE=libFS
+
+# Version number (used in path names)
+LIB_VERS=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = solaris-abi.patch
+
+# Regenerate Makefile.in's from Makefile.am's after patching them
+AUTORECONF=true
+
+# Library name
+LIBNAME=FS
+
+# Man pages to apply Sun footer to & attributes to list
+#SUNTOUCHED_MANPAGES=man/*.man
+SUN_PACKAGE=SUNWxwplt
+LIB_STABILITY=Uncommitted
+LIB_MAN_SUFFIX=3FS
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/libFS.so.5
+
+# Link with version mapfile
+LIB_ADD_LD_OPTIONS = -M $(PWD)/mapfile-vers
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=libfs.pc.in
+
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libFS/mapfile-vers Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,74 @@
+###############################################################################
+#
+# libXt version mapfile
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)mapfile-vers 1.1 08/05/28
+#
+SUNWprivate {
+ global:
+ FSCloseFont;
+ FSNextEvent;
+ FSFreeCatalogues;
+ FSQueryExtension;
+ FSOpenServer;
+ FSFreeExtensionList;
+ FSFlush;
+ FSQueryXInfo;
+ FSFree;
+ FSCloseServer;
+ FSServerName;
+ FSGetErrorDatabaseText;
+ FSQueryXBitmaps16;
+ FSSync;
+ FSErrorList;
+ FSSetCatalogues;
+ FSListCatalogues;
+ FSQueryXExtents16;
+ FSErrorListSize;
+ FSSynchronize;
+ FSFreeFontNames;
+ FSListFontsWithXInfo;
+ FSListExtensions;
+ FSQueryXExtents8;
+ FSGetCatalogues;
+ FSMaxRequestSize;
+ FSSetAfterFunction;
+ FSGetErrorText;
+ FSQueryXBitmaps8;
+ FSSetErrorHandler;
+ FSListFonts;
+ FSMalloc;
+ FSOpenBitmapFont;
+ FSSetIOErrorHandler;
+ local:
+ *;
+};
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libFS/solaris-abi.patch Fri May 30 18:42:13 2008 -0700
@@ -0,0 +1,43 @@
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+
+Change .so version to match existing Solaris libraries, since there's
+no incompatible change since libFS.so.5
+
+diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am 2008-05-21 17:27:09.000000000 -0700
++++ src/Makefile.am 2008-05-21 19:03:29.651500000 -0700
+@@ -35,7 +35,7 @@ libFS_la_LIBADD = $(FS_LIBS) $(XTRANS_LI
+
+ INCLUDES = -I$(top_srcdir)/include/X11/fonts
+
+-libFS_la_LDFLAGS = -version-number 6:0:0 -no-undefined
++libFS_la_LDFLAGS = -version-number 5 -no-undefined
+
+ libFSincludedir = $(includedir)/X11/fonts
+ libFSinclude_HEADERS = \
--- a/packages/SUNWi1of/prototype Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWi1of/prototype Fri May 30 18:42:13 2008 -0700
@@ -30,7 +30,7 @@
###########################################################################
#
-# ident "@(#)prototype 1.23 08/03/07 SMI"
+# ident "@(#)prototype 1.25 08/04/29 SMI"
#
# ISO-8859-1 (Latin-1) Optional Fonts
--- a/packages/SUNWxorg-headers/copyright.add Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxorg-headers/copyright.add Fri May 30 18:42:13 2008 -0700
@@ -1,3 +1,9 @@
+
+--------------------------------------------------------------------
+
+Files from the lib/libFS package are covered by the following notice:
+
+include lib/libFS/COPYING
--------------------------------------------------------------------
--- a/packages/SUNWxorg-headers/prototype Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxorg-headers/prototype Fri May 30 18:42:13 2008 -0700
@@ -29,7 +29,7 @@
#
##########################################################################
#
-# ident "@(#)prototype 1.10 08/05/29 SMI"
+# ident "@(#)prototype 1.11 08/05/30 SMI"
#
# X.Org Foundation X client libraries for Solaris
@@ -78,6 +78,7 @@
d none X11/include/X11/fonts 0755 root bin
f none X11/include/X11/fonts/font.h 0444 root bin
f none X11/include/X11/fonts/FS.h 0444 root bin
+f none X11/include/X11/fonts/FSlib.h 0444 root bin
f none X11/include/X11/fonts/FSproto.h 0444 root bin
f none X11/include/X11/fonts/bdfint.h 0444 root bin
f none X11/include/X11/fonts/bitmap.h 0444 root bin
@@ -115,6 +116,7 @@
# Libraries
+f none lib/pkgconfig/libfs.pc 0444 root bin
f none lib/pkgconfig/xrandr.pc 0444 root bin
f none lib/pkgconfig/xv.pc 0444 root bin
f none lib/pkgconfig/xvmc.pc 0444 root bin
@@ -135,6 +137,7 @@
# Libraries need separate ones for 64-bit to get library paths right
+f none lib/$plat_64/pkgconfig/libfs.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xrandr.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xv.pc 0444 root bin
f none lib/$plat_64/pkgconfig/xvmc.pc 0444 root bin
--- a/packages/SUNWxwfnt/prototype_com Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxwfnt/prototype_com Fri May 30 18:42:13 2008 -0700
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# @(#)prototype_com 35.51 08/03/20 Sun Microsystems
+# @(#)prototype_com 35.54 08/04/29 Sun Microsystems
#
# X Window System required core fonts package
--- a/packages/SUNWxwman/copyright.add Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxwman/copyright.add Fri May 30 18:42:13 2008 -0700
@@ -31,6 +31,18 @@
--------------------------------------------------------------------
+Files from the app/fslsfonts package are covered by the following notice:
+
+include app/fslsfonts/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/fstobdf package are covered by the following notice:
+
+include app/fstobdf/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/iceauth package are covered by the following notice:
include app/iceauth/COPYING
@@ -61,15 +73,15 @@
--------------------------------------------------------------------
-Files from the app/oclock package are covered by the following notice:
+Files from the app/setxkbmap package are covered by the following notice:
-include app/xterm/COPYING
+include app/setxkbmap/COPYING
--------------------------------------------------------------------
-Files from the app/setxkbmap package are covered by the following notice:
+Files from the app/showfont package are covered by the following notice:
-include app/setxkbmap/COPYING
+include app/showfont/COPYING
--------------------------------------------------------------------
@@ -145,6 +157,12 @@
--------------------------------------------------------------------
+Files from the app/xfsinfo package are covered by the following notice:
+
+include app/xfsinfo/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/xfwp package are covered by the following notice:
include app/xfwp/COPYING
@@ -205,12 +223,6 @@
--------------------------------------------------------------------
-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
@@ -247,6 +259,12 @@
--------------------------------------------------------------------
+Files from the app/xterm package are covered by the following notice:
+
+include app/xterm/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/xwd package are covered by the following notice:
include app/xwd/COPYING
@@ -263,3 +281,9 @@
include app/xwud/COPYING
+--------------------------------------------------------------------
+
+Files from the lib/libXpm package are covered by the following notice:
+
+include lib/libXpm/COPYING
+
--- a/packages/SUNWxwman/prototype_com Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxwman/prototype_com Fri May 30 18:42:13 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype_com 35.72 08/05/30 SMI"
+# ident "@(#)prototype_com 35.73 08/05/30 SMI"
#
# X Window System online user man pages
@@ -74,9 +74,6 @@
f none openwin/share/man/man1/cmap_compact.1 0444 root bin
f none openwin/share/man/man1/fs.1 0444 root bin
f none openwin/share/man/man1/fsadmin.1 0444 root bin
-f none openwin/share/man/man1/fsinfo.1 0444 root bin
-f none openwin/share/man/man1/fslsfonts.1 0444 root bin
-f none openwin/share/man/man1/fstobdf.1 0444 root bin
f none openwin/share/man/man1/htt.1 0444 root bin
f none openwin/share/man/man1/iceauth.1 0444 root bin
f none openwin/share/man/man1/imake.1 0444 root bin
@@ -89,7 +86,6 @@
f none openwin/share/man/man1/redxblue.1 0444 root bin
f none openwin/share/man/man1/rgb.1 0444 root bin
f none openwin/share/man/man1/sessreg.1 0444 root bin
-f none openwin/share/man/man1/showfont.1 0444 root bin
f none openwin/share/man/man1/showrgb.1 0444 root bin
f none openwin/share/man/man1/showsnf.1 0444 root bin
f none openwin/share/man/man1/winsysck.1 0444 root bin
@@ -171,6 +167,12 @@
# open-src/app/editres
f none X11/share/man/man1/editres.1 0444 root bin
+# open-src/app/fslsfonts
+f none X11/share/man/man1/fslsfonts.1 0444 root bin
+
+# open-src/app/fstobdf
+f none X11/share/man/man1/fstobdf.1 0444 root bin
+
# open-src/app/listres
f none X11/share/man/man1/listres.1 0444 root bin
@@ -183,13 +185,12 @@
# open-src/app/oclock
f none X11/share/man/man1/oclock.1 0444 root bin
-# open-src/app/xterm
-f none X11/share/man/man1/xterm.1 0444 root bin
-f none X11/share/man/man1/resize.1 0444 root bin
-
# open-src/app/setxkbmap
f none X11/share/man/man1/setxkbmap.1 0444 root bin
+# open-src/app/showfont
+f none X11/share/man/man1/showfont.1 0444 root bin
+
# open-src/app/twm
f none X11/share/man/man1/twm.1 0444 root bin
@@ -231,6 +232,10 @@
# open-src/app/xfd
f none X11/share/man/man1/xfd.1 0444 root bin
+# open-src/app/xfsinfo
+f none X11/share/man/man1/xfsinfo.1 0444 root bin
+s none X11/share/man/man1/fsinfo.1=xfsinfo.1
+
# open-src/app/xfwp
f none X11/share/man/man1/xfwp.1 0444 root bin
@@ -240,9 +245,18 @@
# open-src/app/xhost
f none X11/share/man/man1/xhost.1 0444 root bin
+# open-src/app/xkill
+f none X11/share/man/man1/xkill.1 0444 root bin
+
+# open-src/app/xlsatoms
+f none X11/share/man/man1/xlsatoms.1 0444 root bin
+
# open-src/app/xlsclients
f none X11/share/man/man1/xlsclients.1 0444 root bin
+# open-src/app/xlogo
+f none X11/share/man/man1/xlogo.1 0444 root bin
+
# open-src/app/xmag
f none X11/share/man/man1/xmag.1 0444 root bin
@@ -274,14 +288,9 @@
# open-src/app/xstdcmap
f none X11/share/man/man1/xstdcmap.1 0444 root bin
-# open-src/app/xkill
-f none X11/share/man/man1/xkill.1 0444 root bin
-
-# open-src/app/xlogo
-f none X11/share/man/man1/xlogo.1 0444 root bin
-
-# open-src/app/xlsatoms
-f none X11/share/man/man1/xlsatoms.1 0444 root bin
+# open-src/app/xterm
+f none X11/share/man/man1/xterm.1 0444 root bin
+f none X11/share/man/man1/resize.1 0444 root bin
# open-src/app/xwd
f none X11/share/man/man1/xwd.1 0444 root bin
--- a/packages/SUNWxwplt/copyright.add Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxwplt/copyright.add Fri May 30 18:42:13 2008 -0700
@@ -179,12 +179,30 @@
--------------------------------------------------------------------
+Files from the app/fstobdf package are covered by the following notice:
+
+include app/fstobdf/COPYING
+
+--------------------------------------------------------------------
+
+Files from the app/fslsfonts package are covered by the following notice:
+
+include app/fslsfonts/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/setxkbmap package are covered by the following notice:
include app/setxkbmap/COPYING
--------------------------------------------------------------------
+Files from the app/showfont package are covered by the following notice:
+
+include app/showfont/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/x11perf package are covered by the following notice:
include app/x11perf/COPYING
@@ -227,6 +245,12 @@
--------------------------------------------------------------------
+Files from the app/xfsinfo package are covered by the following notice:
+
+include app/xfsinfo/COPYING
+
+--------------------------------------------------------------------
+
Files from the app/xfwp package are covered by the following notice:
include app/xfwp/COPYING
@@ -323,6 +347,12 @@
--------------------------------------------------------------------
+Files from the lib/libFS package are covered by the following notice:
+
+include lib/libFS/COPYING
+
+--------------------------------------------------------------------
+
Files from the lib/libSM package are covered by the following notice:
include lib/libSM/COPYING
--- a/packages/SUNWxwplt/prototype_com Fri May 30 14:36:03 2008 -0700
+++ b/packages/SUNWxwplt/prototype_com Fri May 30 18:42:13 2008 -0700
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# "@(#)prototype_com 35.176 08/05/30 Sun Microsystems"
+# "@(#)prototype_com 35.177 08/05/30 Sun Microsystems"
#
# X Window System required core package
@@ -55,13 +55,9 @@
f none openwin/bin/cmap_alloc 0755 root bin
f none openwin/bin/showrgb 0755 root bin
f none openwin/bin/fbconsole 0755 root bin
-f none openwin/bin/fsinfo 0755 root bin
-f none openwin/bin/fslsfonts 0755 root bin
-f none openwin/bin/fstobdf 0755 root bin
f none openwin/bin/makepsres 0755 root bin
f none openwin/bin/pclcomp 0755 root bin
f none openwin/bin/redxblue 0755 root bin
-f none openwin/bin/showfont 0755 root bin
f none openwin/bin/winsysck 0755 root bin
f none openwin/bin/xdpr 0755 root bin
f none openwin/bin/xinit 0755 root bin
@@ -95,9 +91,21 @@
f none X11/bin/constype 0755 root bin
s none openwin/bin/constype=../../X11/bin/constype
+# open-src/app/fslsfonts
+f none X11/bin/fslsfonts 0755 root bin
+s none openwin/bin/fslsfonts=../../X11/bin/fslsfonts
+
+# open-src/app/fstobdf
+f none X11/bin/fstobdf 0755 root bin
+s none openwin/bin/fstobdf=../../X11/bin/fstobdf
+
# open-src/app/setxkbmap
f none X11/bin/setxkbmap 0755 root bin
+# open-src/app/showfont
+f none X11/bin/showfont 0755 root bin
+s none openwin/bin/showfont=../../X11/bin/showfont
+
# open-src/app/x11perf
f none X11/bin/x11perf 0755 root bin
@@ -120,6 +128,11 @@
f none X11/bin/xfd 0755 root bin
s none openwin/bin/xfd=../../X11/bin/xfd
+# open-src/app/xfsinfo (formerly known as fsinfo)
+f none X11/bin/xfsinfo 0755 root bin
+s none openwin/bin/fsinfo=../../X11/bin/xfsinfo
+s none X11/bin/fsinfo=xfsinfo
+
# open-src/app/xfwp
f none X11/bin/xfwp 0755 root bin
s none openwin/bin/xfwp=../../X11/bin/xfwp
@@ -214,8 +227,6 @@
f none openwin/lib/libpsres.so.5 0755 root bin
s none openwin/lib/libowconfig.so=./libowconfig.so.0
f none openwin/lib/libowconfig.so.0 0755 root bin
-f none openwin/lib/libFS.so.5 0755 root bin
-s none openwin/lib/libFS.so=./libFS.so.5
s none openwin/lib/libXIE.so=./libXIE.so.6
f none openwin/lib/libXIE.so.6 0755 root bin
@@ -248,6 +259,12 @@
s none X11/lib/libXau.so=./libXau.so.6
f none X11/lib/libXau.so.6 0555 root bin
+# open-src/lib/libFS
+s none openwin/lib/libFS.so.5=../../X11/lib/libFS.so.5
+s none openwin/lib/libFS.so=../../X11/lib/libFS.so.5
+s none X11/lib/libFS.so=./libFS.so.5
+f none X11/lib/libFS.so.5 0555 root bin
+
# open-src/lib/libSM
s none openwin/lib/libSM.so.6=../../X11/lib/libSM.so.6
s none openwin/lib/libSM.so=../../X11/lib/libSM.so.6
@@ -362,6 +379,10 @@
s none X11/lib/$plat_64/libXau.so=./libXau.so.6
f none X11/lib/$plat_64/libXau.so.6 0555 root bin
+# open-src/lib/libFS - never delivered into openwin in 64-bit version
+s none X11/lib/$plat_64/libFS.so=./libFS.so.5
+f none X11/lib/$plat_64/libFS.so.5 0555 root bin
+
# open-src/lib/libSM
s none openwin/lib/$plat_64/libSM.so.6=../../../X11/lib/64/libSM.so.6
s none openwin/lib/$plat_64/libSM.so=../../../X11/lib/64/libSM.so.6