Update freetype2 to 2.2.1, and fix various ports to allow compilation with

the new version.  Please test heavily.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7159 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 178 insertions, 0 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
new file mode 100644
index 000000000..626a501c1
--- /dev/null
+++ b/x11-fonts/fontconfig/Makefile
@@ -0,0 +1,86 @@
+# New ports collection makefile for:	fontconfig
+# Date created:		06 October 2002
+# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.3 2005/08/26 04:03:55 marcus Exp $
+#
+
+PORTNAME=	fontconfig
+PORTVERSION=	2.3.2
+PORTREVISION?=	6
+PORTEPOCH?=	1
+CATEGORIES=	x11-fonts
+MASTER_SITES=	http://fontconfig.org/release/
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An XML-based font configuration API for X Windows
+
+PATCH_SITES+=	http://www.freetype.org/freetype2/patches/
+PATCHFILES+=	fontconfig-2.3.2-noftinternals.patch
+PATCH_DIST_STRIP+=	-p1
+
+.if !defined(REFERENCE_PORT)
+
+LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
+		expat.6:${PORTSDIR}/textproc/expat2
+
+USE_GMAKE=	yes
+PREFIX?=	${X11BASE}
+INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack gnometarget pkgconfig
+CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
+		--with-expat-includes=${LOCALBASE}/include \
+		--with-expat-lib=${LOCALBASE}/lib \
+		--with-default-fonts=${X11BASE}/lib/X11/fonts \
+		--without-add-fonts \
+		--disable-docs
+CONFIGURE_ENV=	HASDOCBOOK=no
+MAKE_ENV=	LC_ALL=C
+PKGINSTALL=	${WRKDIR}/pkg-install
+PKGDEINSTALL=	${PKGINSTALL}
+
+MAN1=		fc-match.1
+MAN5=		fonts-conf.5
+PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_CJK)
+PATCH_SITES+=	http://lwj-hinet.myweb.hinet.net/ \
+		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
+		http://bsdchat.com/dist/firefly-cjk-patchset/
+PATCHFILES+=	cjk-fontconfig-2.3.2-20051217.patch.gz
+PATCH_DIST_STRIP+=	-p1
+.endif
+
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+.endif
+	${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
+	if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
+		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
+		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
+	else \
+		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
+	fi
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
+		s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
+		> ${PKGINSTALL}
+.if !defined(PACKAGE_BUILDING)
+	@${LDCONFIG} -m ${PREFIX}/lib
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.endif
+
+.include <bsd.port.post.mk>
+
+.endif
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
new file mode 100644
index 000000000..0cc28db87
--- /dev/null
+++ b/x11-fonts/fontconfig/distinfo
@@ -0,0 +1,6 @@
+MD5 (fontconfig-2.3.2.tar.gz) = 7354f9f125ea78a8f2851cb9c31d4866
+SHA256 (fontconfig-2.3.2.tar.gz) = 6f7b91d328d6408c097ec11777bf4b1c2c710613b573b399794bc5999ff12227
+SIZE (fontconfig-2.3.2.tar.gz) = 964045
+MD5 (fontconfig-2.3.2-noftinternals.patch) = 92cad1f7eef3edc6a34a2fd5cbbf352a
+SHA256 (fontconfig-2.3.2-noftinternals.patch) = f1b41d3438acf7624c3df767111817dfdea283e418c16b3c74d25768e6d2fedd
+SIZE (fontconfig-2.3.2-noftinternals.patch) = 18275
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
new file mode 100644
index 000000000..1a310350f
--- /dev/null
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -0,0 +1,32 @@
+--- Makefile.in.orig	Wed Jul 27 02:23:03 2005
++++ Makefile.in	Wed Jul 27 02:25:27 2005
+@@ -721,28 +721,7 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(configdir)
+-	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
+-	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
+-	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+-	fi
+-	if [ -f $(srcdir)/fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+-	else if [ -f fonts.conf ]; then \
+-	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
+-	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+-	fi; fi
+-	if $(RUN_FC_CACHE_TEST); then \
+-	    echo " fc-cache/fc-cache -f -v"; \
+-	    fc-cache/fc-cache -f -v; \
+-	else \
+-	    echo "***"; \
+-	    echo "*** Warning: fonts.cache not built"; \
+-	    echo "***"; \
+-	    echo "*** Generate this file manually on host system using fc-cache"; \
+-	    echo "***"; \
+-	fi
++
+ 
+ uninstall-local:
+ 	if [ -f $(srcdir)/fonts.conf ]; then \
diff --git a/x11-fonts/fontconfig/files/pkg-install.in b/x11-fonts/fontconfig/files/pkg-install.in
new file mode 100644
index 000000000..dcf6ebbe1
--- /dev/null
+++ b/x11-fonts/fontconfig/files/pkg-install.in
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin:%%PREFIX%%/bin
+export PATH
+
+if [ "$2" = "POST-INSTALL" ]; then
+    echo "Running fc-cache to build fontconfig cache..."
+    fc-cache -f -v
+elif [ "$2" = "DEINSTALL" ]; then
+    find %%PREFIX%%/lib/X11/fonts/ -name fonts.cache-1 -delete
+    find %%X11BASE%%/lib/X11/fonts/ -name fonts.cache-1 -delete
+fi
diff --git a/x11-fonts/fontconfig/pkg-descr b/x11-fonts/fontconfig/pkg-descr
new file mode 100644
index 000000000..7595ac232
--- /dev/null
+++ b/x11-fonts/fontconfig/pkg-descr
@@ -0,0 +1,18 @@
+Fontconfig does the following:
+
+    * discover new fonts when installed automatically, removing a common source 
+      of configuration problems.
+    * perform font name substitution, so that appropriate alternative fonts can 
+      be selected if fonts are missing.
+    * identify the set of fonts required to completely cover a set of languages.
+    * have GUI configuration tools built as it uses an XML-based configuration 
+      file (though with autodiscovery, we believe this need is minimized).
+    * efficiently and quickly find the fonts you need among the set of fonts 
+      you have installed, even if you have installed thousands of fonts, while 
+      minimzing memory usage.
+    * be used in concert with the X Render Extension and FreeType to implement 
+      high quality, anti-aliased and subpixel rendered text on a display.
+
+-- keithp
+
+WWW: http://fontconfig.org/
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
new file mode 100644
index 000000000..18587b6cd
--- /dev/null
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -0,0 +1,24 @@
+bin/fc-cache
+bin/fc-list
+bin/fc-match
+etc/fonts/conf.d/autohint.conf
+etc/fonts/conf.d/no-bitmaps.conf
+etc/fonts/conf.d/no-sub-pixel.conf
+etc/fonts/conf.d/sub-pixel.conf
+etc/fonts/conf.d/unhinted.conf
+etc/fonts/conf.d/yes-bitmaps.conf
+@unexec if cmp -s %D/etc/fonts/fonts.conf %D/etc/fonts/fonts.conf.default; then rm -f %D/etc/fonts/fonts.conf; fi
+etc/fonts/fonts.conf.default
+@exec [ -f %B/fonts.conf ] || cp %B/%f %B/fonts.conf
+etc/fonts/fonts.dtd
+include/fontconfig/fcfreetype.h
+include/fontconfig/fcprivate.h
+include/fontconfig/fontconfig.h
+lib/libfontconfig.a
+lib/libfontconfig.la
+lib/libfontconfig.so
+lib/libfontconfig.so.1
+libdata/pkgconfig/fontconfig.pc
+@dirrm include/fontconfig
+@dirrmtry etc/fonts/conf.d
+@dirrmtry etc/fonts