Update to freetype-1.2. Mostly bug and build fixes.

8 files changed, 67 insertions, 83 deletions

diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile
index f102e7914b3..4922ac752c7 100644
--- a/graphics/freetype/Makefile
+++ b/graphics/freetype/Makefile
@@ -1,22 +1,20 @@
-# $NetBSD: Makefile,v 1.7 1999/09/03 17:04:40 kim Exp $
+# $NetBSD: Makefile,v 1.8 1999/10/28 00:38:43 jlam Exp $
 
-DISTNAME=		freetype-1.1.full
-PKGNAME=		freetype-1.1
-CATEGORIES=		textproc
-MASTER_SITES=		ftp://ftp.freetype.org/pub/freetype/old/
+DISTNAME=		freetype-1.2
+CATEGORIES=		graphics textproc
+MASTER_SITES=		ftp://ftp.freetype.org/pub/freetype/
 
 MAINTAINER=		root@garbled.net
 HOMEPAGE=		http://www.freetype.org/
 
 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
-CFLAGS+=		-Wl,-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-locale-dir=${PREFIX}/share/locale
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+
+CPPFLAGS+=		-I${LOCALBASE}/include	# libintl.h
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype/files/md5 b/graphics/freetype/files/md5
index e7303d5a96e..d3f29de89f2 100644
--- a/graphics/freetype/files/md5
+++ b/graphics/freetype/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 1999/03/30 05:00:34 garbled Exp $
+$NetBSD: md5,v 1.2 1999/10/28 00:38:45 jlam Exp $
 
-MD5 (freetype-1.1.full.tar.gz) = fc9bfc35086076bd681461e8da670365
+MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc
diff --git a/graphics/freetype/files/patch-sum b/graphics/freetype/files/patch-sum
index 93ed9529cdc..5dc0ebfd3bf 100644
--- a/graphics/freetype/files/patch-sum
+++ b/graphics/freetype/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.1 1999/09/03 17:04:41 kim Exp $
+$NetBSD: patch-sum,v 1.2 1999/10/28 00:38:45 jlam Exp $
 
-MD5 (patch-aa) = c0b3cb28489d00b46c92314e34d95cc1
-MD5 (patch-ab) = 6bc1e56b8b02934990c501ce3620dcd4
-MD5 (patch-ac) = 53e6e67d2878c557b98a14b8e70e69c9
+MD5 (patch-aa) = 19afec47fc3d365730dc924878c6b8b5
+MD5 (patch-ab) = 849c663ea0c005292ea4975094ff96f9
+MD5 (patch-ac) = 669cce5458e659bdea9cdea687b32874
diff --git a/graphics/freetype/patches/patch-aa b/graphics/freetype/patches/patch-aa
index 56da58fd5f9..597cf2e78a5 100644
--- a/graphics/freetype/patches/patch-aa
+++ b/graphics/freetype/patches/patch-aa
@@ -1,58 +1,20 @@
-$NetBSD: patch-aa,v 1.1 1999/09/03 17:04:41 kim Exp $
+$NetBSD: patch-aa,v 1.2 1999/10/28 00:38:46 jlam Exp $
 
---- configure.orig	Tue Jun  2 11:30:14 1998
-+++ configure	Fri Sep  3 12:29:16 1999
-@@ -970,53 +970,6 @@
+--- configure.orig	Mon Oct 26 15:20:13 1998
++++ configure	Wed Oct 20 21:10:03 1999
+@@ -972,6 +972,7 @@
    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'
++if false; then
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
  
- version_info='2:0:0'
+@@ -1017,6 +1018,7 @@
+ ${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; }
++fi
+ 
+ 
+ freetype_version='1.2.0'
diff --git a/graphics/freetype/patches/patch-ab b/graphics/freetype/patches/patch-ab
index c3b99ca1358..1ff2493823e 100644
--- a/graphics/freetype/patches/patch-ab
+++ b/graphics/freetype/patches/patch-ab
@@ -1,13 +1,27 @@
-$NetBSD: patch-ab,v 1.1 1999/09/03 17:04:42 kim Exp $
+$NetBSD: patch-ab,v 1.2 1999/10/28 00:38:46 jlam 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 @@
- 
+--- lib/arch/unix/Makefile.in.orig	Sat Aug 22 01:19:43 1998
++++ lib/arch/unix/Makefile.in	Wed Oct 20 21:16:12 1999
+@@ -21,7 +21,7 @@
  CC = @CC@
