Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6632594 FreeType move from /usr/sfw to /usr [LSARC/2007/662]
authorAlan Coopersmith <Alan.Coopersmith@Sun.COM>
Wed, 28 Nov 2007 14:20:48 -0800
changeset 255 32600afcc112
parent 254 18ef6fec5fcb
child 256 2926491359f8
6632594 FreeType move from /usr/sfw to /usr [LSARC/2007/662]
open-src/app/Makefile.inc file | annotate | diff | comparison | revisions
open-src/app/mkfontscale/Makefile file | annotate | diff | comparison | revisions
open-src/lib/Makefile.inc file | annotate | diff | comparison | revisions
open-src/lib/fontconfig/Makefile file | annotate | diff | comparison | revisions
open-src/lib/freetype/Makefile file | annotate | diff | comparison | revisions
open-src/lib/libXfont/Makefile file | annotate | diff | comparison | revisions
packages/SUNWfreetype2/prototype file | annotate | diff | comparison | revisions 
--- a/open-src/app/Makefile.inc	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/app/Makefile.inc	Wed Nov 28 14:20:48 2007 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.5	07/05/15
+# @(#)Makefile.inc	1.6	07/11/27
 #
 
 PWD:sh=pwd
@@ -52,7 +52,7 @@
 
 # Environment variable options to GNU autoconf configure script
 CONFIG_ENV = CC=$(CC) CFLAGS="$(PROG_CFLAGS)" LD="$(LD) $(LDFLAGS)" \
-	CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR)" \
+	CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR) $(APP_ADD_CPPFLAGS)" \
 	LDFLAGS="$(PROG_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR) $(APP_ADD_LDFLAGS)" \
 	PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR) \
 	$(APP_CONFIG_ENV)
--- a/open-src/app/mkfontscale/Makefile	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/app/mkfontscale/Makefile	Wed Nov 28 14:20:48 2007 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.2	07/01/31
+# @(#)Makefile	1.3	07/11/27
 #
 
 # Package name used in tarballs
@@ -47,7 +47,14 @@
 SUNTOUCH_MAN_FLAGS= \
  -a '{Availability, SUNWxorg-client-programs} {Interface Stability, Volatile}'
 
+# Need to look in $(PROTODIR) for freetype headers
+APP_ADD_CPPFLAGS=-I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/include/freetype2
+
 # Need to link with libfontenc in server private directory
-APP_ADD_LDFLAGS=-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR)
+# /usr/sfw/lib is left in the runpath as a temporary transition aid until
+# all build & test machines have freetype in /usr/lib
+APP_ADD_LDFLAGS=-L$(PROTODIR)$(X11_SERVERLIBS_DIR)$(ARCHLIBSUBDIR) \
+	-R /usr/sfw/lib$(ARCHLIBSUBDIR) \
+	-L $(PROTODIR)/usr/lib$(LIBSUBDIR) 
 
 include ../Makefile.inc
--- a/open-src/lib/Makefile.inc	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/lib/Makefile.inc	Wed Nov 28 14:20:48 2007 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.6	07/05/25
+# @(#)Makefile.inc	1.7	07/11/27
 #
 
 PWD:sh=pwd
@@ -65,7 +65,7 @@
 THIS_LIB_CFLAGS=$(LIB_CFLAGS) -I$(PROTODIR)/usr/X11/include $(LIB_ADD_CFLAGS)
 
 CONFIG_ENV = CC=$(CC) CFLAGS="$(THIS_LIB_CFLAGS)" LD="$(LD) $(LDFLAGS)" \
-	CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR)" \
+	CPPFLAGS="-I $(PROTODIR)$(X11_INCLUDES_DIR) $(LIB_ADD_CPPFLAGS)" \
 	LDFLAGS="$(LIB_LDFLAGS) -L$(PROTODIR)$(X11_DIR)/lib$(ARCHLIBSUBDIR)" \
 	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" \
--- a/open-src/lib/fontconfig/Makefile	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/lib/fontconfig/Makefile	Wed Nov 28 14:20:48 2007 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.68	07/09/17
+# @(#)Makefile	1.69	07/11/27
 #
 
 # Package name used in tarballs
@@ -66,8 +66,7 @@
 # DOC_PATH= PATH="$(PROTODIR)$(X11_DIR)/bin:$(PROTODIR)$(TOOLS_DIR)/bin:$$PATH"
 
 # Command line options to GNU autoconf configure script
