--- a/open-src/font/Makefile Tue Feb 05 14:35:30 2008 -0800
+++ b/open-src/font/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -1,6 +1,6 @@
# Makefile for X Consolidation Open Source font modules
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,14 +28,20 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/11/16
+# @(#)Makefile 1.5 08/02/05 SMI
#
###############################################################################
OS_SUBDIRS = \
encodings \
+ sun-aliases \
bitstream-vera \
- deja-vu
+ deja-vu \
+ adobe-utopia-type1 \
+ bh-type1 \
+ bitstream-type1 \
+ ibm-type1 \
+ xfree86-type1
# Need to install to proto area by default for inter-package dependencies to
# work right.
--- a/open-src/font/Makefile.inc Tue Feb 05 14:35:30 2008 -0800
+++ b/open-src/font/Makefile.inc Tue Feb 05 17:31:22 2008 -0800
@@ -1,6 +1,6 @@
# -*- Makefile -*- rules common to most X.Org font modules
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
# Use subject to license terms.
#
# Permission is hereby granted, free of charge, to any person obtaining a
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.3 07/05/15
+# @(#)Makefile.inc 1.4 08/02/05
#
### Makefile settings/rules common to all X.Org font modules
@@ -49,11 +49,20 @@
# Command line options to GNU autoconf configure script
FONT_CFG=--prefix=$(X11_DIR) $(FONT_CONFIG_OPTS)
+# Paths to find mkfontscale, fc-cache & the libraries they need in build area
+FONT_UTILS_PATH=$(PROTODIR)$(X11_DIR)/bin:$(PROTODIR)/usr/bin
+FONT_LIBS_PATH=$(PROTODIR)$(X11_SERVERLIBS_DIR):$(PROTODIR)$(X11_DIR)/lib:$(PROTODIR)/usr/lib
+
# Environment variable options to GNU autoconf configure script
-CONFIG_ENV = PATH="$(PROTODIR)$(X11_DIR)/bin:$$PATH"
+CONFIG_ENV = PATH="$(FONT_UTILS_PATH):$$PATH" \
+ LD_LIBRARY_PATH="$(FONT_LIBS_PATH)" \
+ PKG_CONFIG_PATH="$(PROTODIR)/usr/lib$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR):/usr/lib$(ARCHLIBSUBDIR)/pkgconfig" \
+ INSTALL="$(TOP)/common/install-sh -c" CPPROG="cp -p"
# Environment variable options needed when building
-BUILD_ENV = LD_LIBRARY_PATH="$(PROTODIR)$(X11_SERVERLIBS_DIR)"
+BUILD_ENV = PATH="$(FONT_UTILS_PATH):$$PATH" \
+ LD_LIBRARY_PATH="$(FONT_LIBS_PATH)" \
+ INSTALL="$(TOP)/common/install-sh -c" CPPROG="cp -p"
build_gen: $(SOURCE_DIR)/Makefile
(cd $(SOURCE_DIR) ; $(BUILD_ENV) $(MAKE) $(MFLAGS))
@@ -67,7 +76,7 @@
# Install
install_gen:: $(SOURCE_DIR)/Makefile
(cd $(SOURCE_DIR) ; \
- $(BUILD_ENV) $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) pkgconfigdir=/usr/lib/pkgconfig CPPROG="cp -p" install )
+ $(BUILD_ENV) $(MAKE) $(MFLAGS) -e DESTDIR=$(PROTODIR) pkgconfigdir=/usr/lib/pkgconfig install )
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/adobe-utopia-type1/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,47 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/02/04 SMI
+#
+
+# Package name used in tarballs
+FONT_NAME=font-adobe-utopia-type1
+
+# Version number (used in path names)
+VERSION=1.0.1
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+# Extra configure flags
+FONT_CONFIG_OPTS=
+
+### Include common rulesets
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bh-type1/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,47 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/02/04 SMI
+#
+
+# Package name used in tarballs
+FONT_NAME=font-bh-type1
+
+# Version number (used in path names)
+VERSION=1.0.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+# Extra configure flags
+FONT_CONFIG_OPTS=
+
+### Include common rulesets
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/bitstream-type1/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,48 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/02/04 SMI
+#
+
+# Package name used in tarballs
+FONT_NAME=font-bitstream-type1
+
+# Version number (used in path names)
+VERSION=1.0.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+# Extra configure flags
+FONT_CONFIG_OPTS=
+
+### Include common rulesets
+include ../Makefile.inc
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/ibm-type1/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,47 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/02/04 SMI
+#
+
+# Package name used in tarballs
+FONT_NAME=font-ibm-type1
+
+# Version number (used in path names)
+VERSION=1.0.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+# Extra configure flags
+FONT_CONFIG_OPTS=
+
+### Include common rulesets
+include ../Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/sun-aliases/COPYING Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,29 @@
+The font data files in this directory are covered by the following copyright
+notice & license:
+
+ 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.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/sun-aliases/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,47 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+# No upstream sources for these files, since they're Solaris-specific
+SOURCE_TARBALL_NAME=NONE
+
+### Include common rulesets
+PWD:sh=pwd
+TOP=$(PWD)/../..
+include $(TOP)/common/Makefile.inc
+
+DESTDIR=$(PROTODIR)
+INSTDIR=$(DESTDIR)/$(X11_DIR)/lib/X11/fonts
+
+CP=cp -pf
+
+install_gen::
+ mkdir -p $(INSTDIR)/Type1
+ $(CP) fonts.alias.type1 $(INSTDIR)/Type1/fonts.alias.all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/sun-aliases/fonts.alias.type1 Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,38 @@
+utopia-regular -adobe-utopia-medium-r-normal--0-0-0-0-p-0-iso8859-1
+utopia-italic -adobe-utopia-medium-i-normal--0-0-0-0-p-0-iso8859-1
+utopia-bold -adobe-utopia-bold-r-normal--0-0-0-0-p-0-iso8859-1
+utopia-bolditalic -adobe-utopia-bold-i-normal--0-0-0-0-p-0-iso8859-1
+courier -ibm-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
+courier-8 -ibm-courier-medium-r-normal--8-0-0-0-m-0-iso8859-1
+courier-10 -ibm-courier-medium-r-normal--10-0-0-0-m-0-iso8859-1
+courier-12 -ibm-courier-medium-r-normal--12-0-0-0-m-0-iso8859-1
+courier-14 -ibm-courier-medium-r-normal--14-0-0-0-m-0-iso8859-1
+courier-18 -ibm-courier-medium-r-normal--18-0-0-0-m-0-iso8859-1
+courier-italic -ibm-courier-medium-i-normal--0-0-0-0-m-0-iso8859-1
+courier-italic-8 -ibm-courier-medium-i-normal--8-0-0-0-m-0-iso8859-1
+courier-italic-10 -ibm-courier-medium-i-normal--10-0-0-0-m-0-iso8859-1
+courier-italic-12 -ibm-courier-medium-i-normal--12-0-0-0-m-0-iso8859-1
+courier-italic-14 -ibm-courier-medium-i-normal--14-0-0-0-m-0-iso8859-1
+courier-italic-18 -ibm-courier-medium-i-normal--18-0-0-0-m-0-iso8859-1
+courier-bold -ibm-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
+courier-bold-8 -ibm-courier-bold-r-normal--8-0-0-0-m-0-iso8859-1
+courier-bold-10 -ibm-courier-bold-r-normal--10-0-0-0-m-0-iso8859-1
+courier-bold-12 -ibm-courier-bold-r-normal--12-0-0-0-m-0-iso8859-1
+courier-bold-14 -ibm-courier-bold-r-normal--14-0-0-0-m-0-iso8859-1
+courier-bold-18 -ibm-courier-bold-r-normal--18-0-0-0-m-0-iso8859-1
+courier-bolditalic -ibm-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
+courier-bolditalic-8 -ibm-courier-bold-i-normal--8-0-0-0-m-0-iso8859-1
+courier-bolditalic-10 -ibm-courier-bold-i-normal--10-0-0-0-m-0-iso8859-1
+courier-bolditalic-12 -ibm-courier-bold-i-normal--12-0-0-0-m-0-iso8859-1
+courier-bolditalic-14 -ibm-courier-bold-i-normal--14-0-0-0-m-0-iso8859-1
+courier-bolditalic-18 -ibm-courier-bold-i-normal--18-0-0-0-m-0-iso8859-1
+# Font aliases for backwards compatibility with old F3 font names:
+--courier-medium-r-normal--0-0-0-0-m-0-iso8859-1 -ibm-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
+--courier-medium-o-normal--0-0-0-0-m-0-iso8859-1 -ibm-courier-medium-i-normal--0-0-0-0-m-0-iso8859-1
+--courier-bold-r-normal--0-0-0-0-m-0-iso8859-1 -ibm-courier-bold-r-normal--0-0-0-0-m-0-iso8859-1
+--courier-bold-o-normal--0-0-0-0-m-0-iso8859-1 -ibm-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1
+# Font aliases for backwards compatibility with old Speedo font names:
+-bitstream-charter-medium-r-normal--0-0-0-0-p-0-iso8859-1 "-bitstream-bitstream charter-medium-r-normal--0-0-0-0-p-0-iso8859-1"
+-bitstream-charter-medium-i-normal--0-0-0-0-p-0-iso8859-1 "-bitstream-bitstream charter-medium-i-normal--0-0-0-0-p-0-iso8859-1"
+-bitstream-charter-black-r-normal--0-0-0-0-p-0-iso8859-1 "-bitstream-bitstream charter-bold-r-normal--0-0-0-0-p-0-iso8859-1"
+-bitstream-charter-black-i-normal--0-0-0-0-p-0-iso8859-1 "-bitstream-bitstream charter-bold-i-normal--0-0-0-0-p-0-iso8859-1"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/xfree86-type1/Makefile Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,48 @@
+###############################################################################
+#
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile 1.1 08/02/04 SMI
+#
+
+# Package name used in tarballs
+FONT_NAME=font-xfree86-type1
+
+# Version number (used in path names)
+VERSION=1.0.0
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES=
+
+# Extra configure flags
+FONT_CONFIG_OPTS=
+
+### Include common rulesets
+include ../Makefile.inc
+
--- a/open-src/lib/fontconfig/fontdirs Tue Feb 05 14:35:30 2008 -0800
+++ b/open-src/lib/fontconfig/fontdirs Tue Feb 05 17:31:22 2008 -0800
@@ -1,5 +1,5 @@
/usr/openwin/lib/X11/fonts/TrueType
-/usr/openwin/lib/X11/fonts/Type1
+/usr/X11/lib/X11/fonts/Type1
/usr/openwin/lib/X11/fonts/pcf
/usr/openwin/lib/locale/KOI8-R/X11/fonts/TrueType/
/usr/openwin/lib/locale/ar/X11/fonts/TrueType/
--- a/packages/SUNWxorg-server/prototype_com Tue Feb 05 14:35:30 2008 -0800
+++ b/packages/SUNWxorg-server/prototype_com Tue Feb 05 17:31:22 2008 -0800
@@ -1,6 +1,6 @@
###########################################################################
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# ident "@(#)prototype_com 1.27 07/10/09 SMI"
+# ident "@(#)prototype_com 1.28 08/02/05 SMI"
#
# X.Org Foundation X server for Solaris
@@ -58,7 +58,6 @@
d none X11/lib/X11/fonts 0755 root bin
s none X11/lib/X11/fonts/F3bitmaps=../../../../openwin/lib/X11/fonts/F3bitmaps
s none X11/lib/X11/fonts/TrueType=../../../../openwin/lib/X11/fonts/TrueType
-s none X11/lib/X11/fonts/Type1=../../../../openwin/lib/X11/fonts/Type1
s none X11/lib/X11/fonts/misc=../../../../openwin/lib/X11/fonts/misc
s none X11/lib/X11/fonts/75dpi=../../../../openwin/lib/X11/fonts/75dpi
s none X11/lib/X11/fonts/100dpi=../../../../openwin/lib/X11/fonts/100dpi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWxwcft/copyright.add Tue Feb 05 17:31:22 2008 -0800
@@ -0,0 +1,135 @@
+Fonts in this package are covered under a variety of open source and
+commercial licenses, including, but not limited to the following licenses.
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/Type1:
+ UTBI____.afm UTB_____.afm UTI_____.afm UTRG____.afm
+ UTBI____.pfa UTB_____.pfa UTI_____.pfa UTRG____.pfa
+
+Permission to use, reproduce, display and distribute the listed typefaces
+is hereby granted, provided that the Adobe Copyright notice appears in all
+whole and partial copies of the software and that the following trademark
+symbol and attribution appear in all unmodified copies of the software:
+
+ Copyright (c) 1989 Adobe Systems Incorporated
+ Utopia (R)
+ Utopia is a registered trademark of Adobe Systems Incorporated
+
+The Adobe typefaces (Type 1 font program, bitmaps and Adobe Font Metric
+files) donated are:
+
+ Utopia Regular
+ Utopia Italic
+ Utopia Bold
+ Utopia Bold Italic
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/Type1:
+ c0419bt_.afm c0583bt_.afm c0632bt_.afm c0648bt_.afm
+ c0419bt_.pfb c0583bt_.pfb c0632bt_.pfb c0648bt_.pfb
+ c0582bt_.afm c0611bt_.afm c0633bt_.afm c0649bt_.afm
+ c0582bt_.pfb c0611bt_.pfb c0633bt_.pfb c0649bt_.pfb
+
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA.
+
+You are hereby granted permission under all Bitstream propriety rights
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts
+for any purpose and without restriction; provided, that this notice is
+left intact on all copies of such fonts and that Bitstream's trademark
+is acknowledged as shown below on all unmodified copies of the 4 Charter
+Type 1 fonts.
+
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/Type1:
+ cour.afm courb.afm courbi.afm couri.afm
+ cour.pfa courb.pfa courbi.pfa couri.pfa
+
+IBM Courier - Copyright (c) IBM Corporation 1990, 1991
+
+You are hereby granted permission under the terms of the IBM/MIT X Consortium
+Courier Typefont agreement to execute, reproduce, distribute, display, market,
+sell and otherwise transfer copies of the IBM Courier font to third parties.
+
+The font is provided "AS IS" without charge. NO WARRANTIES OR INDEMNIFICATION
+ARE GIVEN, WHETHER EXPRESS OR IMPLIED INCLUDING, BUT LIMITED TO THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/Type1:
+ cursor.pfa
+
+Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is fur-
+nished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
+NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
+NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the XFree86 Project shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the XFree86
+Project.
+
+------------------------------------------------------------------------------
+For these font files in /usr/X11/lib/X11/fonts/Type1:
+ l047013t.afm l047033t.pfa l048016t.afm l048036t.pfa l049033t.afm
+ l047013t.pfa l047036t.afm l048016t.pfa l049013t.afm l049033t.pfa
+ l047016t.afm l047036t.pfa l048033t.afm l049013t.pfa l049036t.afm
+ l047016t.pfa l048013t.afm l048033t.pfa l049016t.afm l049036t.pfa
+ l047033t.afm l048013t.pfa l048036t.afm l049016t.pfa
+
+Luxi fonts copyright (c) 2001 by Bigelow & Holmes Inc. Luxi font
+instruction code copyright (c) 2001 by URW++ GmbH. All Rights
+Reserved. Luxi is a registered trademark of Bigelow & Holmes Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of these Fonts and associated documentation files (the "Font
+Software"), to deal in the Font Software, including without
+limitation the rights to use, copy, merge, publish, distribute,
+sublicense, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software.
+
+The Font Software may not be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may not
+be modified nor may additional glyphs or characters be added to the
+Fonts. This License becomes null and void when the Fonts or Font
+Software have been modified.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+BIGELOW & HOLMES INC. OR URW++ GMBH. BE LIABLE FOR ANY CLAIM, DAMAGES
+OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT,
+INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR
+INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT
+SOFTWARE.
+
+Except as contained in this notice, the names of Bigelow & Holmes
+Inc. and URW++ GmbH. shall not be used in advertising or otherwise to
+promote the sale, use or other dealings in this Font Software without
+prior written authorization from Bigelow & Holmes Inc. and URW++ GmbH.
+
+For further information, contact:
+
[email protected]
+or
[email protected]
--- a/packages/SUNWxwcft/prototype Tue Feb 05 14:35:30 2008 -0800
+++ b/packages/SUNWxwcft/prototype Tue Feb 05 17:31:22 2008 -0800
@@ -1,5 +1,5 @@
#
-# Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2008 Sun Microsystems, Inc. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
@@ -26,7 +26,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# ident "@(#)prototype 35.16 06/08/21 SMI"
+# ident "@(#)prototype 35.17 08/02/05 SMI"
#
# X Window System common (but not required) fonts
@@ -34,7 +34,7 @@
# postinstall and postremove are obsoleted by fontsdir class
#i postinstall
i postremove
-i copyright=../copyright
+i copyright
i depend
i i.fontsdir
i r.fontsdir
@@ -42,12 +42,17 @@
i r.fontsalias
!HOME=../openwin/lib/X11/fonts
+!X11FONTS=../usr/X11/lib/X11/fonts
+
+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
d none openwin 0755 root bin
d none openwin/lib 0755 root bin
d none openwin/lib/X11 0755 root bin
-
!search $HOME
d none openwin/lib/X11/fonts 0755 root bin
@@ -68,10 +73,10 @@
!search $HOME/Type1
d none openwin/lib/X11/fonts/Type1 0755 root bin
e fontsdir openwin/lib/X11/fonts/Type1/fonts.dir 644 root bin
-f none openwin/lib/X11/fonts/Type1/UTRG____.pfa 0644 root bin
-f none openwin/lib/X11/fonts/Type1/UTB_____.pfa 0644 root bin
-f none openwin/lib/X11/fonts/Type1/UTBI____.pfa 0644 root bin
-f none openwin/lib/X11/fonts/Type1/UTI_____.pfa 0644 root bin
+s none openwin/lib/X11/fonts/Type1/UTRG____.pfa=../../../../../X11/lib/X11/fonts/Type1/UTRG____.pfa
+s none openwin/lib/X11/fonts/Type1/UTB_____.pfa=../../../../../X11/lib/X11/fonts/Type1/UTB_____.pfa
+s none openwin/lib/X11/fonts/Type1/UTBI____.pfa=../../../../../X11/lib/X11/fonts/Type1/UTBI____.pfa
+s none openwin/lib/X11/fonts/Type1/UTI_____.pfa=../../../../../X11/lib/X11/fonts/Type1/UTI_____.pfa
s none openwin/lib/X11/fonts/Type1/cour.pfa=./outline/Courier.pfa
s none openwin/lib/X11/fonts/Type1/courb.pfa=./outline/Courier-Bold.pfa
s none openwin/lib/X11/fonts/Type1/courbi.pfa=./outline/Courier-BoldOblique.pfa
@@ -88,6 +93,80 @@
e fontsalias openwin/lib/X11/fonts/Type1/fonts.alias.all 0644 root bin
f none openwin/lib/X11/fonts/Type1/fonts.scale 0644 root bin
+!search $X11FONTS/Type1
+d none X11/lib/X11/fonts/Type1 0755 root bin
+e fontsdir X11/lib/X11/fonts/Type1/fonts.dir 644 root bin
+e fontsalias X11/lib/X11/fonts/Type1/fonts.alias.all 0644 root bin
+f none X11/lib/X11/fonts/Type1/fonts.scale 0444 root bin
+
+# open-src/font/adobe-utopia-type1
+f none X11/lib/X11/fonts/Type1/UTBI____.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTBI____.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTB_____.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTB_____.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTI_____.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTI_____.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTRG____.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/UTRG____.pfa 0444 root bin
+
+# open-src/font/bitstream-type1
+f none X11/lib/X11/fonts/Type1/c0419bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0419bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0582bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0582bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0583bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0583bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0611bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0611bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0632bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0632bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0633bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0633bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0648bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0648bt_.pfb 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0649bt_.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/c0649bt_.pfb 0444 root bin
+
+# open-src/font/ibm-type1
+f none X11/lib/X11/fonts/Type1/cour.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/cour.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/courb.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/courb.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/courbi.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/courbi.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/couri.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/couri.pfa 0444 root bin
+
+# open-src/font/xfree86-type1
+f none X11/lib/X11/fonts/Type1/cursor.pfa 0444 root bin
+
+# open-src/font/bh-type1
+f none X11/lib/X11/fonts/Type1/l047013t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047013t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047016t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047016t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047033t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047033t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047036t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l047036t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048013t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048013t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048016t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048016t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048033t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048033t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048036t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l048036t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049013t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049013t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049016t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049016t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049033t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049033t.pfa 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049036t.afm 0444 root bin
+f none X11/lib/X11/fonts/Type1/l049036t.pfa 0444 root bin
+
+
!search $HOME/misc
d none openwin/lib/X11/fonts/misc 0755 root bin
e fontsdir openwin/lib/X11/fonts/misc/fonts.dir 0644 root bin
--- a/packages/SUNWxwfnt/prototype_com Tue Feb 05 14:35:30 2008 -0800
+++ b/packages/SUNWxwfnt/prototype_com Tue Feb 05 17:31:22 2008 -0800
@@ -29,7 +29,7 @@
#
###########################################################################
#
-# @(#)prototype_com 35.47 08/01/08 Sun Microsystems
+# @(#)prototype_com 35.48 08/02/05 Sun Microsystems
#
# X Window System required core fonts package
@@ -617,7 +617,6 @@
!search $HOME/lib/X11/fonts/Type1
d none openwin/lib/X11/fonts/Type1 0755 root bin
-e fontsdir openwin/lib/X11/fonts/Type1/fonts.dir 644 root bin
!search $HOME/lib/X11/fonts/Type1/afm
d none openwin/lib/X11/fonts/Type1/afm 0755 root bin
--- a/packages/upgrade-X Tue Feb 05 14:35:30 2008 -0800
+++ b/packages/upgrade-X Tue Feb 05 17:31:22 2008 -0800
@@ -2,7 +2,7 @@
###
#
-# @(#)upgrade-X 1.34 07/11/07
+# @(#)upgrade-X 1.35 08/02/05
#
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
#
@@ -235,6 +235,14 @@
PKGS_32="${PKGS_32} ${PKGS_XORG_MESA}"
fi
+# 6658871 changed /usr/X11/lib/X11/fonts/Type1 from a link in SUNWxorg-server
+# to a directory in SUNWxwcft, need to remove old link before installing
+# directory
+if [ -L /usr/X11/lib/X11/fonts/Type1 ] ; then
+ REM_PKGS="SUNWxorg-server"
+ FORCE_ADD="${FORCE_ADD} SUNWxorg-server"
+fi
+
if [ "$MACH" = "sparc" ]; then
# special for S10 - builds before 34 had separate 64-bit packages
# they were merged into core packages at build 34.