+ CPP = @CPP@
  
 -LIBTOOL = $(top_builddir)/libtool
 +LIBTOOL = @LIBTOOL@
  MKINSTALLDIRS = $(srcdir)/../mkinstalldirs
  
  version_info = @version_info@
+@@ -122,10 +122,11 @@
+ # C flags
+ CFLAGS = @CFLAGS@ @XX_CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+-FT_CFLAGS = $(CFLAGS) $(INCLUDES)
++FT_CFLAGS = $(CFLAGS) $(CPPFLAGS) $(INCLUDES)
+ 
+ # linker flags
+-FT_LIBS = @LIBS@
++LDFLAGS = @LDFLAGS@
++FT_LIBS = $(LDFLAGS) @LIBS@
+ 
+ # i18n stuff
+ LOCALEDIR = @LOCALEDIR@
diff --git a/graphics/freetype/patches/patch-ac b/graphics/freetype/patches/patch-ac
index 1dc63b2c2d7..26d49b849cf 100644
--- a/graphics/freetype/patches/patch-ac
+++ b/graphics/freetype/patches/patch-ac
@@ -1,13 +1,23 @@
-$NetBSD: patch-ac,v 1.1 1999/09/03 17:04:42 kim Exp $
+$NetBSD: patch-ac,v 1.2 1999/10/28 00:38:46 jlam 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@
- 
+--- test/arch/unix/Makefile.in.orig	Sat Aug  8 18:48:11 1998
++++ test/arch/unix/Makefile.in	Wed Oct 20 21:14:51 1999
+@@ -19,7 +19,7 @@
  CC = @CC@
+ CPP = @CPP@
+ 
 -LIBTOOL = $(top_builddir)/libtool
 +LIBTOOL = @LIBTOOL@
  MKINSTALLDIRS = $(srcdir)/../mkinstalldirs
  
  include $(top_builddir)/MakeSub
+@@ -32,7 +32,8 @@
+ CPPFLAGS = @CPPFLAGS@
+ FT_CFLAGS = $(INCDIRS) $(CFLAGS) $(CPPFLAGS) -DX11 -DLOCALEDIR='"@LOCALEDIR@"'
+ 
+-FT_LIBS = @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @LIBS@
++LDFLAGS = @LDFLAGS@
++FT_LIBS = $(LDFLAGS) @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @LIBS@
+ 
+ SRC = $(srcdir)/common.c           \
+       $(srcdir)/ftdump.c           \
diff --git a/graphics/freetype/pkg/COMMENT b/graphics/freetype/pkg/COMMENT
index 0ec18e8b5bb..e46816f0dcf 100644
--- a/graphics/freetype/pkg/COMMENT
+++ b/graphics/freetype/pkg/COMMENT
@@ -1 +1 @@
-a truetype font rendering engine and library API.
+TrueType font rendering engine and library API
diff --git a/graphics/freetype/pkg/PLIST b/graphics/freetype/pkg/PLIST
index 125714d78cf..db9f1c87189 100644
--- a/graphics/freetype/pkg/PLIST
+++ b/graphics/freetype/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/09/03 17:04:42 kim Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/10/28 00:38:47 jlam Exp $
 bin/ftdump
 bin/fterror
 bin/ftlint
@@ -17,7 +17,7 @@ include/ftxkern.h
 include/ftxpost.h
 include/ftxwidth.h
 lib/libttf.a
-lib/libttf.so.2.0
+lib/libttf.so.3.0
 share/locale/cs/LC_MESSAGES/freetype.mo
 share/locale/de/LC_MESSAGES/freetype.mo
 share/locale/es/LC_MESSAGES/freetype.mo