5 files changed, 31 insertions, 32 deletions

diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index 482fffd03066..4bcf2152abeb 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freetype2
-PORTVERSION=	2.0.9
+PORTVERSION=	2.1.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -23,8 +23,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	TOP=""
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	builds/unix/configure
+CONFIGURE_ARGS=	--disable-nls
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 CONFIGURE_WRKSRC=	${WRKSRC}/builds/unix
 
diff --git a/print/freetype2/distinfo b/print/freetype2/distinfo
index d50e998a6ad3..ed3295f9de49 100644
--- a/print/freetype2/distinfo
+++ b/print/freetype2/distinfo
@@ -1 +1 @@
-MD5 (freetype-2.0.9.tar.bz2) = 09bd932beeb5fc483ebb653033aeefca
+MD5 (freetype-2.1.0.tar.bz2) = 27741388b19784be65b963a98c961bc5
diff --git a/print/freetype2/files/patch-builds::unix::configure b/print/freetype2/files/patch-builds::unix::configure
new file mode 100644
index 000000000000..630791c927a7
--- /dev/null
+++ b/print/freetype2/files/patch-builds::unix::configure
@@ -0,0 +1,22 @@
+
+$FreeBSD$
+
+--- builds/unix/configure.orig	Fri Mar 29 09:43:03 2002
++++ builds/unix/configure	Thu May 30 11:13:41 2002
+@@ -1131,7 +1131,7 @@
+ 
+ ac_config_headers="$ac_config_headers ftconfig.h:ftconfig.in"
+ 
+-version_info='8:0:2'
++version_info='9:0:2'
+ 
+ ft_version=`echo $version_info | tr : .`
+ 
+@@ -7732,6 +7732,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::ltmain.sh b/print/freetype2/files/patch-builds::unix::ltmain.sh
index 9921c2ad2dfd..e69de29bb2d1 100644
--- a/print/freetype2/files/patch-builds::unix::ltmain.sh
+++ b/print/freetype2/files/patch-builds::unix::ltmain.sh
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- builds/unix/ltmain.sh	2001/08/27 09:51:26	1.1
-+++ builds/unix/ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/print/freetype2/pkg-plist b/print/freetype2/pkg-plist
index dd153cec08b7..b8fca8adb6a8 100644
--- a/print/freetype2/pkg-plist
+++ b/print/freetype2/pkg-plist
@@ -10,10 +10,12 @@ 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/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/ftimage.h
@@ -37,9 +39,11 @@ 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/ftgloadr.h
 include/freetype2/freetype/internal/ftmemory.h
 include/freetype2/freetype/internal/ftobjs.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