6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Wed, 17 Feb 2010 12:30:44 -0800
changeset 905 d2b59d5a79ed
parent 904 d452232e7994
child 906 4c633d8c519b
6926932 Removal of Xsun on SPARC [PSARC 2008/033]: X consolidation portion
buildit
make_release_packages
open-src/app/cmap_compact/sun-src/cmap_compact.1
open-src/app/winsysck/sun-src/winsysck.man
open-src/data/smf-rbac/Makefile
open-src/data/smf-rbac/Xserver
open-src/data/smf-rbac/x11-server.xml.in
open-src/lib/liblbxutil/Makefile
open-src/proto/fontsproto/Makefile
open-src/proto/fontsproto/Xsun-findfont.patch
open-src/util/mdb-tools/Makefile
open-src/util/mdb-tools/README
open-src/util/mdb-tools/src/modules/Makefile
open-src/util/mdb-tools/src/modules/Xserver_clients.c
open-src/util/mdb-tools/src/modules/Xserver_device_grabs.c
open-src/util/mdb-tools/src/modules/Xserver_headers.h
open-src/xserver/xorg/sun-manpage.patch
packages/SUNWxwcft/Makefile
packages/SUNWxwcft/depend.tmpl
packages/SUNWxwcft/pkginfo.tmpl
packages/SUNWxwcft/prototype
packages/SUNWxwfnt/copyright.add
packages/SUNWxwfnt/depend.tmpl
packages/SUNWxwfnt/pkginfo.tmpl
packages/SUNWxwfnt/postinstall.tmpl
packages/SUNWxwfnt/postremove.tmpl
packages/SUNWxwfnt/preinstall
packages/SUNWxwfnt/prototype_com
packages/SUNWxwoft/Makefile
packages/SUNWxwoft/depend
packages/SUNWxwoft/pkginfo.tmpl
packages/SUNWxwoft/postinstall.tmpl
packages/SUNWxwoft/postremove.tmpl
packages/SUNWxwoft/prototype
packages/common_files/i.fontsalias
packages/common_files/i.fontsdir
packages/common_files/proc.mkfontdir
packages/common_files/r.fontsalias
packages/common_files/r.fontsdir
packages/upgrade-X
--- a/buildit	Mon Feb 15 16:40:00 2010 -0800
+++ b/buildit	Wed Feb 17 12:30:44 2010 -0800
@@ -5,7 +5,7 @@
 #
 ###########################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -86,8 +86,6 @@
 env
 echo "------------------------------------------------------------------------------"
 
-
-
 XMAKE="$(pwd)/open-src/util/build-tools/xmake"
 chmod +x ${XMAKE}
 
@@ -100,7 +98,9 @@
 
 chmod +x open-src/common/install-sh open-src/common/delibtoolize.pl
 cd open-src
-${XMAKE} -v -k clean install
+# Run as two steps to avoid race between cleaning & rebuilding
+${XMAKE} -v -k clean 
+${XMAKE} -v -k install
 cd ..
 
 echo ""
@@ -112,8 +112,6 @@
 perl -e '$runtime=time-$ARGV[0]; printf("Runtime: %d:%02d\n", $runtime/3600, ($runtime%3600)/60); ' "${START}"
 
 if [ "${MAKE_PKGS}" = 1 ] ; then
-    export PACKAGE_LIST="$(cd packages && echo SUNW*)"
     chmod +x make_release_packages
-    mkdir packages/common_files
     ./make_release_packages
 fi
--- a/make_release_packages	Mon Feb 15 16:40:00 2010 -0800
+++ b/make_release_packages	Wed Feb 17 12:30:44 2010 -0800
@@ -105,17 +105,14 @@
     SUNWxorg-tsol-module 
     SUNWxvnc
     SUNWxwacx
-    SUNWxwcft
     SUNWxwdem
     SUNWxwdxm
-    SUNWxwfnt
     SUNWxwfs
     SUNWxwfsw
     SUNWxwice
     SUNWxwinc
     SUNWxwman
     SUNWxwmod
-    SUNWxwoft
     SUNWxwopt
     SUNWxwplr
     SUNWxwplt
@@ -125,18 +122,6 @@
     SUNWxwxft
 "
 
-XSUN_PACKAGE_LIST="SUNWxsun-headers SUNWxsun-server SUNWxwts"
-
-# Some packages are only built for certain platforms currently
-case "${MACH}" in
-    sparc)	
-    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST $XSUN_PACKAGE_LIST SUNWxwpsr" 
-	;;
-    i386)	
-    	XW_PACKAGE_LIST="$XW_PACKAGE_LIST"
-	;;
-esac
-
 # Localization template packages for delivery to translation teams
 if [[ "$BUILD_L10N" != "no" ]]; then
     XW_L10N_PACKAGES="SUNW0xacx SUNW0xman SUNW0xpmn 
--- a/open-src/app/cmap_compact/sun-src/cmap_compact.1	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/app/cmap_compact/sun-src/cmap_compact.1	Wed Feb 17 12:30:44 2010 -0800
@@ -25,7 +25,7 @@
 .\" 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.
-.TH cmap_compact 1 "11 July 1995"
+.TH cmap_compact 1 "15 October 2010"
 .IX "cmap_comapct" "" "\f3cmap_compact\f1(1) \(em utility to reduce colormap flashing" ""
 .IX "color" "prev" "color" "preventing flashing \(em \f3cmap_compact\f1(1)" ""
 .SH NAME
@@ -45,8 +45,8 @@
 and to be promoted to the high end of the default colormap (toward pixel 255).
 This reduces colormap flashing in many situations.
 .PP
-This technique has no effect for monochrome screens; it applies only to
-color screens.
+This technique has no effect for monochrome or full color screens; it 
+applies only to PseudoColor screens.
 .SH OPTIONS
 .TP
 \f3-display\f1 \fIdpyname\f1
@@ -110,31 +110,6 @@
 .TP
 .B show
 This operation prints out the RGB values of the saved colors for each screen.
-.\" .SH EFFECT ON THE X11 SERVER 
-.\" .LP
-.\" The
-.\" .BR Xsun (1)
-.\" server also reads the file \f3~/.owcolors\f1 to
-.\" determine the amount that it should shift down the color cube
-.\" in the StaticColor colormap (this is called the \fIcube offset\f1).
-.\" .PP
-.\" Because there is only a single StaticColor colormap in the server,
-.\" a decision must be made about how to handle different numbers of
-.\" saved workspace colors on different screens.  The server currently
-.\" takes the simplest approach: the cube offset is the number of
-.\" saved colors for the screen with the largest number of colors.
-.\" .PP
-.\" The cube offset does not include the black and white pixels because
-.\" these pixels are not shifted down with the rest of the cube; these
-.\" pixels stay at the high end of the StaticColor colormap.
-.\" .PP
-.\" No matter what the value of the cube offset, the base pixel of the cube 
-.\" is always greater or equal to 0.
-.\" .PP
-.\" In addition to shifting the StaticColor color cube downward (toward 0)
-.\" to avoid flashing with the saved colors, the black and white pixels
-.\" which are allocated in the default colormap are moved to the high
-.\" end of the default colormap (toward 255).
 .SH FILES
 .TP
 \f3~/.owcolors\f1
@@ -142,7 +117,8 @@
 .BR cmap_compact\ save .
 Contains a list of saved, read-only workspace colors for all screens.  
 .SH SEE ALSO
-.BR Xsun (1)
+.BR xstdcmap (1),
+.BR cmap_alloc (1).
 .br
 .SH BUGS
 Currently does not support using the same \f3~/.owcolors\f1 file
--- a/open-src/app/winsysck/sun-src/winsysck.man	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/app/winsysck/sun-src/winsysck.man	Wed Feb 17 12:30:44 2010 -0800
@@ -1,5 +1,5 @@
 .\" @(#)winsysck.man	1.3	08/07/30 SMI
-.\" Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 .\" Use subject to license terms.
 .\"
 .\" Permission is hereby granted, free of charge, to any person obtaining a
@@ -26,7 +26,7 @@
 .\" 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.
-.TH winsysck 1 "19 October 1990"
+.TH winsysck 1 "15 February 2010"
 .IX "winsysck" "" "\f3winsysck\f1(1) \(em check window protocols" ""
 .IX "window" "check" "window" "check system protocols \(em \f3winsysck\f1(1)" ""
 .SH NAME
@@ -156,7 +156,7 @@
 .fi
 .RE
 .SH "SEE ALSO"
