USE_LIBTOOL=yes so this now works on a.out too.

6 files changed, 106 insertions, 16 deletions

diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile
index bd827f947e8..f102e7914b3 100644
--- a/graphics/freetype/Makefile
+++ b/graphics/freetype/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 1999/07/20 01:12:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 1999/09/03 17:04:40 kim Exp $
 
 DISTNAME=		freetype-1.1.full
 PKGNAME=		freetype-1.1
@@ -13,6 +13,7 @@ DEPENDS+=		gettext-0.10.35:../../devel/gettext
 WRKSRC=			${WRKDIR}/${PKGNAME}
 
 USE_X11=		yes
+USE_LIBTOOL=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-locale-dir=${PREFIX}/share/locale
diff --git a/graphics/freetype/files/patch-sum b/graphics/freetype/files/patch-sum
new file mode 100644
index 00000000000..93ed9529cdc
--- /dev/null
+++ b/graphics/freetype/files/patch-sum
@@ -0,0 +1,5 @@
+$NetBSD: patch-sum,v 1.1 1999/09/03 17:04:41 kim Exp $
+
+MD5 (patch-aa) = c0b3cb28489d00b46c92314e34d95cc1
+MD5 (patch-ab) = 6bc1e56b8b02934990c501ce3620dcd4
+MD5 (patch-ac) = 53e6e67d2878c557b98a14b8e70e69c9
diff --git a/graphics/freetype/patches/patch-aa b/graphics/freetype/patches/patch-aa
new file mode 100644
index 00000000000..56da58fd5f9
--- /dev/null
+++ b/graphics/freetype/patches/patch-aa
@@ -0,0 +1,58 @@
+$NetBSD: patch-aa,v 1.1 1999/09/03 17:04:41 kim Exp $
+
+--- configure.orig	Tue Jun  2 11:30:14 1998
++++ configure	Fri Sep  3 12:29:16 1999
+@@ -970,53 +970,6 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags=
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$host" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 990 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  CFLAGS="$CFLAGS -belf"
+-  ;;
+-esac
+-
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
+-
+ freetype_version='1.1.0'
+ 
+ version_info='2:0:0'
diff --git a/graphics/freetype/patches/patch-ab b/graphics/freetype/patches/patch-ab
new file mode 100644
index 00000000000..c3b99ca1358
--- /dev/null
+++ b/graphics/freetype/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 1999/09/03 17:04:42 kim Exp $
+
+--- lib/arch/unix/Makefile.in.orig	Fri Jun  5 05:42:20 1998
++++ lib/arch/unix/Makefile.in	Fri Sep  3 12:36:20 1999
+@@ -20,7 +20,7 @@
+ 
+ CC = @CC@
+ 
+-LIBTOOL = $(top_builddir)/libtool
++LIBTOOL = @LIBTOOL@
+ MKINSTALLDIRS = $(srcdir)/../mkinstalldirs
+ 
+ version_info = @version_info@
diff --git a/graphics/freetype/patches/patch-ac b/graphics/freetype/patches/patch-ac
new file mode 100644
index 00000000000..1dc63b2c2d7
--- /dev/null
+++ b/graphics/freetype/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1999/09/03 17:04:42 kim Exp $
+
+--- test/arch/unix/Makefile.in.orig	Mon Jun  1 17:59:05 1998
++++ test/arch/unix/Makefile.in	Fri Sep  3 12:46:05 1999
+@@ -17,7 +17,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ 
+ CC = @CC@
+-LIBTOOL = $(top_builddir)/libtool
++LIBTOOL = @LIBTOOL@
+ MKINSTALLDIRS = $(srcdir)/../mkinstalldirs
+ 
+ include $(top_builddir)/MakeSub
diff --git a/graphics/freetype/pkg/PLIST b/graphics/freetype/pkg/PLIST
index c487eeaa7cc..125714d78cf 100644
--- a/graphics/freetype/pkg/PLIST
+++ b/graphics/freetype/pkg/PLIST
@@ -1,25 +1,25 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/03/30 05:00:34 garbled Exp $
-bin/ftview
-bin/fttimer
-bin/ftlint
+@comment $NetBSD: PLIST,v 1.2 1999/09/03 17:04:42 kim Exp $
 bin/ftdump
-bin/ftzoom
+bin/fterror
+bin/ftlint
 bin/ftstring
 bin/ftstrpnm
-bin/fterror
-share/locale/de/LC_MESSAGES/freetype.mo
-share/locale/fr/LC_MESSAGES/freetype.mo
-share/locale/es/LC_MESSAGES/freetype.mo
-share/locale/nl/LC_MESSAGES/freetype.mo
-share/locale/cs/LC_MESSAGES/freetype.mo
+bin/fttimer
+bin/ftview
+bin/ftzoom
 include/freetype.h
 include/fterrid.h
 include/ftnameid.h
-include/ftxkern.h
-include/ftxgasp.h
 include/ftxcmap.h
+include/ftxerr18.h
+include/ftxgasp.h
+include/ftxkern.h
 include/ftxpost.h
 include/ftxwidth.h
-include/ftxerr18.h
+lib/libttf.a
 lib/libttf.so.2.0
-lib/libttf.la
+share/locale/cs/LC_MESSAGES/freetype.mo
+share/locale/de/LC_MESSAGES/freetype.mo
+share/locale/es/LC_MESSAGES/freetype.mo
+share/locale/fr/LC_MESSAGES/freetype.mo
+share/locale/nl/LC_MESSAGES/freetype.mo