Do not use post-stage. Use post-install instead.

The only reason to use post-stage is because the port needs to do
"things" at a later time, like some plist manipulation.
While there, fold post-install in do-install targets when they are
defined.

PR:		214780
Submitted by:	mat
Exp-run by:	antoine
Sponsored by:	Absolight

4 files changed, 11 insertions, 15 deletions

diff --git a/lang/dmd2/Makefile.bootstrap b/lang/dmd2/Makefile.bootstrap
index 70360afea0c1..fa4c8aecea7b 100644
--- a/lang/dmd2/Makefile.bootstrap
+++ b/lang/dmd2/Makefile.bootstrap
@@ -84,7 +84,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR}
 	cd ${WRKDIR}/dmd2 && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR}
 
-post-stage:
 	${LN} -sf ${STAGEDIR}/${PREFIX}/bin/dmd ${WRKDIR}/dmd2/freebsd/bin${MODEL}/dmd
 
 .include <bsd.port.post.mk>
diff --git a/lang/p5-List-MoreUtils/Makefile b/lang/p5-List-MoreUtils/Makefile
index 969e8ea20dd3..a02f139d1c4d 100644
--- a/lang/p5-List-MoreUtils/Makefile
+++ b/lang/p5-List-MoreUtils/Makefile
@@ -26,7 +26,7 @@ BUILD_DEPENDS+=	p5-XSLoader>=0.22:devel/p5-XSLoader
 RUN_DEPENDS+=	p5-XSLoader>=0.22:devel/p5-XSLoader
 .endif
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/List/MoreUtils/MoreUtils.so
 
 .include <bsd.port.post.mk>
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index 8e7f34f75a4a..e6db458fe055 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -41,17 +41,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/pdf/d' ${WRKSRC}/egenix_mx_base.py
 	@${REINPLACE_CMD} -e '/Examples/d' ${WRKSRC}/egenix_mx_base.py
 
-post-stage:
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/DateTime/mxDateTime/mxDateTime.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/BeeBase/mxBeeBase/mxBeeBase.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Proxy/mxProxy/mxProxy.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/UID/mxUID/mxUID.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Stack/mxStack/mxStack.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/URL/mxURL/mxURL.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/TextTools/mxTextTools/mxTextTools.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Tools/mxTools/mxTools.so
-	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Queue/mxQueue/mxQueue.so
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${TXTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
@@ -68,4 +57,14 @@ post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/mx/Tools
 	${INSTALL_DATA} ${WRKSRC}/mx/Tools/Examples/* ${STAGEDIR}${EXAMPLESDIR}/mx/Tools
 
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/DateTime/mxDateTime/mxDateTime.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/BeeBase/mxBeeBase/mxBeeBase.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Proxy/mxProxy/mxProxy.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/UID/mxUID/mxUID.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Stack/mxStack/mxStack.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/URL/mxURL/mxURL.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/TextTools/mxTextTools/mxTextTools.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Tools/mxTools/mxTools.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/mx/Queue/mxQueue/mxQueue.so
+
 .include <bsd.port.mk>
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index afd2d9ee5f1a..ddf0b7ada9a8 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -379,7 +379,6 @@ do-install:
 	@${ECHO} ' done. *)'
 .endif
 
-post-install:
 # Only execute ${PKGINSTALL} when installing to ${PREFIX},
 # but not when staging.
 .ifmake install${CALM}
@@ -387,7 +386,6 @@ post-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
-post-stage:
 	${FIND} ${STAGEDIR} -type f -name '\._*' -delete
 	MLARCHOPSYS=`${STAGEDIR}${MLBIN}/.arch-n-opsys` && \
 	( eval $${MLARCHOPSYS} ; \