--- a/make_release_packages Thu Feb 26 14:59:34 2009 -0800
+++ b/make_release_packages Thu Feb 26 16:41:41 2009 -0800
@@ -27,7 +27,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)make_release_packages 1.67 09/02/12
+# @(#)make_release_packages 1.68 09/02/26
#
# Create and fill a package staging area for X
#
@@ -55,6 +55,7 @@
# List of official (deliverable) X-window packages for all platforms
XW_PACKAGE_LIST="SUNWfontconfig SUNWfontconfig-docs SUNWfontconfig-root
+ SUNWttf-google-droid
SUNWpciaccess SUNWpixman SUNWfreetype2 SUNWvncviewer SUNWxcursor-themes
SUNWxorg-cfg SUNWxorg-client-docs SUNWxorg-client-programs
SUNWxorg-clientlibs SUNWxorg-compatlinks SUNWxorg-devel-docs
--- a/open-src/font/Makefile Thu Feb 26 14:59:34 2009 -0800
+++ b/open-src/font/Makefile Thu Feb 26 16:41:41 2009 -0800
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 08/10/06
+# @(#)Makefile 1.10 09/02/26
#
###############################################################################
@@ -40,6 +40,7 @@
sun-aliases \
bitstream-vera \
deja-vu \
+ google-droid \
liberation \
util \
adobe-75dpi \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/font/google-droid/Makefile Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,98 @@
+###############################################################################
+#
+# Droid Fonts Makefile
+#
+# Copyright 2009 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 09/02/26 SMI
+#
+
+# Package name used in tarballs
+MODULE_NAME=google-droid-fonts
+
+# Version number (used in path names)
+MODULE_VERSION=1.00
+
+# Source tarball
+SOURCE_TARBALL_NAME=$(MODULE_NAME)-$(MODULE_VERSION).tar.gz
+SOURCE_TARBALL_NAME_SET=yes
+
+# Directory created when unpacking tarball
+SOURCE_DIRNAME=base
+SOURCE_DIRNAME_SET=yes
+
+# Download site for source
+SOURCE_URL='http://android.git.kernel.org/?p=platform/frameworks/base.git;a=snapshot;h=b2fdf4096d6f8fc4aaca49bd804f480ba7892856;sf=tgz'
+SOURCE_URL_SET=yes
+SOURCE_UNCOMPRESS=gzcat
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES= # None
+
+# What to build
+BUILD_TARGETS=$(SOURCE_DIR)/fonts.scale
+BUILD_TARGETS_SET=yes
+
+# What to install
+INSTALL_TARGETS=install_droid
+INSTALL_TARGETS_SET=yes
+
+# License file
+LICENSE_FILE=NOTICE
+LICENSE_FILE_SET=yes
+
+### Include common rulesets
+include ../Makefile.inc
+
+### Rules specific to this directory:
+
+DROID_FONT_FILES= \
+ DroidSans.ttf \
+ DroidSans-Bold.ttf \
+ DroidSerif-Regular.ttf \
+ DroidSerif-Bold.ttf \
+ DroidSerif-Italic.ttf \
+ DroidSerif-BoldItalic.ttf \
+ DroidSansMono.ttf \
+ DroidSansFallback.ttf
+
+$(SOURCE_DIR)/fonts.scale: $(UNPACK_TARGET)
+ (cd $(SOURCE_DIR) && $(MKFONTSCALE) . )
+
+FONT_DEST_DIR=$(PROTODIR)$(X11_FONT_DIR)/TrueType/google-droid
+
+install_droid:: $(BUILD_TARGETS)
+ -rm -rf $(FONT_DEST_DIR)
+ mkdir -p $(FONT_DEST_DIR)
+ ( cd $(SOURCE_DIR) ; cp -p $(DROID_FONT_FILES) $(FONT_DEST_DIR)/ )
+ $(MKFONTSCALE) $(FONT_DEST_DIR)
+ $(MKFONTDIR) $(FONT_DEST_DIR)
+
+
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWttf-google-droid/copyright.add Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,6 @@
+--------------------------------------------------------------------
+
+Files from the font/google-droid package are covered by the following notice:
+
+include font/google-droid/COPYING
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWttf-google-droid/pkginfo.tmpl Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,47 @@
+#########################################################################
+#
+# 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.
+#
+##########################################################################
+
+PKG="SUNWttf-google-droid"
+NAME="Droid font family from Google's Android project"
+ARCH="all"
+VERSION=0.2,REV=0.2007.04.24
+CATEGORY="system"
+DESC="True Type fonts designed by Ascender Corp for the Android mobile platform from Google"
+BASEDIR="/usr"
+VENDOR="Sun Microsystems, Inc."
+EMAIL=""
+MAXINST="1000"
+HOTLINE="Please contact your local service provider"
+SUNW_PRODNAME="X.Org Foundation X11 for Solaris"
+SUNW_PKGVERS=1.0
+SUNW_PRODVERS=1.0
+SUNW_PKGTYPE=usr
+CLASSES=none
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWttf-google-droid/postinstall.tmpl Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,39 @@
+###########################################################################
+#
+# 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.
+#
+###########################################################################
+
+# These symlinks cannot be put into packages directly, or even with installf,
+# since pkgadd/pkgmk/pkgrm can't handle files with = in their pathname.
+
+include fontcatlink
+
+make_font_catalogue_link TrueType/google-droid google-droid:pri=42
+
+exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWttf-google-droid/postremove Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,39 @@
+###########################################################################
+#
+# 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.
+#
+###########################################################################
+
+# These symlinks cannot be put into packages directly, or even with installf,
+# since pkgadd/pkgmk/pkgrm can't handle files with = in their pathname.
+
+FONTPATHDIR=${BASEDIR}/../etc/X11/fontpath.d
+
+rm -f ${FONTPATHDIR}/google-droid:pri=42
+
+exit 0
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/SUNWttf-google-droid/prototype Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,60 @@
+###########################################################################
+#
+# 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.
+#
+###########################################################################
+#
+# Google Droid fonts package
+
+i copyright
+i depend=../common_files/depend.font
+i pkginfo
+i postinstall
+i postremove
+
+!HOME=../usr
+!DROID_FONT_DIR=X11/lib/X11/fonts/TrueType/google-droid
+
+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 X11/lib/X11/fonts/TrueType 0755 root bin
+
+!search $HOME/X11/lib/X11/fonts/TrueType/google-droid
+d none X11/lib/X11/fonts/TrueType/google-droid 0755 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/fonts.dir 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/fonts.scale 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSans-Bold.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSans.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSansFallback.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSansMono.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSerif-Bold.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSerif-BoldItalic.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSerif-Italic.ttf 0444 root bin
+f none X11/lib/X11/fonts/TrueType/google-droid/DroidSerif-Regular.ttf 0444 root bin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/packages/common_files/depend.font Thu Feb 26 16:41:41 2009 -0800
@@ -0,0 +1,63 @@
+###########################################################################
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+###########################################################################
+#
+# ident "@(#)depend.font 1.1 09/02/26"
+#
+# 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>
+# ...
+#
+
+# Generic depend file for packages containing only font files
+
+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 SUNWcslr Core Solaris Libraries (Root)
+P SUNWxwfsw X Window System platform required font software
--- a/packages/upgrade-X Thu Feb 26 14:59:34 2009 -0800
+++ b/packages/upgrade-X Thu Feb 26 16:41:41 2009 -0800
@@ -2,7 +2,7 @@
###
#
-# @(#)upgrade-X 1.48 09/02/26
+# @(#)upgrade-X 1.49 09/02/26
#
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
#
@@ -170,6 +170,7 @@
SUNWfontconfig-docs
SUNWpciaccess
SUNWpixman
+ SUNWttf-google-droid
SUNWvncviewer
SUNWxcursor-themes
SUNWxorg-cfg