-LIB_ADD_CONFIG_OPTS = --with-expat-includes=/usr/sfw/include \
-    --with-expat-lib=/usr/sfw/lib$(LIBSUBDIR) \
+LIB_ADD_CONFIG_OPTS = \
     --with-confdir=/etc/fonts --with-default-fonts='--font-dirs-go-here--' \
     --with-freetype-config=../freetype-config
 
@@ -83,7 +82,7 @@
 FONTCONFIG_libdir=$(FONTCONFIG_prefix)/usr/lib
 
 # Paths to find libraries
-LIBPATHS = LD_LIBRARY_PATH=$(PROTODIR)/usr/sfw/lib$(LIBSUBDIR) LD_RUN_PATH=/usr/sfw/lib$(LIBSUBDIR) $(DOC_PATH)
+LIBPATHS = LD_LIBRARY_PATH=$(PROTODIR)/usr/lib$(LIBSUBDIR) LD_RUN_PATH=/usr/lib$(LIBSUBDIR) $(DOC_PATH)
 
 include ../Makefile.inc
 
@@ -91,9 +90,9 @@
 FONTCONFIG_SMF_MANIFEST_dir=$(PROTODIR)/var/svc/manifest/application/font
 FONTCONFIG_SMF_MANIFEST=$(FONTCONFIG_SMF_MANIFEST_dir)/fc-cache.xml
 
-$(FONTCONFIG_FT2CFG): $(PROTODIR)/usr/sfw/bin$(LIBSUBDIR)/freetype-config
+$(FONTCONFIG_FT2CFG): $(PROTODIR)/usr/bin$(LIBSUBDIR)/freetype-config
 	-if [ -f $@ ] ; then rm $@ ; fi
-	sed -e 's|-L$$libdir|-L$(PROTODIR)$${exec_prefix}/lib$(LIBSUBDIR) -L$$libdir|' -e 's|^includedir=$${prefix}|includedir=$(PROTODIR)$${prefix}|' $(PROTODIR)/usr/sfw/bin$(LIBSUBDIR)/freetype-config > $@
+	sed -e 's|-L$$libdir|-L$(PROTODIR)$${exec_prefix}/lib$(LIBSUBDIR) -L$$libdir|' -e 's|^includedir=$${prefix}|includedir=$(PROTODIR)$${prefix}|' $(PROTODIR)/usr/bin$(LIBSUBDIR)/freetype-config > $@
 	chmod +x $@
 
 # Run configure script
--- a/open-src/lib/freetype/Makefile	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/lib/freetype/Makefile	Wed Nov 28 14:20:48 2007 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.68	07/08/17
+# @(#)Makefile	1.69	07/11/27
 #
 
 PWD:sh=pwd
@@ -58,19 +58,16 @@
 # Directory created by unpacking source
 SOURCE_DIR=$(BUILD_DIR)/freetype-$(FT_VERS)
 
+# Where to install freetype files
+FT_prefix=/usr
+
 # Command line options to GNU autoconf configure script
-FT_CFG=--enable-shared=yes --enable-static=no --prefix=/usr/sfw \
-	--libdir=/usr/sfw/lib$(LIBSUBDIR) \
-	--bindir=/usr/sfw/bin$(LIBSUBDIR)
+FT_CFG=--enable-shared=yes --enable-static=no --prefix=$(FT_prefix) \
+	--libdir=$(FT_prefix)/lib$(LIBSUBDIR) \
+	--bindir=$(FT_prefix)/bin$(LIBSUBDIR)
 
 # Library built in tree
-FT_LIB=$(FT_DIR)/objs/.libs/libfreetype.so.6.3.8
-
-# Where to install most files
-FT_prefix=$(PROTODIR)/usr/sfw
-
-# Where to install libraries
-FT_libdir=$(FT_prefix)/lib
+FT_LIB=$(SOURCE_DIR)/objs/.libs/libfreetype.so.6.3.8
 
 # What to build
 BUILD_TARGETS=$(GNUMAKE) $(FT_LIB)
@@ -98,11 +95,11 @@
 	(cd $(SOURCE_DIR) ; LD_OPTIONS="$(LIB_LDFLAGS)" $(GNUMAKE) )
 
 install_gen: $(FT_LIB)
