diff options
-rw-r--r-- | graphics/freetype-lib/Makefile.common | 8 | ||||
-rw-r--r-- | graphics/freetype-lib/files/md5 | 4 | ||||
-rw-r--r-- | graphics/freetype-lib/files/patch-sum | 5 | ||||
-rw-r--r-- | graphics/freetype-lib/patches/patch-ab | 22 | ||||
-rw-r--r-- | graphics/freetype-lib/patches/patch-ac | 13 | ||||
-rw-r--r-- | graphics/freetype-lib/pkg/PLIST | 28 | ||||
-rw-r--r-- | graphics/freetype-utils/pkg/PLIST | 5 | ||||
-rw-r--r-- | graphics/freetype/Makefile | 4 |
8 files changed, 51 insertions, 38 deletions
diff --git a/graphics/freetype-lib/Makefile.common b/graphics/freetype-lib/Makefile.common index a0c06ef445d..8dbf364336e 100644 --- a/graphics/freetype-lib/Makefile.common +++ b/graphics/freetype-lib/Makefile.common @@ -1,9 +1,11 @@ -# $NetBSD: Makefile.common,v 1.4 2000/06/21 00:46:09 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2000/07/22 08:12:40 jlam Exp $ DISTNAME= freetype-${FT_VERS} -FT_VERS= 1.2 +FT_VERS= 1.3.1 CATEGORIES= graphics textproc -MASTER_SITES= ftp://ftp.freetype.org/pub/freetype/ +MASTER_SITES= http://download.sourceforge.net/freetype/ \ + ftp://freetype.sourceforge.net/pub/freetype/freetype1/ \ + ftp://ftp.freetype.org/pub/freetype/ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.freetype.org/ diff --git a/graphics/freetype-lib/files/md5 b/graphics/freetype-lib/files/md5 index 4335dc01368..bebe0dc4a2b 100644 --- a/graphics/freetype-lib/files/md5 +++ b/graphics/freetype-lib/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.1.1.1 2000/05/01 06:02:24 jlam Exp $ +$NetBSD: md5,v 1.2 2000/07/22 08:12:40 jlam Exp $ -MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc +MD5 (freetype-1.3.1.tar.gz) = 9a9e7ad00c1ef6dfbf8f8e19ceefb300 diff --git a/graphics/freetype-lib/files/patch-sum b/graphics/freetype-lib/files/patch-sum index c2b6e34fce9..ec6d07eaa54 100644 --- a/graphics/freetype-lib/files/patch-sum +++ b/graphics/freetype-lib/files/patch-sum @@ -1,4 +1,5 @@ -$NetBSD: patch-sum,v 1.1.1.1 2000/05/01 06:02:24 jlam Exp $ +$NetBSD: patch-sum,v 1.2 2000/07/22 08:12:40 jlam Exp $ MD5 (patch-aa) = 49ea4d95019032b7ee9db832b954f73a -MD5 (patch-ab) = d0d3ba2c9066e71b377a99d8101d6f44 +MD5 (patch-ab) = e1e041058a61d0db3083ed83eaeeb457 +MD5 (patch-ac) = ab996fb13090b4b4d7168198ae2c9a76 diff --git a/graphics/freetype-lib/patches/patch-ab b/graphics/freetype-lib/patches/patch-ab index 52473d2bd51..796a741ce48 100644 --- a/graphics/freetype-lib/patches/patch-ab +++ b/graphics/freetype-lib/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2000/05/01 06:02:25 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2000/07/22 08:12:40 jlam Exp $ ---- test/arch/unix/Makefile.in.orig Sat Aug 8 18:48:11 1998 -+++ test/arch/unix/Makefile.in Mon May 1 01:30:24 2000 -@@ -57,11 +57,12 @@ +--- test/arch/unix/Makefile.in.orig Mon Jun 28 15:52:08 1999 ++++ test/arch/unix/Makefile.in Sat Jul 22 03:24:26 2000 +@@ -62,11 +62,12 @@ # variables used to compile either with libtool or not # -PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -+PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) $(LDFLAGS) -lttf ++PROCESS = $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) $(LDFLAGS) -lttf -lintl #PROCESS = $(CC) $(FT_CFLAGS) -LIBTTF = $(top_builddir)/lib/libttf.la @@ -17,15 +17,3 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/05/01 06:02:25 jlam Exp $ .c.o: $(CC) -c $(FT_CFLAGS) $< -@@ -97,10 +98,9 @@ - $(PROCESS) -o ftstring ftstring.o $(DISPOBJS) \ - $(EFENCE) $(LIBTTF) $(FT_LIBS) -lX11 - --# ftstrpnm does not need any extra libraries - ftstrpnm: ftstrpnm.o common.o $(LIBTTF) - $(PROCESS) -o ftstrpnm ftstrpnm.o common.o \ -- $(EFENCE) $(LIBTTF) -+ $(EFENCE) $(LIBTTF) -lintl - - fterror: fterror.o common.o $(LIBTTF) - $(PROCESS) -o fterror fterror.o common.o \ diff --git a/graphics/freetype-lib/patches/patch-ac b/graphics/freetype-lib/patches/patch-ac new file mode 100644 index 00000000000..51b4d1f5c9a --- /dev/null +++ b/graphics/freetype-lib/patches/patch-ac @@ -0,0 +1,13 @@ +$NetBSD: patch-ac,v 1.1 2000/07/22 08:12:40 jlam Exp $ + +--- lib/arch/unix/Makefile.in.orig Sat Jul 31 02:48:17 1999 ++++ lib/arch/unix/Makefile.in Sat Jul 22 03:30:08 2000 +@@ -195,7 +195,7 @@ + $(SRC_S) + + libttf.la: $(LIB_FILES) +- $(LIBTOOL) --mode=link $(CC) -o libttf.la $(LIB_FILES) \ ++ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o libttf.la $(LIB_FILES) \ + -rpath $(libdir) \ + -version-info $(version_info) $(FT_LIBS) + diff --git a/graphics/freetype-lib/pkg/PLIST b/graphics/freetype-lib/pkg/PLIST index 1784e4648f2..719ff0e662f 100644 --- a/graphics/freetype-lib/pkg/PLIST +++ b/graphics/freetype-lib/pkg/PLIST @@ -1,18 +1,24 @@ -@comment $NetBSD: PLIST,v 1.2 2000/06/21 00:46:11 jlam Exp $ -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 +@comment $NetBSD: PLIST,v 1.3 2000/07/22 08:12:40 jlam Exp $ +include/freetype/freetype.h +include/freetype/fterrid.h +include/freetype/ftnameid.h +include/freetype/ftxcmap.h +include/freetype/ftxerr18.h +include/freetype/ftxgasp.h +include/freetype/ftxgdef.h +include/freetype/ftxgpos.h +include/freetype/ftxgsub.h +include/freetype/ftxkern.h +include/freetype/ftxopen.h +include/freetype/ftxpost.h +include/freetype/ftxsbit.h +include/freetype/ftxwidth.h lib/libttf.a lib/libttf.la -lib/libttf.so.3.0 +lib/libttf.so.4.0 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 +@dirrm include/freetype diff --git a/graphics/freetype-utils/pkg/PLIST b/graphics/freetype-utils/pkg/PLIST index 7bf96adead9..1aa8757bcc4 100644 --- a/graphics/freetype-utils/pkg/PLIST +++ b/graphics/freetype-utils/pkg/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/05/01 06:03:37 jlam Exp $ +@comment $NetBSD: PLIST,v 1.2 2000/07/22 08:12:40 jlam Exp $ bin/ftdump bin/fterror bin/ftlint +bin/ftmetric +bin/ftsbit bin/ftstring bin/ftstrpnm +bin/ftstrtto bin/fttimer bin/ftview bin/ftzoom diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile index ce37c2115cc..79d2454924a 100644 --- a/graphics/freetype/Makefile +++ b/graphics/freetype/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2000/05/01 06:04:33 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2000/07/22 08:12:39 jlam Exp $ DISTNAME= freetype-${FT_VERS} -FT_VERS= 1.2 +FT_VERS= 1.3.1 CATEGORIES= graphics textproc MASTER_SITES= # DISTFILES= # |