-.BR Xsun (1)
+.BR Xserver (1)
 .SH LIMITATIONS
 .LP
 There is no way to determine whether a SunView connection is
--- a/open-src/data/smf-rbac/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/data/smf-rbac/Makefile	Wed Feb 17 12:30:44 2010 -0800
@@ -66,9 +66,7 @@
 build_sparc: build_common
 build_i386: build_common
 
-DEFAULT_XSERVER_sparc=/usr/openwin/bin/Xsun
-DEFAULT_XSERVER_i386=$(X11_BIN_DIR)/Xorg
-DEFAULT_XSERVER=$(DEFAULT_XSERVER_$(MACH))
+DEFAULT_XSERVER=$(X11_BIN_DIR)/Xorg
 
 x11-server.xml: x11-server.xml.in
 	sed -e 's|@DEFAULT_XSERVER@|$(DEFAULT_XSERVER)|' < x11-server.xml.in > $@
--- a/open-src/data/smf-rbac/Xserver	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/data/smf-rbac/Xserver	Wed Feb 17 12:30:44 2010 -0800
@@ -2,7 +2,7 @@
 #
 # ident	"@(#)Xserver	1.10	09/12/11 SMI"
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -33,7 +33,7 @@
 
 USAGE="Usage: $0 [-c <class>] :<display> [<X server arguments>]"
 
-PATH=/usr/bin:/usr/sbin:/usr/X11/bin:/usr/openwin/bin
+PATH=/usr/bin:/usr/sbin
 
 progname=$0
 function fatal_error
@@ -54,12 +54,8 @@
 CLASSES=""
 TCP_LISTEN=""
 SERVERARGS=""
+XSERVER="/usr/bin/Xorg"
 
-if [[ "$(uname -p)" == "sparc" && -x /usr/openwin/bin/Xsun ]] ; then
-    XSERVER="/usr/openwin/bin/Xsun"
-else
-    XSERVER="/usr/bin/Xorg"
-fi
 
 while getopts :c: opt; do
     case $opt in
--- a/open-src/data/smf-rbac/x11-server.xml.in	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/data/smf-rbac/x11-server.xml.in	Wed Feb 17 12:30:44 2010 -0800
@@ -106,8 +106,7 @@
 			</loctext>
 		</common_name>
 		<documentation>
-			<manpage title='Xserver' section='1' manpath='/usr/openwin/share/man' />
-			<manpage title='Xsun' section='1' manpath='/usr/openwin/share/man' />
+			<manpage title='Xserver' section='1' manpath='/usr/share/man' />
 			<manpage title='Xorg' section='1' manpath='/usr/share/man' />
 		</documentation>
 	</template>
--- a/open-src/lib/liblbxutil/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/lib/liblbxutil/Makefile	Wed Feb 17 12:30:44 2010 -0800
@@ -1,7 +1,7 @@
 ###############################################################################
 # lbxutil 1.x Makefile
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -49,7 +49,7 @@
 #LIB_STABILITY=Committed
 #LIB_MAN_SUFFIX=3lbxutil
 
-# Only need 32-bit since we only ship Xsun & lbxproxy as 32-bit
+# Only need 32-bit since we only ship lbxproxy as 32-bit
 BUILD_TYPES=32
 BUILD_TYPES_SET=yes
 
--- a/open-src/proto/fontsproto/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/proto/fontsproto/Makefile	Wed Feb 17 12:30:44 2010 -0800
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -38,7 +38,7 @@
 MODULE_VERSION=2.1.0
 
 # Patches to apply to source after unpacking, in order
-SOURCE_PATCHES=	Xsun-findfont.patch
+SOURCE_PATCHES=	
 
 ### Include common rulesets
 include ../Makefile.inc
