Use "${MV} || ${TRUE}" and "${RM} -f" consistently in post-install targets.

8 files changed, 23 insertions, 23 deletions

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