-	(cd $(SOURCE_DIR) ; $(GNUMAKE) prefix=$(FT_prefix) libdir=$(FT_libdir)$(ARCHLIBSUBDIR) bindir=$(FT_prefix)/bin$(ARCHLIBSUBDIR) install )
-	mkdir -p $(PROTODIR)/usr/sfw/bin$(ARCHLIBSUBDIR)
+	mkdir -p $(PROTODIR)$(FT_prefix)/bin$(ARCHLIBSUBDIR)
+	(cd $(SOURCE_DIR) ; $(GNUMAKE) prefix=$(PROTODIR)$(FT_prefix) libdir=$(PROTODIR)$(FT_prefix)/lib$(ARCHLIBSUBDIR) bindir=$(PROTODIR)$(FT_prefix)/bin$(ARCHLIBSUBDIR) install )
 
 install_64::
-	-/bin/rm -f $(FT_libdir)/64 $(PROTODIR)/usr/sfw/bin/64
-	ln -s $(FT_libdir)/$(SUBDIR64) $(FT_libdir)/64
-	ln -s $(PROTODIR)/usr/sfw/bin/$(SUBDIR64) $(PROTODIR)/usr/sfw/bin/64
+	-/bin/rm -f $(PROTODIR)$(FT_prefix)/lib/64 $(PROTODIR)$(FT_prefix)/bin/64
+	ln -s $(SUBDIR64) $(PROTODIR)$(FT_prefix)/lib/64
+	ln -s $(SUBDIR64) $(PROTODIR)$(FT_prefix)/bin/64
 
--- a/open-src/lib/libXfont/Makefile	Wed Nov 28 14:19:42 2007 -0800
+++ b/open-src/lib/libXfont/Makefile	Wed Nov 28 14:20:48 2007 -0800
@@ -30,7 +30,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.10	07/09/06
+# @(#)Makefile	1.11	07/11/27
 #
 
 # Package name used in tarballs
@@ -67,11 +67,17 @@
 LIB_ADD_SUBDIR=$(X11_SERVERLIBS_SUBDIR)
 
 # Find freetype & fontenc libraries in private subdir
-LIB_ADD_LD_OPTIONS=-L $(PROTODIR)/usr/sfw/lib$(LIBSUBDIR) \
+# /usr/sfw/lib is left in the runpath as a temporary transition aid until
+# all build & test machines have freetype in /usr/lib
+LIB_ADD_LD_OPTIONS=-L $(PROTODIR)/usr/lib$(LIBSUBDIR) \
+	-R /usr/sfw/lib$(LIBSUBDIR) \
 	-L $(PROTODIR)$(X11_DIR)/lib$(X11_SERVERLIBS_SUBDIR)$(LIBSUBDIR)
 
 # Support font modules like libbitstream.so that libXfont doesn't already know
 LIB_ADD_CFLAGS=-DLOADABLEFONTS
 
+# Need to look in $(PROTODIR) for freetype headers
+LIB_ADD_CPPFLAGS=-I$(PROTODIR)/usr/include -I$(PROTODIR)/usr/include/freetype2
+
 include ../Makefile.inc
 
--- a/packages/SUNWfreetype2/prototype	Wed Nov 28 14:19:42 2007 -0800
+++ b/packages/SUNWfreetype2/prototype	Wed Nov 28 14:20:48 2007 -0800
@@ -1,6 +1,6 @@
 ###########################################################################
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# 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
@@ -29,7 +29,7 @@
 #
 ###########################################################################
 #
-#	@(#)prototype	1.11	07/11/05 SMI
+#	@(#)prototype	1.12	07/11/27 SMI
 #
 #  FreeType 2 package
 
@@ -37,140 +37,151 @@
 i copyright=copyright
 i depend
 
-!HOME=../sfw
+!HOME=../usr
 
+# Backwards compatibility links for old /usr/sfw location
 d none sfw 							0755 root bin
+d none sfw/bin 							0755 root bin
+s none sfw/bin/freetype-config=../../bin/freetype-config
+d none sfw/include 						0755 root bin
+s none sfw/include/ft2build.h=../../include/ft2build.h
+s none sfw/include/freetype2=../../include/freetype2
+d none sfw/lib 							0755 root bin
+s none sfw/lib/libfreetype.so.6=../../lib/libfreetype.so.6
+s none sfw/lib/libfreetype.so=libfreetype.so.6
+d none sfw/lib/$plat_64						0755 root bin
+s none sfw/lib/64=$plat_64
+s none sfw/lib/$plat_64/libfreetype.so.6=../../lib/64/libfreetype.so.6
+s none sfw/lib/$plat_64/libfreetype.so=libfreetype.so.6
 
 !search $HOME/bin
