Add freetype2 after a repo-copy from print/freerype.

Several notes:

o Freetype2 is incompatible at API level with older freetype, therefore
  portname will be freetype2-x.x to allow pkg_* tools correctly handle
  dependencies (I do not use NO_LATEST_LINK, because it is a production-quality
  software, not a beta or such).

o There are no fs namespace conflicts between freetype and freetype2, so they
  both could be installed on the same machine w/o any problems.

5 files changed, 75 insertions, 40 deletions

diff --git a/print/Makefile b/print/Makefile
index 71c042cb98f5..7b4e2e6a5362 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -36,6 +36,7 @@
     SUBDIR += enscript-letterdj
     SUBDIR += enscriptfonts
     SUBDIR += freetype
+    SUBDIR += freetype2
     SUBDIR += ggv
     SUBDIR += ghostscript5
     SUBDIR += ghostscript55
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 8968f09e1b8e..b5f365641b85 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -5,8 +5,8 @@
 # $FreeBSD$
 #
 
-PORTNAME=	freetype
-PORTVERSION=	1.3.1
+PORTNAME=	freetype2
+PORTVERSION=	2.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
@@ -21,15 +21,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jseger@FreeBSD.org
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
+CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
+LIBTOOLFILES=	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
-# Older versions of freetype installed include files in ${PREFIX}/include
-# this is a compatibility hack for now
-
-post-install:
-	${LN} -fs ${PREFIX}/include/freetype/*.h ${PREFIX}/include
+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
index 04a11c403cf4..cc7a461180ed 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1 +1 @@
-MD5 (freetype-1.3.1.tar.gz) = 9a9e7ad00c1ef6dfbf8f8e19ceefb300
+MD5 (freetype-2.0.tar.bz2) = 163bf58fbf30c9e7d64775ea11fe68cd
diff --git a/print/freetype2/files/patch-aa b/print/freetype2/files/patch-aa
new file mode 100644
index 000000000000..5c91eb85f8aa
--- /dev/null
+++ b/print/freetype2/files/patch-aa
@@ -0,0 +1,11 @@
+--- builds/unix/detect.mk	2000/11/09 14:14:15	1.1
++++ builds/unix/detect.mk	2000/11/09 14:14:22
+@@ -62,7 +62,7 @@
+     setup: std_setup
+ 
+     unix-def.mk: $(TOP)/builds/unix/unix-def.in
+-	    cd builds/unix; $(USE_CFLAGS) ./configure $(CFG)
++#	    cd builds/unix; $(USE_CFLAGS) ./configure $(CFG)
+ 
+   endif # test Unix
+ endif   # test PLATFORM
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index 1a8244c7158b..7b5973125d31 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -1,32 +1,55 @@
-include/freetype/freetype.h
-include/freetype/fterrid.h
-include/freetype/ftnameid.h
-include/freetype/ftxcmap.h
-include/freetype/ftxerr18.h
-include/freetype/ftxgasp.h
-include/freetype/ftxgdef.h
-include/freetype/ftxgpos.h
-include/freetype/ftxgsub.h
-include/freetype/ftxkern.h
-include/freetype/ftxopen.h
-include/freetype/ftxpost.h
-include/freetype/ftxsbit.h
-include/freetype/ftxwidth.h
-include/freetype.h
-include/fterrid.h
-include/ftnameid.h
-include/ftxcmap.h
-include/ftxerr18.h
-include/ftxgasp.h
-include/ftxgdef.h
-include/ftxgpos.h
-include/ftxgsub.h
-include/ftxkern.h
-include/ftxopen.h
-include/ftxpost.h
-include/ftxsbit.h
-include/ftxwidth.h
-lib/libttf.a
-lib/libttf.so
-lib/libttf.so.4
-@dirrm include/freetype
+bin/freetype-config
+include/freetype2/freetype/cache/ftcchunk.h
+include/freetype2/freetype/cache/ftcglyph.h
+include/freetype2/freetype/cache/ftcimage.h
+include/freetype2/freetype/cache/ftcmanag.h
+include/freetype2/freetype/cache/ftcsbits.h
+include/freetype2/freetype/cache/ftlru.h
+include/freetype2/freetype/config/ftconfig.h
+include/freetype2/freetype/config/ftmodule.h
+include/freetype2/freetype/config/ftoption.h
+include/freetype2/freetype/freetype.h
+include/freetype2/freetype/ftbbox.h
+include/freetype2/freetype/ftcache.h
+include/freetype2/freetype/fterrors.h
+include/freetype2/freetype/ftglyph.h
+include/freetype2/freetype/ftimage.h
+include/freetype2/freetype/ftlist.h
+include/freetype2/freetype/ftmac.h
+include/freetype2/freetype/ftmm.h
+include/freetype2/freetype/ftmodule.h
+include/freetype2/freetype/ftnames.h
+include/freetype2/freetype/ftoutln.h
+include/freetype2/freetype/ftrender.h
+include/freetype2/freetype/ftsynth.h
+include/freetype2/freetype/ftsystem.h
+include/freetype2/freetype/fttypes.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/ftextend.h
+include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobjs.h
+include/freetype2/freetype/internal/ftstream.h
+include/freetype2/freetype/internal/psaux.h
+include/freetype2/freetype/internal/psnames.h
+include/freetype2/freetype/internal/sfnt.h
+include/freetype2/freetype/internal/t1errors.h
+include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/t2errors.h
+include/freetype2/freetype/internal/t2types.h
+include/freetype2/freetype/internal/tterrors.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
+lib/libfreetype.a
+lib/libfreetype.so
+lib/libfreetype.so.6
+@dirrm include/freetype2/freetype/internal
+@dirrm include/freetype2/freetype/config
+@dirrm include/freetype2/freetype/cache
+@dirrm include/freetype2/freetype
+@dirrm include/freetype2