diff options
| author | wiz <wiz@pkgsrc.org> | 2016-08-28 15:48:28 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-08-28 15:48:28 +0000 |
| commit | 603dcc22edc1f178f5df2f3c0853c1294bfc80f8 (patch) | |
| tree | 85b93e9a4d849775aa1efab701f573dd711aa579 | |
| parent | 5391a4ec072e7fb654bef8dbf0ece3ee0945c3fb (diff) | |
| download | pkgsrc-603dcc22edc1f178f5df2f3c0853c1294bfc80f8.tar.gz | |
Remove unnecessary PLIST_SUBST and FILES_SUBST that are now provided
by the infrastructure.
Mark a couple more packages as not ready for python-3.x.
112 files changed, 166 insertions, 287 deletions
diff --git a/archivers/py-yuicompressor/Makefile b/archivers/py-yuicompressor/Makefile index 469302016b4..a4a85a9baf4 100644 --- a/archivers/py-yuicompressor/Makefile +++ b/archivers/py-yuicompressor/Makefile @@ -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: diff --git a/audio/playitslowly/Makefile b/audio/playitslowly/Makefile index ba35c601e5e..b30fa5e4e6e 100644 --- a/audio/playitslowly/Makefile +++ b/audio/playitslowly/Makefile @@ -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" diff --git a/biology/py-mol/Makefile b/biology/py-mol/Makefile index 806f8f70c9f..52f8ec2a812 100644 --- a/biology/py-mol/Makefile +++ b/biology/py-mol/Makefile @@ -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} diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile index 5cc5a77c1b1..35af1b8f713 100644 --- a/converters/py-cairosvg/Makefile +++ b/converters/py-cairosvg/Makefile @@ -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]*:../../graphics/py-cairocffi USE_LANGUAGES= # none PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-install: ${MV} ${DESTDIR}${PREFIX}/bin/cairosvg \ diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile index 7ba47c5e3ad..7f809051e42 100644 --- a/converters/py-chardet/Makefile +++ b/converters/py-chardet/Makefile @@ -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-detection in Python 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} diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile index 6bd06d164f9..8ce096e9bef 100644 --- a/databases/py-couchdb/Makefile +++ b/databases/py-couchdb/Makefile @@ -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/replication_helper.py 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 \ diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile index 372cbf4920c..89b76d5f5a4 100644 --- a/databases/skytools/Makefile +++ b/databases/skytools/Makefile @@ -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 diff --git a/devel/bugs-everywhere/Makefile b/devel/bugs-everywhere/Makefile index 53a1f105994..8d6dedd416e 100644 --- a/devel/bugs-everywhere/Makefile +++ b/devel/bugs-everywhere/Makefile @@ -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]*:../../www/py-cherrypy 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} diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile index b8de0cdff9e..5009bb2f188 100644 --- a/devel/py-babel/Makefile +++ b/devel/py-babel/Makefile @@ -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]*:../../time/py-pytz USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pybabel \ ${DESTDIR}${PREFIX}/bin/pybabel-${PYVERSSUFFIX} diff --git a/devel/py-binaryornot/Makefile b/devel/py-binaryornot/Makefile index 2567a56163a..da850baad22 100644 --- a/devel/py-binaryornot/Makefile +++ b/devel/py-binaryornot/Makefile @@ -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 binary or text LICENSE= modified-bsd USE_LANGUAGES= #none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} DEPENDS+= ${PYPKGPREFIX}-chardet>=2.0.0:../../converters/py-chardet diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile index 97657b8a59b..c635147321a 100644 --- a/devel/py-checker/Makefile +++ b/devel/py-checker/Makefile @@ -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 diff --git a/devel/py-cookiecutter/Makefile b/devel/py-cookiecutter/Makefile index 0b8acea562b..0bde981e310 100644 --- a/devel/py-cookiecutter/Makefile +++ b/devel/py-cookiecutter/Makefile @@ -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-9]*:../../textproc/py-markupsafe DEPENDS+= ${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock .endif -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} REPLACE_PYTHON+= setup.py REPLACE_PYTHON+= cookiecutter/*.py diff --git a/devel/py-coverage/Makefile b/devel/py-coverage/Makefile index 1817196fc2a..2c1f036f085 100644 --- a/devel/py-coverage/Makefile +++ b/devel/py-coverage/Makefile @@ -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]*:../../devel/py-mock BUILD_DEPENDS+= ${PYPKGPREFIX}-greenlet-[0-9]*:../../devel/py-greenlet USE_LANGUAGES= c -PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX} post-extract: ${CHMOD} +r ${WRKSRC}/coverage.egg-info/* diff --git a/devel/py-cython/Makefile b/devel/py-cython/Makefile index 3517ffc7502..d2cc036e8f5 100644 --- a/devel/py-cython/Makefile +++ b/devel/py-cython/Makefile @@ -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 diff --git a/devel/py-distribute/Makefile b/devel/py-distribute/Makefile index 1fcad4a40dc..6074d25c0b1 100644 --- a/devel/py-distribute/Makefile +++ b/devel/py-distribute/Makefile @@ -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 diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile index 046528b4399..ee9c75b8250 100644 --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -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]*:../../devel/py-mccabe 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} diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile index c23c3cfb5bc..7d3128ae6af 100644 --- a/devel/py-flakes/Makefile +++ b/devel/py-flakes/Makefile @@ -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} diff --git a/devel/py-gobject/Makefile.common b/devel/py-gobject/Makefile.common index 76ce748dd81..3812259a141 100644 --- a/devel/py-gobject/Makefile.common +++ b/devel/py-gobject/Makefile.common @@ -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/py-gobject/distinfo PKGCONFIG_OVERRIDE+= pygobject-2.0.pc.in PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} CONFLICTS+= ${PYPKGPREFIX}-gtk2<2.8.4 diff --git a/devel/py-gobject3/Makefile.common b/devel/py-gobject3/Makefile.common index cc216cd0868..3470a6bd541 100644 --- a/devel/py-gobject3/Makefile.common +++ b/devel/py-gobject3/Makefile.common @@ -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-gobject3/patches 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 diff --git a/devel/py-hgview/Makefile b/devel/py-hgview/Makefile index bca43aefb04..4db610494cc 100644 --- a/devel/py-hgview/Makefile +++ b/devel/py-hgview/Makefile @@ -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]*:../../textproc/xmlto REPLACE_PYTHON= *.py PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # not yet ported as of 1.8.0 -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} USE_TOOLS+= gmake diff --git a/devel/py-idle/Makefile b/devel/py-idle/Makefile index 73d6af25b60..b7b92640f82 100644 --- a/devel/py-idle/Makefile +++ b/devel/py-idle/Makefile @@ -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 DeveLopment Environment for Python 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: diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile index f753e4dac47..a3e9ccf146f 100644 --- a/devel/py-ipython/Makefile +++ b/devel/py-ipython/Makefile @@ -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:../../net/py-zmq USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - REPLACE_PYTHON= */*/*.py */*/*/*.py post-install: diff --git a/devel/py-logilab-common/Makefile b/devel/py-logilab-common/Makefile index 3c54513533b..1e5817daa6b 100644 --- a/devel/py-logilab-common/Makefile +++ b/devel/py-logilab-common/Makefile @@ -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:../../lang/py-six DEPENDS+= ${PYPKGPREFIX}-colorama-[0-9]*:../../comms/py-colorama .endif -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-mxDateTime INSTALLATION_DIRS= ${PKGMANDIR}/man1 diff --git a/devel/py-macholib/Makefile b/devel/py-macholib/Makefile index 3fe4f377d9a..a23e609748a 100644 --- a/devel/py-macholib/Makefile +++ b/devel/py-macholib/Makefile @@ -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 \ diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile index aeee2b4b2f6..2953532a8fb 100644 --- a/devel/py-modulegraph/Makefile +++ b/devel/py-modulegraph/Makefile @@ -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:../../graphics/py-altgraph USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: ${MV} ${DESTDIR}${PREFIX}/bin/modulegraph \ ${DESTDIR}${PREFIX}/bin/modulegraph${PYVERSSUFFIX} diff --git a/devel/py-nose/Makefile b/devel/py-nose/Makefile index a16559379d7..33fd2116de8 100644 --- a/devel/py-nose/Makefile +++ b/devel/py-nose/Makefile @@ -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 diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile index 9f5aecdf5c4..5d383fca039 100644 --- a/devel/py-pbr/Makefile +++ b/devel/py-pbr/Makefile @@ -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: diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 7182150b57c..195801b6793 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -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 diff --git a/devel/py-pylint/Makefile b/devel/py-pylint/Makefile index 978c40ac965..2df72dd5992 100644 --- a/devel/py-pylint/Makefile +++ b/devel/py-pylint/Makefile @@ -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 diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index f3c97205bd0..cdaa48e47d5 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -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]*:../../textproc/py-expat # 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 diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile index 116c51ff62a..d44beaf2c04 100644 --- a/devel/py-setuptools_scm/Makefile +++ b/devel/py-setuptools_scm/Makefile @@ -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" diff --git a/devel/py-tabular/Makefile b/devel/py-tabular/Makefile index 72e60142a34..5076179fb34 100644 --- a/devel/py-tabular/Makefile +++ b/devel/py-tabular/Makefile @@ -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/tabular 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" diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile index 2628ac62841..4a3230484c0 100644 --- a/devel/py-test/Makefile +++ b/devel/py-test/Makefile @@ -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: diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile index a9dd2233895..cf6a6ecdee9 100644 --- a/devel/py-tryton/Makefile +++ b/devel/py-tryton/Makefile @@ -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" diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile index 28545c876bd..4c1d9abdafd 100644 --- a/devel/py-trytond/Makefile +++ b/devel/py-trytond/Makefile @@ -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_tryton.py PYTHON_VERSIONED_DEPENDENCIES= dateutil PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} .include "options.mk" diff --git a/devel/py-unittest2/Makefile b/devel/py-unittest2/Makefile index cb5e94ed253..f6f72b85d0d 100644 --- a/devel/py-unittest2/Makefile +++ b/devel/py-unittest2/Makefile @@ -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-9]*:../../devel/py-linecache2 DOCDIR= share/doc/${PKGBASE} INSTALLATION_DIRS+= ${DOCDIR} PLIST_SUBST+= DOCDIR=${DOCDIR} -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} SUBST_CLASSES+= multi SUBST_STAGE.multi= pre-configure diff --git a/devel/py-unittest2py3k/Makefile b/devel/py-unittest2py3k/Makefile index 390345d9a34..583f072d045 100644 --- a/devel/py-unittest2py3k/Makefile +++ b/devel/py-unittest2py3k/Makefile @@ -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} diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index c6cc449930e..c5e6b3b5b1a 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -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/virtualenv COMMENT= Virtual Python Environment builder LICENSE= mit -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} REPLACE_PYTHON= virtualenv.py post-install: diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index a3094518605..d2cdbac4f9b 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -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} diff --git a/finance/moneyguru/Makefile b/finance/moneyguru/Makefile index 24eb5545643..77ac845ca9e 100644 --- a/finance/moneyguru/Makefile +++ b/finance/moneyguru/Makefile @@ -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 diff --git a/finance/py-trytond-account-payment-sepa/Makefile b/finance/py-trytond-account-payment-sepa/Makefile index 04fae51f378..c10cc8e45f5 100644 --- a/finance/py-trytond-account-payment-sepa/Makefile +++ b/finance/py-trytond-account-payment-sepa/Makefile @@ -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:../../textproc/py-lxml 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" diff --git a/finance/py-trytond-bank/Makefile b/finance/py-trytond-bank/Makefile index 1fc8b7811ee..fa6f5586105 100644 --- a/finance/py-trytond-bank/Makefile +++ b/finance/py-trytond-bank/Makefile @@ -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]*:../../devel/py-trytond 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" diff --git a/finance/py-vatnumber/Makefile b/finance/py-vatnumber/Makefile index 2090b1dab9d..7c7eef98ed6 100644 --- a/finance/py-vatnumber/Makefile +++ b/finance/py-vatnumber/Makefile @@ -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" diff --git a/fonts/py-TTFQuery/Makefile b/fonts/py-TTFQuery/Makefile index bf09f541286..294cad49ac9 100644 --- a/fonts/py-TTFQuery/Makefile +++ b/fonts/py-TTFQuery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/07/09 13:03:48 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2016/08/28 15:48:32 wiz Exp $ DISTNAME= TTFQuery-1.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -12,8 +12,6 @@ LICENSE= modified-bsd DEPENDS+= ${PYPKGPREFIX}-fonttools>=2.0b1:../../fonts/py-fonttools -PYDISTUTILSPKG= yes -PLIST_SUBST= PYVERSSUFFIX=${PYVERSSUFFIX} PYTHON_VERSIONS_INCOMPATIBLE= 34 35 # py-fonttools post-install: @@ -21,5 +19,5 @@ post-install: ${MV} $${f} $${f}${PYVERSSUFFIX}; \ done -.include "../../lang/python/extension.mk" +.include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/py-TTFQuery/PLIST b/fonts/py-TTFQuery/PLIST index 0a2c5bafdfe..d320ee87007 100644 --- a/fonts/py-TTFQuery/PLIST +++ b/fonts/py-TTFQuery/PLIST @@ -1,8 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2012/06/03 22:59:03 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/08/28 15:48:32 wiz Exp $ bin/ttffamily${PYVERSSUFFIX} bin/ttffiles${PYVERSSUFFIX} bin/ttfgroups${PYVERSSUFFIX} bin/ttfmetadata${PYVERSSUFFIX} +${PYSITELIB}/${EGG_FILE}/PKG-INFO +${PYSITELIB}/${EGG_FILE}/SOURCES.txt +${PYSITELIB}/${EGG_FILE}/dependency_links.txt +${PYSITELIB}/${EGG_FILE}/top_level.txt ${PYSITELIB}/ttfquery/__init__.py ${PYSITELIB}/ttfquery/__init__.pyc ${PYSITELIB}/ttfquery/__init__.pyo diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index 1c4fde44b2d..47388194e44 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/06/30 17:56:14 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2016/08/28 15:48:32 wiz Exp $ DISTNAME= fonttools-3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -21,9 +21,6 @@ SUBST_FILES.man+= setup.py SUBST_STAGE.man= pre-configure SUBST_MESSAGE.man= Fixing man page installation path. -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: cd ${DESTDIR}${PREFIX}/bin && \ for i in pyftinspect pyftmerge pyftsubset ttx; do \ diff --git a/geography/py-trytond-country/Makefile b/geography/py-trytond-country/Makefile index 3a51162872b..5e218e60092 100644 --- a/geography/py-trytond-country/Makefile +++ b/geography/py-trytond-country/Makefile @@ -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 \ diff --git a/graphics/libv4l/Makefile b/graphics/libv4l/Makefile index f1c5e2f1219..21475dc0df8 100644 --- a/graphics/libv4l/Makefile +++ b/graphics/libv4l/Makefile @@ -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/ diff --git a/graphics/libv4l/distinfo b/graphics/libv4l/distinfo index e9b33746795..71302c2ee1f 100644 --- a/graphics/libv4l/distinfo +++ b/graphics/libv4l/distinfo @@ -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) = 5ade487d6d64d280f3fdae8afad99fbd0b6e5eda 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 diff --git a/graphics/libv4l/patches/patch-af b/graphics/libv4l/patches/patch-af index d149e2da54d..3c78511f925 100644 --- a/graphics/libv4l/patches/patch-af +++ b/graphics/libv4l/patches/patch-af @@ -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:21 jperkin Exp $ 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); } diff --git a/graphics/libv4l/patches/patch-am b/graphics/libv4l/patches/patch-am index af1b672e906..b0570c89637 100644 --- a/graphics/libv4l/patches/patch-am +++ b/graphics/libv4l/patches/patch-am @@ -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:21 jperkin Exp $ 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); } diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile index bb9be4c993d..268e2d3eabe 100644 --- a/graphics/py-pygal/Makefile +++ b/graphics/py-pygal/Makefile @@ -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]*:../../textproc/py-lxml USE_LANGUAGES= # none PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} .include "options.mk" diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile index d2643b5b75d..d381ee5a582 100644 --- a/graphics/py-qrcode/Makefile +++ b/graphics/py-qrcode/Makefile @@ -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]*:../../lang/py-six USE_LANGUAGES= # none PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} REPLACE_PYTHON+= qrcode/console_scripts.py SUBST_CLASSES+= pkgmandir diff --git a/lang/py-cxfreeze/Makefile b/lang/py-cxfreeze/Makefile index 94725ef43df..8f9261a1de4 100644 --- a/lang/py-cxfreeze/Makefile +++ b/lang/py-cxfreeze/Makefile @@ -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} diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile index 9b9ccefd950..bc2a4748e00 100644 --- a/lang/py-hy/Makefile +++ b/lang/py-hy/Makefile @@ -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:../../devel/py-astor USE_LANGUAGES= # none PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-install: ${MV} ${DESTDIR}${PREFIX}/bin/hy \ diff --git a/lang/py-pythonz/Makefile b/lang/py-pythonz/Makefile index 4e69b9acb27..b76232b26ee 100644 --- a/lang/py-pythonz/Makefile +++ b/lang/py-pythonz/Makefile @@ -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: diff --git a/math/py-Scientific/Makefile b/math/py-Scientific/Makefile index 6e83bbce851..f49cad4be05 100644 --- a/math/py-Scientific/Makefile +++ b/math/py-Scientific/Makefile @@ -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 diff --git a/math/py-gmpy/Makefile b/math/py-gmpy/Makefile index e47e07b786f..c7cc6e9a7c0 100644 --- a/math/py-gmpy/Makefile +++ b/math/py-gmpy/Makefile @@ -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; \ diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile index 2bbc6685f89..c1bcc09ce73 100644 --- a/math/py-numpy/Makefile +++ b/math/py-numpy/Makefile @@ -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, strings, records, and objects LICENSE= modified-bsd USE_LANGUAGES= c fortran -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} MAKE_ENV+= ATLAS=None REPLACE_PYTHON+= *.py */*.py */*/*.py */*/*/*.py */*/*/*/*.py diff --git a/math/py-pytables/Makefile b/math/py-pytables/Makefile index 6c7006afd69..ce26dc9255e 100644 --- a/math/py-pytables/Makefile +++ b/math/py-pytables/Makefile @@ -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}-${GITHUB_TAG} PYSETUPBUILDARGS+= --hdf5=${BUILDLINK_PREFIX.hdf5} PYSETUPINSTALLARGS= ${PYSETUPBUILDARGS} -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} DEPENDS+= ${PYPKGPREFIX}-numexpr>=2.0:../../math/py-numexpr diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile index b44c7fcfd32..23ebbc98e11 100644 --- a/math/py-sympy/Makefile +++ b/math/py-sympy/Makefile @@ -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 diff --git a/meta-pkgs/py-tryton-platform/Makefile b/meta-pkgs/py-tryton-platform/Makefile index 48c2e63fde4..e7fc7f42103 100644 --- a/meta-pkgs/py-tryton-platform/Makefile +++ b/meta-pkgs/py-tryton-platform/Makefile @@ -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-product-location-[0-9]*:../../misc/py-try 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" diff --git a/misc/khard/Makefile b/misc/khard/Makefile index 8dc08ec3a5c..641c4e5a20f 100644 --- a/misc/khard/Makefile +++ b/misc/khard/Makefile @@ -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 not support python-2.x any longer 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 diff --git a/misc/py-stdnum/Makefile b/misc/py-stdnum/Makefile index 495d502560c..ddfa7805ca7 100644 --- a/misc/py-stdnum/Makefile +++ b/misc/py-stdnum/Makefile @@ -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-stdnum 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" diff --git a/misc/py-trytond-party/options.mk b/misc/py-trytond-party/options.mk index b276121477f..1b6a5f74970 100644 --- a/misc/py-trytond-party/options.mk +++ b/misc/py-trytond-party/options.mk @@ -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 diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile index 12357b3d860..3aa9006d2d1 100644 --- a/net/py-boto/Makefile +++ b/net/py-boto/Makefile @@ -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_ami.py boto/services/bs.py REPLACE_PYTHON+= boto/services/result.py PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-install: ${MV} ${DESTDIR}${PREFIX}/bin/asadmin \ diff --git a/net/py-celery/Makefile b/net/py-celery/Makefile index 9304062f914..0fa380411db 100644 --- a/net/py-celery/Makefile +++ b/net/py-celery/Makefile @@ -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]*:../../time/py-pytz USE_LANGUAGES= c -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: ${MV} ${DESTDIR}${PREFIX}/bin/celery \ ${DESTDIR}${PREFIX}/bin/celery${PYVERSSUFFIX} diff --git a/net/py-cymruwhois/Makefile b/net/py-cymruwhois/Makefile index 228a5e95404..88d581e69cc 100644 --- a/net/py-cymruwhois/Makefile +++ b/net/py-cymruwhois/Makefile @@ -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]*:../../devel/py-nose USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} -FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} EGG_NAME= ${DISTNAME:S/python-//} post-install: diff --git a/net/py-dnsdiag/Makefile b/net/py-dnsdiag/Makefile index bf9eccd7fc3..d3b9bb979c7 100644 --- a/net/py-dnsdiag/Makefile +++ b/net/py-dnsdiag/Makefile @@ -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 \ diff --git a/net/py-eventlib/Makefile b/net/py-eventlib/Makefile index 5c9ececab11..63e2fe18438 100644 --- a/net/py-eventlib/Makefile +++ b/net/py-eventlib/Makefile @@ -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:../../www/py-django 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: diff --git a/net/py-hatop/Makefile b/net/py-hatop/Makefile index 627cbba816a..31afc38686e 100644 --- a/net/py-hatop/Makefile +++ b/net/py-hatop/Makefile @@ -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/hatop/ 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" diff --git a/net/py-metar/Makefile b/net/py-metar/Makefile index 086e1cd7821..849aa910921 100644 --- a/net/py-metar/Makefile +++ b/net/py-metar/Makefile @@ -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/software-pymetar.shtml 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} diff --git a/net/py-simplesoap/Makefile b/net/py-simplesoap/Makefile index ab30ab245f7..e1d85125b92 100644 --- a/net/py-simplesoap/Makefile +++ b/net/py-simplesoap/Makefile @@ -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" diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile index f7d3f514cfc..237f7731f23 100644 --- a/net/py-zsi/Makefile +++ b/net/py-zsi/Makefile @@ -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} diff --git a/print/py-weasyprint/Makefile b/print/py-weasyprint/Makefile index 7c4ea69c48b..7836ce2e0fa 100644 --- a/print/py-weasyprint/Makefile +++ b/print/py-weasyprint/Makefile @@ -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 diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index d5ef0a3b63f..109e23c9c8b 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -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} diff --git a/sysutils/py-attic/Makefile b/sysutils/py-attic/Makefile index 1b282917f53..c28cddce04e 100644 --- a/sysutils/py-attic/Makefile +++ b/sysutils/py-attic/Makefile @@ -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} diff --git a/sysutils/py-borgbackup/Makefile b/sysutils/py-borgbackup/Makefile index d9607fedc15..a865e1fb413 100644 --- a/sysutils/py-borgbackup/Makefile +++ b/sysutils/py-borgbackup/Makefile @@ -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} diff --git a/sysutils/py-diffoscope/Makefile b/sysutils/py-diffoscope/Makefile index 9af52bc9c0b..bed3185d810 100644 --- a/sysutils/py-diffoscope/Makefile +++ b/sysutils/py-diffoscope/Makefile @@ -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 && \ diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile index 4e7f029ead1..8491c87a2b2 100644 --- a/sysutils/py-xattr/Makefile +++ b/sysutils/py-xattr/Makefile @@ -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 diff --git a/textproc/csvtomd/Makefile b/textproc/csvtomd/Makefile index 4f629afc7f7..abd17926397 100644 --- a/textproc/csvtomd/Makefile +++ b/textproc/csvtomd/Makefile @@ -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 diff --git a/textproc/py-HappyDoc/Makefile b/textproc/py-HappyDoc/Makefile index 4fe9a73ea5e..43efda7af31 100644 --- a/textproc/py-HappyDoc/Makefile +++ b/textproc/py-HappyDoc/Makefile @@ -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 API documents 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 diff --git a/textproc/py-cElementTree/Makefile b/textproc/py-cElementTree/Makefile index 74e0dc5047f..3ee0479cf75 100644 --- a/textproc/py-cElementTree/Makefile +++ b/textproc/py-cElementTree/Makefile @@ -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!) diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 0cf8111aa3a..c7d2533e800 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -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:../../math/py-roman 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 diff --git a/textproc/py-empy/Makefile b/textproc/py-empy/Makefile index 3fe347d1d33..cc9a7c2ee70 100644 --- a/textproc/py-empy/Makefile +++ b/textproc/py-empy/Makefile @@ -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 diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index f6142843e37..1f6e78f9d44 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -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!) diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile index eb96be724e8..ed09c7a40a2 100644 --- a/textproc/py-ftfy/Makefile +++ b/textproc/py-ftfy/Makefile @@ -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} diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index e9083c60477..9f2dd76f5f7 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -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 plain ASCII text 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} diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile index fab8bde3537..f38525b1baf 100644 --- a/textproc/py-jsonschema/Makefile +++ b/textproc/py-jsonschema/Makefile @@ -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/jsonschema COMMENT= Implementation of JSON Schema for Python LICENSE= modified-bsd -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} - .include "../../lang/python/egg.mk" post-install: diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile index fe14ca696b9..d2e8d1d851f 100644 --- a/textproc/py-markdown/Makefile +++ b/textproc/py-markdown/Makefile @@ -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]*:../../textproc/py-yaml USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-extract: ${MV} ${WRKSRC}/bin/markdown_py ${WRKSRC}/bin/markdown_py${PYVERSSUFFIX} diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 1b01c637713..7903abfdff3 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -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]*:../../devel/py-nose #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} diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile index afb9576c9b7..42972615e9c 100644 --- a/textproc/py-rdflib/Makefile +++ b/textproc/py-rdflib/Makefile @@ -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/pyRdfa/extras/httpheader.py 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} diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index 8aaa4423da3..9374fedd4c6 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -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]*:../../lang/py-six 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 diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index 807664888c4..b5a08bf67a2 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -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} && \ diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile index 793208ae5ee..1534fcc7f53 100644 --- a/textproc/py-xml/Makefile +++ b/textproc/py-xml/Makefile @@ -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" diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile index 55810720bae..0930e72c612 100644 --- a/www/py-curl/Makefile +++ b/www/py-curl/Makefile @@ -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" diff --git a/www/py-django/Makefile b/www/py-django/Makefile index f49436e4847..75d6d843b43 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -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 diff --git a/www/py-django14/Makefile b/www/py-django14/Makefile index 1687eeae61a..3a8030318ba 100644 --- a/www/py-django14/Makefile +++ b/www/py-django14/Makefile @@ -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 diff --git a/www/py-feedgen/Makefile b/www/py-feedgen/Makefile index e1e06a1ead2..b24018cf5d3 100644 --- a/www/py-feedgen/Makefile +++ b/www/py-feedgen/Makefile @@ -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" diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile index d84decc32bf..95d1b47f44a 100644 --- a/www/py-flask/Makefile +++ b/www/py-flask/Makefile @@ -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 diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile index 4a727b91c73..4ca010d2ab0 100644 --- a/www/py-mod_wsgi/Makefile +++ b/www/py-mod_wsgi/Makefile @@ -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: diff --git a/www/py-pelican/Makefile b/www/py-pelican/Makefile index 861028f08f8..c3f8eb5f8cf 100644 --- a/www/py-pelican/Makefile +++ b/www/py-pelican/Makefile @@ -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]*:../../time/py-dateutil 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 diff --git a/www/py-static/Makefile b/www/py-static/Makefile index 2103bd42db8..79f28276119 100644 --- a/www/py-static/Makefile +++ b/www/py-static/Makefile @@ -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 content via WSGI or stand-alone LICENSE= mit USE_LANGUAGES= # none -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} post-install: ${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX} diff --git a/www/py-twill/Makefile b/www/py-twill/Makefile index 05f818f9ea7..553ebdd62ab 100644 --- a/www/py-twill/Makefile +++ b/www/py-twill/Makefile @@ -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: diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile index 8450969a669..f7ab2a10ecd 100644 --- a/www/py-uwsgi/Makefile +++ b/www/py-uwsgi/Makefile @@ -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 exception 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" diff --git a/www/py-uwsgitop/Makefile b/www/py-uwsgitop/Makefile index 96f65453eb8..f5c6efaa810 100644 --- a/www/py-uwsgitop/Makefile +++ b/www/py-uwsgitop/Makefile @@ -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]*:../../devel/py-curses USE_LANGUAGES= # none -PY_PATCHPLIST= yes -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} - post-install: ${MV} ${DESTDIR}${PREFIX}/bin/uwsgitop \ ${DESTDIR}${PREFIX}/bin/uwsgitop${PYVERSSUFFIX} diff --git a/x11/py-kde4/Makefile b/x11/py-kde4/Makefile index e9b583513bf..244ede61f79 100644 --- a/x11/py-kde4/Makefile +++ b/x11/py-kde4/Makefile @@ -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 \ diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile index afab18455c7..79514bc5556 100644 --- a/x11/py-qt4-qscintilla/Makefile +++ b/x11/py-qt4-qscintilla/Makefile @@ -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} diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile index ac397318c4f..2e8069068a1 100644 --- a/x11/py-qt4/Makefile +++ b/x11/py-qt4/Makefile @@ -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 diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile index 6f80965ab2f..a92729cbc62 100644 --- a/x11/py-qt5/Makefile +++ b/x11/py-qt5/Makefile @@ -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 diff --git a/x11/py-qwt-qt4/Makefile b/x11/py-qwt-qt4/Makefile index 229471868f3..dc5067207dc 100644 --- a/x11/py-qwt-qt4/Makefile +++ b/x11/py-qwt-qt4/Makefile @@ -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 diff --git a/x11/py-sip/Makefile b/x11/py-sip/Makefile index 12ec902ec36..5855553b097 100644 --- a/x11/py-sip/Makefile +++ b/x11/py-sip/Makefile @@ -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" |