pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Use "${MV} || ${TRUE}" and "${RM} -f" consistently in ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1ccc3ac89fe6
branches: trunk
changeset: 356668:1ccc3ac89fe6
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Tue Jan 03 13:23:01 2017 +0000
description:
Use "${MV} || ${TRUE}" and "${RM} -f" consistently in post-install targets.
diffstat:
archivers/py-yuicompressor/Makefile | 4 +-
converters/py-cairosvg/Makefile | 4 +-
converters/py-chardet/Makefile | 4 +-
databases/py-couchdb/Makefile | 10 +++---
databases/py-sqlparse/Makefile | 4 +-
devel/py-babel/Makefile | 4 +-
devel/py-boost/Makefile | 4 +-
devel/py-checker/Makefile | 4 +-
devel/py-codestyle/Makefile | 4 +-
devel/py-flake8/Makefile | 4 +-
devel/py-flakes/Makefile | 4 +-
devel/py-hgview/Makefile | 4 +-
devel/py-ipython/Makefile | 11 +++----
devel/py-macholib/Makefile | 8 +++---
devel/py-modulegraph/Makefile | 4 +-
devel/py-pbr/Makefile | 4 +-
devel/py-py2app/Makefile | 4 +-
devel/py-pylint/Makefile | 12 ++++----
devel/py-test/Makefile | 4 +-
devel/py-tryton/Makefile | 4 +-
devel/py-trytond/Makefile | 8 +++---
devel/py-unittest2py3k/Makefile | 6 ++--
devel/py-virtualenv/Makefile | 4 +-
devel/py-wheel/Makefile | 4 +-
geography/py-trytond-country/Makefile | 4 +-
graphics/py-pygal/Makefile | 4 +-
graphics/py-qrcode/Makefile | 6 ++--
lang/py-hy/Makefile | 8 +++---
lang/py-pythonz/Makefile | 6 ++--
net/py-boto/Makefile | 44 +++++++++++++++++-----------------
net/py-celery/Makefile | 10 +++---
net/py-cymruwhois/Makefile | 4 +-
net/py-eventlib/Makefile | 4 +-
security/py-keyring/Makefile | 4 +-
sysutils/py-attic/Makefile | 4 +-
sysutils/py-borgbackup/Makefile | 4 +-
sysutils/py-xattr/Makefile | 4 +-
textproc/py-docutils/Makefile | 4 +-
textproc/py-ftfy/Makefile | 4 +-
textproc/py-html2text/Makefile | 4 +-
textproc/py-jsonschema/Makefile | 4 +-
textproc/py-pygments/Makefile | 4 +-
textproc/py-rdflib/Makefile | 12 ++++----
textproc/py-sphinx/Makefile | 10 +++---
textproc/py-vobject/Makefile | 4 +-
www/py-django/Makefile | 6 ++--
www/py-mod_wsgi/Makefile | 4 +-
www/py-static/Makefile | 4 +-
www/py-trytond-webdav/Makefile | 4 +-
www/py-twill/Makefile | 6 ++--
www/py-uwsgi/Makefile | 4 +-
www/py-uwsgitop/Makefile | 4 +-
52 files changed, 155 insertions(+), 156 deletions(-)
diffs (truncated from 1084 to 300 lines):
diff -r deffbaae879b -r 1ccc3ac89fe6 archivers/py-yuicompressor/Makefile
--- a/archivers/py-yuicompressor/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/archivers/py-yuicompressor/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 converters/py-cairosvg/Makefile
--- a/converters/py-cairosvg/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/converters/py-cairosvg/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 converters/py-chardet/Makefile
--- a/converters/py-chardet/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/converters/py-chardet/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 databases/py-couchdb/Makefile
--- a/databases/py-couchdb/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/databases/py-couchdb/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
${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 -r deffbaae879b -r 1ccc3ac89fe6 databases/py-sqlparse/Makefile
--- a/databases/py-sqlparse/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/databases/py-sqlparse/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-babel/Makefile
--- a/devel/py-babel/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-babel/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-boost/Makefile
--- a/devel/py-boost/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-boost/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
# 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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-checker/Makefile
--- a/devel/py-checker/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-checker/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-codestyle/Makefile
--- a/devel/py-codestyle/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-codestyle/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-flake8/Makefile
--- a/devel/py-flake8/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-flake8/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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-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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-flakes/Makefile
--- a/devel/py-flakes/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-flakes/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-hgview/Makefile
--- a/devel/py-hgview/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-hgview/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-ipython/Makefile
--- a/devel/py-ipython/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-ipython/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-macholib/Makefile
--- a/devel/py-macholib/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-macholib/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-modulegraph/Makefile
--- a/devel/py-modulegraph/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-modulegraph/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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 @@
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 -r deffbaae879b -r 1ccc3ac89fe6 devel/py-pbr/Makefile
--- a/devel/py-pbr/Makefile Tue Jan 03 12:27:27 2017 +0000
+++ b/devel/py-pbr/Makefile Tue Jan 03 13:23:01 2017 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index