Update freetype2 to 2.1.9, and fix Mozilla and Firefox so that they compile

against it.  Since there is no ABI change in 2.1.9, we do not need to
bump the PORTREVISIONs for mozilla and firefox.

PR:		78385
Submitted by:	lesi


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

9 files changed, 241 insertions, 0 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
new file mode 100644
index 000000000..c91c74368
--- /dev/null
+++ b/print/freetype2/Makefile
@@ -0,0 +1,64 @@
+# New ports collection makefile for:	freetype
+# Date created:		January 24, 1998
+# Whom:			jseger@FreeBSD.org
+#
+# $FreeBSD$
+#
+
+PORTNAME=	freetype2
+PORTVERSION=	2.1.9
+CATEGORIES=	print
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
+		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
+		http://www.funet.fi/pub/mirrors/ftp.freetype.org/%SUBDIR%/ \
+		http://ftp.sunet.se/pub/text-processing/freetype/%SUBDIR%/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \
+		ftp://ftp.freetype.org/freetype/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A free and portable TrueType font rendering engine
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+MAKE_ENV=	TOP=""
+INSTALLS_SHLIB=	yes
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnometarget pkgconfig
+USE_REINPLACE=	yes
+LIBTOOLFILES=	builds/unix/configure
+CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
+
+.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
+CFLAGS+=	-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER
+.endif
+
+#.if defined(WITH_CJK)
+#PATCH_SITES+=	http://bsdchat.com/dist/firefly-cjk-patchset/
+#PATCHFILES+=	cjk-patch-freetype2-20041115.diff.gz
+#.endif
+
+pre-everything::
+.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You may want not to compile a bytecode interpreter into the"
+	@${ECHO_MSG} "TrueType driver. Without this you will only compile the code"
+	@${ECHO_MSG} "necessary to load TrueType glyphs without hinting."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Hit Ctrl-C now and use \"make WITHOUT_TTF_BYTECODE_ENABLED=yes\""
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Note that there are important patent issues related to the"
+	@${ECHO_MSG} "use of the interpreter."
+	@${ECHO_MSG}
+.endif
+
+pre-patch:
+	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/builds/unix/install.mk
+
+post-configure:
+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
+
+.include <bsd.port.mk>
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
new file mode 100644
index 000000000..b41567bbf
--- /dev/null
+++ b/print/freetype2/distinfo
@@ -0,0 +1,4 @@
+MD5 (freetype-2.1.9.tar.bz2) = ec1b903e4be5f073caa72458ea58c29c
+SIZE (freetype-2.1.9.tar.bz2) = 992394
+MD5 (cjk-patch-freetype2-20041115.diff.gz) = c1e52458b877a78636a4cdbb97badb11
+SIZE (cjk-patch-freetype2-20041115.diff.gz) = 16052
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
new file mode 100644
index 000000000..6db517ee1
--- /dev/null
+++ b/print/freetype2/files/patch-aa
@@ -0,0 +1,15 @@
+--- builds/unix/detect.mk.orig	Sun Jan  9 21:12:51 2005
++++ builds/unix/detect.mk	Sun Jan  9 21:13:42 2005
+@@ -78,10 +78,10 @@
+   ifneq ($(have_mk),)
+     # we are building FT2 not in the src tree
+     $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
+-	    $(TOP_DIR)/builds/unix/configure $(CFG)
++#	    $(TOP_DIR)/builds/unix/configure $(CFG)
+   else
+     $(BUILD_DIR)/unix-def.mk: $(TOP_DIR)/builds/unix/unix-def.in
+-	    cd builds/unix; ./configure $(CFG)
++#	    cd builds/unix; ./configure $(CFG)
+   endif
+ 
+ endif   # test PLATFORM unix
diff --git a/print/freetype2/files/patch-builds::unix::configure b/print/freetype2/files/patch-builds::unix::configure
new file mode 100644
index 000000000..382c87d41
--- /dev/null
+++ b/print/freetype2/files/patch-builds::unix::configure
@@ -0,0 +1,13 @@
+
+$FreeBSD: ports/print/freetype2/files/patch-builds::unix::configure,v 1.2 2002/06/21 16:42:45 sobomax Exp $
+
+--- builds/unix/configure.orig	Mon Apr 22 19:50:27 2002
++++ builds/unix/configure	Fri Jun 21 15:48:06 2002
+@@ -8654,6 +8654,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/print/freetype2/files/patch-builds::unix::freetype-config.in b/print/freetype2/files/patch-builds::unix::freetype-config.in
new file mode 100644
index 000000000..ca50202de
--- /dev/null
+++ b/print/freetype2/files/patch-builds::unix::freetype-config.in
@@ -0,0 +1,17 @@
+--- builds/unix/freetype-config.in.orig	Sun Jan  9 21:18:15 2005
++++ builds/unix/freetype-config.in	Sun Jan  9 21:18:57 2005
+@@ -105,12 +105,8 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes" ; then
+-  cflags="-I$includedir/freetype2"
+-  if test "$includedir" != "/usr/include" ; then
+-    echo $cflags -I$includedir
+-  else
+-    echo $cflags
+-  fi
++  cflags="-I@includedir@/freetype2 -I@includedir@"
++  echo $cflags
+ fi
+ 
+ if test "$echo_libs" = "yes" ; then
diff --git a/print/freetype2/files/patch-builds::unix::freetype2.in b/print/freetype2/files/patch-builds::unix::freetype2.in
new file mode 100644
index 000000000..3edd50098
--- /dev/null
+++ b/print/freetype2/files/patch-builds::unix::freetype2.in
@@ -0,0 +1,8 @@
+--- builds/unix/freetype2.in.orig	Wed Mar  2 20:22:23 2005
++++ builds/unix/freetype2.in	Wed Mar  2 20:22:53 2005
+@@ -8,4 +8,4 @@
+ Version: @ft_version@
+ Requires:
+ Libs: -L${libdir} -lfreetype @LIBZ@
+-Cflags: -I${includedir}/freetype2
++Cflags: -I${includedir}/freetype2 -I${includedir}
diff --git a/print/freetype2/files/patch-src::truetype::ttgload.c b/print/freetype2/files/patch-src::truetype::ttgload.c
new file mode 100644
index 000000000..3d15d3b8f
--- /dev/null
+++ b/print/freetype2/files/patch-src::truetype::ttgload.c
@@ -0,0 +1,22 @@
+Index: src/truetype/ttgload.c
+===================================================================
+RCS file: /cvsroot/freetype/freetype2/src/truetype/ttgload.c,v
+retrieving revision 1.131
+retrieving revision 1.132
+diff -u -r1.131 -r1.132
+--- src/truetype/ttgload.c	13 Oct 2004 05:15:44 -0000	1.131
++++ src/truetype/ttgload.c	19 Nov 2004 10:35:52 -0000	1.132
+@@ -797,12 +797,10 @@
+     if ( IS_HINTED( load->load_flags ) )
+     {
+       FT_Pos  x = zone->org[n_points-4].x;
+-      FT_Pos  y = zone->org[n_points-2].y;
+ 
+ 
+       x = FT_PIX_ROUND( x ) - x;
+-      y = FT_PIX_ROUND( y ) - y;
+-      translate_array( n_points, zone->org, x, y );
++      translate_array( n_points, zone->org, x, 0 );
+ 
+       org_to_cur( n_points, zone );
+ 
diff --git a/print/freetype2/pkg-descr b/print/freetype2/pkg-descr
new file mode 100644
index 000000000..302f71321
--- /dev/null
+++ b/print/freetype2/pkg-descr
@@ -0,0 +1,9 @@
+The FreeType engine is a free and portable TrueType font rendering
+engine.  It  has been developed to  provide TT support  to a great
+variety of platforms and environments.
+
+Notice that  FreeType is a *library*.   It is *not*  a font server
+for  your preferred environment,  even though  it was  designed to
+allow the design of many font servers.
+
+WWW: http://www.freetype.org/
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
new file mode 100644
index 000000000..788737ad6
--- /dev/null
+++ b/print/freetype2/pkg-plist
@@ -0,0 +1,89 @@
+bin/freetype-config
+include/freetype2/freetype/cache/ftccache.h
+include/freetype2/freetype/cache/ftccmap.h
+include/freetype2/freetype/cache/ftcglyph.h
+include/freetype2/freetype/cache/ftcimage.h
+include/freetype2/freetype/cache/ftcmanag.h
+include/freetype2/freetype/cache/ftcmru.h
+include/freetype2/freetype/cache/ftcsbits.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftheader.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/config/ftstdlib.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftbdf.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/ftchapters.h
+include/freetype2/freetype/fterrdef.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgzip.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftincrem.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftlzw.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodapi.h
+include/freetype2/freetype/ftmoderr.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftpfr.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsizes.h
+include/freetype2/freetype/ftsnames.h
+include/freetype2/freetype/ftstroke.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsysio.h
+include/freetype2/freetype/ftsysmem.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttrigon.h
+include/freetype2/freetype/fttypes.h
+include/freetype2/freetype/ftwinfnt.h
+include/freetype2/freetype/ftxf86.h
+include/freetype2/freetype/internal/autohint.h
+include/freetype2/freetype/internal/ftcalc.h
+include/freetype2/freetype/internal/ftdebug.h
+include/freetype2/freetype/internal/ftdriver.h
+include/freetype2/freetype/internal/ftgloadr.h
+include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobjs.h
+include/freetype2/freetype/internal/ftrfork.h
+include/freetype2/freetype/internal/ftserv.h
+include/freetype2/freetype/internal/ftstream.h
+include/freetype2/freetype/internal/fttrace.h
+include/freetype2/freetype/internal/internal.h
+include/freetype2/freetype/internal/pcftypes.h
+include/freetype2/freetype/internal/psaux.h
+include/freetype2/freetype/internal/pshints.h
+include/freetype2/freetype/internal/sfnt.h
+include/freetype2/freetype/internal/svbdf.h
+include/freetype2/freetype/internal/svgldict.h
+include/freetype2/freetype/internal/svmm.h
+include/freetype2/freetype/internal/svpfr.h
+include/freetype2/freetype/internal/svpostnm.h
+include/freetype2/freetype/internal/svpscmap.h
+include/freetype2/freetype/internal/svpsinfo.h
+include/freetype2/freetype/internal/svsfnt.h
+include/freetype2/freetype/internal/svttcmap.h
+include/freetype2/freetype/internal/svwinfnt.h
+include/freetype2/freetype/internal/svxf86nm.h
+include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/tttypes.h
+include/freetype2/freetype/t1tables.h
+include/freetype2/freetype/ttnameid.h
+include/freetype2/freetype/tttables.h
+include/freetype2/freetype/tttags.h
+include/freetype2/freetype/ttunpat.h
+include/ft2build.h
+lib/libfreetype.a
+lib/libfreetype.so
+lib/libfreetype.so.9
+libdata/pkgconfig/freetype2.pc
+share/aclocal/freetype2.m4
+@dirrm include/freetype2/freetype/internal
+@dirrm include/freetype2/freetype/config
+@dirrm include/freetype2/freetype/cache
+@dirrm include/freetype2/freetype
+@dirrm include/freetype2