Update py-fonttools to 2.3

TTX/FontTools Version 2.3
* TrueType Collection (TTC) support
* Python 2.6 support
* Update Unicode data to 5.2.0
* Couple of bug fixes

4 files changed, 16 insertions, 25 deletions

diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile
index e47b4373dd2..8580c12d4b8 100644
--- a/fonts/py-fonttools/Makefile
+++ b/fonts/py-fonttools/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/09/23 09:54:45 tron Exp $
+# $NetBSD: Makefile,v 1.18 2011/10/29 11:40:27 obache Exp $
 #
 
-DISTNAME=		fonttools-2.2
+DISTNAME=		fonttools-2.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=		fonts python
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=fonttools/}
@@ -10,10 +10,15 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://fonttools.sourceforge.net/
 COMMENT=		Library for manipulating fonts
 
+DEPENDS+=	${PYPKGPREFIX}-numpy-[0-9]*:../../math/py-numpy
+DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-PYDISTUTILSPKG=		yes
+SUBST_CLASSES+=		fix-mandir
+SUBST_STAGE.fix-mandir=	pre-configure
+SUBST_FILES.fix-mandir=	setup.py
+SUBST_SED.fix-mandir=	-e 's|share/man/man1|${PKGMANDIR}/man1|g'
 
-.include "../../lang/python/extension.mk"
-.include "../../math/py-numpy/buildlink3.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/py-fonttools/PLIST b/fonts/py-fonttools/PLIST
index 455cf199aae..766b20b69ec 100644
--- a/fonts/py-fonttools/PLIST
+++ b/fonts/py-fonttools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:54:15 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/10/29 11:40:27 obache Exp $
 bin/ttx
 ${PYSITELIB}/FontTools.pth
 ${PYSITELIB}/FontTools/fontTools/__init__.py
@@ -263,6 +263,7 @@ ${PYSITELIB}/FontTools/fontTools/ttx.pyo
 ${PYSITELIB}/FontTools/fontTools/unicode.py
 ${PYSITELIB}/FontTools/fontTools/unicode.pyc
 ${PYSITELIB}/FontTools/fontTools/unicode.pyo
+${PYSITELIB}/FontTools/${EGG_FILE}
 ${PYSITELIB}/FontTools/sstruct.py
 ${PYSITELIB}/FontTools/sstruct.pyc
 ${PYSITELIB}/FontTools/sstruct.pyo
diff --git a/fonts/py-fonttools/distinfo b/fonts/py-fonttools/distinfo
index dd1d654f731..4c76c4a42d3 100644
--- a/fonts/py-fonttools/distinfo
+++ b/fonts/py-fonttools/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/07/16 15:11:37 joerg Exp $
+$NetBSD: distinfo,v 1.5 2011/10/29 11:40:27 obache Exp $
 
-SHA1 (fonttools-2.2.tar.gz) = 7f4c63b4c42057a01552f54c392c0e9184e27df0
-RMD160 (fonttools-2.2.tar.gz) = 77aa0498acfe8eed19c02e558bd81afe2ff5f713
-Size (fonttools-2.2.tar.gz) = 336019 bytes
-SHA1 (patch-aa) = d02581b28337ada973b0788db1c267e2bf9d01b8
+SHA1 (fonttools-2.3.tar.gz) = 3d434d6192a1feb6605d67975c1e973e084e86d7
+RMD160 (fonttools-2.3.tar.gz) = df5021ea53b8a7fa016dfd3ff763b1dfaf0d7c4b
+Size (fonttools-2.3.tar.gz) = 348810 bytes
diff --git a/fonts/py-fonttools/patches/patch-aa b/fonts/py-fonttools/patches/patch-aa
deleted file mode 100644
index 4efbfef845f..00000000000
--- a/fonts/py-fonttools/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/07/16 15:11:37 joerg Exp $
-
---- Lib/fontTools/ttLib/tables/ttProgram.py.orig	2009-07-16 17:07:23.000000000 +0200
-+++ Lib/fontTools/ttLib/tables/ttProgram.py
-@@ -394,7 +394,7 @@ if __name__ == "__main__":
- 	
- 	p = Program()
- 	p.fromBytecode(bc)
--	as = p.getAssembly()
--	p.fromAssembly(as)
-+	as_ = p.getAssembly()
-+	p.fromAssembly(as_)
- 	print bc == p.getBytecode()
-