pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc
Module Name: pkgsrc
Committed By: wiz
Date: Sun Aug 28 15:48:37 UTC 2016
Modified Files:
pkgsrc/archivers/py-yuicompressor: Makefile
pkgsrc/audio/playitslowly: Makefile
pkgsrc/biology/py-mol: Makefile
pkgsrc/converters/py-cairosvg: Makefile
pkgsrc/converters/py-chardet: Makefile
pkgsrc/databases/py-couchdb: Makefile
pkgsrc/databases/skytools: Makefile
pkgsrc/devel/bugs-everywhere: Makefile
pkgsrc/devel/py-babel: Makefile
pkgsrc/devel/py-binaryornot: Makefile
pkgsrc/devel/py-checker: Makefile
pkgsrc/devel/py-cookiecutter: Makefile
pkgsrc/devel/py-coverage: Makefile
pkgsrc/devel/py-cython: Makefile
pkgsrc/devel/py-distribute: Makefile
pkgsrc/devel/py-flake8: Makefile
pkgsrc/devel/py-flakes: Makefile
pkgsrc/devel/py-gobject: Makefile.common
pkgsrc/devel/py-gobject3: Makefile.common
pkgsrc/devel/py-hgview: Makefile
pkgsrc/devel/py-idle: Makefile
pkgsrc/devel/py-ipython: Makefile
pkgsrc/devel/py-logilab-common: Makefile
pkgsrc/devel/py-macholib: Makefile
pkgsrc/devel/py-modulegraph: Makefile
pkgsrc/devel/py-nose: Makefile
pkgsrc/devel/py-pbr: Makefile
pkgsrc/devel/py-pip: Makefile
pkgsrc/devel/py-pylint: Makefile
pkgsrc/devel/py-setuptools: Makefile
pkgsrc/devel/py-setuptools_scm: Makefile
pkgsrc/devel/py-tabular: Makefile
pkgsrc/devel/py-test: Makefile
pkgsrc/devel/py-tryton: Makefile
pkgsrc/devel/py-trytond: Makefile
pkgsrc/devel/py-unittest2: Makefile
pkgsrc/devel/py-unittest2py3k: Makefile
pkgsrc/devel/py-virtualenv: Makefile
pkgsrc/devel/py-wheel: Makefile
pkgsrc/finance/moneyguru: Makefile
pkgsrc/finance/py-trytond-account-payment-sepa: Makefile
pkgsrc/finance/py-trytond-bank: Makefile
pkgsrc/finance/py-vatnumber: Makefile
pkgsrc/fonts/py-TTFQuery: Makefile PLIST
pkgsrc/fonts/py-fonttools: Makefile
pkgsrc/geography/py-trytond-country: Makefile
pkgsrc/graphics/libv4l: Makefile distinfo
pkgsrc/graphics/libv4l/patches: patch-af patch-am
pkgsrc/graphics/py-pygal: Makefile
pkgsrc/graphics/py-qrcode: Makefile
pkgsrc/lang/py-cxfreeze: Makefile
pkgsrc/lang/py-hy: Makefile
pkgsrc/lang/py-pythonz: Makefile
pkgsrc/math/py-Scientific: Makefile
pkgsrc/math/py-gmpy: Makefile
pkgsrc/math/py-numpy: Makefile
pkgsrc/math/py-pytables: Makefile
pkgsrc/math/py-sympy: Makefile
pkgsrc/meta-pkgs/py-tryton-platform: Makefile
pkgsrc/misc/khard: Makefile
pkgsrc/misc/py-stdnum: Makefile
pkgsrc/misc/py-trytond-party: options.mk
pkgsrc/net/py-boto: Makefile
pkgsrc/net/py-celery: Makefile
pkgsrc/net/py-cymruwhois: Makefile
pkgsrc/net/py-dnsdiag: Makefile
pkgsrc/net/py-eventlib: Makefile
pkgsrc/net/py-hatop: Makefile
pkgsrc/net/py-metar: Makefile
pkgsrc/net/py-simplesoap: Makefile
pkgsrc/net/py-zsi: Makefile
pkgsrc/print/py-weasyprint: Makefile
pkgsrc/security/py-keyring: Makefile
pkgsrc/sysutils/py-attic: Makefile
pkgsrc/sysutils/py-borgbackup: Makefile
pkgsrc/sysutils/py-diffoscope: Makefile
pkgsrc/sysutils/py-xattr: Makefile
pkgsrc/textproc/csvtomd: Makefile
pkgsrc/textproc/py-HappyDoc: Makefile
pkgsrc/textproc/py-cElementTree: Makefile
pkgsrc/textproc/py-docutils: Makefile
pkgsrc/textproc/py-empy: Makefile
pkgsrc/textproc/py-expat: Makefile
pkgsrc/textproc/py-ftfy: Makefile
pkgsrc/textproc/py-html2text: Makefile
pkgsrc/textproc/py-jsonschema: Makefile
pkgsrc/textproc/py-markdown: Makefile
pkgsrc/textproc/py-pygments: Makefile
pkgsrc/textproc/py-rdflib: Makefile
pkgsrc/textproc/py-sphinx: Makefile
pkgsrc/textproc/py-vobject: Makefile
pkgsrc/textproc/py-xml: Makefile
pkgsrc/www/py-curl: Makefile
pkgsrc/www/py-django: Makefile
pkgsrc/www/py-django14: Makefile
pkgsrc/www/py-feedgen: Makefile
pkgsrc/www/py-flask: Makefile
pkgsrc/www/py-mod_wsgi: Makefile
pkgsrc/www/py-pelican: Makefile
pkgsrc/www/py-static: Makefile
pkgsrc/www/py-twill: Makefile
pkgsrc/www/py-uwsgi: Makefile
pkgsrc/www/py-uwsgitop: Makefile
pkgsrc/x11/py-kde4: Makefile
pkgsrc/x11/py-qt4: Makefile
pkgsrc/x11/py-qt4-qscintilla: Makefile
pkgsrc/x11/py-qt5: Makefile
pkgsrc/x11/py-qwt-qt4: Makefile
pkgsrc/x11/py-sip: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/archivers/py-yuicompressor/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/playitslowly/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/biology/py-mol/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/converters/py-cairosvg/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/converters/py-chardet/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/py-couchdb/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/skytools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/bugs-everywhere/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-babel/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-binaryornot/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/devel/py-checker/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-cookiecutter/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/py-coverage/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-cython/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-distribute/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/py-flake8/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-flakes/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-gobject/Makefile.common
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/py-gobject3/Makefile.common
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-hgview/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/py-idle/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/py-ipython/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-logilab-common/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-macholib/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-modulegraph/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-nose/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/py-pbr/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/py-pip/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/py-pylint/Makefile
cvs rdiff -u -r1.106 -r1.107 pkgsrc/devel/py-setuptools/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/py-setuptools_scm/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/py-tabular/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/py-test/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/py-tryton/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/py-trytond/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/py-unittest2/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/py-unittest2py3k/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/py-virtualenv/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/py-wheel/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/finance/moneyguru/Makefile
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/finance/py-trytond-account-payment-sepa/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/finance/py-trytond-bank/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/finance/py-vatnumber/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/fonts/py-TTFQuery/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/fonts/py-TTFQuery/PLIST
cvs rdiff -u -r1.25 -r1.26 pkgsrc/fonts/py-fonttools/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/py-trytond-country/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/libv4l/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/libv4l/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libv4l/patches/patch-af
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libv4l/patches/patch-am
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/py-pygal/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/py-qrcode/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/py-cxfreeze/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/py-hy/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/py-pythonz/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/math/py-Scientific/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/py-gmpy/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/math/py-pytables/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/math/py-sympy/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/meta-pkgs/py-tryton-platform/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/khard/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/py-stdnum/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/misc/py-trytond-party/options.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/net/py-boto/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/py-celery/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-cymruwhois/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-dnsdiag/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/py-eventlib/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/py-hatop/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/py-metar/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-simplesoap/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/net/py-zsi/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/print/py-weasyprint/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/security/py-keyring/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/py-attic/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/sysutils/py-borgbackup/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/sysutils/py-diffoscope/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/py-xattr/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/csvtomd/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/py-HappyDoc/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/textproc/py-cElementTree/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/textproc/py-docutils/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/textproc/py-empy/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/py-expat/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/py-ftfy/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/textproc/py-html2text/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-jsonschema/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/py-markdown/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/py-pygments/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/py-rdflib/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/textproc/py-sphinx/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/py-vobject/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/textproc/py-xml/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/www/py-curl/Makefile
cvs rdiff -u -r1.75 -r1.76 pkgsrc/www/py-django/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/www/py-django14/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/py-feedgen/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/py-flask/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-mod_wsgi/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/www/py-pelican/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/py-static/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-twill/Makefile
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/py-uwsgi/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/py-uwsgitop/Makefile
cvs rdiff -u -r1.49 -r1.50 pkgsrc/x11/py-kde4/Makefile
cvs rdiff -u -r1.81 -r1.82 pkgsrc/x11/py-qt4/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/py-qt4-qscintilla/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/py-qwt-qt4/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/x11/py-sip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/archivers/py-yuicompressor/Makefile
diff -u pkgsrc/archivers/py-yuicompressor/Makefile:1.2 pkgsrc/archivers/py-yuicompressor/Makefile:1.3
--- pkgsrc/archivers/py-yuicompressor/Makefile:1.2 Wed Jun 8 17:43:20 2016
+++ pkgsrc/archivers/py-yuicompressor/Makefile Sun Aug 28 15:48:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:28 wiz Exp $
DISTNAME= yuicompressor-2.4.8
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE= modified-bsd
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
USE_JAVA= run
post-install:
Index: pkgsrc/audio/playitslowly/Makefile
diff -u pkgsrc/audio/playitslowly/Makefile:1.4 pkgsrc/audio/playitslowly/Makefile:1.5
--- pkgsrc/audio/playitslowly/Makefile:1.4 Sun May 29 21:12:14 2016
+++ pkgsrc/audio/playitslowly/Makefile Sun Aug 28 15:48:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/05/29 21:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:28 wiz Exp $
DISTNAME= playitslowly-1.5.1
CATEGORIES= audio
@@ -22,7 +22,6 @@ SUBST_STAGE.exec= post-build
SUBST_MESSAGE.exec= Fixing path to python interpreter.
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
Index: pkgsrc/biology/py-mol/Makefile
diff -u pkgsrc/biology/py-mol/Makefile:1.26 pkgsrc/biology/py-mol/Makefile:1.27
--- pkgsrc/biology/py-mol/Makefile:1.26 Sat Jul 9 13:03:32 2016
+++ pkgsrc/biology/py-mol/Makefile Sun Aug 28 15:48:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:03:32 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:28 wiz Exp $
DISTNAME= pymol-v1.5.0.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/pymol-v/mol-/}
@@ -33,8 +33,6 @@ CHECK_PORTABILITY_SKIP+= setup/*
INSTALLATION_DIRS= bin
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
# Gross hack
PYSETUPBUILDTARGET= install ${_PYSETUPINSTALLARGS}
Index: pkgsrc/converters/py-cairosvg/Makefile
diff -u pkgsrc/converters/py-cairosvg/Makefile:1.5 pkgsrc/converters/py-cairosvg/Makefile:1.6
--- pkgsrc/converters/py-cairosvg/Makefile:1.5 Wed Jun 8 17:43:21 2016
+++ pkgsrc/converters/py-cairosvg/Makefile Sun Aug 28 15:48:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:21 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:28 wiz Exp $
DISTNAME= CairoSVG-1.0.15
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-cairocffi-[0-9]
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/cairosvg \
Index: pkgsrc/converters/py-chardet/Makefile
diff -u pkgsrc/converters/py-chardet/Makefile:1.14 pkgsrc/converters/py-chardet/Makefile:1.15
--- pkgsrc/converters/py-chardet/Makefile:1.14 Wed Jun 8 17:43:21 2016
+++ pkgsrc/converters/py-chardet/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/06/08 17:43:21 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:29 wiz Exp $
DISTNAME= chardet-2.3.0
PKGREVISION= 1
@@ -12,8 +12,6 @@ COMMENT= Character encoding auto-detecti
LICENSE= gnu-lgpl-v2.1
REPLACE_PYTHON= chardet/chardetect.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/chardetect ${DESTDIR}${PREFIX}/bin/chardetect-${PYVERSSUFFIX}
Index: pkgsrc/databases/py-couchdb/Makefile
diff -u pkgsrc/databases/py-couchdb/Makefile:1.5 pkgsrc/databases/py-couchdb/Makefile:1.6
--- pkgsrc/databases/py-couchdb/Makefile:1.5 Sat Jul 9 13:03:35 2016
+++ pkgsrc/databases/py-couchdb/Makefile Sun Aug 28 15:48:29 2016
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/07/09 13:03:35 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:29 wiz Exp $
DISTNAME= CouchDB-0.9
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -27,7 +26,6 @@ REPLACE_PYTHON+= couchdb/tools/replicati
REPLACE_PYTHON+= couchdb/tools/replication_helper_test.py
REPLACE_PYTHON+= couchdb/view.py
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${INSTALL_DATA} ${WRKSRC}/doc/*.rst \
Index: pkgsrc/databases/skytools/Makefile
diff -u pkgsrc/databases/skytools/Makefile:1.6 pkgsrc/databases/skytools/Makefile:1.7
--- pkgsrc/databases/skytools/Makefile:1.6 Sat Jul 9 13:03:36 2016
+++ pkgsrc/databases/skytools/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:03:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:29 wiz Exp $
DISTNAME= skytools-3.2
PKGREVISION= 1
@@ -21,7 +21,6 @@ USE_TOOLS+= awk gmake grep sed
PY_PATCHPLIST= yes
PY_NO_EGG= no
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 3.2
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= scripts/*.py
REPLACE_PYTHON+= python/*.py
Index: pkgsrc/devel/bugs-everywhere/Makefile
diff -u pkgsrc/devel/bugs-everywhere/Makefile:1.4 pkgsrc/devel/bugs-everywhere/Makefile:1.5
--- pkgsrc/devel/bugs-everywhere/Makefile:1.4 Sat Jul 9 13:03:37 2016
+++ pkgsrc/devel/bugs-everywhere/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 13:03:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:29 wiz Exp $
DISTNAME= be-1.1.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/be/bugs-everywhere/}
@@ -22,10 +22,8 @@ DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*
USE_LANGUAGES= # none
EGG_NAME= bugs_everywhere-${PKGVERSION_NOREV}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not ported yet as of 1.1.1
REPLACE_PYTHON+= libbe/version.py
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
cd ${DESTDIR}${PREFIX}/bin && mv be be${PYVERSSUFFIX}
Index: pkgsrc/devel/py-babel/Makefile
diff -u pkgsrc/devel/py-babel/Makefile:1.16 pkgsrc/devel/py-babel/Makefile:1.17
--- pkgsrc/devel/py-babel/Makefile:1.16 Wed Jun 8 17:43:24 2016
+++ pkgsrc/devel/py-babel/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:24 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:29 wiz Exp $
DISTNAME= Babel-1.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,9 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/pybabel \
${DESTDIR}${PREFIX}/bin/pybabel-${PYVERSSUFFIX}
Index: pkgsrc/devel/py-binaryornot/Makefile
diff -u pkgsrc/devel/py-binaryornot/Makefile:1.2 pkgsrc/devel/py-binaryornot/Makefile:1.3
--- pkgsrc/devel/py-binaryornot/Makefile:1.2 Thu Jun 9 06:23:39 2016
+++ pkgsrc/devel/py-binaryornot/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/09 06:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
DISTNAME= binaryornot-0.4.0
GITHUB_PROJECT= binaryornot
@@ -13,7 +13,6 @@ COMMENT= Guess whether a file is binar
LICENSE= modified-bsd
USE_LANGUAGES= #none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
DEPENDS+= ${PYPKGPREFIX}-chardet>=2.0.0:../../converters/py-chardet
Index: pkgsrc/devel/py-checker/Makefile
diff -u pkgsrc/devel/py-checker/Makefile:1.21 pkgsrc/devel/py-checker/Makefile:1.22
--- pkgsrc/devel/py-checker/Makefile:1.21 Sat Jul 9 13:03:40 2016
+++ pkgsrc/devel/py-checker/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2016/07/09 13:03:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2016/08/28 15:48:29 wiz Exp $
DISTNAME= pychecker-0.8.19
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,7 +11,6 @@ COMMENT= Python code checker
LICENSE= modified-bsd
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 0.8.19
Index: pkgsrc/devel/py-cookiecutter/Makefile
diff -u pkgsrc/devel/py-cookiecutter/Makefile:1.2 pkgsrc/devel/py-cookiecutter/Makefile:1.3
--- pkgsrc/devel/py-cookiecutter/Makefile:1.2 Thu Jun 9 06:23:39 2016
+++ pkgsrc/devel/py-cookiecutter/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/09 06:23:39 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
DISTNAME= cookiecutter-1.3.0
GITHUB_PROJECT= cookiecutter
@@ -34,7 +34,6 @@ DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0
DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
.endif
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= setup.py
REPLACE_PYTHON+= cookiecutter/*.py
Index: pkgsrc/devel/py-coverage/Makefile
diff -u pkgsrc/devel/py-coverage/Makefile:1.9 pkgsrc/devel/py-coverage/Makefile:1.10
--- pkgsrc/devel/py-coverage/Makefile:1.9 Wed Jun 8 17:43:24 2016
+++ pkgsrc/devel/py-coverage/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/06/08 17:43:24 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:29 wiz Exp $
DISTNAME= coverage-4.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-mock-[0-9
BUILD_DEPENDS+= ${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet
USE_LANGUAGES= c
-PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX}
post-extract:
${CHMOD} +r ${WRKSRC}/coverage.egg-info/*
Index: pkgsrc/devel/py-cython/Makefile
diff -u pkgsrc/devel/py-cython/Makefile:1.33 pkgsrc/devel/py-cython/Makefile:1.34
--- pkgsrc/devel/py-cython/Makefile:1.33 Mon Aug 15 00:07:28 2016
+++ pkgsrc/devel/py-cython/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/08/15 00:07:28 leot Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/28 15:48:29 wiz Exp $
DISTNAME= Cython-0.24
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Cy/cy/}
@@ -12,7 +12,6 @@ LICENSE= apache-1.1
USE_LANGUAGES= c
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_VARS= cygdb
REPLACE_PYTHON+= Cython/Build/Cythonize.py
Index: pkgsrc/devel/py-distribute/Makefile
diff -u pkgsrc/devel/py-distribute/Makefile:1.15 pkgsrc/devel/py-distribute/Makefile:1.16
--- pkgsrc/devel/py-distribute/Makefile:1.15 Wed Jun 8 17:43:25 2016
+++ pkgsrc/devel/py-distribute/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/06/08 17:43:25 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/28 15:48:29 wiz Exp $
DISTNAME= distribute-0.6.49
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT= Replacement for setuptools
LICENSE= python-software-foundation # or ZPL
CONFLICTS+= ${PYPKGPREFIX}-setuptools-[0-9]*
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON= setuptools/command/easy_install.py
REPLACE_PYTHON+= setuptools/tests/test_resources.py
Index: pkgsrc/devel/py-flake8/Makefile
diff -u pkgsrc/devel/py-flake8/Makefile:1.2 pkgsrc/devel/py-flake8/Makefile:1.3
--- pkgsrc/devel/py-flake8/Makefile:1.2 Wed Jun 8 17:43:23 2016
+++ pkgsrc/devel/py-flake8/Makefile Sun Aug 28 15:48:29 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:29 wiz Exp $
DISTNAME= flake8-2.2.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-mccabe-[0-9]*:.
DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
DEPENDS+= ${PYPKGPREFIX}-pep8-[0-9]*:../../devel/py-pep8
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/flake8 ${DESTDIR}${PREFIX}/bin/flake8-${PYVERSSUFFIX}
Index: pkgsrc/devel/py-flakes/Makefile
diff -u pkgsrc/devel/py-flakes/Makefile:1.6 pkgsrc/devel/py-flakes/Makefile:1.7
--- pkgsrc/devel/py-flakes/Makefile:1.6 Wed Jun 8 17:43:25 2016
+++ pkgsrc/devel/py-flakes/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:30 wiz Exp $
DISTNAME= pyflakes-0.9.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//}
@@ -13,7 +13,6 @@ LICENSE= mit
USE_LANGUAGES= # none
PYDISTUTILSPKG= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/pyflakes ${DESTDIR}${PREFIX}/bin/pyflakes${PYVERSSUFFIX}
Index: pkgsrc/devel/py-gobject/Makefile.common
diff -u pkgsrc/devel/py-gobject/Makefile.common:1.19 pkgsrc/devel/py-gobject/Makefile.common:1.20
--- pkgsrc/devel/py-gobject/Makefile.common:1.19 Mon Sep 12 22:01:34 2011
+++ pkgsrc/devel/py-gobject/Makefile.common Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2011/09/12 22:01:34 wiz Exp $
+# $NetBSD: Makefile.common,v 1.20 2016/08/28 15:48:30 wiz Exp $
#
# used by devel/py-gobject/Makefile
# used by devel/py-gobject-shared/Makefile
@@ -24,5 +24,4 @@ DISTINFO_FILE= ${.CURDIR}/../../devel/p
PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4
Index: pkgsrc/devel/py-gobject3/Makefile.common
diff -u pkgsrc/devel/py-gobject3/Makefile.common:1.7 pkgsrc/devel/py-gobject3/Makefile.common:1.8
--- pkgsrc/devel/py-gobject3/Makefile.common:1.7 Fri Apr 8 07:41:26 2016
+++ pkgsrc/devel/py-gobject3/Makefile.common Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2016/04/08 07:41:26 prlw1 Exp $
+# $NetBSD: Makefile.common,v 1.8 2016/08/28 15:48:30 wiz Exp $
# used by devel/py-gobject3/Makefile
# used by devel/py-gobject3-common/Makefile
@@ -25,7 +25,6 @@ PATCHDIR= ${.CURDIR}/../../devel/py-gob
PKGCONFIG_OVERRIDE+= pygobject-3.0.pc.in
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4
CONFLICTS+= ${PYPKGPREFIX}-gobject<2.28.6nb4
Index: pkgsrc/devel/py-hgview/Makefile
diff -u pkgsrc/devel/py-hgview/Makefile:1.13 pkgsrc/devel/py-hgview/Makefile:1.14
--- pkgsrc/devel/py-hgview/Makefile:1.13 Sat Jul 9 13:03:41 2016
+++ pkgsrc/devel/py-hgview/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/07/09 13:03:41 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/28 15:48:30 wiz Exp $
DISTNAME= hgview-1.8.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ BUILD_DEPENDS+= xmlto-[0-9]*:../../textp
REPLACE_PYTHON= *.py
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.8.0
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
USE_TOOLS+= gmake
Index: pkgsrc/devel/py-idle/Makefile
diff -u pkgsrc/devel/py-idle/Makefile:1.35 pkgsrc/devel/py-idle/Makefile:1.36
--- pkgsrc/devel/py-idle/Makefile:1.35 Tue Feb 17 08:08:31 2015
+++ pkgsrc/devel/py-idle/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2015/02/17 08:08:31 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2016/08/28 15:48:30 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-idle-${PY_DISTVERSION}
CATEGORIES= devel python
@@ -10,7 +10,6 @@ COMMENT= IDLE - The Integrated DeveLopme
DEPENDS+= ${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
do-patch:
Index: pkgsrc/devel/py-ipython/Makefile
diff -u pkgsrc/devel/py-ipython/Makefile:1.16 pkgsrc/devel/py-ipython/Makefile:1.17
--- pkgsrc/devel/py-ipython/Makefile:1.16 Thu Jul 21 12:13:12 2016
+++ pkgsrc/devel/py-ipython/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/07/21 12:13:12 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:30 wiz Exp $
DISTNAME= ipython-3.2.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -23,9 +23,6 @@ DEPENDS+= ${PYPKGPREFIX}-zmq>=14.0.1:../
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
REPLACE_PYTHON= */*/*.py */*/*/*.py
post-install:
Index: pkgsrc/devel/py-logilab-common/Makefile
diff -u pkgsrc/devel/py-logilab-common/Makefile:1.12 pkgsrc/devel/py-logilab-common/Makefile:1.13
--- pkgsrc/devel/py-logilab-common/Makefile:1.12 Sat Jul 9 13:03:42 2016
+++ pkgsrc/devel/py-logilab-common/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 13:03:42 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:30 wiz Exp $
DISTNAME= logilab-common-0.63.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-six>=1.4.0:../.
DEPENDS+= ${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama
.endif
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-mxDateTime
INSTALLATION_DIRS= ${PKGMANDIR}/man1
Index: pkgsrc/devel/py-macholib/Makefile
diff -u pkgsrc/devel/py-macholib/Makefile:1.4 pkgsrc/devel/py-macholib/Makefile:1.5
--- pkgsrc/devel/py-macholib/Makefile:1.4 Wed Jun 8 17:43:27 2016
+++ pkgsrc/devel/py-macholib/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:30 wiz Exp $
DISTNAME= macholib-1.7
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ USE_LANGUAGES= # none
REPLACE_PYTHON+= macholib/macho_dump.py macholib/macho_find.py
REPLACE_PYTHON+= macholib/macho_standalone.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/macho_dump \
Index: pkgsrc/devel/py-modulegraph/Makefile
diff -u pkgsrc/devel/py-modulegraph/Makefile:1.6 pkgsrc/devel/py-modulegraph/Makefile:1.7
--- pkgsrc/devel/py-modulegraph/Makefile:1.6 Wed Jun 8 17:43:27 2016
+++ pkgsrc/devel/py-modulegraph/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:30 wiz Exp $
DISTNAME= modulegraph-0.12.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-altgraph>=0.11:
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/modulegraph \
${DESTDIR}${PREFIX}/bin/modulegraph${PYVERSSUFFIX}
Index: pkgsrc/devel/py-nose/Makefile
diff -u pkgsrc/devel/py-nose/Makefile:1.14 pkgsrc/devel/py-nose/Makefile:1.15
--- pkgsrc/devel/py-nose/Makefile:1.14 Sun Jul 24 11:56:15 2016
+++ pkgsrc/devel/py-nose/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/24 11:56:15 kamil Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:30 wiz Exp $
DISTNAME= nose-1.3.7
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ LICENSE= gnu-lgpl-v2.1
#DEPENDS+= ${PYPKGPREFIX}-coverage>=3.0:../../devel/py-coverage
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
SUBST_CLASSES+= manpath
SUBST_STAGE.manpath= pre-build
Index: pkgsrc/devel/py-pbr/Makefile
diff -u pkgsrc/devel/py-pbr/Makefile:1.12 pkgsrc/devel/py-pbr/Makefile:1.13
--- pkgsrc/devel/py-pbr/Makefile:1.12 Wed Jun 8 17:49:20 2016
+++ pkgsrc/devel/py-pbr/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/06/08 17:49:20 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:30 wiz Exp $
DISTNAME= pbr-1.10.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= pbr/tests/testpackage/setup.py
post-install:
Index: pkgsrc/devel/py-pip/Makefile
diff -u pkgsrc/devel/py-pip/Makefile:1.15 pkgsrc/devel/py-pip/Makefile:1.16
--- pkgsrc/devel/py-pip/Makefile:1.15 Sat Aug 27 11:41:23 2016
+++ pkgsrc/devel/py-pip/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/08/27 11:41:23 richard Exp $
+# $NetBSD: Makefile,v 1.16 2016/08/28 15:48:30 wiz Exp $
DISTNAME= pip-8.1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,9 +10,6 @@ HOMEPAGE= http://www.pip-installer.org/
COMMENT= Installs Python packages as an easy_install replacement
LICENSE= mit
-PLIST_SUBST+= PYVERSSUFFIX="${PYVERSSUFFIX}"
-FILES_SUBST+= PYVERSSUFFIX="${PYVERSSUFFIX}"
-
REPLACE_PYTHON+= pip/__init__.py pip/_vendor/requests/certs.py
REPLACE_PYTHON+= pip/_vendor/requests/packages/chardet/chardetect.py
Index: pkgsrc/devel/py-pylint/Makefile
diff -u pkgsrc/devel/py-pylint/Makefile:1.10 pkgsrc/devel/py-pylint/Makefile:1.11
--- pkgsrc/devel/py-pylint/Makefile:1.10 Tue Jul 12 09:32:14 2016
+++ pkgsrc/devel/py-pylint/Makefile Sun Aug 28 15:48:30 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/12 09:32:14 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:30 wiz Exp $
DISTNAME= pylint-1.6.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,6 @@ USE_LANGUAGES= # none
DOCDIR= ${PREFIX}/share/doc/pylint
INSTALLATION_DIRS= ${DOCDIR} ${PKGMANDIR}/man1
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= pylint/__main__.py pylint/test/data/ascript pylint/test/input/noext
Index: pkgsrc/devel/py-setuptools/Makefile
diff -u pkgsrc/devel/py-setuptools/Makefile:1.106 pkgsrc/devel/py-setuptools/Makefile:1.107
--- pkgsrc/devel/py-setuptools/Makefile:1.106 Mon Aug 22 14:12:15 2016
+++ pkgsrc/devel/py-setuptools/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2016/08/22 14:12:15 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2016/08/28 15:48:31 wiz Exp $
DISTNAME= setuptools-26.0.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:.
# not sure if this would introduce a dependency cycle
#BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
REPLACE_PYTHON+= setuptools/command/easy_install.py
Index: pkgsrc/devel/py-setuptools_scm/Makefile
diff -u pkgsrc/devel/py-setuptools_scm/Makefile:1.3 pkgsrc/devel/py-setuptools_scm/Makefile:1.4
--- pkgsrc/devel/py-setuptools_scm/Makefile:1.3 Wed Jan 6 05:30:56 2016
+++ pkgsrc/devel/py-setuptools_scm/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/01/06 05:30:56 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:31 wiz Exp $
DISTNAME= setuptools_scm-1.10.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,5 @@ LICENSE= mit
#DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-#PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-#PLIST_SUBST+= EGG_INFODIR=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
-
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-tabular/Makefile
diff -u pkgsrc/devel/py-tabular/Makefile:1.6 pkgsrc/devel/py-tabular/Makefile:1.7
--- pkgsrc/devel/py-tabular/Makefile:1.6 Sat Jul 9 13:03:44 2016
+++ pkgsrc/devel/py-tabular/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:03:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:31 wiz Exp $
DISTNAME= tabular-0.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,13 +10,10 @@ HOMEPAGE= http://pypi.python.org/pypi/ta
COMMENT= Tabular data tools for Python
LICENSE= mit
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 0.1
.include "../../graphics/py-matplotlib/buildlink3.mk"
-.include "../../math/py-numpy/buildlink3.mk"
BUILDLINK_API_DEPENDS.pynumpy+= ${PYPKGPREFIX}-numpy>=1.6
-
+.include "../../math/py-numpy/buildlink3.mk"
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/py-test/Makefile
diff -u pkgsrc/devel/py-test/Makefile:1.19 pkgsrc/devel/py-test/Makefile:1.20
--- pkgsrc/devel/py-test/Makefile:1.19 Wed Aug 24 21:35:12 2016
+++ pkgsrc/devel/py-test/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2016/08/24 21:35:12 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2016/08/28 15:48:31 wiz Exp $
DISTNAME= pytest-3.0.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -20,9 +20,6 @@ USE_TOOLS+= bash:build
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
REPLACE_PYTHON+= _pytest/standalonetemplate.py
post-install:
Index: pkgsrc/devel/py-tryton/Makefile
diff -u pkgsrc/devel/py-tryton/Makefile:1.20 pkgsrc/devel/py-tryton/Makefile:1.21
--- pkgsrc/devel/py-tryton/Makefile:1.20 Wed Aug 3 10:22:39 2016
+++ pkgsrc/devel/py-tryton/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/08/03 10:22:39 adam Exp $
+# $NetBSD: Makefile,v 1.21 2016/08/28 15:48:31 wiz Exp $
TRYTON_MODULE_NAME= tryton
PKGREVISION= 1
.include "../../devel/py-trytond/Makefile.common"
@@ -13,7 +13,6 @@ USE_LANGUAGES= # none
PYTHON_VERSIONED_DEPENDENCIES= dateutil
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
.include "options.mk"
Index: pkgsrc/devel/py-trytond/Makefile
diff -u pkgsrc/devel/py-trytond/Makefile:1.13 pkgsrc/devel/py-trytond/Makefile:1.14
--- pkgsrc/devel/py-trytond/Makefile:1.13 Thu Feb 25 12:12:49 2016
+++ pkgsrc/devel/py-trytond/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/02/25 12:12:49 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/28 15:48:31 wiz Exp $
TRYTON_MODULE_NAME= trytond
.include "../../devel/py-trytond/Makefile.common"
CATEGORIES= devel python
@@ -33,7 +33,6 @@ REPLACE_PYTHON+= trytond/tests/test_tryt
PYTHON_VERSIONED_DEPENDENCIES= dateutil
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
.include "options.mk"
Index: pkgsrc/devel/py-unittest2/Makefile
diff -u pkgsrc/devel/py-unittest2/Makefile:1.11 pkgsrc/devel/py-unittest2/Makefile:1.12
--- pkgsrc/devel/py-unittest2/Makefile:1.11 Wed Jun 8 17:43:27 2016
+++ pkgsrc/devel/py-unittest2/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2016/06/08 17:43:27 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/28 15:48:31 wiz Exp $
DISTNAME= unittest2-1.1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,7 +18,6 @@ DEPENDS+= ${PYPKGPREFIX}-linecache2-[0-
DOCDIR= share/doc/${PKGBASE}
INSTALLATION_DIRS+= ${DOCDIR}
PLIST_SUBST+= DOCDIR=${DOCDIR}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
SUBST_CLASSES+= multi
SUBST_STAGE.multi= pre-configure
Index: pkgsrc/devel/py-unittest2py3k/Makefile
diff -u pkgsrc/devel/py-unittest2py3k/Makefile:1.4 pkgsrc/devel/py-unittest2py3k/Makefile:1.5
--- pkgsrc/devel/py-unittest2py3k/Makefile:1.4 Wed Jun 8 17:43:23 2016
+++ pkgsrc/devel/py-unittest2py3k/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:31 wiz Exp $
DISTNAME= unittest2py3k-0.5.1
# to match python-2.x name
@@ -17,7 +17,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
DOCDIR= share/doc/${PKGBASE}
INSTALLATION_DIRS+= ${DOCDIR}
PLIST_SUBST+= DOCDIR=${DOCDIR}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR}
Index: pkgsrc/devel/py-virtualenv/Makefile
diff -u pkgsrc/devel/py-virtualenv/Makefile:1.33 pkgsrc/devel/py-virtualenv/Makefile:1.34
--- pkgsrc/devel/py-virtualenv/Makefile:1.33 Fri Aug 19 15:35:22 2016
+++ pkgsrc/devel/py-virtualenv/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2016/08/19 15:35:22 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2016/08/28 15:48:31 wiz Exp $
DISTNAME= virtualenv-15.0.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE= http://pypi.python.org/pypi/vi
COMMENT= Virtual Python Environment builder
LICENSE= mit
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON= virtualenv.py
post-install:
Index: pkgsrc/devel/py-wheel/Makefile
diff -u pkgsrc/devel/py-wheel/Makefile:1.1 pkgsrc/devel/py-wheel/Makefile:1.2
--- pkgsrc/devel/py-wheel/Makefile:1.1 Mon May 16 07:53:02 2016
+++ pkgsrc/devel/py-wheel/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/05/16 07:53:02 nils Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:31 wiz Exp $
DISTNAME= wheel-0.26.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,9 +12,6 @@ LICENSE= mit
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/wheel \
${DESTDIR}${PREFIX}/bin/wheel-${PYVERSSUFFIX}
Index: pkgsrc/finance/moneyguru/Makefile
diff -u pkgsrc/finance/moneyguru/Makefile:1.17 pkgsrc/finance/moneyguru/Makefile:1.18
--- pkgsrc/finance/moneyguru/Makefile:1.17 Sun Aug 21 12:07:51 2016
+++ pkgsrc/finance/moneyguru/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/08/21 12:07:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2016/08/28 15:48:31 wiz Exp $
DISTNAME= moneyguru-2.10.1
CATEGORIES= finance
@@ -24,7 +24,6 @@ USE_TOOLS= pax
PYTHON_VERSIONS_INCOMPATIBLE= 27
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= cocoa/waf
REPLACE_PYTHON+= cocoa/wscript
REPLACE_PYTHON+= psmtabbarcontrol/waf
Index: pkgsrc/finance/py-trytond-account-payment-sepa/Makefile
diff -u pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.3 pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.4
--- pkgsrc/finance/py-trytond-account-payment-sepa/Makefile:1.3 Sun Mar 15 00:17:35 2015
+++ pkgsrc/finance/py-trytond-account-payment-sepa/Makefile Sun Aug 28 15:48:31 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/03/15 00:17:35 rodent Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:31 wiz Exp $
TRYTON_MODULE_NAME= trytond_account_payment_sepa
.include "../../devel/py-trytond/Makefile.common"
CATEGORIES= finance python
@@ -18,6 +18,8 @@ DEPENDS+= ${PYPKGPREFIX}-lxml>=2.0:../..
REPLACE_PYTHON+= tests/test_account_payment_sepa.py
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap via py-stdnum and py-trytond-bank
+
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
.include "../../lang/python/versioned_dependencies.mk"
Index: pkgsrc/finance/py-trytond-bank/Makefile
diff -u pkgsrc/finance/py-trytond-bank/Makefile:1.2 pkgsrc/finance/py-trytond-bank/Makefile:1.3
--- pkgsrc/finance/py-trytond-bank/Makefile:1.2 Sun Mar 15 00:17:35 2015
+++ pkgsrc/finance/py-trytond-bank/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/03/15 00:17:35 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:32 wiz Exp $
TRYTON_MODULE_NAME= trytond_bank
.include "../../devel/py-trytond/Makefile.common"
CATEGORIES= finance python
@@ -16,6 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-trytond-[0-9]*:
USE_LANGUAGES= # none
REPLACE_PYTHON+= tests/test_bank.py
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap via py-stdnum
.include "../../lang/python/application.mk"
.include "../../lang/python/egg.mk"
Index: pkgsrc/finance/py-vatnumber/Makefile
diff -u pkgsrc/finance/py-vatnumber/Makefile:1.6 pkgsrc/finance/py-vatnumber/Makefile:1.7
--- pkgsrc/finance/py-vatnumber/Makefile:1.6 Thu Aug 18 20:48:43 2016
+++ pkgsrc/finance/py-vatnumber/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/08/18 20:48:43 richard Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:32 wiz Exp $
DISTNAME= vatnumber-1.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,5 +12,7 @@ LICENSE= gnu-gpl-v3
DEPENDS+= ${PYPKGPREFIX}-stdnum-[0-9]*:../../misc/py-stdnum
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap via py-stdnum
+
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/fonts/py-TTFQuery/Makefile
diff -u pkgsrc/fonts/py-TTFQuery/Makefile:1.18 pkgsrc/fonts/py-TTFQuery/Makefile:1.19
--- pkgsrc/fonts/py-TTFQuery/Makefile:1.18 Sat Jul 9 13:03:48 2016
+++ pkgsrc/fonts/py-TTFQuery/Makefile Sun Aug 28 15:48:32 2016
@@ -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"
Index: pkgsrc/fonts/py-TTFQuery/PLIST
diff -u pkgsrc/fonts/py-TTFQuery/PLIST:1.3 pkgsrc/fonts/py-TTFQuery/PLIST:1.4
--- pkgsrc/fonts/py-TTFQuery/PLIST:1.3 Sun Jun 3 22:59:03 2012
+++ pkgsrc/fonts/py-TTFQuery/PLIST Sun Aug 28 15:48:32 2016
@@ -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
Index: pkgsrc/fonts/py-fonttools/Makefile
diff -u pkgsrc/fonts/py-fonttools/Makefile:1.25 pkgsrc/fonts/py-fonttools/Makefile:1.26
--- pkgsrc/fonts/py-fonttools/Makefile:1.25 Thu Jun 30 17:56:14 2016
+++ pkgsrc/fonts/py-fonttools/Makefile Sun Aug 28 15:48:32 2016
@@ -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 \
Index: pkgsrc/geography/py-trytond-country/Makefile
diff -u pkgsrc/geography/py-trytond-country/Makefile:1.7 pkgsrc/geography/py-trytond-country/Makefile:1.8
--- pkgsrc/geography/py-trytond-country/Makefile:1.7 Sun Mar 15 00:17:35 2015
+++ pkgsrc/geography/py-trytond-country/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/03/15 00:17:35 rodent Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/28 15:48:32 wiz Exp $
TRYTON_MODULE_NAME= trytond_country
.include "../../devel/py-trytond/Makefile.common"
CATEGORIES= geography python
@@ -15,7 +15,6 @@ USE_LANGUAGES= # none
REPLACE_PYTHON+= tests/test_country.py
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/trytond_import_zip \
Index: pkgsrc/graphics/libv4l/Makefile
diff -u pkgsrc/graphics/libv4l/Makefile:1.10 pkgsrc/graphics/libv4l/Makefile:1.11
--- pkgsrc/graphics/libv4l/Makefile:1.10 Tue Mar 17 13:55:40 2015
+++ pkgsrc/graphics/libv4l/Makefile Sun Aug 28 15:48:32 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/03/17 13:55:40 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:32 wiz Exp $
DISTNAME= libv4l-0.4.3
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://people.atrpms.net/~hdegoede/
Index: pkgsrc/graphics/libv4l/distinfo
diff -u pkgsrc/graphics/libv4l/distinfo:1.13 pkgsrc/graphics/libv4l/distinfo:1.14
--- pkgsrc/graphics/libv4l/distinfo:1.13 Tue Nov 3 21:34:09 2015
+++ pkgsrc/graphics/libv4l/distinfo Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 21:34:09 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/08/28 15:48:32 wiz Exp $
SHA1 (libv4l-0.4.3.tar.gz) = 2539aa6b04650b97c9fc7ba95721f1e362a73031
RMD160 (libv4l-0.4.3.tar.gz) = 4f0435d955f15602ac093385607417fab71deb17
@@ -9,10 +9,10 @@ SHA1 (patch-ab) = 5ade487d6d64d280f3fdae
SHA1 (patch-ac) = 5457af836909f1c9f759c6a780daeb13968ec91f
SHA1 (patch-ad) = 1d2568e49182efcbde47c14911b6a04e088b2578
SHA1 (patch-ae) = 1bdefe4897c6edbe4049c52d963f1769bd916750
-SHA1 (patch-af) = b536fba33678e9b44ed22846344e523f92cd23ce
+SHA1 (patch-af) = 80ffb8b9aba0c80cac137f7755f1e7ac67a3d1e0
SHA1 (patch-ah) = d32f2e6aa694d4f0d04e8afbf462b3e61a31bbcc
SHA1 (patch-ai) = 8f22e4050d5e20981bfdd1fc51e572e42347c2b5
SHA1 (patch-aj) = 521abdfba83a34716ce0909f75d784fe0b6ecc8a
SHA1 (patch-ak) = 0465c3cc368609a3108f8d1aafcacf0ab3c61858
SHA1 (patch-al) = 8d020ef01f9956b37f718a529306e5f13aaa03a3
-SHA1 (patch-am) = 23d75eb7e9d1959d2be87dd9aa961e55cfc58c52
+SHA1 (patch-am) = 21573a1e8cb19dd1d96b4e4898b72ef4ea22a984
Index: pkgsrc/graphics/libv4l/patches/patch-af
diff -u pkgsrc/graphics/libv4l/patches/patch-af:1.5 pkgsrc/graphics/libv4l/patches/patch-af:1.6
--- pkgsrc/graphics/libv4l/patches/patch-af:1.5 Mon Jun 24 15:57:21 2013
+++ pkgsrc/graphics/libv4l/patches/patch-af Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.5 2013/06/24 15:57:21 jperkin Exp $
+$NetBSD: patch-af,v 1.6 2016/08/28 15:48:32 wiz Exp $
* XXXX
* `mode_t' is promoted to `int' when passed through `...'.
@@ -71,7 +71,18 @@ $NetBSD: patch-af,v 1.5 2013/06/24 15:57
LIBV4L_PUBLIC int close(int fd)
{
-@@ -148,11 +169,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+@@ -137,22 +158,19 @@ LIBV4L_PUBLIC int ioctl (int fd, unsigne
+ return v4l2_ioctl (fd, request, arg);
+ }
+
+-LIBV4L_PUBLIC ssize_t read (int fd, void* buffer, size_t n)
+-{
+- return v4l2_read (fd, buffer, n);
+-}
+-
+ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
+ __off_t offset)
+ {
return v4l2_mmap(start, length, prot, flags, fd, offset);
}
Index: pkgsrc/graphics/libv4l/patches/patch-am
diff -u pkgsrc/graphics/libv4l/patches/patch-am:1.4 pkgsrc/graphics/libv4l/patches/patch-am:1.5
--- pkgsrc/graphics/libv4l/patches/patch-am:1.4 Mon Jun 24 15:57:21 2013
+++ pkgsrc/graphics/libv4l/patches/patch-am Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.4 2013/06/24 15:57:21 jperkin Exp $
+$NetBSD: patch-am,v 1.5 2016/08/28 15:48:32 wiz Exp $
* XXXX
* `mode_t' is promoted to `int' when passed through `...'.
@@ -51,7 +51,18 @@ $NetBSD: patch-am,v 1.4 2013/06/24 15:57
LIBV4L_PUBLIC int close(int fd) {
return v4l1_close(fd);
-@@ -114,11 +120,13 @@ LIBV4L_PUBLIC void *mmap(void *start, si
+@@ -103,22 +109,19 @@ LIBV4L_PUBLIC int ioctl (int fd, unsigne
+ return v4l1_ioctl (fd, request, arg);
+ }
+
+-LIBV4L_PUBLIC ssize_t read(int fd, void* buffer, size_t n)
+-{
+- return v4l1_read (fd, buffer, n);
+-}
+-
+ LIBV4L_PUBLIC void *mmap(void *start, size_t length, int prot, int flags, int fd,
+ __off_t offset)
+ {
return v4l1_mmap(start, length, prot, flags, fd, offset);
}
Index: pkgsrc/graphics/py-pygal/Makefile
diff -u pkgsrc/graphics/py-pygal/Makefile:1.4 pkgsrc/graphics/py-pygal/Makefile:1.5
--- pkgsrc/graphics/py-pygal/Makefile:1.4 Wed Jun 8 17:43:34 2016
+++ pkgsrc/graphics/py-pygal/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:32 wiz Exp $
DISTNAME= pygal-1.7.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,6 @@ DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
.include "options.mk"
Index: pkgsrc/graphics/py-qrcode/Makefile
diff -u pkgsrc/graphics/py-qrcode/Makefile:1.8 pkgsrc/graphics/py-qrcode/Makefile:1.9
--- pkgsrc/graphics/py-qrcode/Makefile:1.8 Sat Aug 13 07:08:17 2016
+++ pkgsrc/graphics/py-qrcode/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/13 07:08:17 wen Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/28 15:48:32 wiz Exp $
DISTNAME= qrcode-5.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../.
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= qrcode/console_scripts.py
SUBST_CLASSES+= pkgmandir
Index: pkgsrc/lang/py-cxfreeze/Makefile
diff -u pkgsrc/lang/py-cxfreeze/Makefile:1.6 pkgsrc/lang/py-cxfreeze/Makefile:1.7
--- pkgsrc/lang/py-cxfreeze/Makefile:1.6 Sat Jan 25 10:30:12 2014
+++ pkgsrc/lang/py-cxfreeze/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2014/01/25 10:30:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:32 wiz Exp $
VERS= 4.2.3
DISTNAME= cx_Freeze-${VERS}
@@ -13,8 +13,6 @@ LICENSE= python-software-foundation
USE_LANGUAGES= c c++
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/cxfreeze ${WRKSRC}/cxfreeze${PYVERSSUFFIX}
Index: pkgsrc/lang/py-hy/Makefile
diff -u pkgsrc/lang/py-hy/Makefile:1.3 pkgsrc/lang/py-hy/Makefile:1.4
--- pkgsrc/lang/py-hy/Makefile:1.3 Wed Jun 8 17:43:34 2016
+++ pkgsrc/lang/py-hy/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:34 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:32 wiz Exp $
DISTNAME= hy-0.10.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ DEPENDS+= ${PYPKGPREFIX}-astor>=0.3:../.
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/hy \
Index: pkgsrc/lang/py-pythonz/Makefile
diff -u pkgsrc/lang/py-pythonz/Makefile:1.6 pkgsrc/lang/py-pythonz/Makefile:1.7
--- pkgsrc/lang/py-pythonz/Makefile:1.6 Sat Jul 9 13:03:53 2016
+++ pkgsrc/lang/py-pythonz/Makefile Sun Aug 28 15:48:32 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:03:53 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:32 wiz Exp $
DISTNAME= pythonz-1.2.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,6 @@ LICENSE= mit
WRKSRC= ${WRKDIR}/pythonz-${DISTNAME}
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.2.1
post-install:
Index: pkgsrc/math/py-Scientific/Makefile
diff -u pkgsrc/math/py-Scientific/Makefile:1.43 pkgsrc/math/py-Scientific/Makefile:1.44
--- pkgsrc/math/py-Scientific/Makefile:1.43 Sat Jul 9 13:03:55 2016
+++ pkgsrc/math/py-Scientific/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/07/09 13:03:55 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/28 15:48:33 wiz Exp $
DISTNAME= ScientificPython-2.8.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/Python//}
@@ -14,7 +14,6 @@ CONFLICTS+= py-Scientific-[0-9]*
MAKE_ENV+= NETCDF_PREFIX=${BUILDLINK_PREFIX.netcdf}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PLIST_SUBST+= OSNAME=${LOWER_OPSYS:S/solaris/sunos/}
PLIST_SUBST+= OSVER=${OS_VERSION:C/^(.).*/\1/}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 2.8.1
Index: pkgsrc/math/py-gmpy/Makefile
diff -u pkgsrc/math/py-gmpy/Makefile:1.7 pkgsrc/math/py-gmpy/Makefile:1.8
--- pkgsrc/math/py-gmpy/Makefile:1.7 Sat Jan 25 10:30:13 2014
+++ pkgsrc/math/py-gmpy/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/01/25 10:30:13 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/28 15:48:33 wiz Exp $
DISTNAME= gmpy-1.15
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,9 +14,8 @@ LICENSE= gnu-lgpl-v2.1
USE_LANGUAGES= c
BUILD_TARGET= gmpy.so
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
TEST_ENV+= PYTHONPATH=${WRKSRC}/test
+
do-test:
${ECHO} "Testing py-gmpy:"
${RUN} cd ${WRKSRC}/test; \
Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.31 pkgsrc/math/py-numpy/Makefile:1.32
--- pkgsrc/math/py-numpy/Makefile:1.31 Tue Aug 23 22:45:05 2016
+++ pkgsrc/math/py-numpy/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/08/23 22:45:05 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/08/28 15:48:33 wiz Exp $
DISTNAME= numpy-1.11.1
GITHUB_PROJECT= numpy
@@ -13,7 +13,6 @@ COMMENT= Array processing for numbers, s
LICENSE= modified-bsd
USE_LANGUAGES= c fortran
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
MAKE_ENV+= ATLAS=None
REPLACE_PYTHON+= *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py
Index: pkgsrc/math/py-pytables/Makefile
diff -u pkgsrc/math/py-pytables/Makefile:1.34 pkgsrc/math/py-pytables/Makefile:1.35
--- pkgsrc/math/py-pytables/Makefile:1.34 Thu Aug 18 20:30:02 2016
+++ pkgsrc/math/py-pytables/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2016/08/18 20:30:02 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2016/08/28 15:48:33 wiz Exp $
DISTNAME= tables-3.2.3
PKGNAME= ${PYPKGPREFIX}-py${DISTNAME}
@@ -17,7 +17,6 @@ WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${
PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5}
PYSETUPINSTALLARGS= ${PYSETUPBUILDARGS}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
DEPENDS+= ${PYPKGPREFIX}-numexpr>=2.0:../../math/py-numexpr
Index: pkgsrc/math/py-sympy/Makefile
diff -u pkgsrc/math/py-sympy/Makefile:1.17 pkgsrc/math/py-sympy/Makefile:1.18
--- pkgsrc/math/py-sympy/Makefile:1.17 Fri Aug 19 08:14:49 2016
+++ pkgsrc/math/py-sympy/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2016/08/19 08:14:49 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2016/08/28 15:48:33 wiz Exp $
DISTNAME= sympy-1.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,8 +18,6 @@ USE_LANGUAGES= # none
REPLACE_PYTHON+= sympy/utilities/tests/diagnose_imports.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
SUBST_CLASSES+= manpath
SUBST_SED.manpath= -e 's,share/man,${PKGMANDIR},'
SUBST_FILES.manpath+= setup.py
Index: pkgsrc/meta-pkgs/py-tryton-platform/Makefile
diff -u pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.2 pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.3
--- pkgsrc/meta-pkgs/py-tryton-platform/Makefile:1.2 Mon Aug 24 15:50:08 2015
+++ pkgsrc/meta-pkgs/py-tryton-platform/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/08/24 15:50:08 richard Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:33 wiz Exp $
#
DISTNAME= # empty
PKGNAME= ${PYPKGPREFIX}-tryton-platform-${TRYTON_BASEVER}
@@ -59,4 +59,6 @@ DEPENDS+= ${PYPKGPREFIX}-trytond-stock-p
DEPENDS+= ${PYPKGPREFIX}-trytond-calendar-[0-9]*:../../time/py-trytond-calendar
DEPENDS+= ${PYPKGPREFIX}-trytond-company-work-time-[0-9]*:../../time/py-trytond-company-work-time
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap via py-stdnum and py-trytond-bank
+
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/khard/Makefile
diff -u pkgsrc/misc/khard/Makefile:1.9 pkgsrc/misc/khard/Makefile:1.10
--- pkgsrc/misc/khard/Makefile:1.9 Sat Aug 27 15:50:47 2016
+++ pkgsrc/misc/khard/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/08/27 15:50:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:33 wiz Exp $
DISTNAME= khard-0.11.1
CATEGORIES= misc net
@@ -19,7 +19,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27 # does
INSTALLATION_DIRS= share/examples/khard
REPLACE_PYTHON+= */*.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${INSTALL_DATA} ${WRKSRC}/misc/khard/khard.conf.example ${DESTDIR}${PREFIX}/share/examples/khard
Index: pkgsrc/misc/py-stdnum/Makefile
diff -u pkgsrc/misc/py-stdnum/Makefile:1.8 pkgsrc/misc/py-stdnum/Makefile:1.9
--- pkgsrc/misc/py-stdnum/Makefile:1.8 Thu Aug 18 17:00:38 2016
+++ pkgsrc/misc/py-stdnum/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/08/18 17:00:38 richard Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/28 15:48:33 wiz Exp $
DISTNAME= python-stdnum-1.4
PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
@@ -10,9 +10,11 @@ HOMEPAGE= http://arthurdejong.org/python
COMMENT= Python module to handle standardized numbers and codes
LICENSE= gnu-lgpl-v3
+DEPENDS+= ${PYPKGPREFIX}-simplesoap-[0-9]*:../../net/py-simplesoap
+
USE_LANGUAGES= # none
-DEPENDS+= ${PYPKGPREFIX}-simplesoap-[0-9]*:../../net/py-simplesoap
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/misc/py-trytond-party/options.mk
diff -u pkgsrc/misc/py-trytond-party/options.mk:1.1 pkgsrc/misc/py-trytond-party/options.mk:1.2
--- pkgsrc/misc/py-trytond-party/options.mk:1.1 Sat Feb 1 18:26:44 2014
+++ pkgsrc/misc/py-trytond-party/options.mk Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2014/02/01 18:26:44 rodent Exp $
+# $NetBSD: options.mk,v 1.2 2016/08/28 15:48:33 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.py-trytond-party
PKG_SUPPORTED_OPTIONS= vatnumber
@@ -7,5 +7,6 @@ PKG_SUGGESTED_OPTIONS+= vatnumber
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mvatnumber)
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-simplesoap via py-stdnum and py-vatnumber
DEPENDS+= ${PYPKGPREFIX}-vatnumber-[0-9]*:../../finance/py-vatnumber
.endif
Index: pkgsrc/net/py-boto/Makefile
diff -u pkgsrc/net/py-boto/Makefile:1.24 pkgsrc/net/py-boto/Makefile:1.25
--- pkgsrc/net/py-boto/Makefile:1.24 Wed Jun 8 17:43:36 2016
+++ pkgsrc/net/py-boto/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2016/06/08 17:43:36 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2016/08/28 15:48:33 wiz Exp $
DISTNAME= boto-2.37.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ REPLACE_PYTHON+= bin/* boto/pyami/launch
REPLACE_PYTHON+= boto/services/result.py
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/asadmin \
Index: pkgsrc/net/py-celery/Makefile
diff -u pkgsrc/net/py-celery/Makefile:1.6 pkgsrc/net/py-celery/Makefile:1.7
--- pkgsrc/net/py-celery/Makefile:1.6 Wed Jun 8 17:43:37 2016
+++ pkgsrc/net/py-celery/Makefile Sun Aug 28 15:48:33 2016
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:37 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:33 wiz Exp $
DISTNAME= celery-3.1.16
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,8 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-pytz-[0-9]*:../
USE_LANGUAGES= c
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/celery \
${DESTDIR}${PREFIX}/bin/celery${PYVERSSUFFIX}
Index: pkgsrc/net/py-cymruwhois/Makefile
diff -u pkgsrc/net/py-cymruwhois/Makefile:1.1 pkgsrc/net/py-cymruwhois/Makefile:1.2
--- pkgsrc/net/py-cymruwhois/Makefile:1.1 Thu Jun 30 17:47:02 2016
+++ pkgsrc/net/py-cymruwhois/Makefile Sun Aug 28 15:48:33 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/06/30 17:47:02 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:33 wiz Exp $
DISTNAME= python-cymruwhois-1.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//}
@@ -15,8 +15,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
EGG_NAME= ${DISTNAME:S/python-//}
post-install:
Index: pkgsrc/net/py-dnsdiag/Makefile
diff -u pkgsrc/net/py-dnsdiag/Makefile:1.1 pkgsrc/net/py-dnsdiag/Makefile:1.2
--- pkgsrc/net/py-dnsdiag/Makefile:1.1 Thu Jun 30 17:48:21 2016
+++ pkgsrc/net/py-dnsdiag/Makefile Sun Aug 28 15:48:33 2016
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2016/06/30 17:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:33 wiz Exp $
DISTNAME= dnsdiag-1.5.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_PYPI:=d/dnsdiag/}
@@ -10,14 +11,12 @@ HOMEPAGE= https://dnsdiag.org/
COMMENT= DNS Diagnostics and Performance Measurement Tools
LICENSE= 2-clause-bsd
-DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
+# cited as dependency, but dnsdiag installs conflicting files
+#DEPENDS+= ${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
DEPENDS+= ${PYPKGPREFIX}-cymruwhois-[0-9]*:../../net/py-cymruwhois
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
cd ${DESTDIR}${PREFIX}/bin && \
for i in dnseval dnsping dnstraceroute; do \
Index: pkgsrc/net/py-eventlib/Makefile
diff -u pkgsrc/net/py-eventlib/Makefile:1.9 pkgsrc/net/py-eventlib/Makefile:1.10
--- pkgsrc/net/py-eventlib/Makefile:1.9 Sat Jul 9 13:04:00 2016
+++ pkgsrc/net/py-eventlib/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/07/09 13:04:00 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:34 wiz Exp $
DISTNAME= eventlib-0.1.5
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,6 @@ DEPENDS+= ${PYPKGPREFIX}-django>=1.4.1:.
USE_LANGUAGES= # none
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE+= 34 35 # not yet ported as of 0.1.5
post-install:
Index: pkgsrc/net/py-hatop/Makefile
diff -u pkgsrc/net/py-hatop/Makefile:1.2 pkgsrc/net/py-hatop/Makefile:1.3
--- pkgsrc/net/py-hatop/Makefile:1.2 Mon Apr 13 23:12:43 2015
+++ pkgsrc/net/py-hatop/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/04/13 23:12:43 rodent Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:34 wiz Exp $
DISTNAME= hatop-0.7.7
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,9 @@ HOMEPAGE= http://feurix.org/projects/hat
COMMENT= Interactive client and monitoring tool for HAProxy
LICENSE= gnu-gpl-v3
+DEPENDS+= haproxy>=1.4:../../net/haproxy
+DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
+
USE_LANGUAGES= # none
NO_BUILD= yes
@@ -17,7 +20,6 @@ PYTHON_VERSIONS_ACCEPTED= 27
REPLACE_PYTHON= bin/hatop
INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
do-configure:
# XXX: Blank, but we can't define NO_CONFIGURE and use REPLACE_PYTHON...
@@ -28,8 +30,6 @@ do-install:
${INSTALL_MAN} ${WRKSRC}/man/hatop.1 \
${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/hatop${PYVERSSUFFIX}.1
-DEPENDS+= haproxy>=1.4:../../net/haproxy
-DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:../../devel/py-curses
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-metar/Makefile
diff -u pkgsrc/net/py-metar/Makefile:1.4 pkgsrc/net/py-metar/Makefile:1.5
--- pkgsrc/net/py-metar/Makefile:1.4 Sat Jul 9 13:04:00 2016
+++ pkgsrc/net/py-metar/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 13:04:00 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:34 wiz Exp $
DISTNAME= pymetar-0.19
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -10,7 +10,6 @@ HOMEPAGE= http://www.schwarzvogel.de/sof
COMMENT= Downloads weather reports
LICENSE= gnu-gpl-v2 # or later
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 0.19
SUBST_CLASSES+= manpath
@@ -19,8 +18,6 @@ SUBST_FILES.manpath+= setup.py
SUBST_STAGE.manpath= pre-configure
SUBST_MESSAGE.manpath= Fix man page installation path.
-CONFLICTS= ${PYPKGPREFIX}-pymetar-[0-9]*
-
post-extract:
${MV} ${WRKSRC}/bin/pymetar ${WRKSRC}/bin/pymetar${PYVERSSUFFIX}
Index: pkgsrc/net/py-simplesoap/Makefile
diff -u pkgsrc/net/py-simplesoap/Makefile:1.3 pkgsrc/net/py-simplesoap/Makefile:1.4
--- pkgsrc/net/py-simplesoap/Makefile:1.3 Thu Aug 18 21:05:35 2016
+++ pkgsrc/net/py-simplesoap/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/08/18 21:05:35 richard Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:34 wiz Exp $
DISTNAME= PySimpleSOAP-1.16
PKGNAME= ${DISTNAME:tl:S/py/${PYPKGPREFIX}-/1}
@@ -11,8 +11,7 @@ COMMENT= Python Simple SOAP Library
LICENSE= gnu-lgpl-v3
USE_LANGUAGES= # none
-
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
+PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # as of 1.16
.include "../../lang/python/egg.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/py-zsi/Makefile
diff -u pkgsrc/net/py-zsi/Makefile:1.22 pkgsrc/net/py-zsi/Makefile:1.23
--- pkgsrc/net/py-zsi/Makefile:1.22 Sat Jul 9 13:04:01 2016
+++ pkgsrc/net/py-zsi/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2016/07/09 13:04:01 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/08/28 15:48:34 wiz Exp $
DISTNAME= ZSI-2.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,8 +16,6 @@ USE_LANGUAGES= # none
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-xml
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
post-extract:
${MV} ${WRKSRC}/scripts/wsdl2py \
${WRKSRC}/scripts/wsdl2py${PYVERSSUFFIX}
Index: pkgsrc/print/py-weasyprint/Makefile
diff -u pkgsrc/print/py-weasyprint/Makefile:1.3 pkgsrc/print/py-weasyprint/Makefile:1.4
--- pkgsrc/print/py-weasyprint/Makefile:1.3 Thu Feb 18 17:30:18 2016
+++ pkgsrc/print/py-weasyprint/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/02/18 17:30:18 kleink Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:34 wiz Exp $
DISTNAME= WeasyPrint-0.26
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE= modified-bsd
USE_LANGUAGES= # empty
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
DEPENDS+= ${PYPKGPREFIX}-cairosvg>=0.4.1:../../converters/py-cairosvg
DEPENDS+= ${PYPKGPREFIX}-cairocffi>=0.5:../../graphics/py-cairocffi
DEPENDS+= ${PYPKGPREFIX}-lxml>=3.0:../../textproc/py-lxml
Index: pkgsrc/security/py-keyring/Makefile
diff -u pkgsrc/security/py-keyring/Makefile:1.16 pkgsrc/security/py-keyring/Makefile:1.17
--- pkgsrc/security/py-keyring/Makefile:1.16 Wed Jun 8 17:43:38 2016
+++ pkgsrc/security/py-keyring/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2016/06/08 17:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:34 wiz Exp $
DISTNAME= keyring-5.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -15,8 +15,6 @@ LICENSE= python-software-foundation
BUILD_DEPENDS+= ${PYPKGPREFIX}-hgtools>=5.0:../../devel/py-hgtools
REPLACE_PYTHON+= keyring/cli.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/keyring ${DESTDIR}${PREFIX}/bin/keyring-${PYVERSSUFFIX}
Index: pkgsrc/sysutils/py-attic/Makefile
diff -u pkgsrc/sysutils/py-attic/Makefile:1.4 pkgsrc/sysutils/py-attic/Makefile:1.5
--- pkgsrc/sysutils/py-attic/Makefile:1.4 Wed Jun 8 17:43:39 2016
+++ pkgsrc/sysutils/py-attic/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/06/08 17:43:39 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:34 wiz Exp $
DISTNAME= Attic-0.16
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/A/a/}
@@ -14,8 +14,6 @@ LICENSE= modified-bsd
DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
PYTHON_VERSIONS_INCOMPATIBLE= 27
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
cd ${DESTDIR}${PREFIX}/bin && mv attic attic${PYVERSSUFFIX}
Index: pkgsrc/sysutils/py-borgbackup/Makefile
diff -u pkgsrc/sysutils/py-borgbackup/Makefile:1.7 pkgsrc/sysutils/py-borgbackup/Makefile:1.8
--- pkgsrc/sysutils/py-borgbackup/Makefile:1.7 Fri Aug 19 22:34:14 2016
+++ pkgsrc/sysutils/py-borgbackup/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/08/19 22:34:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/28 15:48:34 wiz Exp $
DISTNAME= borgbackup-1.0.7
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -17,8 +17,6 @@ PYTHON_VERSIONS_INCOMPATIBLE= 27
MAKE_ENV+= BORG_OPENSSL_PREFIX=${SSLBASE:Q}
MAKE_ENV+= BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
cd ${DESTDIR}${PREFIX}/bin && mv borg borg-${PYVERSSUFFIX}
Index: pkgsrc/sysutils/py-diffoscope/Makefile
diff -u pkgsrc/sysutils/py-diffoscope/Makefile:1.1 pkgsrc/sysutils/py-diffoscope/Makefile:1.2
--- pkgsrc/sysutils/py-diffoscope/Makefile:1.1 Sun Dec 27 15:43:59 2015
+++ pkgsrc/sysutils/py-diffoscope/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/12/27 15:43:59 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:34 wiz Exp $
DISTNAME= diffoscope-44
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -27,8 +27,6 @@ SUBST_MESSAGE.gtar= Fix path to gtar.
SUBST_STAGE.gtar= post-configure
PYTHON_VERSIONS_INCOMPATIBLE= 27
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
cd ${DESTDIR}${PREFIX}/bin && \
Index: pkgsrc/sysutils/py-xattr/Makefile
diff -u pkgsrc/sysutils/py-xattr/Makefile:1.10 pkgsrc/sysutils/py-xattr/Makefile:1.11
--- pkgsrc/sysutils/py-xattr/Makefile:1.10 Sat Jul 9 13:04:07 2016
+++ pkgsrc/sysutils/py-xattr/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 13:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:34 wiz Exp $
DISTNAME= v0.7.6
PROPERNAME= ${DISTNAME:S/v/xattr-/}
@@ -20,8 +20,6 @@ WRKSRC= ${WRKDIR}/${PROPERNAME}
EGG_NAME= ${PROPERNAME}
USE_LANGUAGES= c
REPLACE_PYTHON= xattr/tool.py
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
# XXX: builds, installs, but cannot be executed
PYTHON_VERSIONS_INCOMPATIBLE= 34 35
Index: pkgsrc/textproc/csvtomd/Makefile
diff -u pkgsrc/textproc/csvtomd/Makefile:1.3 pkgsrc/textproc/csvtomd/Makefile:1.4
--- pkgsrc/textproc/csvtomd/Makefile:1.3 Thu Jul 28 09:54:59 2016
+++ pkgsrc/textproc/csvtomd/Makefile Sun Aug 28 15:48:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/07/28 09:54:59 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:34 wiz Exp $
DISTNAME= csvtomd-0.1.1
CATEGORIES= textproc
@@ -13,7 +13,6 @@ LICENSE= mit
USE_LANGUAGES= # none
REPLACE_PYTHON+= csvtomd
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 27
Index: pkgsrc/textproc/py-HappyDoc/Makefile
diff -u pkgsrc/textproc/py-HappyDoc/Makefile:1.26 pkgsrc/textproc/py-HappyDoc/Makefile:1.27
--- pkgsrc/textproc/py-HappyDoc/Makefile:1.26 Sat Jul 9 13:04:09 2016
+++ pkgsrc/textproc/py-HappyDoc/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:35 wiz Exp $
DISTNAME= HappyDoc_r2_1
PKGNAME= ${PYPKGPREFIX}-HappyDoc-2.1
@@ -13,7 +13,6 @@ COMMENT= Python tool to generate Python
USE_LANGUAGES= #none
WRKSRC= ${WRKDIR}/HappyDoc-r2_1
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
EGG_NAME= ${DISTNAME:S/_r/-/:S/_/./g}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 2.1
Index: pkgsrc/textproc/py-cElementTree/Makefile
diff -u pkgsrc/textproc/py-cElementTree/Makefile:1.12 pkgsrc/textproc/py-cElementTree/Makefile:1.13
--- pkgsrc/textproc/py-cElementTree/Makefile:1.12 Sun Mar 15 19:42:33 2015
+++ pkgsrc/textproc/py-cElementTree/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/03/15 19:42:33 hiramatsu Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:35 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-cElementTree-${PY_DISTVERSION}
CATEGORIES= textproc python
@@ -17,7 +17,6 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
Index: pkgsrc/textproc/py-docutils/Makefile
diff -u pkgsrc/textproc/py-docutils/Makefile:1.43 pkgsrc/textproc/py-docutils/Makefile:1.44
--- pkgsrc/textproc/py-docutils/Makefile:1.43 Tue Feb 24 11:03:05 2015
+++ pkgsrc/textproc/py-docutils/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2015/02/24 11:03:05 markd Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/28 15:48:35 wiz Exp $
DISTNAME= docutils-0.12
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,8 +14,6 @@ DEPENDS+= ${PYPKGPREFIX}-roman>=1.4:../.
DEPENDS+= ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
USE_LANGUAGES= #none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= docutils/utils/code_analyzer.py
REPLACE_PYTHON+= docutils/utils/error_reporting.py
Index: pkgsrc/textproc/py-empy/Makefile
diff -u pkgsrc/textproc/py-empy/Makefile:1.9 pkgsrc/textproc/py-empy/Makefile:1.10
--- pkgsrc/textproc/py-empy/Makefile:1.9 Sat Jul 9 13:04:10 2016
+++ pkgsrc/textproc/py-empy/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/07/09 13:04:10 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2016/08/28 15:48:35 wiz Exp $
DISTNAME= empy-3.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -16,7 +16,6 @@ REPLACE_PYTHON+= em.py
USE_TOOLS+= pax
PYDISTUTILSPKG= # yes
-PLIST_SUBST+= PYVERSSUFFIX="${PYVERSSUFFIX}"
PYTHON_SELF_CONFLICT= yes
PYTHON_VERSIONS_INCOMPATIBLE= 34 35
Index: pkgsrc/textproc/py-expat/Makefile
diff -u pkgsrc/textproc/py-expat/Makefile:1.23 pkgsrc/textproc/py-expat/Makefile:1.24
--- pkgsrc/textproc/py-expat/Makefile:1.23 Thu Mar 13 11:08:52 2014
+++ pkgsrc/textproc/py-expat/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/28 15:48:35 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-expat-${PY_DISTVERSION}
CATEGORIES= textproc python
@@ -16,7 +16,6 @@ PY_PATCHPLIST= yes
PY_SETUP_SUBST+= EXPATPREFIX=${BUILDLINK_DIR}
PY_SETUP_SUBST+= EXPATRTPREFIX=${BUILDLINK_PREFIX.expat}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
PYSETUPINSTALLARGS+= --install-lib ${PREFIX}/${PYLIB}/lib-dynload
# ignore errors due to missing files (EXTRACT_ELEMENTS!)
Index: pkgsrc/textproc/py-ftfy/Makefile
diff -u pkgsrc/textproc/py-ftfy/Makefile:1.2 pkgsrc/textproc/py-ftfy/Makefile:1.3
--- pkgsrc/textproc/py-ftfy/Makefile:1.2 Wed Jun 8 17:43:42 2016
+++ pkgsrc/textproc/py-ftfy/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:35 wiz Exp $
DISTNAME= ftfy-3.4.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE= mit
USE_LANGUAGES= # none
-PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/ftfy \
${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX}
Index: pkgsrc/textproc/py-html2text/Makefile
diff -u pkgsrc/textproc/py-html2text/Makefile:1.46 pkgsrc/textproc/py-html2text/Makefile:1.47
--- pkgsrc/textproc/py-html2text/Makefile:1.46 Sun Jul 3 11:58:57 2016
+++ pkgsrc/textproc/py-html2text/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2016/07/03 11:58:57 wiz Exp $
+# $NetBSD: Makefile,v 1.47 2016/08/28 15:48:35 wiz Exp $
DISTNAME= html2text-2016.5.29
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,8 +11,6 @@ COMMENT= Convert HTML into easy-to-read
LICENSE= gnu-gpl-v2
REPLACE_PYTHON= html2text/__init__.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/html2text ${DESTDIR}${PREFIX}/bin/html2text-${PYVERSSUFFIX}
Index: pkgsrc/textproc/py-jsonschema/Makefile
diff -u pkgsrc/textproc/py-jsonschema/Makefile:1.3 pkgsrc/textproc/py-jsonschema/Makefile:1.4
--- pkgsrc/textproc/py-jsonschema/Makefile:1.3 Wed Jun 8 17:43:42 2016
+++ pkgsrc/textproc/py-jsonschema/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/08 17:43:42 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:35 wiz Exp $
DISTNAME= jsonschema-2.4.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -10,8 +10,6 @@ HOMEPAGE= https://github.com/Julian/json
COMMENT= Implementation of JSON Schema for Python
LICENSE= modified-bsd
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
.include "../../lang/python/egg.mk"
post-install:
Index: pkgsrc/textproc/py-markdown/Makefile
diff -u pkgsrc/textproc/py-markdown/Makefile:1.10 pkgsrc/textproc/py-markdown/Makefile:1.11
--- pkgsrc/textproc/py-markdown/Makefile:1.10 Fri Nov 13 14:47:09 2015
+++ pkgsrc/textproc/py-markdown/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2015/11/13 14:47:09 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/28 15:48:35 wiz Exp $
DISTNAME= Markdown-2.6.4
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,8 +15,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-extract:
${MV} ${WRKSRC}/bin/markdown_py ${WRKSRC}/bin/markdown_py${PYVERSSUFFIX}
Index: pkgsrc/textproc/py-pygments/Makefile
diff -u pkgsrc/textproc/py-pygments/Makefile:1.23 pkgsrc/textproc/py-pygments/Makefile:1.24
--- pkgsrc/textproc/py-pygments/Makefile:1.23 Wed Jun 8 17:43:40 2016
+++ pkgsrc/textproc/py-pygments/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2016/06/08 17:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2016/08/28 15:48:35 wiz Exp $
DISTNAME= Pygments-2.0.2
PKGREVISION= 1
@@ -17,8 +17,6 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9
#BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/pygmentize ${DESTDIR}${PREFIX}/bin/pygmentize${PYVERSSUFFIX}
Index: pkgsrc/textproc/py-rdflib/Makefile
diff -u pkgsrc/textproc/py-rdflib/Makefile:1.3 pkgsrc/textproc/py-rdflib/Makefile:1.4
--- pkgsrc/textproc/py-rdflib/Makefile:1.3 Thu Jun 9 06:23:40 2016
+++ pkgsrc/textproc/py-rdflib/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:40 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:35 wiz Exp $
DISTNAME= rdflib-4.2.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -23,8 +23,6 @@ REPLACE_PYTHON+= rdflib/plugins/parsers/
REPLACE_PYTHON+= rdflib/plugins/parsers/structureddata.py
REPLACE_PYTHON+= rdflib/tools/rdfpipe.py
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/csv2rdf \
${DESTDIR}${PREFIX}/bin/csv2rdf${PYVERSSUFFIX}
Index: pkgsrc/textproc/py-sphinx/Makefile
diff -u pkgsrc/textproc/py-sphinx/Makefile:1.31 pkgsrc/textproc/py-sphinx/Makefile:1.32
--- pkgsrc/textproc/py-sphinx/Makefile:1.31 Wed Jun 8 17:43:40 2016
+++ pkgsrc/textproc/py-sphinx/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2016/06/08 17:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.32 2016/08/28 15:48:35 wiz Exp $
DISTNAME= Sphinx-1.4.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -24,8 +24,6 @@ DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../.
BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose
USE_LANGUAGES= #none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= sphinx/pycode/pgen2/token.py
Index: pkgsrc/textproc/py-vobject/Makefile
diff -u pkgsrc/textproc/py-vobject/Makefile:1.18 pkgsrc/textproc/py-vobject/Makefile:1.19
--- pkgsrc/textproc/py-vobject/Makefile:1.18 Sat Aug 27 15:45:19 2016
+++ pkgsrc/textproc/py-vobject/Makefile Sun Aug 28 15:48:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2016/08/27 15:45:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/08/28 15:48:35 wiz Exp $
DISTNAME= vobject-0.9.3
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -13,8 +13,6 @@ LICENSE= apache-2.0
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
cd ${DESTDIR}${PREFIX}/bin && \
${MV} change_tz change_tz-${PYVERSSUFFIX} && \
Index: pkgsrc/textproc/py-xml/Makefile
diff -u pkgsrc/textproc/py-xml/Makefile:1.26 pkgsrc/textproc/py-xml/Makefile:1.27
--- pkgsrc/textproc/py-xml/Makefile:1.26 Sat Jul 9 13:04:11 2016
+++ pkgsrc/textproc/py-xml/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2016/07/09 13:04:11 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2016/08/28 15:48:36 wiz Exp $
DISTNAME= PyXML-0.8.4
PKGNAME= ${PYPKGPREFIX}-xml-0.8.4
@@ -32,7 +32,6 @@ post-extract:
.endfor
REPLACE_PYTHON= ${PYXML_SCRIPTS:S/$/${PYVERSSUFFIX}/g}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../textproc/expat/buildlink3.mk"
.include "../../lang/python/distutils.mk"
Index: pkgsrc/www/py-curl/Makefile
diff -u pkgsrc/www/py-curl/Makefile:1.49 pkgsrc/www/py-curl/Makefile:1.50
--- pkgsrc/www/py-curl/Makefile:1.49 Sat Mar 5 11:29:39 2016
+++ pkgsrc/www/py-curl/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/03/05 11:29:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2016/08/28 15:48:36 wiz Exp $
DISTNAME= pycurl-7.19.3.1
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -11,12 +11,9 @@ HOMEPAGE= http://pycurl.sourceforge.net/
COMMENT= Python module interface to the cURL library
LICENSE= gnu-lgpl-v2.1 OR mit
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
-BUILDLINK_API_DEPENDS.curl+= curl>=7.19.0
-
PYSETUPARGS= --with-ssl
+BUILDLINK_API_DEPENDS.curl+= curl>=7.19.0
.include "../../www/curl/buildlink3.mk"
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/py-django/Makefile
diff -u pkgsrc/www/py-django/Makefile:1.75 pkgsrc/www/py-django/Makefile:1.76
--- pkgsrc/www/py-django/Makefile:1.75 Thu Aug 4 08:23:11 2016
+++ pkgsrc/www/py-django/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2016/08/04 08:23:11 adam Exp $
+# $NetBSD: Makefile,v 1.76 2016/08/28 15:48:36 wiz Exp $
DISTNAME= Django-1.9.9
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.djangoproject.com/
COMMENT= Django, a high-level Python Web framework
LICENSE= modified-bsd
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
USE_LANGUAGES= # empty
REPLACE_PYTHON= ${WRKSRC}/django/bin/django-admin.py
REPLACE_PYTHON+= ${WRKSRC}/django/conf/project_template/manage.py-tpl
Index: pkgsrc/www/py-django14/Makefile
diff -u pkgsrc/www/py-django14/Makefile:1.14 pkgsrc/www/py-django14/Makefile:1.15
--- pkgsrc/www/py-django14/Makefile:1.14 Sat Jul 9 13:04:14 2016
+++ pkgsrc/www/py-django14/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 13:04:14 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:36 wiz Exp $
DISTNAME= Django-1.4.22
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,8 +10,6 @@ HOMEPAGE= http://www.djangoproject.com/
COMMENT= Django, a high-level Python Web framework (LTS version)
LICENSE= modified-bsd
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
USE_LANGUAGES= # empty
REPLACE_PYTHON= ${WRKSRC}/django/bin/*.py
REPLACE_PYTHON+= ${WRKSRC}/django/bin/profiling/*.py
Index: pkgsrc/www/py-feedgen/Makefile
diff -u pkgsrc/www/py-feedgen/Makefile:1.1 pkgsrc/www/py-feedgen/Makefile:1.2
--- pkgsrc/www/py-feedgen/Makefile:1.1 Wed Aug 17 01:01:22 2016
+++ pkgsrc/www/py-feedgen/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/08/17 01:01:22 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:36 wiz Exp $
DISTNAME= v0.3.2
PKGNAME= ${PYPKGPREFIX}-${GITHUB_PROJECT:S/python-//}-${DISTNAME:S/v//}
@@ -16,7 +16,5 @@ LICENSE= 2-clause-bsd
DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]*:../../time/py-dateutil
DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
.include "../../lang/python/distutils.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/www/py-flask/Makefile
diff -u pkgsrc/www/py-flask/Makefile:1.8 pkgsrc/www/py-flask/Makefile:1.9
--- pkgsrc/www/py-flask/Makefile:1.8 Wed Jun 1 21:05:46 2016
+++ pkgsrc/www/py-flask/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/06/01 21:05:46 kleink Exp $
+# $NetBSD: Makefile,v 1.9 2016/08/28 15:48:36 wiz Exp $
DISTNAME= Flask-0.11
PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl}
@@ -12,8 +12,6 @@ LICENSE= modified-bsd
USE_LANGUAGES= # empty
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
-
DEPENDS+= ${PYPKGPREFIX}-click>=2.0:../../devel/py-click
DEPENDS+= ${PYPKGPREFIX}-itsdangerous-[0-9]*:../../security/py-itsdangerous
DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
Index: pkgsrc/www/py-mod_wsgi/Makefile
diff -u pkgsrc/www/py-mod_wsgi/Makefile:1.5 pkgsrc/www/py-mod_wsgi/Makefile:1.6
--- pkgsrc/www/py-mod_wsgi/Makefile:1.5 Wed Jun 8 17:43:48 2016
+++ pkgsrc/www/py-mod_wsgi/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/06/08 17:43:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:36 wiz Exp $
DISTNAME= mod_wsgi-4.4.12
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -18,8 +18,6 @@ APACHE_MODULE= yes
MESSAGE_SUBST+= PYSITELIB=${PYSITELIB}
MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
# __init__.py is the same as in mod_wsgi-metrics; remove it to avoid conflict
post-extract:
Index: pkgsrc/www/py-pelican/Makefile
diff -u pkgsrc/www/py-pelican/Makefile:1.3 pkgsrc/www/py-pelican/Makefile:1.4
--- pkgsrc/www/py-pelican/Makefile:1.3 Fri Nov 27 22:14:57 2015
+++ pkgsrc/www/py-pelican/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/11/27 22:14:57 nils Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:36 wiz Exp $
DISTNAME= pelican-3.6.3
GITHUB_PROJECT= pelican
@@ -25,7 +25,6 @@ DEPENDS+= ${PYPKGPREFIX}-dateutil-[0-9]
BUILD_DEPENDS+= ${PYPKGPREFIX}-sphinx>=1.2.3nb1:../../textproc/py-sphinx
USE_TOOLS+= bash:run make:build
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
REPLACE_PYTHON+= pelican/tools/pelican_import.py
REPLACE_PYTHON+= pelican/tools/pelican_quickstart.py
REPLACE_PYTHON+= pelican/tools/pelican_themes.py
Index: pkgsrc/www/py-static/Makefile
diff -u pkgsrc/www/py-static/Makefile:1.2 pkgsrc/www/py-static/Makefile:1.3
--- pkgsrc/www/py-static/Makefile:1.2 Wed Jun 8 17:43:43 2016
+++ pkgsrc/www/py-static/Makefile Sun Aug 28 15:48:36 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2016/06/08 17:43:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:36 wiz Exp $
DISTNAME= static-1.0.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,6 @@ COMMENT= Serve static or templated conte
LICENSE= mit
USE_LANGUAGES= # none
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX}
Index: pkgsrc/www/py-twill/Makefile
diff -u pkgsrc/www/py-twill/Makefile:1.6 pkgsrc/www/py-twill/Makefile:1.7
--- pkgsrc/www/py-twill/Makefile:1.6 Sat Jul 9 13:04:15 2016
+++ pkgsrc/www/py-twill/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 13:04:15 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:37 wiz Exp $
DISTNAME= twill-1.8.0
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE= mit
USE_LANGUAGES= # none
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # setup fails for 1.8.0
post-install:
Index: pkgsrc/www/py-uwsgi/Makefile
diff -u pkgsrc/www/py-uwsgi/Makefile:1.32 pkgsrc/www/py-uwsgi/Makefile:1.33
--- pkgsrc/www/py-uwsgi/Makefile:1.32 Sat Mar 5 11:29:39 2016
+++ pkgsrc/www/py-uwsgi/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2016/03/05 11:29:39 jperkin Exp $
+# $NetBSD: Makefile,v 1.33 2016/08/28 15:48:37 wiz Exp $
DISTNAME= uwsgi-2.0.10
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ LICENSE= gnu-gpl-v2 # with linking excep
USE_LANGUAGES= c
USE_TOOLS+= pkg-config
-PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} PYVERSSUFFIX=${PYVERSSUFFIX}
+PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
EGG_NAME= ${DISTNAME:S/uwsgi/uWSGI/}
.include "options.mk"
Index: pkgsrc/www/py-uwsgitop/Makefile
diff -u pkgsrc/www/py-uwsgitop/Makefile:1.6 pkgsrc/www/py-uwsgitop/Makefile:1.7
--- pkgsrc/www/py-uwsgitop/Makefile:1.6 Wed Jun 8 17:43:47 2016
+++ pkgsrc/www/py-uwsgitop/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2016/06/08 17:43:47 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:37 wiz Exp $
DISTNAME= uwsgitop-0.8
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -17,9 +17,6 @@ DEPENDS+= ${PYPKGPREFIX}-curses-[0-9]*:.
USE_LANGUAGES= # none
-PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-
post-install:
${MV} ${DESTDIR}${PREFIX}/bin/uwsgitop \
${DESTDIR}${PREFIX}/bin/uwsgitop${PYVERSSUFFIX}
Index: pkgsrc/x11/py-kde4/Makefile
diff -u pkgsrc/x11/py-kde4/Makefile:1.49 pkgsrc/x11/py-kde4/Makefile:1.50
--- pkgsrc/x11/py-kde4/Makefile:1.49 Sat Mar 5 11:29:47 2016
+++ pkgsrc/x11/py-kde4/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2016/03/05 11:29:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.50 2016/08/28 15:48:37 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-kde4-${_KDE_VERSION}
PKGREVISION= 3
@@ -15,7 +15,6 @@ CMAKE_ARGS+= -DWITH_Soprano:BOOL=OFF
CMAKE_ARGS+= -DWITH_Nepomuk:BOOL=OFF
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
REPLACE_PYTHON+= \
tools/pykdeuic4/*.py \
Index: pkgsrc/x11/py-qt4/Makefile
diff -u pkgsrc/x11/py-qt4/Makefile:1.81 pkgsrc/x11/py-qt4/Makefile:1.82
--- pkgsrc/x11/py-qt4/Makefile:1.81 Mon Apr 11 04:05:05 2016
+++ pkgsrc/x11/py-qt4/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2016/04/11 04:05:05 dbj Exp $
+# $NetBSD: Makefile,v 1.82 2016/08/28 15:48:37 wiz Exp $
PKGNAME= ${PYPKGPREFIX}-qt4-${PYQT_VERSION}
PYQT_VERSION= 4.11.4
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+= --qsci-api
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtCore
BUILDLINK_TRANSFORM+= rm:-Wl,-R${WRKSRC}/qpy/QtDeclarative
Index: pkgsrc/x11/py-qt4-qscintilla/Makefile
diff -u pkgsrc/x11/py-qt4-qscintilla/Makefile:1.43 pkgsrc/x11/py-qt4-qscintilla/Makefile:1.44
--- pkgsrc/x11/py-qt4-qscintilla/Makefile:1.43 Sat Mar 5 11:27:59 2016
+++ pkgsrc/x11/py-qt4-qscintilla/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2016/03/05 11:27:59 jperkin Exp $
+# $NetBSD: Makefile,v 1.44 2016/08/28 15:48:37 wiz Exp $
PKGREVISION= 1
.include "../../x11/qt4-qscintilla/Makefile.common"
@@ -9,7 +9,6 @@ COMMENT= QScintilla -- Python bindings
WRKSRC= ${WRKDIR}/${DISTNAME}/Python
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
Index: pkgsrc/x11/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.12 pkgsrc/x11/py-qt5/Makefile:1.13
--- pkgsrc/x11/py-qt5/Makefile:1.12 Thu Aug 4 17:03:40 2016
+++ pkgsrc/x11/py-qt5/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/08/04 17:03:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:37 wiz Exp $
DISTNAME= PyQt-gpl-${PYQT_VERSION}
PKGNAME= ${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -26,7 +26,6 @@ CONFIGURE_ARGS+= --verbose
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
SUBST_CLASSES+= install x11lib
SUBST_STAGE.install= post-configure
Index: pkgsrc/x11/py-qwt-qt4/Makefile
diff -u pkgsrc/x11/py-qwt-qt4/Makefile:1.7 pkgsrc/x11/py-qwt-qt4/Makefile:1.8
--- pkgsrc/x11/py-qwt-qt4/Makefile:1.7 Sat Jul 9 13:04:18 2016
+++ pkgsrc/x11/py-qwt-qt4/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2016/07/09 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/28 15:48:37 wiz Exp $
DISTNAME= PyQwt-5.2.0
PKGNAME= ${PYPKGPREFIX}-qwt-qt4-${DISTNAME:S/PyQwt-//}
@@ -20,7 +20,6 @@ BUILD_DIRS= configure
PLIST_SUBST+= PYSITELIB=${PYSITELIB}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
-# Following line rescues from 'Unresolved dependency with pbulk'
PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-Numeric
REPLACE_PYTHON+=qt4lib/PyQt4/Qwt5/grace.py
Index: pkgsrc/x11/py-sip/Makefile
diff -u pkgsrc/x11/py-sip/Makefile:1.46 pkgsrc/x11/py-sip/Makefile:1.47
--- pkgsrc/x11/py-sip/Makefile:1.46 Fri Feb 26 11:27:16 2016
+++ pkgsrc/x11/py-sip/Makefile Sun Aug 28 15:48:37 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2016/02/26 11:27:16 jperkin Exp $
+# $NetBSD: Makefile,v 1.47 2016/08/28 15:48:37 wiz Exp $
DISTNAME= sip-4.17
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+= LIBDIR=${PREFIX}/lib
CONFIGURE_ARGS.DragonFly+= -p freebsd-g++
PY_PATCHPLIST= yes
-PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q}
.include "../../mk/compiler.mk"
Home |
Main Index |
Thread Index |
Old Index