diff options
52 files changed, 155 insertions, 156 deletions
diff --git a/archivers/py-yuicompressor/Makefile b/archivers/py-yuicompressor/Makefile index a4a85a9baf4..4f0473b7eda 100644 --- a/archivers/py-yuicompressor/Makefile +++ b/archivers/py-yuicompressor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:28 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= yuicompressor-2.4.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ USE_JAVA= run post-install: ${MV} ${DESTDIR}${PREFIX}/bin/yuicompressor \ - ${DESTDIR}${PREFIX}/bin/yuicompressor${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/yuicompressor${PYVERSSUFFIX} || ${TRUE} .include "../../mk/java-vm.mk" .include "../../lang/python/egg.mk" diff --git a/converters/py-cairosvg/Makefile b/converters/py-cairosvg/Makefile index 35af1b8f713..2896f73fc5a 100644 --- a/converters/py-cairosvg/Makefile +++ b/converters/py-cairosvg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/08/28 15:48:28 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= CairoSVG-1.0.15 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -18,7 +18,7 @@ PY_PATCHPLIST= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/cairosvg \ - ${DESTDIR}${PREFIX}/bin/cairosvg${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/cairosvg${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/converters/py-chardet/Makefile b/converters/py-chardet/Makefile index 7f809051e42..b92fead6fef 100644 --- a/converters/py-chardet/Makefile +++ b/converters/py-chardet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/08/28 15:48:29 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= chardet-2.3.0 PKGREVISION= 1 @@ -14,7 +14,7 @@ LICENSE= gnu-lgpl-v2.1 REPLACE_PYTHON= chardet/chardetect.py post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/chardetect ${DESTDIR}${PREFIX}/bin/chardetect-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/chardetect ${DESTDIR}${PREFIX}/bin/chardetect-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/databases/py-couchdb/Makefile b/databases/py-couchdb/Makefile index ad7e3347e2b..1e88de5bcb9 100644 --- a/databases/py-couchdb/Makefile +++ b/databases/py-couchdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2017/01/01 14:43:27 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= CouchDB-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -31,13 +31,13 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.rst \ ${DESTDIR}${PREFIX}/share/doc/py-couchdb ${MV} ${DESTDIR}${PREFIX}/bin/couchdb-dump \ - ${DESTDIR}${PREFIX}/bin/couchdb-dump${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/couchdb-dump${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/couchdb-load \ - ${DESTDIR}${PREFIX}/bin/couchdb-load${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/couchdb-load${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/couchdb-replicate \ - ${DESTDIR}${PREFIX}/bin/couchdb-replicate${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/couchdb-replicate${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/couchpy \ - ${DESTDIR}${PREFIX}/bin/couchpy${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/couchpy${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/databases/py-sqlparse/Makefile b/databases/py-sqlparse/Makefile index 51e17f847b2..5a04464cd5c 100644 --- a/databases/py-sqlparse/Makefile +++ b/databases/py-sqlparse/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2016/10/31 16:31:32 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= sqlparse-0.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test post-install: - cd ${DESTDIR}${PREFIX}/bin && mv sqlformat sqlformat-${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} sqlformat sqlformat-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-babel/Makefile b/devel/py-babel/Makefile index 9a72590cca6..7d32d42c1a2 100644 --- a/devel/py-babel/Makefile +++ b/devel/py-babel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/12/15 10:41:20 adam Exp $ +# $NetBSD: Makefile,v 1.19 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= Babel-2.3.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pybabel \ - ${DESTDIR}${PREFIX}/bin/pybabel-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pybabel-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-boost/Makefile b/devel/py-boost/Makefile index 36a8718fefd..8a1bf9d5723 100644 --- a/devel/py-boost/Makefile +++ b/devel/py-boost/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/06/24 20:32:08 fhajny Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/03 13:23:01 jperkin Exp $ BOOST_PACKAGE= python BOOST_COMMENT= (Boost.Python binary library) @@ -30,7 +30,7 @@ do-install: boost-install-libs # The python3 variant also includes redundant copies of the libs # that conflict with the python2 variant. post-install: - ${RM} ${DESTDIR}${PREFIX}/lib/libboost_python.* + ${RM} -f ${DESTDIR}${PREFIX}/lib/libboost_python.* .endif .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile index d7448b099ad..706ea4cda9c 100644 --- a/devel/py-checker/Makefile +++ b/devel/py-checker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/01/01 14:43:32 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= pychecker-0.8.19 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -15,7 +15,7 @@ PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 0.8.19 post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/pychecker ${DESTDIR}${PREFIX}/bin/pychecker${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/pychecker ${DESTDIR}${PREFIX}/bin/pychecker${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-codestyle/Makefile b/devel/py-codestyle/Makefile index 782fc4596f9..3240e89541d 100644 --- a/devel/py-codestyle/Makefile +++ b/devel/py-codestyle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2016/09/30 10:36:13 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= pycodestyle-2.0.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -13,7 +13,7 @@ LICENSE= mit USE_LANGUAGES= # none post-install: - cd ${DESTDIR}${PREFIX}/bin && mv pycodestyle pycodestyle-${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} pycodestyle pycodestyle-${PYVERSSUFFIX} || ${TRUE} do-test: cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ${PYTHONBIN} setup.py test diff --git a/devel/py-flake8/Makefile b/devel/py-flake8/Makefile index 7340f91ee6c..6f134b1559b 100644 --- a/devel/py-flake8/Makefile +++ b/devel/py-flake8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/11/28 12:45:55 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/03 13:23:01 jperkin Exp $ DISTNAME= flake8-3.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test BUILD_DEPENDS+= ${PYPKGPREFIX}-test-runner-[0-9]*:../../devel/py-test-runner post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/flake8 ${DESTDIR}${PREFIX}/bin/flake8-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/flake8 ${DESTDIR}${PREFIX}/bin/flake8-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-flakes/Makefile b/devel/py-flakes/Makefile index ce01f1c9c17..98578be12ab 100644 --- a/devel/py-flakes/Makefile +++ b/devel/py-flakes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2016/12/17 11:45:18 adam Exp $ +# $NetBSD: Makefile,v 1.9 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= pyflakes-1.3.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/^py//} @@ -15,7 +15,7 @@ USE_LANGUAGES= # none PYDISTUTILSPKG= yes post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/pyflakes ${DESTDIR}${PREFIX}/bin/pyflakes${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/pyflakes ${DESTDIR}${PREFIX}/bin/pyflakes${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-hgview/Makefile b/devel/py-hgview/Makefile index c683be1b8d9..527fe325c55 100644 --- a/devel/py-hgview/Makefile +++ b/devel/py-hgview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2017/01/01 14:43:33 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= hgview-1.8.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -22,7 +22,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.8.0 USE_TOOLS+= gmake post-install: - mv ${DESTDIR}${PREFIX}/bin/hgview ${DESTDIR}${PREFIX}/bin/hgview${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/hgview ${DESTDIR}${PREFIX}/bin/hgview${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/distutils.mk" diff --git a/devel/py-ipython/Makefile b/devel/py-ipython/Makefile index a3e9ccf146f..1c05ebd7b90 100644 --- a/devel/py-ipython/Makefile +++ b/devel/py-ipython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:30 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= ipython-3.2.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -26,11 +26,10 @@ USE_LANGUAGES= # none REPLACE_PYTHON= */*/*.py */*/*/*.py post-install: - mv ${DESTDIR}${PREFIX}/bin/iptest ${DESTDIR}${PREFIX}/bin/iptest${PYVERSSUFFIX} - for f in ipcluster ipcontroller ipengine ipython ; \ - do \ - mv ${DESTDIR}${PREFIX}/bin/$$f ${DESTDIR}${PREFIX}/bin/$${f}${PYVERSSUFFIX}; \ - mv ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$${f}${PYVERSSUFFIX}.1; \ + ${MV} ${DESTDIR}${PREFIX}/bin/iptest ${DESTDIR}${PREFIX}/bin/iptest${PYVERSSUFFIX} || ${TRUE} + for f in ipcluster ipcontroller ipengine ipython; do \ + ${MV} ${DESTDIR}${PREFIX}/bin/$$f ${DESTDIR}${PREFIX}/bin/$${f}${PYVERSSUFFIX} || ${TRUE}; \ + ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$${f}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$${f}${PYVERSSUFFIX}.1 || ${TRUE}; \ done .include "../../lang/python/distutils.mk" diff --git a/devel/py-macholib/Makefile b/devel/py-macholib/Makefile index a23e609748a..88db38c85f6 100644 --- a/devel/py-macholib/Makefile +++ b/devel/py-macholib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:30 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= macholib-1.7 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,11 +19,11 @@ REPLACE_PYTHON+= macholib/macho_standalone.py post-install: ${MV} ${DESTDIR}${PREFIX}/bin/macho_dump \ - ${DESTDIR}${PREFIX}/bin/macho_dump${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/macho_dump${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/macho_find \ - ${DESTDIR}${PREFIX}/bin/macho_find${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/macho_find${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/macho_standalone \ - ${DESTDIR}${PREFIX}/bin/macho_standalone${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/macho_standalone${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/devel/py-modulegraph/Makefile b/devel/py-modulegraph/Makefile index 2953532a8fb..5b817591a82 100644 --- a/devel/py-modulegraph/Makefile +++ b/devel/py-modulegraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:30 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= modulegraph-0.12.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ USE_LANGUAGES= # none post-install: ${MV} ${DESTDIR}${PREFIX}/bin/modulegraph \ - ${DESTDIR}${PREFIX}/bin/modulegraph${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/modulegraph${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-pbr/Makefile b/devel/py-pbr/Makefile index 5d383fca039..27a3bffce91 100644 --- a/devel/py-pbr/Makefile +++ b/devel/py-pbr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2016/08/28 15:48:30 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= pbr-1.10.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ REPLACE_PYTHON+= pbr/tests/testpackage/setup.py post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pbr \ - ${DESTDIR}${PREFIX}/bin/pbr${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pbr${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/devel/py-py2app/Makefile b/devel/py-py2app/Makefile index ffcc117f6bc..2cc29c44683 100644 --- a/devel/py-py2app/Makefile +++ b/devel/py-py2app/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/08/28 15:45:36 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= py2app-0.9 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= Darwin-*-* post-install: ${MV} ${DESTDIR}${PREFIX}/bin/py2applet \ - ${DESTDIR}${PREFIX}/bin/py2applet${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/py2applet${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-pylint/Makefile b/devel/py-pylint/Makefile index fadbf0d0c76..209fe008adf 100644 --- a/devel/py-pylint/Makefile +++ b/devel/py-pylint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2016/08/29 15:44:26 darcy Exp $ +# $NetBSD: Makefile,v 1.13 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= pylint-1.6.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,15 +23,15 @@ REPLACE_PYTHON+= pylint/__main__.py pylint/test/data/ascript pylint/test/input/n post-install: ${MV} ${DESTDIR}${PREFIX}/bin/epylint \ - ${DESTDIR}${PREFIX}/bin/epylint-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/epylint-${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/pylint \ - ${DESTDIR}${PREFIX}/bin/pylint-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pylint-${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/pylint-gui \ - ${DESTDIR}${PREFIX}/bin/pylint-gui-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pylint-gui-${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/pyreverse \ - ${DESTDIR}${PREFIX}/bin/pyreverse-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pyreverse-${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/symilar \ - ${DESTDIR}${PREFIX}/bin/symilar-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/symilar-${PYVERSSUFFIX} || ${TRUE} ${INSTALL_MAN} ${WRKSRC}/man/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 do-test: diff --git a/devel/py-test/Makefile b/devel/py-test/Makefile index ab20b03ccac..0d25b2e2c5b 100644 --- a/devel/py-test/Makefile +++ b/devel/py-test/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/12/12 14:02:20 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= pytest-3.0.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -24,7 +24,7 @@ REPLACE_PYTHON+= _pytest/standalonetemplate.py post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} py.test py.test-${PYVERSSUFFIX} && \ - ${MV} pytest pytest-${PYVERSSUFFIX} + ${MV} pytest pytest-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile index 61bb40b18dd..89d6cbfbd65 100644 --- a/devel/py-tryton/Makefile +++ b/devel/py-tryton/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2017/01/01 14:43:35 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2017/01/03 13:23:02 jperkin Exp $ TRYTON_MODULE_NAME= tryton PKGREVISION= 1 .include "../../devel/py-trytond/Makefile.common" @@ -22,7 +22,7 @@ DEPENDS.Darwin+= ${PYPKGPREFIX}-py2app-[0-9]*:../../devel/py-py2app post-install: ${MV} ${DESTDIR}${PREFIX}/bin/tryton \ - ${DESTDIR}${PREFIX}/bin/tryton${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/tryton${PYVERSSUFFIX} || ${TRUE} .include "../../graphics/librsvg/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/devel/py-trytond/Makefile b/devel/py-trytond/Makefile index cba0e948649..1f6bda3d83c 100644 --- a/devel/py-trytond/Makefile +++ b/devel/py-trytond/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2016/12/04 21:12:59 rodent Exp $ +# $NetBSD: Makefile,v 1.16 2017/01/03 13:23:02 jperkin Exp $ TRYTON_MODULE_NAME= trytond .include "../../devel/py-trytond/Makefile.common" CATEGORIES= devel python @@ -55,11 +55,11 @@ CONF_FILES+= ${EGDIR}/logging.conf.example \ post-install: ${MV} ${DESTDIR}${PREFIX}/bin/trytond-admin \ - ${DESTDIR}${PREFIX}/bin/trytond-admin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/trytond-admin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/trytond-cron \ - ${DESTDIR}${PREFIX}/bin/trytond-cron${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/trytond-cron${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/trytond \ - ${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX} || ${TRUE} ${INSTALL_DATA} ${FILESDIR}/trytond.conf.example \ ${DESTDIR}${PREFIX}/${EGDIR}/trytond.conf.example ${INSTALL_DATA} ${FILESDIR}/logging.conf.example \ diff --git a/devel/py-unittest2py3k/Makefile b/devel/py-unittest2py3k/Makefile index 583f072d045..599f8262b63 100644 --- a/devel/py-unittest2py3k/Makefile +++ b/devel/py-unittest2py3k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:31 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/03 13:23:02 jperkin Exp $ DISTNAME= unittest2py3k-0.5.1 # to match python-2.x name @@ -20,9 +20,9 @@ PLIST_SUBST+= DOCDIR=${DOCDIR} post-install: ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/${DOCDIR} - ${RM} ${DESTDIR}${PREFIX}/bin/unit2 + ${RM} -f ${DESTDIR}${PREFIX}/bin/unit2 ${MV} ${DESTDIR}${PREFIX}/bin/unit2.py \ - ${DESTDIR}${PREFIX}/bin/unit2-${PYVERSSUFFIX}.py + ${DESTDIR}${PREFIX}/bin/unit2-${PYVERSSUFFIX}.py || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 345a7107804..15bfaa53f18 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2016/11/28 15:15:40 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= virtualenv-15.1.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= mit REPLACE_PYTHON= virtualenv.py post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/virtualenv ${DESTDIR}${PREFIX}/bin/virtualenv-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/virtualenv ${DESTDIR}${PREFIX}/bin/virtualenv-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/devel/py-wheel/Makefile b/devel/py-wheel/Makefile index d2cdbac4f9b..f5e7e00c706 100644 --- a/devel/py-wheel/Makefile +++ b/devel/py-wheel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:31 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= wheel-0.26.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ USE_LANGUAGES= # none post-install: ${MV} ${DESTDIR}${PREFIX}/bin/wheel \ - ${DESTDIR}${PREFIX}/bin/wheel-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/wheel-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/geography/py-trytond-country/Makefile b/geography/py-trytond-country/Makefile index 4a211d05bf9..6c0eb605dc1 100644 --- a/geography/py-trytond-country/Makefile +++ b/geography/py-trytond-country/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/12/04 21:13:05 rodent Exp $ +# $NetBSD: Makefile,v 1.10 2017/01/03 13:23:03 jperkin Exp $ TRYTON_MODULE_NAME= trytond_country .include "../../devel/py-trytond/Makefile.common" CATEGORIES= geography python @@ -18,7 +18,7 @@ PY_PATCHPLIST= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/trytond_import_zip \ - ${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX}_import_zip + ${DESTDIR}${PREFIX}/bin/trytond${PYVERSSUFFIX}_import_zip || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/graphics/py-pygal/Makefile b/graphics/py-pygal/Makefile index 268e2d3eabe..825037138e4 100644 --- a/graphics/py-pygal/Makefile +++ b/graphics/py-pygal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2016/08/28 15:48:32 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= pygal-1.7.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -20,7 +20,7 @@ PY_PATCHPLIST= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pygal_gen.py \ - ${DESTDIR}${PREFIX}/bin/pygal_gen${PYVERSSUFFIX}.py + ${DESTDIR}${PREFIX}/bin/pygal_gen${PYVERSSUFFIX}.py || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/py-qrcode/Makefile b/graphics/py-qrcode/Makefile index d381ee5a582..631e20db637 100644 --- a/graphics/py-qrcode/Makefile +++ b/graphics/py-qrcode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/08/28 15:48:32 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= qrcode-5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -27,9 +27,9 @@ SUBST_STAGE.pkgmandir= post-patch post-install: ${MV} ${DESTDIR}${PREFIX}/bin/qr \ - ${DESTDIR}${PREFIX}/bin/qr${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/qr${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr.1 \ - ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr${PYVERSSUFFIX}.1 + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/qr${PYVERSSUFFIX}.1 || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/lang/py-hy/Makefile b/lang/py-hy/Makefile index bc2a4748e00..6bfcdabbca6 100644 --- a/lang/py-hy/Makefile +++ b/lang/py-hy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:32 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= hy-0.10.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,11 +19,11 @@ PY_PATCHPLIST= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/hy \ - ${DESTDIR}${PREFIX}/bin/hy${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/hy${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/hy2py \ - ${DESTDIR}${PREFIX}/bin/hy2py${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/hy2py${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/hyc \ - ${DESTDIR}${PREFIX}/bin/hyc${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/hyc${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/py-pythonz/Makefile b/lang/py-pythonz/Makefile index ffcddc38f97..6b977750973 100644 --- a/lang/py-pythonz/Makefile +++ b/lang/py-pythonz/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/01/01 14:43:45 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= pythonz-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,9 +17,9 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 1.2.1 post-install: ${MV} ${DESTDIR}${PREFIX}/bin/pythonz \ - ${DESTDIR}${PREFIX}/bin/pythonz${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pythonz${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/pythonz_install \ - ${DESTDIR}${PREFIX}/bin/pythonz_install${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pythonz_install${PYVERSSUFFIX} || ${TRUE} ${CHMOD} -x ${DESTDIR}${PREFIX}/${PYSITELIB}/pythonz/patches/osx/python25/* .include "../../lang/python/egg.mk" diff --git a/net/py-boto/Makefile b/net/py-boto/Makefile index 3aa9006d2d1..107d95bdbea 100644 --- a/net/py-boto/Makefile +++ b/net/py-boto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/08/28 15:48:33 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= boto-2.37.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,47 +19,47 @@ PY_PATCHPLIST= yes post-install: ${MV} ${DESTDIR}${PREFIX}/bin/asadmin \ - ${DESTDIR}${PREFIX}/bin/asadmin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/asadmin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/bundle_image \ - ${DESTDIR}${PREFIX}/bin/bundle_image${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/bundle_image${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/cfadmin \ - ${DESTDIR}${PREFIX}/bin/cfadmin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/cfadmin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/cq \ - ${DESTDIR}${PREFIX}/bin/cq${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/cq${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/cwutil \ - ${DESTDIR}${PREFIX}/bin/cwutil${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/cwutil${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/dynamodb_dump \ - ${DESTDIR}${PREFIX}/bin/dynamodb_dump${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/dynamodb_dump${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/dynamodb_load \ - ${DESTDIR}${PREFIX}/bin/dynamodb_load${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/dynamodb_load${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/elbadmin \ - ${DESTDIR}${PREFIX}/bin/elbadmin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/elbadmin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/fetch_file \ - ${DESTDIR}${PREFIX}/bin/fetch_file${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/fetch_file${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/glacier \ - ${DESTDIR}${PREFIX}/bin/glacier${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/glacier${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/instance_events \ - ${DESTDIR}${PREFIX}/bin/instance_events${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/instance_events${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/kill_instance \ - ${DESTDIR}${PREFIX}/bin/kill_instance${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/kill_instance${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/launch_instance \ - ${DESTDIR}${PREFIX}/bin/launch_instance${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/launch_instance${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/list_instances \ - ${DESTDIR}${PREFIX}/bin/list_instances${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/list_instances${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/lss3 \ - ${DESTDIR}${PREFIX}/bin/lss3${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/lss3${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/mturk \ - ${DESTDIR}${PREFIX}/bin/mturk${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/mturk${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/pyami_sendmail \ - ${DESTDIR}${PREFIX}/bin/pyami_sendmail${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/pyami_sendmail${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/route53 \ - ${DESTDIR}${PREFIX}/bin/route53${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/route53${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/s3put \ - ${DESTDIR}${PREFIX}/bin/s3put${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/s3put${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/sdbadmin \ - ${DESTDIR}${PREFIX}/bin/sdbadmin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/sdbadmin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/taskadmin \ - ${DESTDIR}${PREFIX}/bin/taskadmin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/taskadmin${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/net/py-celery/Makefile b/net/py-celery/Makefile index 0fa380411db..b696687ddfb 100644 --- a/net/py-celery/Makefile +++ b/net/py-celery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:33 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= celery-3.1.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,13 +19,13 @@ USE_LANGUAGES= c post-install: ${MV} ${DESTDIR}${PREFIX}/bin/celery \ - ${DESTDIR}${PREFIX}/bin/celery${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/celery${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/celerybeat \ - ${DESTDIR}${PREFIX}/bin/celerybeat${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/celerybeat${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/celeryd \ - ${DESTDIR}${PREFIX}/bin/celeryd${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/celeryd${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/celeryd-multi \ - ${DESTDIR}${PREFIX}/bin/celeryd-multi${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/celeryd-multi${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-cymruwhois/Makefile b/net/py-cymruwhois/Makefile index 88d581e69cc..effecd44744 100644 --- a/net/py-cymruwhois/Makefile +++ b/net/py-cymruwhois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2016/08/28 15:48:33 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= python-cymruwhois-1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/python-//} @@ -18,7 +18,7 @@ USE_LANGUAGES= # none EGG_NAME= ${DISTNAME:S/python-//} post-install: - cd ${DESTDIR}${PREFIX}/bin && mv cymruwhois cymruwhois-${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} cymruwhois cymruwhois-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/py-eventlib/Makefile b/net/py-eventlib/Makefile index 5100a6c6419..0b96eda98ea 100644 --- a/net/py-eventlib/Makefile +++ b/net/py-eventlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2017/01/01 14:43:51 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= eventlib-0.1.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -23,7 +23,7 @@ PYTHON_VERSIONS_INCOMPATIBLE+= 34 35 36 # not yet ported as of 0.1.5 post-install: ${MV} ${DESTDIR}${PREFIX}/bin/eventlib \ - ${DESTDIR}${PREFIX}/bin/eventlib${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/eventlib${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/py-keyring/Makefile b/security/py-keyring/Makefile index 109e23c9c8b..76b21ecd203 100644 --- a/security/py-keyring/Makefile +++ b/security/py-keyring/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2016/08/28 15:48:34 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= keyring-5.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -17,7 +17,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-hgtools>=5.0:../../devel/py-hgtools REPLACE_PYTHON+= keyring/cli.py post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/keyring ${DESTDIR}${PREFIX}/bin/keyring-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/keyring ${DESTDIR}${PREFIX}/bin/keyring-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/sysutils/py-attic/Makefile b/sysutils/py-attic/Makefile index 1ed67648482..af526cb3cb5 100644 --- a/sysutils/py-attic/Makefile +++ b/sysutils/py-attic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2016/09/19 13:49:02 wiedi Exp $ +# $NetBSD: Makefile,v 1.7 2017/01/03 13:23:03 jperkin Exp $ DISTNAME= Attic-0.16 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/A/a/} @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack PYTHON_VERSIONS_INCOMPATIBLE= 27 post-install: - cd ${DESTDIR}${PREFIX}/bin && mv attic attic${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} attic attic${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/distutils.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/sysutils/py-borgbackup/Makefile b/sysutils/py-borgbackup/Makefile index a320646c011..fad4fe78e78 100644 --- a/sysutils/py-borgbackup/Makefile +++ b/sysutils/py-borgbackup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2016/11/16 13:21:14 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= borgbackup-1.0.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,7 @@ MAKE_ENV+= BORG_OPENSSL_PREFIX=${SSLBASE:Q} MAKE_ENV+= BORG_LZ4_PREFIX=${BUILDLINK_PREFIX.lz4} post-install: - cd ${DESTDIR}${PREFIX}/bin && mv borg borg-${PYVERSSUFFIX} + cd ${DESTDIR}${PREFIX}/bin && ${MV} borg borg-${PYVERSSUFFIX} || ${TRUE} .include "../../archivers/lz4/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/sysutils/py-xattr/Makefile b/sysutils/py-xattr/Makefile index a41663b67d2..44be4831306 100644 --- a/sysutils/py-xattr/Makefile +++ b/sysutils/py-xattr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2017/01/01 14:43:58 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= v0.7.6 PROPERNAME= ${DISTNAME:S/v/xattr-/} @@ -26,7 +26,7 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 post-install: ${MV} ${DESTDIR}${PREFIX}/bin/xattr \ - ${DESTDIR}${PREFIX}/bin/xattr-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/xattr-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile index 904cd0a76ff..f47b335e330 100644 --- a/textproc/py-docutils/Makefile +++ b/textproc/py-docutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2016/12/15 10:42:30 adam Exp $ +# $NetBSD: Makefile,v 1.46 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= docutils-0.13.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -28,7 +28,7 @@ CMDS+= rst2pseudoxml rst2s5 rst2xetex rst2xml rstpep2html post-install: for f in ${CMDS}; do \ - ${MV} ${DESTDIR}${PREFIX}/bin/$$f.py ${DESTDIR}${PREFIX}/bin/$$f-${PYVERSSUFFIX}.py; \ + ${MV} ${DESTDIR}${PREFIX}/bin/$$f.py ${DESTDIR}${PREFIX}/bin/$$f-${PYVERSSUFFIX}.py || ${TRUE}; \ done .include "../../lang/python/application.mk" diff --git a/textproc/py-ftfy/Makefile b/textproc/py-ftfy/Makefile index ed09c7a40a2..8318b8f5bff 100644 --- a/textproc/py-ftfy/Makefile +++ b/textproc/py-ftfy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:35 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= ftfy-3.4.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -14,7 +14,7 @@ USE_LANGUAGES= # none post-install: ${MV} ${DESTDIR}${PREFIX}/bin/ftfy \ - ${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/ftfy${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index 8dea96244f2..9c36497528a 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2016/12/04 22:02:00 rodent Exp $ +# $NetBSD: Makefile,v 1.50 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= html2text-2016.9.19 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -15,7 +15,7 @@ USE_LANGUAGES= # none REPLACE_PYTHON= html2text/__init__.py post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/html2text ${DESTDIR}${PREFIX}/bin/html2text-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/html2text ${DESTDIR}${PREFIX}/bin/html2text-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/textproc/py-jsonschema/Makefile b/textproc/py-jsonschema/Makefile index a8b760b62e8..c00a88e89bf 100644 --- a/textproc/py-jsonschema/Makefile +++ b/textproc/py-jsonschema/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/10/26 13:44:17 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= jsonschema-2.5.1 PKGREVISION= 2 @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-vcversioner-[0-9]*:../../devel/py-vcversioner .include "../../lang/python/egg.mk" post-install: - mv ${DESTDIR}${PREFIX}/bin/jsonschema ${DESTDIR}${PREFIX}/bin/jsonschema${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/jsonschema ${DESTDIR}${PREFIX}/bin/jsonschema${PYVERSSUFFIX} || ${TRUE} ${RM} -r -f ${DESTDIR}${PREFIX}${PYSITELIB}/jsonschema/__pycache__ .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index 0488833db85..8b4d608f665 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2016/12/15 09:42:49 adam Exp $ +# $NetBSD: Makefile,v 1.26 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= Pygments-2.1.3 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -18,7 +18,7 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-nose-[0-9]*:../../devel/py-nose USE_LANGUAGES= # none post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/pygmentize ${DESTDIR}${PREFIX}/bin/pygmentize${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/pygmentize ${DESTDIR}${PREFIX}/bin/pygmentize${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile index 42972615e9c..71564812298 100644 --- a/textproc/py-rdflib/Makefile +++ b/textproc/py-rdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2016/08/28 15:48:35 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= rdflib-4.2.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -25,15 +25,15 @@ REPLACE_PYTHON+= rdflib/tools/rdfpipe.py post-install: ${MV} ${DESTDIR}${PREFIX}/bin/csv2rdf \ - ${DESTDIR}${PREFIX}/bin/csv2rdf${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/csv2rdf${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/rdf2dot \ - ${DESTDIR}${PREFIX}/bin/rdf2dot${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/rdf2dot${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/rdfgraphisomorphism \ - ${DESTDIR}${PREFIX}/bin/rdfgraphisomorphism${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/rdfgraphisomorphism${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/rdfpipe \ - ${DESTDIR}${PREFIX}/bin/rdfpipe${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/rdfpipe${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/rdfs2dot \ - ${DESTDIR}${PREFIX}/bin/rdfs2dot${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/rdfs2dot${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/textproc/py-sphinx/Makefile b/textproc/py-sphinx/Makefile index c86c18a6056..2b85fd08c25 100644 --- a/textproc/py-sphinx/Makefile +++ b/textproc/py-sphinx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2016/12/16 20:05:58 adam Exp $ +# $NetBSD: Makefile,v 1.36 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= Sphinx-1.5.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -36,10 +36,10 @@ post-extract: ${RM} ${WRKSRC}/sphinx/locale/__init__.pyc post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-apidoc ${DESTDIR}${PREFIX}/bin/sphinx-apidoc${PYVERSSUFFIX} - ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-autogen ${DESTDIR}${PREFIX}/bin/sphinx-autogen${PYVERSSUFFIX} - ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-build ${DESTDIR}${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} - ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-quickstart ${DESTDIR}${PREFIX}/bin/sphinx-quickstart${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-apidoc ${DESTDIR}${PREFIX}/bin/sphinx-apidoc${PYVERSSUFFIX} || ${TRUE} + ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-autogen ${DESTDIR}${PREFIX}/bin/sphinx-autogen${PYVERSSUFFIX} || ${TRUE} + ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-build ${DESTDIR}${PREFIX}/bin/sphinx-build${PYVERSSUFFIX} || ${TRUE} + ${MV} ${DESTDIR}${PREFIX}/bin/sphinx-quickstart ${DESTDIR}${PREFIX}/bin/sphinx-quickstart${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile index a50f5ed9d75..fba8b627505 100644 --- a/textproc/py-vobject/Makefile +++ b/textproc/py-vobject/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2016/10/31 16:28:27 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= vobject-0.9.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,7 +16,7 @@ DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six post-install: cd ${DESTDIR}${PREFIX}/bin && \ ${MV} change_tz change_tz-${PYVERSSUFFIX} && \ - ${MV} ics_diff ics_diff-${PYVERSSUFFIX} + ${MV} ics_diff ics_diff-${PYVERSSUFFIX} || ${TRUE} # tests.py is missing in 0.9.3 tarball # https://github.com/eventable/vobject/issues/38 diff --git a/www/py-django/Makefile b/www/py-django/Makefile index d359ad1b6d7..7fa6eb9e2b3 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.80 2016/12/02 12:21:17 adam Exp $ +# $NetBSD: Makefile,v 1.81 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= Django-1.10.4 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} @@ -18,9 +18,9 @@ PYTHON_VERSIONED_DEPENDENCIES= flup post-install: ${MV} ${DESTDIR}${PREFIX}/bin/django-admin \ - ${DESTDIR}${PREFIX}/bin/django-admin${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/django-admin${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/django-admin.py \ - ${DESTDIR}${PREFIX}/bin/django-admin${PYVERSSUFFIX}.py + ${DESTDIR}${PREFIX}/bin/django-admin${PYVERSSUFFIX}.py || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-mod_wsgi/Makefile b/www/py-mod_wsgi/Makefile index cf221acc23d..d2bff392133 100644 --- a/www/py-mod_wsgi/Makefile +++ b/www/py-mod_wsgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/09/09 09:44:52 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:04 jperkin Exp $ DISTNAME= mod_wsgi-4.4.12 PKGNAME= ${PYPKGPREFIX}-${APACHE_PKG_PREFIX}-${DISTNAME} @@ -25,7 +25,7 @@ post-extract: post-install: ${MV} ${DESTDIR}${PREFIX}/bin/mod_wsgi-express \ - ${DESTDIR}${PREFIX}/bin/mod_wsgi-express${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/mod_wsgi-express${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-static/Makefile b/www/py-static/Makefile index 79f28276119..88d20e7e17e 100644 --- a/www/py-static/Makefile +++ b/www/py-static/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2016/08/28 15:48:36 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2017/01/03 13:23:05 jperkin Exp $ DISTNAME= static-1.0.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -13,7 +13,7 @@ LICENSE= mit USE_LANGUAGES= # none post-install: - ${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX} + ${MV} ${DESTDIR}${PREFIX}/bin/static ${DESTDIR}${PREFIX}/bin/static-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-trytond-webdav/Makefile b/www/py-trytond-webdav/Makefile index 0ee5f940efc..8bafec18290 100644 --- a/www/py-trytond-webdav/Makefile +++ b/www/py-trytond-webdav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2017/01/01 14:44:06 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2017/01/03 13:23:05 jperkin Exp $ TRYTON_MODULE_NAME= trytond_webdav .include "../../devel/py-trytond/Makefile.common" CATEGORIES= python www @@ -17,7 +17,7 @@ REPLACE_PYTHON+= tests/test_webdav.py post-install: ${MV} ${DESTDIR}${PREFIX}/bin/trytond-webdav \ - ${DESTDIR}${PREFIX}/bin/trytond-webdav${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/trytond-webdav${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-twill/Makefile b/www/py-twill/Makefile index 0847db61943..d2ddee33b74 100644 --- a/www/py-twill/Makefile +++ b/www/py-twill/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2017/01/01 14:44:06 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2017/01/03 13:23:05 jperkin Exp $ DISTNAME= twill-1.8.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -16,9 +16,9 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # setup fails for 1.8.0 post-install: ${MV} ${DESTDIR}${PREFIX}/bin/twill-fork \ - ${DESTDIR}${PREFIX}/bin/twill-fork${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/twill-fork${PYVERSSUFFIX} || ${TRUE} ${MV} ${DESTDIR}${PREFIX}/bin/twill-sh \ - ${DESTDIR}${PREFIX}/bin/twill-sh${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/twill-sh${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-uwsgi/Makefile b/www/py-uwsgi/Makefile index 42f5a34a018..38544c0f6c4 100644 --- a/www/py-uwsgi/Makefile +++ b/www/py-uwsgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2016/11/04 21:38:59 maya Exp $ +# $NetBSD: Makefile,v 1.35 2017/01/03 13:23:05 jperkin Exp $ DISTNAME= uwsgi-2.0.14 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -24,7 +24,7 @@ INSTALLATION_DIRS+= share/examples/${PYPKGPREFIX}-uwsgi post-install: ${MV} ${DESTDIR}${PREFIX}/bin/uwsgi \ - ${DESTDIR}${PREFIX}/bin/uwsgi-${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/uwsgi-${PYVERSSUFFIX} || ${TRUE} ${INSTALL_DATA} ${WRKSRC}/examples/* \ ${DESTDIR}${PREFIX}/share/examples/${PYPKGPREFIX}-uwsgi diff --git a/www/py-uwsgitop/Makefile b/www/py-uwsgitop/Makefile index f5c6efaa810..7466462d414 100644 --- a/www/py-uwsgitop/Makefile +++ b/www/py-uwsgitop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2016/08/28 15:48:37 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2017/01/03 13:23:05 jperkin Exp $ DISTNAME= uwsgitop-0.8 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} @@ -19,7 +19,7 @@ USE_LANGUAGES= # none post-install: ${MV} ${DESTDIR}${PREFIX}/bin/uwsgitop \ - ${DESTDIR}${PREFIX}/bin/uwsgitop${PYVERSSUFFIX} + ${DESTDIR}${PREFIX}/bin/uwsgitop${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/distutils.mk" .include "../../mk/bsd.pkg.mk" |