diff options
author | jperkin <jperkin@pkgsrc.org> | 2017-01-03 13:23:01 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2017-01-03 13:23:01 +0000 |
commit | b2c72c7fada41010e5beeed332e23ef2d5e7ff93 (patch) | |
tree | 0afef97b509bb0ade4367b6585a9a9119c9042e7 /net | |
parent | 75e1986ea1f9aefbe1614eb290f3526ca149a93d (diff) | |
download | pkgsrc-b2c72c7fada41010e5beeed332e23ef2d5e7ff93.tar.gz |
Use "${MV} || ${TRUE}" and "${RM} -f" consistently in post-install targets.
Diffstat (limited to 'net')
-rw-r--r-- | net/py-boto/Makefile | 44 | ||||
-rw-r--r-- | net/py-celery/Makefile | 10 | ||||
-rw-r--r-- | net/py-cymruwhois/Makefile | 4 | ||||
-rw-r--r-- | net/py-eventlib/Makefile | 4 |
4 files changed, 31 insertions, 31 deletions
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" |