--- a/open-src/proto/fontsproto/Xsun-findfont.patch	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-Font header changes required for Xsun to maintain libfont ABI compatibility and
-fix for:
-	4424766 Xsun should select fonts more intelligently
-	<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4424766>
-
---- font.h	Wed Apr 19 11:54:33 2006
-+++ font.h	Wed Apr 19 13:54:56 2006
-@@ -24,6 +24,40 @@
- /* $XFree86: xc/include/fonts/font.h,v 3.4 2000/11/27 00:10:02 dawes Exp $ */
- /* $NCDXorg: @(#)font.h,v 1.7 1991/06/24 17:00:23 lemke Exp $ */
- 
-+#ifdef XSUN
-+/************************************************************************
-+ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
-+ * which has a different mechanism using font path names)
-+ *
-+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+#endif /* XSUN */
-+
- #ifndef FONT_H
- #define FONT_H
- 
-@@ -76,6 +110,11 @@
- #define	BadCharRange	87
- #define	BadFontFormat	88
- #define	FPEResetFailed	89	/* for when an FPE reset won't work */
-+#ifdef XSUN
-+#define FontNameScalable 90
-+#define FontNameBitmap   91
-+#define FontNameMatch    92
-+#endif
- 
- /* OpenFont flags */
- #define FontLoadInfo	0x0001
-@@ -96,7 +135,11 @@
- #define CACHING_OFF 0
- #define CACHE_16_BIT_GLYPHS 1
- #define CACHE_ALL_GLYPHS 2
-+#ifdef XSUN
-+#define DEFAULT_GLYPH_CACHING_MODE CACHING_OFF
-+#else
- #define DEFAULT_GLYPH_CACHING_MODE CACHE_16_BIT_GLYPHS
-+#endif
- extern int glyphCachingMode;
- 
- struct _Client;
-
---- fontproto.h	Wed Apr 19 11:54:33 2006
-+++ fontproto.h	Wed Apr 19 13:55:08 2006
-@@ -22,6 +22,41 @@
- authorization from The XFree86 Project Inc..
- 
- */
-+#ifdef XSUN
-+/************************************************************************
-+ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
-+ * which has a different mechanism using font path names)
-+ *
-+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+#endif /* XSUN */
-+
-+
- #ifndef _FONTPROTO_H
- #define _FONTPROTO_H
- 
-@@ -41,8 +76,14 @@
- 				  LoadGlyphsFunc load_glyphs, 
- 				  StartLaFunc start_list_alias_func, 
- 				  NextLaFunc next_list_alias_func, 
-+#ifdef XSUN
-+				  SetPathFunc set_path_func,
-+  				  FindFontFunc find_font_fonc);
-+#else
- 				  SetPathFunc set_path_func);
-+#endif
- 
-+
- extern int GetDefaultPointSize ( void );
- 
- extern int init_fs_handlers ( FontPathElementPtr fpe, 
-
---- fontstruct.h	Wed Apr 19 11:54:33 2006
-+++ fontstruct.h	Wed Apr 19 13:55:49 2006
-@@ -23,6 +23,41 @@
- ******************************************************************/
- /* $XFree86: xc/include/fonts/fontstruct.h,v 3.3 1999/08/21 13:47:34 dawes Exp $ */
- 
-+#ifdef XSUN
-+/************************************************************************
-+ * Xsun additions for preferring non-scaled bitmaps (not used in Xorg
-+ * which has a different mechanism using font path names) and preserving
-+ * binary compatibility with existing Xsun/libfont ABI.
-+ *
-+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the
-+ * "Software"), to deal in the Software without restriction, including
-+ * without limitation the rights to use, copy, modify, merge, publish,
-+ * distribute, and/or sell copies of the Software, and to permit persons
-+ * to whom the Software is furnished to do so, provided that the above
-+ * copyright notice(s) and this permission notice appear in all copies of
-+ * the Software and that both the above copyright notice(s) and this
-+ * permission notice appear in supporting documentation.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-+ * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-+ * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-+ * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-+ * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ *
-+ * Except as contained in this notice, the name of a copyright holder
-+ * shall not be used in advertising or otherwise to promote the sale, use
-+ * or other dealings in this Software without prior written authorization
-+ * of the copyright holder.
-+ */
-+#endif /* XSUN */
-+
- #ifndef FONTSTR_H
- #define FONTSTR_H
- 
-@@ -122,7 +157,10 @@
- 				unsigned long * /* count */,
- 				xCharInfo **    /* glyphs */);
-     void        (*unload_font) (FontPtr         /* font */);
-+#ifndef XSUN
-+/* Moved to the end to preserve binary compatibility. */
-     void        (*unload_glyphs) (FontPtr         /* font */);
-+#endif
-     FontPathElementPtr fpe;
-     pointer     svrPrivate;
-     pointer     fontPrivate;
-@@ -129,6 +167,10 @@
-     pointer     fpePrivate;
-     int		maxPrivate;
-     pointer	*devPrivates;
-+#ifdef XSUN
-+/* Moved to the end to preserve binary compatibility. */
-+    void        (*unload_glyphs) (FontPtr         /* font */);
-+#endif
- }           FontRec;
- 
- #define FontGetPrivate(pFont,n) ((n) > (pFont)->maxPrivate ? (pointer) 0 : \
-@@ -222,6 +264,19 @@
- 
- typedef void (*SetPathFunc)(void);
- 
-+#ifdef XSUN
-+typedef int (*FindFontFunc) ( pointer client,
-+			      FontPathElementPtr fpe,
-+			      Mask flags,
-+			      char* name,
-+			      int namelen,
-+			      fsBitmapFormat format,
-+			      fsBitmapFormatMask fmask,
-+			      XID id,
-+			      char** aliasName,
-+			      FontPtr non_cachable_font);
-+#endif
-+
- typedef struct _FPEFunctions {
-     NameCheckFunc       name_check;
-     InitFpeFunc 	init_fpe;
-@@ -246,6 +301,9 @@
- 			data = list of fsChar2b's */
-     LoadGlyphsFunc	load_glyphs;
-     SetPathFunc		set_path_hook;
-+#ifdef XSUN
-+    FindFontFunc	find_font;
-+#endif
- } FPEFunctionsRec, FPEFunctions;
- 
- /*
--- a/open-src/util/mdb-tools/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/Makefile	Wed Feb 17 12:30:44 2010 -0800
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -37,9 +37,6 @@
 ADDITIONAL_SOURCE_DIR=src
 
 # We build per-Xserver type, not per-bitsize
-# We default to building only the Xorg version, since the Xsun one requires
-# the osdep.h header not included in the open-src release or Xsun DDK headers 
-#BUILD_TYPES=Xorg Xsun
 BUILD_TYPES=Xorg
 BUILD_TYPES_SET=yes
 
@@ -70,19 +67,6 @@
 ### Include common rulesets
 include ../Makefile.inc
 
-XSUN_MAKEFLAGS = XSERVER=XSUN Xserver=Xsun BUILD_DIR=build_Xsun
-
-source_Xsun::
-	$(MAKE) $(MAKEFLAGS) $(XSUN_MAKEFLAGS) source_gen
-
-build_Xsun:: source_Xsun
-	$(MAKE) $(MAKEFLAGS) $(XSUN_MAKEFLAGS) build_gen
-
-clean_Xsun:
-	-rm -rf build_Xsun
-
-clean:: clean_Xsun
-
 XORG_MAKEFLAGS = XSERVER=XORG Xserver=Xorg BUILD_DIR=build_Xorg
 
 source_Xorg::
--- a/open-src/util/mdb-tools/README	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/README	Wed Feb 17 12:30:44 2010 -0800
@@ -12,19 +12,12 @@
 
 Building
 --------
-Due to the different data structures used, there are different versions
-for X servers based on the Xsun source (those delivered in /usr/openwin)
-and for those based on the Xorg source (those delivered in /usr/bin).
-
 Building these depends on headers in the X server sources which aren't
-delivered in each server's SDK headers, so the Xsun one requires the
-closed Xsun source, and the Xorg one requires at least having done 
+delivered in each server's SDK headers, so you must have at least done
 "make source configure" in the open-src/xserver/xorg directory.
 
-Once the sources are in place "make build_Xsun" builds the modules for
-Xsun and creates a SVR4 package named XSUNdebug.   "make build_Xorg" 
-similarly creates XORGdebug.   In the instructions that follow, if you're
-using the Xsun version replace "XORG" with "XSUN" and "Xorg" with "Xsun".
+Once the sources are in place "make build_Xorg" builds the modules for
+Xorg and creates a SVR4 package named XORGdebug.
 
 Installation
 ------------
@@ -34,8 +27,6 @@
 
  # pkgadd -d . XORGdebug
 
-(or Xsun debug as appropriate).
-
 Scripts
 -------
 
--- a/open-src/util/mdb-tools/src/modules/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/src/modules/Makefile	Wed Feb 17 12:30:44 2010 -0800
@@ -36,12 +36,6 @@
 XC_TOP=$(TOP)/../xc
 
 CFLAGS += -K pic -g
-XSUN_CPPFLAGS = \
-	-I $(PROTODIR)/usr/include/X11 \
-	-I /usr/include/X11 \
-	-I $(PROTODIR)/usr/openwin/server/include \
-	-I /usr/openwin/server/include \
-	-I $(XC_TOP)/programs/Xserver/os
 XORG_CPPFLAGS = \
 	-I $(PROTODIR)/usr/include/X11 \
 	-I /usr/include/X11 \
@@ -50,7 +44,7 @@
         -I $(PROTODIR)/usr/include/pixman-1 \
         -I /usr/include/pixman-1 \
 	-I $(TOP)/xserver/xorg/build_64/*/os
-CPPFLAGS += $($(XSERVER)_CPPFLAGS) -D$(XSERVER)
+CPPFLAGS += $(XORG_CPPFLAGS)
 LDFLAGS += -Wl,-z,text
 
 OBJECTS = $(MODULES:%.so=%.o)
--- a/open-src/util/mdb-tools/src/modules/Xserver_clients.c	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/src/modules/Xserver_clients.c	Wed Feb 17 12:30:44 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -40,7 +40,6 @@
     ClientRec client_data;
 };
 
-#ifdef XORG
 /* Xsun has these in a header, Xorg has them in sun-src/IA/interactive.c so
    we just copy it here for now.   XXX: Move to header in Xorg too. */
 typedef struct _ClientProcessInfo {
@@ -58,7 +57,6 @@
     int state;
     pointer value;
 };
-#endif
 
 /*
  * Initialize the client walker by either using the given starting address,
@@ -70,26 +68,17 @@
 {
     struct client_walk_data *cwda;
     short max_clients = 128;
-#ifdef XSUN
-# define MAX_CLIENTS "max_clients"
-#else
+
 # define MAX_CLIENTS "currentMaxClients"
-#endif
     
     if (wsp->walk_addr == NULL) {
-#ifdef XSUN /* clients is a pointer to an array */	
-       if (mdb_readvar(&wsp->walk_addr, "clients") == -1) {
-	   mdb_warn("failed to read 'clients'");
-	   return (WALK_ERR);
-       }
-#else /* Xorg 1.6 - clients is the array itself */
+       /* Xorg 1.6 - clients is the array itself */
        GElf_Sym clients_sym;
        if (mdb_lookup_by_name("clients", &clients_sym) == -1) {
 	   mdb_warn("failed to lookup 'clients'");
 	   return (WALK_ERR);
        }
        wsp->walk_addr = clients_sym.st_value;
-#endif
        if (mdb_readvar(&max_clients, MAX_CLIENTS) == -1) {
 	   mdb_warn("failed to read '%s'", MAX_CLIENTS);
 	   return (WALK_ERR);
@@ -210,9 +199,7 @@
 
 			mdb_printf("%4d ", oscomm.fd);
 
-#ifdef XSUN
-			cpp = oscomm.process;
-#else /* XORG 1.6 or later */
+			/* Xorg 1.6 or later */
 			{
 			    int IAPrivKeyIndex;
 			    GElf_Sym privkey_sym;
@@ -242,7 +229,6 @@
 				}
 			    }
 			}
