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

10 files changed, 9 insertions, 13 deletions

diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 74a3fe87a865..ee045f3674ee 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -41,7 +41,6 @@ post-install:
 	${REINPLACE_CMD} -e 's/%%USER%%/${USERS}/g' ${WRKSRC}/samples/rc/cego
 	${CP} ${WRKSRC}/samples/rc/cego ${STAGEDIR}${PREFIX}/etc/rc.d/
 
-post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcego.so.2.0.0
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcgwrap.so.2.0.0
 
diff --git a/databases/mariadb100-client/Makefile b/databases/mariadb100-client/Makefile
index 866c578ab633..092cee6f586b 100644
--- a/databases/mariadb100-client/Makefile
+++ b/databases/mariadb100-client/Makefile
@@ -19,7 +19,7 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CLIENT_ONLY=	yes
 
-post-stage:
+post-install:
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
 
diff --git a/databases/mariadb101-client/Makefile b/databases/mariadb101-client/Makefile
index 3930e76262fe..fdeeb46fe70e 100644
--- a/databases/mariadb101-client/Makefile
+++ b/databases/mariadb101-client/Makefile
@@ -18,7 +18,8 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
 
 CLIENT_ONLY=	yes
 
-post-stage:
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
@@ -33,7 +34,7 @@ post-stage:
 	# Fix https://mariadb.atlassian.net/browse/MDEV-9388
 	@${REINPLACE_CMD} 's/-l-pthread/-lpthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config
 
-post-stage-GSSAPI_NONE:
+post-install-GSSAPI_NONE:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb101-server/Makefile b/databases/mariadb101-server/Makefile
index fc2cbdb17b2c..81de5687b582 100644
--- a/databases/mariadb101-server/Makefile
+++ b/databases/mariadb101-server/Makefile
@@ -105,9 +105,6 @@ OPTIONS_SUB=		yes
 # MySQL-Client part
 USES+=		readline
 GSSAPI_NONE_CMAKE_ON=	-DPLUGIN_AUTH_GSSAPI_CLIENT=NO
-
-post-install:
-	${RM} ${STAGEDIR}${PREFIX}/bin/wsrep*
 .else
 # MySQL-Server part
 USES+=		mysql:101m
diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile
index 3b1b82c7e8b0..f5744de7c044 100644
--- a/databases/mysql57-server/Makefile
+++ b/databases/mysql57-server/Makefile
@@ -158,7 +158,6 @@ post-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample
 
-post-stage:
 	${MKDIR} ${STAGEDIR}${ETCDIR}/keyring
 	${MKDIR} ${STAGEDIR}${MY_SECDIR}
 	${MKDIR} ${STAGEDIR}${MY_TMPDIR}
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index ad771a1d06c5..3277deb9e298 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 USES=		perl5 pgsql
 USE_PERL5=	configure
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Pg/Pg.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-cego/Makefile b/databases/p5-DBD-cego/Makefile
index 1b2e793e1ecc..69022055fb7e 100644
--- a/databases/p5-DBD-cego/Makefile
+++ b/databases/p5-DBD-cego/Makefile
@@ -24,7 +24,7 @@ USES+=		perl5
 USE_PERL5=	configure
 CC:=		${CXX}
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/Cego/Cego.so
 
 .include <bsd.port.mk>
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index d599c8232c10..6eda54d46849 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -27,7 +27,7 @@ SSL_BUILD_DEPENDS=	p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay
 SSL_RUN_DEPENDS=	${SSL_BUILD_DEPENDS}
 SSL_CONFIGURE_ON=	--ssl
 
-post-stage:
+post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/mysql/mysql.so
 
 .include <bsd.port.mk>
diff --git a/databases/py-carbon/Makefile b/databases/py-carbon/Makefile
index af8a90bd1393..a8712844333b 100644
--- a/databases/py-carbon/Makefile
+++ b/databases/py-carbon/Makefile
@@ -21,7 +21,7 @@ USE_RC_SUBR=	carbon
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
 
-post-stage:
+post-install:
 	${RM} -r ${STAGEDIR}${PREFIX}/examples/init.d
 	${RMDIR} ${STAGEDIR}${PREFIX}/examples
 
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index 51562be615af..564e8732c5d0 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -153,7 +153,7 @@ post-patch:
 post-configure:
 	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/config.mk
 
-post-stage:
+post-install:
 .for f in ${TOSTRIP}
 	-${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
 .endfor