-d none sfw/bin 							0755 root bin
-f none sfw/bin/freetype-config					0755 root bin
+d none bin 							0755 root bin
+f none bin/freetype-config					0755 root bin
 
 !search $HOME/include/
-d none sfw/include 						0755 root bin
-f none sfw/include/ft2build.h					0755 root bin
-d none sfw/include/freetype2					0755 root bin
+d none include 							0755 root bin
+f none include/ft2build.h					0444 root bin
+d none include/freetype2					0755 root bin
 
 !search $HOME/include/freetype2/freetype
-d none sfw/include/freetype2/freetype				0755 root bin
-f none sfw/include/freetype2/freetype/freetype.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftbbox.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftbdf.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftbitmap.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftcache.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftchapters.h		0755 root bin
-f none sfw/include/freetype2/freetype/fterrdef.h		0755 root bin
-f none sfw/include/freetype2/freetype/fterrors.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftglyph.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftgzip.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftimage.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftincrem.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftlist.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftlzw.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftmac.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftmm.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftmodapi.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftmoderr.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftotval.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftoutln.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftpfr.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftrender.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftsizes.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftsnames.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftstroke.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftsynth.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftsysio.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftsysmem.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftsystem.h		0755 root bin
-f none sfw/include/freetype2/freetype/fttrigon.h		0755 root bin
-f none sfw/include/freetype2/freetype/fttypes.h			0755 root bin
-f none sfw/include/freetype2/freetype/ftwinfnt.h		0755 root bin
-f none sfw/include/freetype2/freetype/ftxf86.h			0755 root bin
-f none sfw/include/freetype2/freetype/t1tables.h		0755 root bin
-f none sfw/include/freetype2/freetype/ttnameid.h		0755 root bin
-f none sfw/include/freetype2/freetype/tttables.h		0755 root bin
-f none sfw/include/freetype2/freetype/tttags.h			0755 root bin
-f none sfw/include/freetype2/freetype/ttunpat.h			0755 root bin
+d none include/freetype2/freetype				0755 root bin
+f none include/freetype2/freetype/freetype.h			0444 root bin
+f none include/freetype2/freetype/ftbbox.h			0444 root bin
+f none include/freetype2/freetype/ftbdf.h			0444 root bin
+f none include/freetype2/freetype/ftbitmap.h			0444 root bin
+f none include/freetype2/freetype/ftcache.h			0444 root bin
+f none include/freetype2/freetype/ftchapters.h			0444 root bin
+f none include/freetype2/freetype/fterrdef.h			0444 root bin
+f none include/freetype2/freetype/fterrors.h			0444 root bin
+f none include/freetype2/freetype/ftglyph.h			0444 root bin
+f none include/freetype2/freetype/ftgzip.h			0444 root bin
+f none include/freetype2/freetype/ftimage.h			0444 root bin
+f none include/freetype2/freetype/ftincrem.h			0444 root bin
+f none include/freetype2/freetype/ftlist.h			0444 root bin
+f none include/freetype2/freetype/ftlzw.h			0444 root bin
+f none include/freetype2/freetype/ftmac.h			0444 root bin
+f none include/freetype2/freetype/ftmm.h			0444 root bin
+f none include/freetype2/freetype/ftmodapi.h			0444 root bin
+f none include/freetype2/freetype/ftmoderr.h			0444 root bin
+f none include/freetype2/freetype/ftotval.h			0444 root bin
+f none include/freetype2/freetype/ftoutln.h			0444 root bin
+f none include/freetype2/freetype/ftpfr.h			0444 root bin
+f none include/freetype2/freetype/ftrender.h			0444 root bin
+f none include/freetype2/freetype/ftsizes.h			0444 root bin
+f none include/freetype2/freetype/ftsnames.h			0444 root bin
+f none include/freetype2/freetype/ftstroke.h			0444 root bin
+f none include/freetype2/freetype/ftsynth.h			0444 root bin
+f none include/freetype2/freetype/ftsysio.h			0444 root bin
+f none include/freetype2/freetype/ftsysmem.h			0444 root bin
+f none include/freetype2/freetype/ftsystem.h			0444 root bin
+f none include/freetype2/freetype/fttrigon.h			0444 root bin
+f none include/freetype2/freetype/fttypes.h			0444 root bin
+f none include/freetype2/freetype/ftwinfnt.h			0444 root bin
+f none include/freetype2/freetype/ftxf86.h			0444 root bin
+f none include/freetype2/freetype/t1tables.h			0444 root bin
+f none include/freetype2/freetype/ttnameid.h			0444 root bin
+f none include/freetype2/freetype/tttables.h			0444 root bin
+f none include/freetype2/freetype/tttags.h			0444 root bin
+f none include/freetype2/freetype/ttunpat.h			0444 root bin
 
 !search $HOME/include/freetype2/freetype/cache