-#endif			
 			
 			if (cpp != NULL) {
 			    ClientProcessRec cpr;
--- a/open-src/util/mdb-tools/src/modules/Xserver_device_grabs.c	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/src/modules/Xserver_device_grabs.c	Wed Feb 17 12:30:44 2010 -0800
@@ -159,11 +159,7 @@
     
     mdb_printf("Device \"%s\" id %d: %s\n", devName, dev->id, type);
 
-#ifdef XSUN
-    grabP = dev->grab;
-#else
     grabP = dev->deviceGrab.grab;
-#endif    
     
     if (grabP == NULL) {
 	mdb_printf("  -- no active grab on device\n\n");
@@ -173,17 +169,8 @@
 	if (mdb_vread(&grab, sizeof (GrabRec), (uintptr_t) grabP) == -1) {
 	    mdb_warn("failed to read GrabRec at %p", grabP);
 	} else {
-	    int clientid;
-#ifdef XSUN
-	    long flag1024;
+	    int clientid = CLIENT_ID(grab.resource);
 
-	    if (mdb_readsym(&flag1024, sizeof (flag1024), "NConnBitArrays") == -1) {
-		mdb_warn("failed to read NConnBitArrays", dev->grab);
-	    }
-	    clientid = CLIENT_ID_F(grab.resource, (flag1024 == 0));
-#else
-	    clientid = CLIENT_ID(grab.resource);
-#endif	    
 	    mdb_printf("  -- active grab %p by client %d\n\n", grab.resource,
 		       clientid);
 	}
@@ -205,7 +192,7 @@
 };
 
 static const mdb_walker_t walkers[] = {
-	{ "inputdev_walk", "walk list of input devices connected to Xsun",
+	{ "inputdev_walk", "walk list of input devices connected to X server",
 		inputdev_walk_init, inputdev_walk_step, inputdev_walk_fini },
 	{ NULL }
 };
--- a/open-src/util/mdb-tools/src/modules/Xserver_headers.h	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/util/mdb-tools/src/modules/Xserver_headers.h	Wed Feb 17 12:30:44 2010 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use subject to license terms.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -34,20 +34,7 @@
 /* Xserver includes & definitions needed to build mdb modules */
 #define SUNSOFT
 
-#ifdef XSUN
-# define XKB
-# define SHAPE
-# define XEVIE
-# define INPUT
-# define XResExtension
-# define XCSECURITY
-# define PIXPRIV
-# define RENDER
-# define LBX
-#else /* Xorg */
-# include "xorg-server.h"
-#endif
-
+#include "xorg-server.h"
 #include "Xdefs.h"
 #include "osdep.h"
 #include "dixstruct.h"
--- a/open-src/xserver/xorg/sun-manpage.patch	Mon Feb 15 16:40:00 2010 -0800
+++ b/open-src/xserver/xorg/sun-manpage.patch	Wed Feb 17 12:30:44 2010 -0800
@@ -17,7 +17,7 @@
 @@ -1,3 +1,33 @@
 +.\" ident	"@(#)sun-manpage.patch	1.12	09/12/11 SMI"
 +.\" 
-+.\" Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
++.\" Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
 +.\" Use is subject to license terms.
 +.\" 
 +.\" Permission is hereby granted, free of charge, to any person obtaining a
@@ -269,7 +269,7 @@
 +.\" Only list the servers shipped on Solaris
 +.PP
 +Server-specific man pages:
-+\fIXsun\fP(1), \fIXorg\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1)
++\fIXorg\fP(1), \fIXephyr\fP(1), \fIXvfb\fP(1), \fIXvnc\fP(1)
 +.PP
 +Service management framework:
 +\fIsmf\fP(5), \fIsvcadm\fP(1M), \fIsvccfg\fP(1M)
--- a/packages/SUNWxwcft/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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
-# "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.
-#
-
-SOURCEDIR =	..
-TMPLFILES =	postinstall postremove
-DATAFILES =
-
-.KEEP_STATE:
-
-all \
-install:	$(TMPLFILES) $(DATAFILES)
-
-.SUFFIXES: .tmpl $(SUFFIXES)
-
-.tmpl: $(SOURCEDIR)/awk_procedure
-	-$(RM) $@
-	SOURCEDIR=${SOURCEDIR} nawk -f $(SOURCEDIR)/awk_procedure [email protected] >$@
--- a/packages/SUNWxwcft/depend.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# ident	"@(#)depend.tmpl	35.5	09/11/23 SMI"
-#
-
-P SUNWxwfnt		X Window System Fonts
-P SUNWfont-xorg-core	X.Org core fonts
-
-include ../common_files/depend.font
--- a/packages/SUNWxwcft/pkginfo.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)pkginfo.tmpl	35.77	09/11/23 SMI"
-
-PKG="SUNWxwcft"
-NAME="X Window System common (not required) fonts"
-ARCH="ISA"
-VERSION=6.4.2.0,REV=0.2000.02.02
-CATEGORY="system"
-SUNW_PRODNAME="Solaris X11"
-SUNW_PRODVERS=6.4.2
-DESC="X Window System optional fonts"
-BASEDIR="/usr"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-MAXINST="1000"
-SUNW_PKGTYPE="usr"
-CLASSES="none"
-SUNW_PKGVERS=1.0
--- a/packages/SUNWxwcft/prototype	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-# ident	"@(#)prototype	35.35	09/11/23 SMI"
-#
-#  X Window System common (but not required) fonts
-
-i pkginfo
-i copyright
-i depend
-
-d none X11 0755 root bin
-d none X11/lib 0755 root bin
-d none X11/lib/X11 0755 root bin
-d none X11/lib/X11/fonts 0755 root bin
-s none X11/lib/X11/fonts/Type1=../../../../share/fonts/X11/Type1
--- a/packages/SUNWxwfnt/copyright.add	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-
---------------------------------------------------------------------
-
-Fonts in this package are covered under a variety of open source and
-commercial licenses, including, but not limited to the following licenses.
--- a/packages/SUNWxwfnt/depend.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)depend.tmpl	35.10	09/11/23 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWfont-xorg-core		X.Org core fonts
-P SUNWfont-xorg-iso8859-1	X.Org Foundation X11 iso8859-1 fonts
-include ../common_files/depend.font
--- a/packages/SUNWxwfnt/pkginfo.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident "@(#)pkginfo.tmpl 35.75     09/07/16 SMI"
-#
-
-PKG="SUNWxwfnt"
-NAME="X Window System platform required fonts"
-ARCH="ISA"
-VERSION=6.4.2.0,REV=0.2000.02.02
-CATEGORY="system"
-SUNW_PRODNAME="Solaris X11"
-SUNW_PRODVERS=6.4.2
-DESC="X Window System Fonts (required fonts)"
-BASEDIR="/usr"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-MAXINST="1000"
-SUNW_PKGTYPE="usr"
-CLASSES=none fontsdir fontsalias
-SUNW_PKGVERS=1.0
--- a/packages/SUNWxwfnt/postinstall.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# 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.
-#
-###########################################################################
-#
-# SUNWxwfnt (X Window System platform required fonts) postinstall script.
-#
-# /usr/openwin/bin/installalias  and mkfontdir was previously packaged
-# in SUNWxwfnt.  Now it is moved to SUNWxwfsw and we need to preserve it
-# due to zones upgrade from S10.
-# Therefore, removef(1M) is used to remove the packaging database entry
-# although the files itself are preserved.
-#
-FILELIST="\
-/usr/openwin/server/lib/libtypesclr.so.0 \
-/usr/openwin/server/lib/libtypesclr.so \
-/usr/openwin/server/lib/libfont.so.1 \
-/usr/openwin/server/lib/libfont.so \
-/usr/openwin/server/lib \
-/usr/openwin/server \
-/usr/openwin/lib/installalias \
-/usr/openwin/bin/mkfontdir \
-/usr/openwin/bin \
-"
-for i in $FILELIST ; do
-/usr/sbin/removef  SUNWxwfnt $i >/dev/null 2>&1
-done
-/usr/sbin/removef -f  SUNWxwfnt >/dev/null 2>&1
-
-include fc_rebuild
-
-include fontcatlink
-
-make_font_catalogue_link sun/F3bitmaps	F3bitmaps:unscaled:pri=10
-make_font_catalogue_link sun/F3bitmaps	F3bitmaps:pri=80
-make_font_catalogue_link sun/TrueType	TrueType:pri=41
-
-
-exit 0 
--- a/packages/SUNWxwfnt/postremove.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)postremove.tmpl	1.8	09/11/23 SMI"
-#
-# SUNWxwfnt (X Window System platform required fonts) postremove script.
-
-include fc_rebuild
-
-include mkfontdir
-
-update_fontdir_and_alias $BASEDIR/X11/lib/X11/fonts/75dpi
-update_fontdir_and_alias $BASEDIR/X11/lib/X11/fonts/100dpi
-update_fontdir_and_alias $BASEDIR/openwin/lib/X11/fonts/pcf
-update_fontdir_and_alias $BASEDIR/X11/lib/X11/fonts/misc
-update_fontdir_and_alias $BASEDIR/X11/lib/X11/fonts/F3bitmaps
-update_fontdir_and_alias $BASEDIR/openwin/lib/X11/fonts/Type1/outline
-update_fontdir_and_alias $BASEDIR/openwin/lib/X11/fonts/Type1/sun
-update_fontdir_and_alias $BASEDIR/X11/lib/X11/fonts/TrueType
-update_fontdir_and_alias $BASEDIR/openwin/lib/X11/fonts/TTbitmaps
-
-# These symlinks cannot be put into packages directly, or even with installf,
-# since pkgadd/pkgmk/pkgrm can't handle files with = in their pathname.
-rm -f $BASEDIR/../etc/X11/fontpath.d/misc:unscaled:pri=10
-rm -f $BASEDIR/../etc/X11/fontpath.d/misc:unscaled:pri=15
-rm -f $BASEDIR/../etc/X11/fontpath.d/100dpi:unscaled:pri=20
-rm -f $BASEDIR/../etc/X11/fontpath.d/75dpi:unscaled:pri=25
-rm -f $BASEDIR/../etc/X11/fontpath.d/TTF:pri=40
-rm -f $BASEDIR/../etc/X11/fontpath.d/TrueType:pri=41
-rm -f $BASEDIR/../etc/X11/fontpath.d/misc:pri=80
-rm -f $BASEDIR/../etc/X11/fontpath.d/misc:pri=85
-rm -f $BASEDIR/../etc/X11/fontpath.d/100dpi:pri=90
-rm -f $BASEDIR/../etc/X11/fontpath.d/75dpi:pri=95
-
-exit 0
-
--- a/packages/SUNWxwfnt/preinstall	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# 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.
-#
-#
-
-EXEC_BASE=/usr
-PKGCOND=/usr/bin/pkgcond
-DISKLESS_SRVC=`echo $BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_${ARCH}.all`
-
-is_srngz=99
-is_ngz=99
-
-if [ -x $PKGCOND ]; then
-    $PKGCOND  is_sparse_root_nonglobal_zone
-    is_srngz=$?
-    $PKGCOND -v is_nonglobal_zone > /dev/null 2>&1
-    is_ngz=$?
-fi
-
-##
-## 'pkgcond' does not exist when you do live upgrade from S8/S9
-## so in that case, use 'touch' instead for the testing
-##
-test_writable() {
-    if [ $is_srngz -ne 99 ]; then
-        $PKGCOND is_path_writable $1 && return $?
-    else
-        /usr/bin/touch $1/.test.$$ > /dev/null 2>&1
-        if [ $? !=  0 ]; then
-            return 1
-        else
-            rm -f  $1/.test.$$ > /dev/null 2>&1
-            return 0
-        fi
-    fi
-}
-
-##
-##  If there is a hard directory in /usr/openwin/lib/X11/fonts/<font>
-##  then, make a hard directory in /usr/X11/lib/X11/fonts/
-##	  and move the contents from /usr/openwin/lib/X11/fonts/<font>
-##				  to /usr/X11/lib/X11/fonts/<font>
-##  else if /usr/openwin/lib/X11/fonts/<font> is a link, do nothing.
-##
-
-make_font_link() {
-   XWFNT_DIROLD=${PKG_INSTALL_ROOT}$2
-   XWFNT_DIRNEW=${PKG_INSTALL_ROOT}$3
-
-## Just delete old fontconfig cache files, they live in /var/cache now
-   if [ -f ${XWFNT_DIROLD}/$1/fonts.cache-1 ] ; then
-      /usr/bin/rm -f ${XWFNT_DIROLD}/$1/fonts.cache*
-   fi
-
-## case 0 and 1 test.
-   if [ -d ${XWFNT_DIROLD}/$1 -a ! -h ${XWFNT_DIROLD}/$1 ]; then
-## case 3 test olddir is a hard file.   now is new dir a hard file
-      if [ -d ${XWFNT_DIRNEW}/$1 -a ! -h ${XWFNT_DIRNEW}/$1 ]; then
-## copy contents and remove the old directory
-         if test_writable ${XWFNT_DIRNEW} ; then
-             /usr/bin/cp -rpP ${XWFNT_DIROLD}/$1/* ${XWFNT_DIRNEW}/$1
-             /usr/bin/rm -rf ${XWFNT_DIROLD}/$1
-         fi
-## case 4 test
-      elif [ -h ${XWFNT_DIRNEW}/$1 ]; then
-## remove the link and move the directory
-         if test_writable ${XWFNT_DIRNEW} ; then
-               /usr/bin/rm -f ${XWFNT_DIRNEW}/$1
-               /usr/bin/mv ${XWFNT_DIROLD}/$1 ${XWFNT_DIRNEW}/$1
-         fi
-## case 2 test
-      else
-	 if [ ! -d ${XWFNT_DIRNEW} ]; then
-	    mkdir -p ${XWFNT_DIRNEW}/$1
-	    rmdir ${XWFNT_DIRNEW}/$1
-	 fi
-## move the old directory to new location
-         if test_writable ${XWFNT_DIRNEW} ; then
-               /usr/bin/mv ${XWFNT_DIROLD}/$1 ${XWFNT_DIRNEW}/$1
-         fi
-      fi
-   fi 
-}
-
-OWFNT_DIR=/usr/openwin/lib/X11/fonts 
-X11FNT_DIR=/usr/X11/lib/X11/fonts
-SHFNT_DIR=/usr/share/fonts
-
-make_font_link 100dpi ${OWFNT_DIR} ${SHFNT_DIR}/X11
-make_font_link 100dpi ${X11FNT_DIR} ${SHFNT_DIR}/X11
-make_font_link 75dpi ${OWFNT_DIR} ${SHFNT_DIR}/X11
-make_font_link 75dpi ${X11FNT_DIR} ${SHFNT_DIR}/X11
-make_font_link Type1 ${X11FNT_DIR} ${SHFNT_DIR}/X11
-make_font_link F3bitmaps ${OWFNT_DIR} ${SHFNT_DIR}/sun
-make_font_link F3bitmaps ${X11FNT_DIR} ${SHFNT_DIR}/sun
-make_font_link Type1/sun ${OWFNT_DIR} ${SHFNT_DIR}/sun
-make_font_link Type3 ${OWFNT_DIR} ${SHFNT_DIR}/sun
-make_font_link HTbdf ${X11FNT_DIR} ${SHFNT_DIR}/sun
-exit 0 
-
--- a/packages/SUNWxwfnt/prototype_com	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,440 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)prototype_com	35.87	09/12/18 SMI"
-#
-#  X Window System required core fonts package
-
-i pkginfo
-i copyright
-i depend=../common_files/depend.font
-i preinstall
-i postremove
-i postinstall
-!search ../common_files
-i i.fontsdir
-i r.fontsdir
-i i.fontsalias
-i r.fontsalias
-
-!HOME=../usr
-!OW_FONTS=$HOME/openwin/lib/X11/fonts
-
-d none share							0755 root sys
-d none share/fonts						0755 root bin
-d none share/fonts/sun						0755 root bin
-
-!search  $HOME/share/fonts/sun/F3bitmaps
-d none share/fonts/sun/F3bitmaps				0755 root bin
-f none share/fonts/sun/F3bitmaps/fonts.dir			0444 root bin
-f none share/fonts/sun/F3bitmaps/fonts.alias			0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Book6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Book8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Book10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Book12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Book14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-BookOblique6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-BookOblique8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-BookOblique10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-BookOblique12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-BookOblique14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Demi6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Demi8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Demi10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Demi12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-Demi14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-DemiOblique6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-DemiOblique8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-DemiOblique10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-DemiOblique12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/AvantGarde-DemiOblique14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bmb6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Bmb8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Bmb10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Bmb12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Bmb14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbB6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbB8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbB10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbB12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbB14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbBI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbBI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbBI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbBI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbBI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/BmbI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Demi6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Demi8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Demi10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Demi12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Demi14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-DemiItalic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-DemiItalic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-DemiItalic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-DemiItalic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-DemiItalic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Light6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Light8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Light10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Light12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-Light14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-LightItalic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-LightItalic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-LightItalic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-LightItalic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Bookman-LightItalic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/GilS6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilS8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilS10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilS12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilS14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSB6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSB8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSB10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSB12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSB14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSBI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSBI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSBI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSBI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSBI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/GilSI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Bold6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Bold8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Bold10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Bold12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Bold14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-BoldOblique6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-BoldOblique8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-BoldOblique10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-BoldOblique12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-BoldOblique14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Bold6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Bold8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Bold10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Bold12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Bold14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-BoldOblique6.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-BoldOblique8.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-BoldOblique10.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-BoldOblique12.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-BoldOblique14.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Oblique6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Oblique8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Oblique10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Oblique12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Narrow-Oblique14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Oblique6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Oblique8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Oblique10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Oblique12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Helvetica-Oblique14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Demi6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Demi8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Demi10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Demi12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Demi14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-DemiItalic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-DemiItalic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-DemiItalic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-DemiItalic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-DemiItalic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Italic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Italic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Italic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Italic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaBright-Italic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Bold18.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-BoldItalic18.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Italic18.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter18.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter17.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter20.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-Typewriter24.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold10.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold12.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold14.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold18.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold17.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold20.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans-TypewriterBold24.pcf 0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans18.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans17.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans20.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/LucidaSans24.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Bold6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Bold8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Bold10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Bold12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Bold14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Italic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Italic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Italic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Italic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Italic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Roman6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Roman8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Roman10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Roman12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/NewCenturySchlbk-Roman14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Bold6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Bold8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Bold10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Bold12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Bold14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-BoldItalic6.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-BoldItalic8.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-BoldItalic10.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-BoldItalic12.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-BoldItalic14.pcf	0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Italic6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Italic8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Italic10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Italic12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Italic14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Roman6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Roman8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Roman10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Roman12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Palatino-Roman14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Rkw6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Rkw8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Rkw10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Rkw12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Rkw14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwB6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwB8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwB10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwB12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwB14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwBI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwBI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwBI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwBI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwBI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwI6.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwI8.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwI10.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwI12.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/RkwI14.pcf			0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Bold6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Bold8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Bold10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Bold12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Bold14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-BoldItalic6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-BoldItalic8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-BoldItalic10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-BoldItalic12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-BoldItalic14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Italic6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Italic8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Italic10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Italic12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Italic14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Roman6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Roman8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Roman10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Roman12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/Times-Roman14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats6.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats8.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats10.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats12.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats14.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats16.pcf		0444 root bin
-f none share/fonts/sun/F3bitmaps/ZapfDingbats18.pcf		0444 root bin
-
-!search $OW_FONTS/Type1/sun
-d none share/fonts/sun/Type1					0755 root bin
-f none share/fonts/sun/Type1/fonts.dir				0444 root bin
-f none share/fonts/sun/Type1/fonts.scale			0444 root bin
-f none share/fonts/sun/Type1/fonts.upr				0444 root bin
-f none share/fonts/sun/Type1/LucidaBright-Demi.pfa		0444 root bin
-f none share/fonts/sun/Type1/LucidaBright-DemiItalic.pfa	0444 root bin
-f none share/fonts/sun/Type1/LucidaBright-Italic.pfa		0444 root bin
-f none share/fonts/sun/Type1/LucidaBright.pfa			0444 root bin
-f none share/fonts/sun/Type1/LucidaSans-Bold.pfa		0444 root bin
-f none share/fonts/sun/Type1/LucidaSans-BoldItalic.pfa		0444 root bin
-f none share/fonts/sun/Type1/LucidaSans-Italic.pfa		0444 root bin
-f none share/fonts/sun/Type1/LucidaSans.pfa			0444 root bin
-f none share/fonts/sun/Type1/LucidaSansTypewriter-Bold.pfa	0444 root bin
-f none share/fonts/sun/Type1/LucidaSansTypewriter.pfa		0444 root bin
-f none share/fonts/sun/Type1/AvantGarde-Book.ps			0444 root bin
-f none share/fonts/sun/Type1/AvantGarde-BookOblique.ps		0444 root bin
-f none share/fonts/sun/Type1/AvantGarde-Demi.ps			0444 root bin
-f none share/fonts/sun/Type1/AvantGarde-DemiOblique.ps		0444 root bin
-f none share/fonts/sun/Type1/Bookman-Demi.ps			0444 root bin
-f none share/fonts/sun/Type1/Bookman-DemiItalic.ps		0444 root bin
-f none share/fonts/sun/Type1/Bookman-Light.ps			0444 root bin
-f none share/fonts/sun/Type1/Bookman-LightItalic.ps		0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Bold.ps			0444 root bin
-f none share/fonts/sun/Type1/Helvetica-BoldOblique.ps		0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Narrow-BolOblique.ps	0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Narrow-Bold.ps		0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Narrow-BoldOblique.ps	0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Narrow-Oblique.ps	0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Narrow.ps		0444 root bin
-f none share/fonts/sun/Type1/Helvetica-Oblique.ps		0444 root bin
-f none share/fonts/sun/Type1/Helvetica.ps			0444 root bin
-f none share/fonts/sun/Type1/Lucida-Bright.ps			0444 root bin
-f none share/fonts/sun/Type1/Lucida-BrightDemiBold.ps		0444 root bin
-f none share/fonts/sun/Type1/Lucida-BrightDemiBoldItalic.ps	0444 root bin
-f none share/fonts/sun/Type1/Lucida-BrightItalic.ps		0444 root bin
-f none share/fonts/sun/Type1/LucidaSans-Typewriter.ps		0444 root bin
-f none share/fonts/sun/Type1/LucidaSans-TypewriterBold.ps	0444 root bin
-f none share/fonts/sun/Type1/NewCenturySchlbk-Bold.ps		0444 root bin
-f none share/fonts/sun/Type1/NewCenturySchlbk-BoldItalic.ps	0444 root bin
-f none share/fonts/sun/Type1/NewCenturySchlbk-Italic.ps		0444 root bin
-f none share/fonts/sun/Type1/NewCenturySchlbk-Roman.ps		0444 root bin
-f none share/fonts/sun/Type1/Palatino-Bold.ps			0444 root bin
-f none share/fonts/sun/Type1/Palatino-BoldItalic.ps		0444 root bin
-f none share/fonts/sun/Type1/Palatino-Italic.ps			0444 root bin
-f none share/fonts/sun/Type1/Palatino-Roman.ps			0444 root bin
-f none share/fonts/sun/Type1/Times-Bold.ps			0444 root bin
-f none share/fonts/sun/Type1/Times-BoldItalic.ps		0444 root bin
-f none share/fonts/sun/Type1/Times-Italic.ps			0444 root bin
-f none share/fonts/sun/Type1/Times-Roman.ps			0444 root bin
-f none share/fonts/sun/Type1/ZapfChancery-MediumItalic.ps	0444 root bin
-f none share/fonts/sun/Type1/MonotypeSorts.pfb			0444 root bin
-f none share/fonts/sun/Type1/ZapfDingbats.ps			0444 root bin
-
-!search $OW_FONTS/Type1/sun/afm
-d none share/fonts/sun/Type1					0755 root bin
-d none share/fonts/sun/Type1/afm				0755 root bin
-f none share/fonts/sun/Type1/afm/LucidaBright-Demi.afm		0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaBright-DemiItalic.afm	0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaBright-Italic.afm	0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaBright.afm		0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSans-Bold.afm		0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSans-BoldItalic.afm	0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSans-Italic.afm		0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSans.afm			0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSansTypewriter-Bold.afm	0444 root bin
-f none share/fonts/sun/Type1/afm/LucidaSansTypewriter.afm	0444 root bin
-f none share/fonts/sun/Type1/afm/MonotypeSorts.afm		0444 root bin
-
-!search $OW_FONTS/TrueType
-d none share/fonts/sun/TrueType					0755 root bin
-f none share/fonts/sun/TrueType/fonts.dir			0444 root bin
-f none share/fonts/sun/TrueType/fonts.scale			0444 root bin
-f none share/fonts/sun/TrueType/fonts.upr			0444 root bin
-f none share/fonts/sun/TrueType/LucidaBrightDemiBold.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaBrightDemiItalic.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaBrightItalic.ttf		0444 root bin
-f none share/fonts/sun/TrueType/LucidaBrightRegular.ttf		0444 root bin
-f none share/fonts/sun/TrueType/LucidaSansDemiBold.ttf		0444 root bin
-f none share/fonts/sun/TrueType/LucidaSansDemiOblique.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaSansOblique.ttf		0444 root bin
-f none share/fonts/sun/TrueType/LucidaSansRegular.ttf		0444 root bin
-f none share/fonts/sun/TrueType/LucidaTypewriterBold.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaTypewriterBoldOblique.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaTypewriterOblique.ttf	0444 root bin
-f none share/fonts/sun/TrueType/LucidaTypewriterRegular.ttf	0444 root bin
-
-
-d none openwin							0755 root bin
-d none openwin/lib						0755 root bin
-d none openwin/lib/X11						0755 root bin
-d none openwin/lib/X11/fonts					0755 root bin
-s none openwin/lib/X11/fonts/75dpi=../../../../share/fonts/X11/75dpi
-s none openwin/lib/X11/fonts/100dpi=../../../../share/fonts/X11/100dpi
-s none openwin/lib/X11/fonts/F3bitmaps=../../../../share/fonts/sun/F3bitmaps
-d none openwin/lib/X11/fonts/Type1				0755 root bin
-s none openwin/lib/X11/fonts/Type1/sun=../../../../share/fonts/sun/Type1
-
-d none X11							0755 root bin
-d none X11/lib							0755 root bin
-d none X11/lib/X11						0755 root bin
-d none X11/lib/X11/fonts					0755 root bin
-s none X11/lib/X11/fonts/F3bitmaps=../../../../share/fonts/sun/F3bitmaps
-
-# These need to be a directory, not a symlink, since other packages install
-# subdirectories here - empty fonts.dir left to keep X configurations with
-# these paths in the font dir from dying
-e fontsdir openwin/lib/X11/fonts/Type1/fonts.dir		0644 root bin
-d none openwin/lib/X11/fonts/misc				0755 root bin
-e fontsdir openwin/lib/X11/fonts/misc/fonts.dir			0644 root bin
-d none openwin/lib/X11/fonts/TrueType				0755 root bin
-e fontsdir openwin/lib/X11/fonts/TrueType/fonts.dir		0644 root bin
-
--- a/packages/SUNWxwoft/Makefile	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# 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
-# "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.
-#
-
-SOURCEDIR =	..
-TMPLFILES =	postinstall postremove
-DATAFILES =
-
-.KEEP_STATE:
-
-all \
-install:	$(TMPLFILES) $(DATAFILES)
-
-.SUFFIXES: .tmpl $(SUFFIXES)
-
-.tmpl: $(SOURCEDIR)/awk_procedure
-	-$(RM) $@
-	SOURCEDIR=${SOURCEDIR} nawk -f $(SOURCEDIR)/awk_procedure [email protected] >$@
--- a/packages/SUNWxwoft/depend	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-###########################################################################
-#
-# Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)depend	35.3	07/11/05 SMI"
-#
-# This package information file defines software dependencies associated
-# with the pkg.  You can define three types of pkg dependencies with this file:
-#	 P indicates a prerequisite for installation
-#	 I indicates an incompatible package
-#	 R indicates a reverse dependency
-# <pkg.abbr> see pkginfo(4), PKG parameter
-# <name> see pkginfo(4), NAME parameter
-# <version> see pkginfo(4), VERSION parameter
-# <arch> see pkginfo(4), ARCH parameter
-# <type> <pkg.abbr> <name>
-# 	(<arch>)<version>
-# 	(<arch>)<version>
-# 	...
-# <type> <pkg.abbr> <name>
-# ...
-#
-
-P SUNWcar	Core Architecture, (Root)
-P SUNWcakr	Core Solaris Kernel Architecture (Root)
-P SUNWkvm	Core Architecture, (Kvm)
-P SUNWcsr	Core Solaris, (Root)
-P SUNWckr	Core Solaris Kernel (Root)
-P SUNWcnetr	Core Solaris Network Infrastructure (Root)
-P SUNWcsu	Core Solaris, (Usr)
-P SUNWcsd	Core Solaris Devices
-P SUNWcsl	Core Solaris Libraries
-P SUNWxwfsw	X Window System platform required font software
-P SUNWxwfnt	X Window System Fonts
--- a/packages/SUNWxwoft/pkginfo.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)pkginfo.tmpl	35.77	09/11/23 SMI"
-
-PKG="SUNWxwoft"
-NAME="X Window System optional fonts"
-ARCH="ISA"
-VERSION=6.4.2.0,REV=0.2000.02.02
-CATEGORY="system"
-SUNW_PRODNAME="Solaris X11"
-SUNW_PRODVERS=6.4.2
-DESC="X Window System optional fonts"
-BASEDIR="/usr"
-VENDOR="Sun Microsystems, Inc."
-HOTLINE="Please contact your local service provider"
-EMAIL=""
-MAXINST="1000"
-SUNW_PKGTYPE="usr"
-CLASSES=none
-SUNW_PKGVERS=1.0
--- a/packages/SUNWxwoft/postinstall.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-###########################################################################
-#
-# 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
-# "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.
-#
-###########################################################################
-#
-# 	@(#)postinstall.tmpl	1.1	08/02/27 SMI
-#
-# SUNWxwoft (X Window System optional fonts) postinstall script.
-
-include fc_rebuild
-
-exit 0
-
--- a/packages/SUNWxwoft/postremove.tmpl	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)postremove.tmpl	35.10	09/11/23 SMI"
-#
-# SUNWxwoft (X Window System optional fonts) postremove script.
-
-include fc_rebuild
-
-exit 0
-
-
--- a/packages/SUNWxwoft/prototype	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,269 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-# ident	"@(#)prototype	35.31	09/11/23 SMI"
-#
-#  X Window System optional fonts
-
-i pkginfo
-i postinstall
-i postremove
-i copyright
-i depend=../depend
-
-!HOME=../usr
-!OW_FONTS=$HOME/openwin/lib/X11/fonts
-
-d none share							0755 root sys
-d none share/fonts						0755 root bin
-d none share/fonts/sun						0755 root bin
-
-!search  $OW_FONTS/Type3
-d none share/fonts/sun/Type3					0755 root bin
-f none share/fonts/sun/Type3/Dijkstra.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshCyr.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshGoth.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshGrk.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshGrkN.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshGrkp.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshI.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshIN.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshIW.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshRom.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshRomN.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshRomW.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshRomd.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshRomp.ps			0444 root bin
-f none share/fonts/sun/Type3/HrshScr.ps				0444 root bin
-f none share/fonts/sun/Type3/HrshScrN.ps			0444 root bin
-
-!search  $HOME/share/fonts/sun/HTbdf
-d none share/fonts/sun/HTbdf					0755 root bin
-f none share/fonts/sun/HTbdf/fonts.dir				0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightR24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightB24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightI24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI9.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaBrightBI24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR10.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR11.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR12.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR13.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR14.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR15.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR16.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR17.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR18.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR19.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR20.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR21.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR22.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR23.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansR24.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB10.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB11.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB12.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB13.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB14.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB15.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB16.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB17.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB18.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB19.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB20.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB21.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB22.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB23.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansB24.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI10.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI11.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI12.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI13.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI14.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI15.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI16.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI17.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI18.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI19.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI20.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI21.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI22.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI23.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansI24.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI9.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI10.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI11.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI12.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI13.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI14.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI15.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI16.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI17.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI18.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI19.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI20.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI21.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI22.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI23.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaSansBI24.pcf			0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR9.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterR24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB9.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterB24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI9.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterI24.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI9.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI10.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI11.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI12.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI13.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI14.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI15.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI16.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI17.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI18.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI19.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI20.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI21.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI22.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI23.pcf		0444 root bin
-f none share/fonts/sun/HTbdf/LucidaTypewriterBI24.pcf		0444 root bin
-
-d none openwin							0755 root bin
-d none openwin/lib						0755 root bin
-d none openwin/lib/X11						0755 root bin
-d none openwin/lib/X11/fonts					0755 root bin
-s none openwin/lib/X11/fonts/Type3=../../../../share/fonts/sun/Type3
--- a/packages/common_files/i.fontsalias	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-#	@(#)i.fontsalias	35.9	09/06/02 SMI
-#
-# X Consolidation class action script for fontsalias class.
-
-
-EXEC_BASE=/usr
-PKGCOND=/usr/bin/pkgcond
-DISKLESS_SRVC=`echo $BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_${ARCH}.all`
-is_srngz=99
-is_wrngz=99
-is_ngz=99
-
-if [ -x $PKGCOND ]; then
-     $PKGCOND  is_sparse_root_nonglobal_zone
-     is_srngz=$?
-     $PKGCOND  is_whole_root_nonglobal_zone
-     is_wrngz=$?
-     $PKGCOND -v is_nonglobal_zone > /dev/null 2>&1
-     is_ngz=$?
-fi
-
-if [ $is_ngz -eq 0 ]; then
-        if [  "$DISKLESS_SRVC" ]; then
-                EXEC_BASE=/usr
-        else
-                EXEC_BASE=$BASEDIR
-        fi
-LD_LIBRARY_PATH=$BASEDIR/openwin/server/lib:$BASEDIR/openwin/lib
-export LD_LIBRARY_PATH
-fi
-
-if [ $is_srngz -ne 0 ]; then
-     if [ ! -x $EXEC_BASE/openwin/lib/installalias ]
-     then
-         # if installalias doesn't exist we cannot proceed
-         exit 2
-     fi
-fi
-
-while   read src dst
-do
-     # If pkgcond exists
-     dir=`dirname $dst`
-     if [ $is_srngz -ne 99 ]; then
-         $PKGCOND is_path_writable $dir || \
-             continue
-     fi
-     cp $src $dst
-     cd $dir
-     $EXEC_BASE/openwin/lib/installalias `basename $dst` . || exit 2
-done
-
-exit 0 
--- a/packages/common_files/i.fontsdir	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-#!/bin/sh -x
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-#	@(#)i.fontsdir	35.11	09/06/02 SMI
-#
-# X Consolidation class action script for fontsdir class
-
-EXEC_BASE=/usr
-PKGCOND=/usr/bin/pkgcond
-DISKLESS_SRVC=`echo $BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_${ARCH}.all`
-is_srngz=99
-is_wrngz=99
-is_ngz=99
-
-if [ -x $PKGCOND ]; then
-    $PKGCOND is_sparse_root_nonglobal_zone
-    is_srngz=$?
-    $PKGCOND is_whole_root_nonglobal_zone
-    is_wrngz=$?
-    $PKGCOND -v is_nonglobal_zone > /dev/null 2>&1
-    is_ngz=$?
-fi
-
-if [ $is_ngz -eq 0 ]; then
-        if [  "$DISKLESS_SRVC" ]; then
-                EXEC_BASE=/usr
-        else
-                EXEC_BASE=$BASEDIR
-        fi
-LD_LIBRARY_PATH=$BASEDIR/openwin/server/lib:$BASEDIR/openwin/lib
-export LD_LIBRARY_PATH
-fi
-
-if [ $is_srngz -ne 0 ]; then
-        if [ ! -x $EXEC_BASE/openwin/bin/mkfontdir ]
-        then
-            # if installalias doesn't exist we cannot proceed
-            exit 2
-        fi
-fi
-
-while read src dst
-do
-        DIRNAME=`dirname $dst`
-        # If pkgcond exists
-        if [ $is_srngz -ne 99 ]; then
-                $PKGCOND is_path_writable $DIRNAME || \
-                        continue
-        fi
-        cd $DIRNAME
-        $EXEC_BASE/openwin/bin/mkfontdir . || exit 2
-        # Bug 4198211: chgrp to bin to match pkg database
-        chgrp bin fonts.dir
-done
-
-exit 0
--- a/packages/common_files/proc.mkfontdir	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-###########################################################################
-#
-# 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
-# "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.
-#
-###########################################################################
-#
-# "@(#)proc.mkfontdir	1.1	08/02/25 Sun Microsystems"
-#
-# Rebuilds the fonts.dir files if mkfontdir exists otherwise does nothing
-#
-
-EXEC_BASE=/usr
-PKGCOND=/usr/bin/pkgcond
-MKFONTDIR=$EXEC_BASE/openwin/bin/mkfontdir
-ENV_MKFONTDIR=$MKFONTDIR
-INSTALLALIAS=$EXEC_BASE/openwin/lib/installalias
-ENV_INSTALLALIAS=$INSTALLALIAS
-DISKLESS_SRVC=`echo $BASEDIR | /usr/bin/grep export/Solaris_[1-9][0-9]/usr_${ARCH}.all`
-
-is_srngz=99
-is_ngz=99
-
-if [ -x $PKGCOND ]; then
-    $PKGCOND  is_sparse_root_nonglobal_zone
-    is_srngz=$?
-    $PKGCOND -v is_nonglobal_zone > /dev/null 2>&1
-    is_ngz=$?
-fi
-
-if [ $is_ngz -eq 0 ]; then
-        if [  "$DISKLESS_SRVC" ]; then
-                EXEC_BASE=/usr
-        else
-                EXEC_BASE=$BASEDIR
-        fi
- 	MKFONTDIR=$EXEC_BASE/openwin/bin/mkfontdir
- 	INSTALLALIAS=$EXEC_BASE/openwin/lib/installalias
-    	ENV_MKFONTDIR="env LD_LIBRARY_PATH=$BASEDIR/openwin/server/lib:$BASEDIR/openwin/lib $MKFONTDIR"
-    	ENV_INSTALLALIAS="env LD_LIBRARY_PATH=$BASEDIR/openwin/server/lib:$BASEDIR/openwin/lib $INSTALLALIAS"
-fi
-
-##
-## 'pkgcond' does not exist when you do live upgrade from S8/S9
-## so in that case, use 'touch' instead for the testing
-##
-test_writable() {
-    if [ $is_srngz -ne 99 ]; then
-        $PKGCOND is_path_writable $1 && return $?
-    else
-        /usr/bin/touch $1/.test.$$ > /dev/null 2>&1
-        if [ $? !=  0 ]; then
-            return 1
-        else
-            rm -f  $1/.test.$$ > /dev/null 2>&1
-            return 0
-        fi
-    fi
-}
-
-##
-## Updates font.dir and fonts.alias files to match those present in
-## the directory now
-##
-update_fontdir_and_alias() {
-    if [ -x $EXEC_BASE/openwin/bin/mkfontdir ]; then
-	if [ -d $1 ]; then
-	  (
-		cd $1
-		if test_writable $1; then
-		$ENV_MKFONTDIR . || exit 2
-		$ENV_INSTALLALIAS fonts.alias.req . 
-		# Bug 4198211: chgrp to bin to match pkg database
-		chgrp bin fonts.dir
-		fi
-	  )
-	fi
-    fi
-}
-
--- a/packages/common_files/r.fontsalias	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-#	@(#)r.fontsalias	35.3	09/06/02	Sun Microsystems.
-#
-# X Consolidation class action script for fontsalias class.
-
-while   read dst
-do
-    if [ -f $dst ]
-    then
-	cd `dirname $dst`
-	rm -f fonts.alias
-	rm -f $dst
-    fi
-done
-
-exit 0
--- a/packages/common_files/r.fontsdir	Mon Feb 15 16:40:00 2010 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-###########################################################################
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, and/or sell copies of the Software, and to permit persons
-# to whom the Software is furnished to do so, provided that the above
-# copyright notice(s) and this permission notice appear in all copies of
-# the Software and that both the above copyright notice(s) and this
-# permission notice appear in supporting documentation.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-# Except as contained in this notice, the name of a copyright holder
-# shall not be used in advertising or otherwise to promote the sale, use
-# or other dealings in this Software without prior written authorization
-# of the copyright holder.
-#
-###########################################################################
-#
-#	@(#)r.fontsdir	35.3	09/06/02	Sun Microsystems
-#
-# X Consolidation class action remove script for the fontsdir class
-
-# Remove the fonts.dir files. (If mkfontdir exists they'll be updated by the
-# postremove script.)
-
-while   read dst
-do
-    rm -f $dst
-done
-
-exit 0
--- a/packages/upgrade-X	Mon Feb 15 16:40:00 2010 -0800
+++ b/packages/upgrade-X	Wed Feb 17 12:30:44 2010 -0800
@@ -238,19 +238,6 @@
 	SUNWxwxft
 "
 
-xsun_pkg_list="
-	SUNWxsun-headers
-	SUNWxsun-server
-	SUNWxwts
-"
-
-# Some packages are only built for certain platforms currently
-case "${MACH}" in
-    sparc)      
-        pkg_list+=" SUNWxwpsr ${xsun_pkg_list}" 
-        ;;
-esac
-
 ####
 #
 #   Deal with changes since various older Nevada builds
@@ -287,8 +274,11 @@
 REM_PKGS+=" SUNWxorg-devel-docs SUNWxorg-cfg"
 
 # snv_118: 6850136 Removal of Xsun-based Xvfb & Xnest servers [PSARC 2008/033]
-#	   6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
-REM_PKGS+=" SUNWxwsrv ${xsun_pkg_list}"
+REM_PKGS+=" SUNWxwsrv"
+
+# snv_118: 6781710 Removal of Xsun on x86/x64 [PSARC 2008/033]
+# snv_135: 6926932 Removal of Xsun on SPARC [PSARC 2008/033]
+REM_PKGS+=" SUNWxsun-headers SUNWxsun-server SUNWxwts SUNWxwpsr"
 
 # snv_120: 6859233 Removal of Xprint [PSARC 2009/294]
 REM_PKGS+=" SUNWxprint-server SUNWxwpft"