diff options
author | wiz <wiz@pkgsrc.org> | 2016-08-28 15:48:28 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2016-08-28 15:48:28 +0000 |
commit | 054e54170c92b1162f347df79f822f33a642508c (patch) | |
tree | 7a5f961fd7465a18423b1e92a6abb26f9ca019c9 /fonts | |
parent | 10f62c9ce476436b884ca371b3081cf27ae5aee8 (diff) | |
download | pkgsrc-054e54170c92b1162f347df79f822f33a642508c.tar.gz |
Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided
by the infrastructure.
Mark a couple more packages as not ready for python-3.x.
Diffstat (limited to 'fonts')
-rw-r--r-- | fonts/py-TTFQuery/Makefile | 6 | ||||
-rw-r--r-- | fonts/py-TTFQuery/PLIST | 6 | ||||
-rw-r--r-- | fonts/py-fonttools/Makefile | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/fonts/py-TTFQuery/Makefile b/fonts/py-TTFQuery/Makefile index bf09f541286..294cad49ac9 100644 --- a/fonts/py-TTFQuery/Makefile +++ b/fonts/py-TTFQuery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/07/09 13:03:48 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2016/08/28 15:48:32 wiz Exp $ DISTNAME= TTFQuery-1.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,6 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-fonttools>=2.0b1:../../fonts/py-fonttools -PYDISTUTILSPKG= yes -PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX} PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-fonttools post-install: @@ -21,5 +19,5 @@ post-install: ${MV} $${f} $${f}${PYVERSSUFFIX}; \ done -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/py-TTFQuery/PLIST b/fonts/py-TTFQuery/PLIST index 0a2c5bafdfe..d320ee87007 100644 --- a/fonts/py-TTFQuery/PLIST +++ b/fonts/py-TTFQuery/PLIST @@ -1,8 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 22:59:03 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/08/28 15:48:32 wiz Exp $ bin/ttffamily${PYVERSSUFFIX} bin/ttffiles${PYVERSSUFFIX} bin/ttfgroups${PYVERSSUFFIX} bin/ttfmetadata${PYVERSSUFFIX} +${PYSITELIB}/${EGG_FILE}/PKG-INFO +${PYSITELIB}/${EGG_FILE}/SOURCES.txt +${PYSITELIB}/${EGG_FILE}/dependency_links.txt +${PYSITELIB}/${EGG_FILE}/top_level.txt ${PYSITELIB}/ttfquery/__init__.py ${PYSITELIB}/ttfquery/__init__.pyc ${PYSITELIB}/ttfquery/__init__.pyo diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index 1c4fde44b2d..47388194e44 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/06/30 17:56:14 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2016/08/28 15:48:32 wiz Exp $ DISTNAME= fonttools-3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,9 +21,6 @@ SUBST_FILES.man+= setup.py SUBST_STAGE.man= pre-configure SUBST_MESSAGE.man= Fixing man page installation path. -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: cd ${DESTDIR}${PREFIX}/bin && \ for i in pyftinspect pyftmerge pyftsubset ttx; do \ |