-d none sfw/include/freetype2/freetype/cache			0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftccache.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftccmap.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftcglyph.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftcimage.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftcmanag.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftcmru.h		0755 root bin
-f none sfw/include/freetype2/freetype/cache/ftcsbits.h		0755 root bin
+d none include/freetype2/freetype/cache				0755 root bin
+f none include/freetype2/freetype/cache/ftccache.h		0444 root bin
+f none include/freetype2/freetype/cache/ftccmap.h		0444 root bin
+f none include/freetype2/freetype/cache/ftcglyph.h		0444 root bin
+f none include/freetype2/freetype/cache/ftcimage.h		0444 root bin
+f none include/freetype2/freetype/cache/ftcmanag.h		0444 root bin
+f none include/freetype2/freetype/cache/ftcmru.h		0444 root bin
+f none include/freetype2/freetype/cache/ftcsbits.h		0444 root bin
 
 !search $HOME/include/freetype2/freetype/config
-d none sfw/include/freetype2/freetype/config			0755 root bin
-f none sfw/include/freetype2/freetype/config/ftconfig.h		0755 root bin
-f none sfw/include/freetype2/freetype/config/ftheader.h		0755 root bin
-f none sfw/include/freetype2/freetype/config/ftmodule.h		0755 root bin
-f none sfw/include/freetype2/freetype/config/ftoption.h		0755 root bin
-f none sfw/include/freetype2/freetype/config/ftstdlib.h		0755 root bin
+d none include/freetype2/freetype/config			0755 root bin
+f none include/freetype2/freetype/config/ftconfig.h		0444 root bin
+f none include/freetype2/freetype/config/ftheader.h		0444 root bin
+f none include/freetype2/freetype/config/ftmodule.h		0444 root bin
+f none include/freetype2/freetype/config/ftoption.h		0444 root bin
+f none include/freetype2/freetype/config/ftstdlib.h		0444 root bin
 
 !search $HOME/include/freetype2/freetype/internal
