From accb9f1a747dec77f318dcf0a8ffcacff6167f9b Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Wed, 19 Jul 2000 23:06:26 +0000
Subject: [PATCH] - sort PLIST - remove old pre-extract check

---
 print/freetype/Makefile  | 23 ++---------------------
 print/freetype/pkg/PLIST | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index e94d25a70bd..18fd1e38fca 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2000/07/04 01:33:57 krw Exp $
+# $OpenBSD: Makefile,v 1.13 2000/07/19 23:06:26 brad Exp $
 # $FreeBSD: Makefile,v 1.6 1998/06/21 02:42:33 jseger Exp $
 
 DISTNAME=	freetype-1.3
@@ -24,28 +24,9 @@ CONFIGURE_STYLE= gnu dest
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --disable-nls
 
-# People that installed an older version of freetype wound up with a
-# shared lib with just a major (FreeBSD ELF versioning)... 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 "|"; \
-	   echo "+-------------------"; \
-	   exit 1; \
-	fi
-
 # Older versions of freetype installed include files in ${PREFIX}/include
 # this is a compatibility hack for now.
 post-install:
-	@cd ${PREFIX}/include; ln -fs freetype/*.h .
+	@cd ${PREFIX}/include && ln -fs freetype/*.h .
 
 .include <bsd.port.mk>
diff --git a/print/freetype/pkg/PLIST b/print/freetype/pkg/PLIST
index 4d904ddc4cd..08870623e3b 100644
--- a/print/freetype/pkg/PLIST
+++ b/print/freetype/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2000/06/12 16:42:13 brad Exp $
+@comment $OpenBSD: PLIST,v 1.7 2000/07/19 23:06:27 brad Exp $
 bin/ftdump
 bin/ftlint
 bin/ftstring
@@ -7,6 +7,19 @@ 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/ftxgdef.h
+include/ftxgpos.h
+include/ftxgsub.h
+include/ftxkern.h
+include/ftxopen.h
+include/ftxpost.h
+include/ftxsbit.h
+include/ftxwidth.h
 include/freetype/freetype.h
 include/freetype/fterrid.h
 include/freetype/ftnameid.h
@@ -21,19 +34,6 @@ include/freetype/ftxopen.h
 include/freetype/ftxpost.h
 include/freetype/ftxsbit.h
 include/freetype/ftxwidth.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.la
 %%SHARED%%