Back to 2.1.5

4 files changed, 23 insertions, 24 deletions

diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index 9d724b14b75..4701e3e7694 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2003/12/18 11:28:42 adam Exp $
+# $NetBSD: Makefile,v 1.24 2003/12/19 13:45:59 adam Exp $
 #
 
-DISTNAME=	freetype-2.1.7
-PKGNAME=	freetype2-2.1.7
+DISTNAME=	freetype-2.1.5
+PKGNAME=	freetype2-2.1.5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.freetype.org/freetype/freetype2/		\
 		ftp://ftp.ntua.gr/mirror/freetype/freetype2/		\
diff --git a/graphics/freetype2/PLIST b/graphics/freetype2/PLIST
index 765795f2f9b..869a28c030f 100644
--- a/graphics/freetype2/PLIST
+++ b/graphics/freetype2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/12/18 11:28:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/12/19 13:45:59 adam Exp $
 bin/freetype-config
 include/freetype2/freetype/cache/ftccache.h
 include/freetype2/freetype/cache/ftccmap.h
@@ -26,8 +26,8 @@ include/freetype2/freetype/ftincrem.h
 include/freetype2/freetype/ftlist.h
 include/freetype2/freetype/ftmac.h
 include/freetype2/freetype/ftmm.h
-include/freetype2/freetype/ftmodapi.h
 include/freetype2/freetype/ftmoderr.h
+include/freetype2/freetype/ftmodule.h
 include/freetype2/freetype/ftoutln.h
 include/freetype2/freetype/ftpfr.h
 include/freetype2/freetype/ftrender.h
@@ -43,31 +43,30 @@ include/freetype2/freetype/fttypes.h
 include/freetype2/freetype/ftwinfnt.h
 include/freetype2/freetype/ftxf86.h
 include/freetype2/freetype/internal/autohint.h
+include/freetype2/freetype/internal/bdftypes.h
+include/freetype2/freetype/internal/cfftypes.h
+include/freetype2/freetype/internal/fnttypes.h
 include/freetype2/freetype/internal/ftcalc.h
+include/freetype2/freetype/internal/ftcore.h
 include/freetype2/freetype/internal/ftdebug.h
 include/freetype2/freetype/internal/ftdriver.h
+include/freetype2/freetype/internal/ftexcept.h
 include/freetype2/freetype/internal/ftgloadr.h
+include/freetype2/freetype/internal/fthash.h
 include/freetype2/freetype/internal/ftmemory.h
+include/freetype2/freetype/internal/ftobject.h
 include/freetype2/freetype/internal/ftobjs.h
-include/freetype2/freetype/internal/ftserv.h
 include/freetype2/freetype/internal/ftstream.h
 include/freetype2/freetype/internal/fttrace.h
 include/freetype2/freetype/internal/internal.h
 include/freetype2/freetype/internal/pcftypes.h
+include/freetype2/freetype/internal/pfr.h
 include/freetype2/freetype/internal/psaux.h
 include/freetype2/freetype/internal/pshints.h
+include/freetype2/freetype/internal/psnames.h
 include/freetype2/freetype/internal/sfnt.h
-include/freetype2/freetype/internal/svbdf.h
-include/freetype2/freetype/internal/svgldict.h
-include/freetype2/freetype/internal/svmm.h
-include/freetype2/freetype/internal/svpfr.h
-include/freetype2/freetype/internal/svpostnm.h
-include/freetype2/freetype/internal/svpscmap.h
-include/freetype2/freetype/internal/svpsinfo.h
-include/freetype2/freetype/internal/svsfnt.h
-include/freetype2/freetype/internal/svwinfnt.h
-include/freetype2/freetype/internal/svxf86nm.h
 include/freetype2/freetype/internal/t1types.h
+include/freetype2/freetype/internal/t42types.h
 include/freetype2/freetype/internal/tttypes.h
 include/freetype2/freetype/t1tables.h
 include/freetype2/freetype/ttnameid.h
@@ -79,7 +78,7 @@ lib/libfreetype.a
 lib/libfreetype.la
 lib/libfreetype.so
 lib/libfreetype.so.9
-lib/libfreetype.so.9.5
+lib/libfreetype.so.9.4
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
diff --git a/graphics/freetype2/distinfo b/graphics/freetype2/distinfo
index 18572adfb86..9447544af8e 100644
--- a/graphics/freetype2/distinfo
+++ b/graphics/freetype2/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2003/12/18 11:28:42 adam Exp $
+$NetBSD: distinfo,v 1.10 2003/12/19 13:46:00 adam Exp $
 
-SHA1 (freetype-2.1.7.tar.bz2) = f7e1534d7248fd144e869b86b97cae449d595dbb
-Size (freetype-2.1.7.tar.bz2) = 930583 bytes
+SHA1 (freetype-2.1.5.tar.bz2) = 4cee0581671928f7e721206ef1d4e9f9d37f0faa
+Size (freetype-2.1.5.tar.bz2) = 850767 bytes
 SHA1 (patch-aa) = 7bcff26021b690e4d789c4760baf820c2dc280a5
-SHA1 (patch-ab) = ee7a3a221a868a08e980415b8a8f6ad72b992a87
+SHA1 (patch-ab) = cb1394b51c2b0eb1a4adf0ebef4b460a1adb20f6
diff --git a/graphics/freetype2/patches/patch-ab b/graphics/freetype2/patches/patch-ab
index 01bc64eec6b..df5dc62b3f7 100644
--- a/graphics/freetype2/patches/patch-ab
+++ b/graphics/freetype2/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2003/12/18 11:28:42 adam Exp $
+$NetBSD: patch-ab,v 1.5 2003/12/19 13:46:00 adam Exp $
 
---- builds/unix/configure.orig	2003-11-09 08:37:12.000000000 +0000
+--- builds/unix/configure.orig	2003-07-26 08:08:14.000000000 +0200
 +++ builds/unix/configure
-@@ -21036,6 +21036,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
+@@ -9388,6 +9388,7 @@ s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
  s,@LIBTOOL@,$LIBTOOL,;t t
  s,@LIBOBJS@,$LIBOBJS,;t t
  s,@LTLIBOBJS@,$LTLIBOBJS,;t t