Update to 2.3.4. This is based on the 2.3.3 patch submitted by chinsan.

PR:		111272


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

7 files changed, 184 insertions, 0 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
new file mode 100644
index 000000000..acbf451aa
--- /dev/null
+++ b/print/freetype2/Makefile
@@ -0,0 +1,72 @@
+# New ports collection makefile for:	freetype
+# Date created:		January 24, 1998
+# Whom:			jseger@FreeBSD.org
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	freetype2
+PORTVERSION=	2.3.4
+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_AUTOTOOLS=	libtool:15
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+MAKE_ENV=	TOP=""
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget pkgconfig
+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://lwj-hinet.myweb.hinet.net/ \
+#		ftp://local-distfiles.freebsd.org.cn/pub/china-ports/hamigua/ \
+#		http://bsdchat.com/dist/firefly-cjk-patchset/
+#PATCHFILES+=	cjk-freetype-2.1.10-20051219.patch.gz
+#PATCH_DIST_STRIP+=	-p1
+.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
+.if !defined(WITHOUT_TTF_BYTECODE_ENABLED)
+	@${REINPLACE_CMD} -e '/#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER/s,/\* \(.*\) \*/,\1,; /#define TT_CONFIG_OPTION_UNPATENTED_HINTING/s,^\(.*\),/* \1 \*/,' \
+		${WRKSRC}/include/freetype/config/ftoption.h
+.endif
+
+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..c7e80e867
--- /dev/null
+++ b/print/freetype2/distinfo
@@ -0,0 +1,3 @@
+MD5 (freetype-2.3.4.tar.bz2) = 1a6c59a7723d637c78672e7784da865d
+SHA256 (freetype-2.3.4.tar.bz2) = 7157876cf358d1fb68b890c7da4f7025288a4e7b756af7b01009c5055637c954
+SIZE (freetype-2.3.4.tar.bz2) = 1277929
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
new file mode 100644
index 000000000..87863d444
--- /dev/null
+++ b/print/freetype2/files/patch-aa
@@ -0,0 +1,14 @@
+--- builds/unix/detect.mk.orig	Tue Aug 22 17:53:59 2006
++++ builds/unix/detect.mk	Tue Aug 22 17:54:09 2006
+@@ -78,9 +78,9 @@ ifeq ($(PLATFORM),unix)
+   ifdef must_configure
+     ifneq ($(have_Makefile),)
+       # we are building FT2 not in the src tree
+-	      $(TOP_DIR)/builds/unix/configure $(CFG)
++#	      $(TOP_DIR)/builds/unix/configure $(CFG)
+     else
+-	      cd builds/unix; ./configure $(CFG)
++#	      cd builds/unix; ./configure $(CFG)
+     endif
+   endif
+ 
diff --git a/print/freetype2/files/patch-builds::unix::configure b/print/freetype2/files/patch-builds::unix::configure
new file mode 100644
index 000000000..5f1567fdd
--- /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.4 2006/10/14 08:35:44 marcus 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/pkg-descr b/print/freetype2/pkg-descr
new file mode 100644
index 000000000..57ec2a4c6
--- /dev/null
+++ b/print/freetype2/pkg-descr
@@ -0,0 +1,10 @@
+This includes some tools that are in FreeType 1's contrib directory.
+
+ttf2pfb: Converting TrueType fonts to the Postscript Type 1 format.
+ttf2pk:  A simple conversion tool to bring TrueType quality to the
+         TeX world.
+ttf2bdf: Produce bitmapped fonts from TrueType files for your X11
+         applications.
+ttfbanner: make posters using a TrueType font
+
+WWW: http://freetype.sourceforge.net/
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
new file mode 100644
index 000000000..501381bce
--- /dev/null
+++ b/print/freetype2/pkg-plist
@@ -0,0 +1,55 @@
+bin/freetype-config
+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/ftbitmap.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/ftchapters.h
+include/freetype2/freetype/fterrdef.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftgasp.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftgxval.h
+include/freetype2/freetype/ftgzip.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftincrem.h
+include/freetype2/freetype/ftlcdfil.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/ftotval.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/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/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.la
+lib/libfreetype.so
+lib/libfreetype.so.9
+libdata/pkgconfig/freetype2.pc
+share/aclocal/freetype2.m4
+@dirrm include/freetype2/freetype/config
+@dirrm include/freetype2/freetype
+@dirrm include/freetype2