diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index cdb7f59f6ee..7b53056a5bf 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -1,15 +1,43 @@
-# $OpenBSD: Makefile,v 1.1.1.1 1998/11/19 05:09:06 jasoni Exp $
+# $OpenBSD: Makefile,v 1.2 1999/03/31 21:42:11 brad Exp $
 # $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger Exp $
-#
 
-DISTNAME=	freetype-1.1
+DISTNAME=	freetype-1.2
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.physiol.med.tu-muenchen.de/pub/freetype/
+MASTER_SITES=	ftp://ftp.tux.org/pub/devel/freetype/ \
+		ftp://ftp.lerc.nasa.gov/ImageMagick/delegates/ \
+		ftp://ftp.wizards.dupont.com/pub/ImageMagick/delegates/ \
+		ftp://ftp.kddlabs.co.jp/.6/graphics/freetype/ \
+		ftp://ring.aist.go.jp/pub/graphics/freetype/ \
+		ftp://ftp.unina.it/pub/Unix/pkgs/font/freetype/
+
+NEED_VERSION=	1.73
 
 MAINTAINER=	jasoni@openbsd.org
 
-USE_GMAKE=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
+USE_GMAKE=	yes
+SEPARATE_BUILD=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS+= --enable-static --disable-nls
+
+# People that installed an older version of freetype wound up with
+# libttf.a and libttf.so.2 in /usr/local/lib... these files
+# MUST be removed as the version was incorrect (it came from 1.1
+# sources). Check that out here (and bitch if necessary).
+#
+pre-extract:
+	@if [ -f ${LOCALBASE}/lib/libttf.so.2 ]; then \
+	   echo "+-------------------"; \
+	   echo "| ERROR: you MUST remove the existing freetype installation"; \
+	   echo "| before installing this version. To fully remove run"; \
+	   echo "| these commands as user root"; \
+	   echo "|"; \
+	   echo "|      pkg_delete -f `pkg_info -e 'freetype-*'`"; \
+	   echo "|      ldconfig ${LOCALBASE}/lib"; \
+	   echo "|      ldconfig -m ${LOCALBASE}/lib"; \
+	   echo "|"; \
+	   echo "+-------------------"; \
+	   exit 1; \
+	fi
 
 .include <bsd.port.mk>
diff --git a/print/freetype/files/md5 b/print/freetype/files/md5
index 46c20389418..0628798a91a 100644
--- a/print/freetype/files/md5
+++ b/print/freetype/files/md5
@@ -1,3 +1,3 @@
-MD5 (freetype-1.1.tar.gz) = 374f93425968f882215d0433b65069ed
-RMD160 (freetype-1.1.tar.gz) = e1d226f57a1ca9f709e723acca31c0b3c0f8129e
-SHA1 (freetype-1.1.tar.gz) = 15eb7126fc4a54841a2cdc4ad7155cf395b8c103
+MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc
+RMD160 (freetype-1.2.tar.gz) = 32f17b841473a52fc43ea0eecf8eadc180c4a4a6
+SHA1 (freetype-1.2.tar.gz) = f776eef75630f133736944762716c4ff183d06ac
diff --git a/print/freetype/patches/patch-aa b/print/freetype/patches/patch-aa
new file mode 100644
index 00000000000..d66067cd291
--- /dev/null
+++ b/print/freetype/patches/patch-aa
@@ -0,0 +1,11 @@
+--- lib/arch/unix/Makefile.in.orig	Wed Mar 31 16:24:18 1999
++++ lib/arch/unix/Makefile.in	Wed Mar 31 16:24:31 1999
+@@ -178,7 +178,7 @@
+ libttf.la: $(LIB_FILES)
+ 	$(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \
+                                -rpath $(libdir) \
+-                               -version-info $(version_info) $(FT_LIBS)
++                               -version-info 1:2:0 $(FT_LIBS)
+ 
+ install: libttf.la
+ 	$(MKINSTALLDIRS) $(libdir) $(includedir)
diff --git a/print/freetype/patches/patch-ab b/print/freetype/patches/patch-ab
new file mode 100644
index 00000000000..4ae8332bef2
--- /dev/null
+++ b/print/freetype/patches/patch-ab
@@ -0,0 +1,40 @@
+--- ltmain.sh.orig	Wed Mar 31 16:04:27 1999
++++ ltmain.sh	Wed Mar 31 16:04:43 1999
+@@ -2023,37 +2023,6 @@
+       done
+     fi
+ 
+-    echo "------------------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "To link against installed libraries in a given directory, LIBDIR,"
+-    echo "you must use the \`-LLIBDIR' flag during linking."
+-    echo
+-    echo " You will also need to do one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "------------------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
diff --git a/print/freetype/patches/patch-ac b/print/freetype/patches/patch-ac
deleted file mode 100644
index 3daaebcb106..00000000000
--- a/print/freetype/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
---- ltmain.sh.orig	Sat Sep 19 11:12:26 1998
-+++ ltmain.sh	Sat Sep 19 11:19:06 1998
-@@ -967,6 +967,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+	version_vars="$version_vars major versuffix"
-+	major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+	versuffix="$current"
-+	else
-+	versuffix="$current.$revision"
-+	fi
-+	;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig	Sat Sep 19 11:12:21 1998
-+++ ltconfig	Sat Sep 19 11:15:42 1998
-@@ -1123,10 +1123,21 @@
-   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
-   ;;
- 
--freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
-   library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd3*)
-+  version_type=freebsd
-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  fi
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
diff --git a/print/freetype/pkg/PLIST b/print/freetype/pkg/PLIST
index 8071eb1bc6a..8185944f0b5 100644
--- a/print/freetype/pkg/PLIST
+++ b/print/freetype/pkg/PLIST
@@ -16,7 +16,5 @@ include/ftxpost.h
 include/ftxwidth.h
 lib/libttf.a
 lib/libttf.la
-lib/libttf.so
-lib/libttf.so.2
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/libttf.so.1.2
+@exec /sbin/ldconfig -m %B
diff --git a/print/freetype/pkg/PLIST.noshared b/print/freetype/pkg/PLIST.noshared
new file mode 100644
index 00000000000..f38e8eba868
--- /dev/null
+++ b/print/freetype/pkg/PLIST.noshared
@@ -0,0 +1,18 @@
+bin/ftdump
+bin/ftlint
+bin/ftstring
+bin/ftstrpnm
+bin/fttimer
+bin/ftview
+bin/ftzoom
+include/freetype.h
+include/fterrid.h
+include/ftnameid.h
+include/ftxcmap.h
+include/ftxerr18.h
+include/ftxgasp.h
+include/ftxkern.h
+include/ftxpost.h
+include/ftxwidth.h
+lib/libttf.a
+lib/libttf.la