-d none sfw/include/freetype2/freetype/internal			0755 root bin
-f none sfw/include/freetype2/freetype/internal/autohint.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftcalc.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftdebug.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftdriver.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftgloadr.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftmemory.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftobjs.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftrfork.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftserv.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftstream.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/fttrace.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/ftvalid.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/internal.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/pcftypes.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/psaux.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/pshints.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/sfnt.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/svbdf.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/svgldict.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svmm.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/svotval.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svpfr.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/svpostnm.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svpscmap.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svpsinfo.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svsfnt.h		0755 root bin
-f none sfw/include/freetype2/freetype/internal/svttcmap.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svwinfnt.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/svxf86nm.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/t1types.h	0755 root bin
-f none sfw/include/freetype2/freetype/internal/tttypes.h	0755 root bin
+d none include/freetype2/freetype/internal			0755 root bin
+f none include/freetype2/freetype/internal/autohint.h		0444 root bin
+f none include/freetype2/freetype/internal/ftcalc.h		0444 root bin
+f none include/freetype2/freetype/internal/ftdebug.h		0444 root bin
+f none include/freetype2/freetype/internal/ftdriver.h		0444 root bin
+f none include/freetype2/freetype/internal/ftgloadr.h		0444 root bin
+f none include/freetype2/freetype/internal/ftmemory.h		0444 root bin
+f none include/freetype2/freetype/internal/ftobjs.h		0444 root bin
+f none include/freetype2/freetype/internal/ftrfork.h		0444 root bin
+f none include/freetype2/freetype/internal/ftserv.h		0444 root bin
+f none include/freetype2/freetype/internal/ftstream.h		0444 root bin
+f none include/freetype2/freetype/internal/fttrace.h		0444 root bin
+f none include/freetype2/freetype/internal/ftvalid.h		0444 root bin
+f none include/freetype2/freetype/internal/internal.h		0444 root bin
+f none include/freetype2/freetype/internal/pcftypes.h		0444 root bin
+f none include/freetype2/freetype/internal/psaux.h		0444 root bin
+f none include/freetype2/freetype/internal/pshints.h		0444 root bin
+f none include/freetype2/freetype/internal/sfnt.h		0444 root bin
+f none include/freetype2/freetype/internal/svbdf.h		0444 root bin
+f none include/freetype2/freetype/internal/svgldict.h		0444 root bin
+f none include/freetype2/freetype/internal/svmm.h		0444 root bin
+f none include/freetype2/freetype/internal/svotval.h		0444 root bin
+f none include/freetype2/freetype/internal/svpfr.h		0444 root bin
+f none include/freetype2/freetype/internal/svpostnm.h		0444 root bin
+f none include/freetype2/freetype/internal/svpscmap.h		0444 root bin
+f none include/freetype2/freetype/internal/svpsinfo.h		0444 root bin
+f none include/freetype2/freetype/internal/svsfnt.h		0444 root bin
+f none include/freetype2/freetype/internal/svttcmap.h		0444 root bin
+f none include/freetype2/freetype/internal/svwinfnt.h		0444 root bin
+f none include/freetype2/freetype/internal/svxf86nm.h		0444 root bin
+f none include/freetype2/freetype/internal/t1types.h		0444 root bin
+f none include/freetype2/freetype/internal/tttypes.h		0444 root bin
 
 !search $HOME/lib
-d none sfw/lib 							0755 root bin
-f none sfw/lib/libfreetype.so.6=$HOME/lib/libfreetype.so.6.3.8	0755 root bin
-s none sfw/lib/libfreetype.so=libfreetype.so.6
+d none lib 							0755 root bin
+f none lib/libfreetype.so.6=$HOME/lib/libfreetype.so.6.3.8	0755 root bin
+s none lib/libfreetype.so=libfreetype.so.6
 
-d none sfw/share 						0755 root bin
+d none share 							0755 root bin
 
 !search $HOME/share/aclocal
-d none sfw/share/aclocal					0755 root bin
-f none sfw/share/aclocal/freetype2.m4				0755 root bin
+d none share/aclocal						0755 root bin
+f none share/aclocal/freetype2.m4				0444 root bin
 
 !search $HOME/lib/pkgconfig
-d none lib	 						0755 root bin
-d none lib/pkgconfig 						0755 root other 
-f none lib/pkgconfig/freetype2.pc				0644 root bin
+d none lib/pkgconfig 						0755 root other
+f none lib/pkgconfig/freetype2.pc				0444 root bin
 
 #  FreeType 2 64-bit libraries 
 
 !search $HOME/lib/$plat_64
-d none sfw/lib/$plat_64						0755 root bin
-s none sfw/lib/64=$plat_64
-f none sfw/lib/$plat_64/libfreetype.so.6=$HOME/lib/$plat_64/libfreetype.so.6.3.8	0755 root bin
-s none sfw/lib/$plat_64/libfreetype.so=libfreetype.so.6
+d none lib/$plat_64						0444 root bin
+s none lib/64=$plat_64
+f none lib/$plat_64/libfreetype.so.6=$HOME/lib/$plat_64/libfreetype.so.6.3.8	0755 root bin
+s none lib/$plat_64/libfreetype.so=libfreetype.so.6
 
 !search $HOME/lib/$plat_64/pkgconfig
-d none lib/$plat_64						0755 root bin
-d none lib/$plat_64/pkgconfig					0755 root other 
-f none lib/$plat_64/pkgconfig/freetype2.pc			0644 root bin
+d none lib/$plat_64/pkgconfig					0755 root other
+f none lib/$plat_64/pkgconfig/freetype2.pc			0444 root bin
upstream/oracle/x-cons/x-s11-update-clone