Attachment 177328 Details for Bug 214780 – v1

[patch] v1

post-stage.diff (text/plain), 64.02 KB, created by Mathieu Arnold on 2016-11-23 12:06:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Arnold

Created: 2016-11-23 12:06:47 UTC

Size: 64.02 KB

patch

obsolete

>commit 7d8c1bdeb633071903c528356271c2756c495315 (origin/trunk)
>Author: tijl <tijl@35697150-7ecd-e111-bb59-0022644237b5>
>Date:   2016-11-23 11:11:27 +0000
>
>    Update to util-linux-ng 2.17.2-12.24.el6_8.1.
>    
>    PR:             214772
>    Submitted by:   Piotr Kubaj <pkubaj@anongoth.pl>
>    
>    
>    git-svn-id: https://svn.freebsd.org/ports/head@426893 35697150-7ecd-e111-bb59-0022644237b5
>diff --git archivers/p5-Compress-LZ4/Makefile archivers/p5-Compress-LZ4/Makefile
>index cb90b45..2943147 100644
>--- archivers/p5-Compress-LZ4/Makefile
>+++ archivers/p5-Compress-LZ4/Makefile
>@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
> USES=		perl5
> USE_PERL5=	configure
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Compress/LZ4/LZ4.so
> 
> .include <bsd.port.mk>
>diff --git astro/p5-Starlink-AST/Makefile astro/p5-Starlink-AST/Makefile
>index 0ba8ed2..aed3bfd 100644
>--- astro/p5-Starlink-AST/Makefile
>+++ astro/p5-Starlink-AST/Makefile
>@@ -22,7 +22,7 @@ TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
> USES=		perl5
> USE_PERL5=	modbuild
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Starlink/AST/AST.so
> 
> .include <bsd.port.mk>
>diff --git audio/libogg/Makefile audio/libogg/Makefile
>index 827072b..541ad9c 100644
>--- audio/libogg/Makefile
>+++ audio/libogg/Makefile
>@@ -19,7 +19,7 @@ TEST_TARGET=	check
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-stage:
>+post-install:
> 	${LN} -s libogg.so.0 ${STAGEDIR}${PREFIX}/lib/libogg.so.8
> 
> .include <bsd.port.mk>
>diff --git audio/libvorbis/Makefile audio/libvorbis/Makefile
>index 33cac57..f19baf0 100644
>--- audio/libvorbis/Makefile
>+++ audio/libvorbis/Makefile
>@@ -22,7 +22,7 @@ TEST_TARGET=	check
> 
> OPTIONS_DEFINE=	DOCS
> 
>-post-stage:
>+post-install:
> 	cd ${STAGEDIR}${PREFIX}/share/doc && ${MV} ${DISTNAME} libvorbis
> 	${LN} -s libvorbis.so.0 ${STAGEDIR}${PREFIX}/lib/libvorbis.so.4
> 	${LN} -s libvorbisfile.so.3 ${STAGEDIR}${PREFIX}/lib/libvorbisfile.so.6
>diff --git audio/p5-Net-FreeDB/Makefile audio/p5-Net-FreeDB/Makefile
>index 05eac8a..b8a09a3 100644
>--- audio/p5-Net-FreeDB/Makefile
>+++ audio/p5-Net-FreeDB/Makefile
>@@ -21,7 +21,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
> USES=		alias perl5
> USE_PERL5=	configure
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/FreeDB/FreeDB.so
> 
> .include <bsd.port.mk>
>diff --git biology/cd-hit/Makefile biology/cd-hit/Makefile
>index 00c9d2e..b287430 100644
>--- biology/cd-hit/Makefile
>+++ biology/cd-hit/Makefile
>@@ -31,7 +31,7 @@ post-patch:
> 		-e 's|/bin/bash|${LOCALBASE}/bin/bash|g' \
> 		${WRKSRC}/*.pl
> 
>-post-stage:
>+post-install:
> 	@cd ${STAGEDIR}${PREFIX}/bin && \
> 		${STRIP_CMD} cd-hit cd-hit-2d cd-hit-454 \
> 		cd-hit-div cd-hit-est cd-hit-est-2d
>diff --git cad/tkgate/Makefile cad/tkgate/Makefile
>index 12c0cb8..a3023fe 100644
>--- cad/tkgate/Makefile
>+++ cad/tkgate/Makefile
>@@ -25,7 +25,7 @@ post-patch:
> 		${WRKSRC}/configure
> 
> # Remove backup files somehow installed to the stagedir
>-post-stage:
>+post-install:
> 	${FIND} ${STAGEDIR}/${DATADIR} -name '*~' -delete -or -name '*~?' -delete
> 
> .include <bsd.port.mk>
>diff --git comms/qsstv/Makefile comms/qsstv/Makefile
>index 3f523d4..595cfd4 100644
>--- comms/qsstv/Makefile
>+++ comms/qsstv/Makefile
>@@ -41,7 +41,7 @@ post-patch:
> 	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.txt.*
> 	${RM} ${WRKSRC}/qsstv/documentation/manual/manual.*.orig
> 
>-post-stage:
>+post-install:
> 	-${RM} ${STAGEDIR}/${DOCSDIR}/manual.doxy
> 	-${RM} ${STAGEDIR}/${DOCSDIR}/doxygen_sqlite3.db
> 	-${RM} ${STAGEDIR}/${DOCSDIR}/*.bak
>diff --git comms/svxlink/Makefile comms/svxlink/Makefile
>index e1031c7..150fac0 100644
>--- comms/svxlink/Makefile
>+++ comms/svxlink/Makefile
>@@ -74,7 +74,7 @@ post-patch-OSS-on:
> 		${REINPLACE_CMD} -e 's|alsa:plughw:0|oss:/dev/dsp|'
> 
> .if ${PORTNAME}==svxlink
>-post-stage:
>+post-install:
> 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc \
> 		${STAGEDIR}${PREFIX}/etc/svxlink/.procmailrc.sample
> 	${MV}	${STAGEDIR}${PREFIX}/etc/svxlink/TclVoiceMail.conf \
>diff --git comms/trustedqsl/Makefile comms/trustedqsl/Makefile
>index 66bcec9..51d58fd 100644
>--- comms/trustedqsl/Makefile
>+++ comms/trustedqsl/Makefile
>@@ -38,13 +38,13 @@ CONVERTER_CMAKE_ON=	-DBUILD_CONVERTER=ON
> 
> OPTIONS_SUB=	yes
> 
>-post-stage-GEN_CRQ-on:
>+post-install-GEN_CRQ-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/gen_crq ${STAGEDIR}${PREFIX}/bin
>-post-stage-LOAD_CERT-on:
>+post-install-LOAD_CERT-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/load_cert ${STAGEDIR}${PREFIX}/bin
>-post-stage-STATION_LOC-on:
>+post-install-STATION_LOC-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/station_loc ${STAGEDIR}${PREFIX}/bin
>-post-stage-CONVERTER-on:
>+post-install-CONVERTER-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/converter ${STAGEDIR}${PREFIX}/bin
> 
> post-patch:
>diff --git databases/cego/Makefile databases/cego/Makefile
>index 6d85751..68906fa 100644
>--- databases/cego/Makefile
>+++ 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 databases/mariadb100-client/Makefile databases/mariadb100-client/Makefile
>index 866c578..092cee6 100644
>--- databases/mariadb100-client/Makefile
>+++ 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 databases/mariadb101-client/Makefile databases/mariadb101-client/Makefile
>index 3930e76..1f1a969 100644
>--- databases/mariadb101-client/Makefile
>+++ databases/mariadb101-client/Makefile
>@@ -18,7 +18,7 @@ USE_LDCONFIG=	${PREFIX}/lib/mysql
> 
> CLIENT_ONLY=	yes
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4
> 	${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig
> 	${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private
>@@ -33,7 +33,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 databases/mysql57-server/Makefile databases/mysql57-server/Makefile
>index 3b1b82c..f5744de 100644
>--- databases/mysql57-server/Makefile
>+++ 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 databases/p5-DBD-Pg/Makefile databases/p5-DBD-Pg/Makefile
>index ad771a1..3277deb 100644
>--- databases/p5-DBD-Pg/Makefile
>+++ 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 databases/p5-DBD-cego/Makefile databases/p5-DBD-cego/Makefile
>index 1b2e793..6902205 100644
>--- databases/p5-DBD-cego/Makefile
>+++ 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 databases/p5-DBD-mysql/Makefile databases/p5-DBD-mysql/Makefile
>index aed242b..9c7c568 100644
>--- databases/p5-DBD-mysql/Makefile
>+++ 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 databases/py-carbon/Makefile databases/py-carbon/Makefile
>index af8a90b..a871284 100644
>--- databases/py-carbon/Makefile
>+++ 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 databases/sqlrelay/Makefile databases/sqlrelay/Makefile
>index 51562be..564e873 100644
>--- databases/sqlrelay/Makefile
>+++ 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
>diff --git devel/R-cran-plyr/Makefile devel/R-cran-plyr/Makefile
>index 0d4a3fc..392f094 100644
>--- devel/R-cran-plyr/Makefile
>+++ devel/R-cran-plyr/Makefile
>@@ -19,7 +19,7 @@ RUN_DEPENDS=	R-cran-Rcpp>=0.11.0:devel/R-cran-Rcpp
> 
> USES=	cran:auto-plist
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/R/library/plyr/libs/plyr.so
> 
> .include <bsd.port.mk>
>diff --git devel/arm-none-eabi-gcc492/Makefile devel/arm-none-eabi-gcc492/Makefile
>index dd5b75e..eb504eb 100644
>--- devel/arm-none-eabi-gcc492/Makefile
>+++ devel/arm-none-eabi-gcc492/Makefile
>@@ -51,7 +51,7 @@ INSTALL_TARGET=	install-gcc install-target-libgcc
> 
> CONFIGURE_TARGET=	${ARCH}-portbld-${OPSYS:tl}${OSREL}
> 
>-post-stage:
>+post-install:
> 	@if [ -f ${STAGEDIR}${PREFIX}/bin/cpp ] ; then \
> 		${MV} ${STAGEDIR}${PREFIX}/bin/cpp  \
> 		    ${STAGEDIR}${PREFIX}/bin/${GCC_TARGET}-cpp ; \
>diff --git devel/avr-gcc-devel/Makefile devel/avr-gcc-devel/Makefile
>index 4b280da..88c133f 100644
>--- devel/avr-gcc-devel/Makefile
>+++ devel/avr-gcc-devel/Makefile
>@@ -53,7 +53,7 @@ INFO=		cpp gcc gccint cppinternals gccinstall
> post-configure:
> 	${MKDIR} ${WRKSRC}/gcc/include
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/4.10.0/liblto_plugin.so.0
> 
> .include <bsd.port.post.mk>
>diff --git devel/avr-gcc/Makefile devel/avr-gcc/Makefile
>index 56bd04c..bc836ff 100644
>--- devel/avr-gcc/Makefile
>+++ devel/avr-gcc/Makefile
>@@ -56,7 +56,7 @@ ARCH=		x86_64
> post-configure:
> 	${MKDIR} ${WRKSRC}/gcc/include
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/gcc/avr/${PORTVERSION}/liblto_plugin.so.0
> 
> .include <bsd.port.post.mk>
>diff --git devel/efl/Makefile devel/efl/Makefile
>index 55f3a35..0e09315 100644
>--- devel/efl/Makefile
>+++ devel/efl/Makefile
>@@ -152,7 +152,7 @@ LIB_DEPENDS+=			libluajit-5.1.so:lang/luajit
> PLIST_SUB+=			ELUA=""
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} -r ${STAGEDIR}${PREFIX}/share/gdb
> 	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
> 	    if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
>diff --git devel/gcc-msp430-ti-toolchain/Makefile devel/gcc-msp430-ti-toolchain/Makefile
>index e8b481f..4e2239d 100644
>--- devel/gcc-msp430-ti-toolchain/Makefile
>+++ devel/gcc-msp430-ti-toolchain/Makefile
>@@ -144,7 +144,6 @@ do-install:
> 	@cd ${WRKDIR}/build/gdb && \
> 	 ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
> 
>-post-stage:
> 	@${ECHO_MSG} "Remove unneeded host files..."
> 	@for f in ${UNNEEDED_HOST_FILES} ; do \
> 		${RM} "${STAGEDIR}${GNU_CONFIGURE_PREFIX}/$$f" ; \
>diff --git devel/google-gdata/Makefile devel/google-gdata/Makefile
>index 72f8a2a..648ec51 100644
>--- devel/google-gdata/Makefile
>+++ devel/google-gdata/Makefile
>@@ -26,7 +26,7 @@ NO_ARCH=	yes
> post-patch:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/Makefile
> 
>-post-stage:
>+post-install:
> 	cd ${STAGEDIR}${PREFIX}; ${FIND} lib/mono libdata/pkgconfig \
> 		$ -type f -or -type l $ | ${SORT} >> ${TMPPLIST}
> 
>diff --git devel/google-perftools/Makefile devel/google-perftools/Makefile
>index f026d9a..235fe5a 100644
>--- devel/google-perftools/Makefile
>+++ devel/google-perftools/Makefile
>@@ -67,7 +67,6 @@ post-install:
> 	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig ${STAGEDIR}${PREFIX}/libdata
> 	${MV} ${STAGEDIR}${PREFIX}/bin/pprof ${STAGEDIR}${PREFIX}/bin/perftools-pprof
> 
>-post-stage:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
> 
> # Two of the tests are known to fail on FreeBSD 10, uncomment this as soon as this is fixed
>diff --git devel/icu/Makefile devel/icu/Makefile
>index b885e47..2b4feca 100644
>--- devel/icu/Makefile
>+++ devel/icu/Makefile
>@@ -43,7 +43,7 @@ PLIST_FILES+=	%%DATADIR%%/%%ICUVER%%/icudt%%ICUMAJOR%%b.dat
> PLIST_FILES+=	%%DATADIR%%/%%ICUVER%%/icudt%%ICUMAJOR%%l.dat
> .endif
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/g* \
> 		${STAGEDIR}${PREFIX}/bin/*conv \
> 		${STAGEDIR}${PREFIX}/bin/icuinfo \
>diff --git devel/ivykis/Makefile devel/ivykis/Makefile
>index d9a1c56..71b1a1a 100644
>--- devel/ivykis/Makefile
>+++ devel/ivykis/Makefile
>@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
> USE_GITHUB=	yes
> GH_ACCOUNT=	buytenh
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libivykis.so.0.4.2
> 
> .include <bsd.port.mk>
>diff --git devel/lfcbase/Makefile devel/lfcbase/Makefile
>index 955bbbe..ea36b89 100644
>--- devel/lfcbase/Makefile
>+++ devel/lfcbase/Makefile
>@@ -17,7 +17,7 @@ USES=		autoreconf libtool
> post-patch:
> 	@${REINPLACE_CMD} 's|-O3||g' ${WRKSRC}/src/Makefile.in
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/liblfcbase.so.2
> 
> .include <bsd.port.mk>
>diff --git devel/libmpsse/Makefile devel/libmpsse/Makefile
>index 06e1c4e..a080aa8 100644
>--- devel/libmpsse/Makefile
>+++ devel/libmpsse/Makefile
>@@ -47,7 +47,6 @@ post-install:
> 	${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
> 	(cd ${WRKSRC}/src/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} "! -name Makefile")
> 
>-post-stage:
> 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pylibmpsse.so
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpsse.so
> 
>diff --git devel/liborcus07/Makefile devel/liborcus07/Makefile
>index b0e7fc0..e5db21c 100644
>--- devel/liborcus07/Makefile
>+++ devel/liborcus07/Makefile
>@@ -29,7 +29,7 @@ CONFIGURE_ENV=	ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz"
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/bin/*
> 
> .include <bsd.port.mk>
>diff --git devel/libtermkey/Makefile devel/libtermkey/Makefile
>index 17ad615..6f23932 100644
>--- devel/libtermkey/Makefile
>+++ devel/libtermkey/Makefile
>@@ -17,7 +17,7 @@ LIB_DEPENDS=	libunibilium.so:devel/unibilium
> USE_LDCONFIG=	yes
> MAKE_ARGS=	MANDIR=${MANPREFIX}/man
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtermkey.so.1.12.0
> 
> .include <bsd.port.mk>
>diff --git devel/mongo-c-driver/Makefile devel/mongo-c-driver/Makefile
>index 4cea6f5..181f492 100644
>--- devel/mongo-c-driver/Makefile
>+++ devel/mongo-c-driver/Makefile
>@@ -21,7 +21,7 @@ USES=		cmake pkgconfig
> USE_LDCONFIG=	yes
> LDFLAGS+=	-pthread
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmongoc-1.0.so.${PORTVERSION}
> 
> .include <bsd.port.mk>
>diff --git devel/msgpack/Makefile devel/msgpack/Makefile
>index 702366b..8ba4ef9 100644
>--- devel/msgpack/Makefile
>+++ devel/msgpack/Makefile
>@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	CFLAGS="${CFLAGS} -march=i686" CXXFLAGS="${CXXFLAGS} -march=i686
> 
> pre-configure:
> 	cd ${WRKSRC} && ./bootstrap
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmsgpackc.so.2.0.0
> 
> .include <bsd.port.post.mk>
>diff --git devel/ocaml-camlp4/Makefile devel/ocaml-camlp4/Makefile
>index 38d4fa5..5669242 100644
>--- devel/ocaml-camlp4/Makefile
>+++ devel/ocaml-camlp4/Makefile
>@@ -23,7 +23,7 @@ MAKE_JOBS_UNSAFE=yes
> ALL_TARGET=	all camlp4/META
> INSTALL_TARGET=	install install-META
> 
>-post-stage:
>+post-install:
> .for f in camlp4o camlp4of camlp4oof camlp4orf camlp4r camlp4rf
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}.opt
> .endfor
>diff --git devel/ocaml-ppx-tools/Makefile devel/ocaml-ppx-tools/Makefile
>index 98adf90..12e0440 100644
>--- devel/ocaml-ppx-tools/Makefile
>+++ devel/ocaml-ppx-tools/Makefile
>@@ -20,7 +20,7 @@ USE_GITHUB=	yes
> GH_ACCOUNT=	alainfrisch
> GH_PROJECT=	${PORTNAME:C/-/_/}
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib/ppx_tools/ppx_tools.cmxs
> 
> .include <bsd.port.mk>
>diff --git devel/opendht/Makefile devel/opendht/Makefile
>index 4a1310b..c090371 100644
>--- devel/opendht/Makefile
>+++ devel/opendht/Makefile
>@@ -27,7 +27,7 @@ USES=		autoreconf compiler:c++11-lib libtool pathfix pkgconfig
> CFLAGS+=	-I${LOCALBASE}/include
> CXXFLAGS+=	-I${LOCALBASE}/include
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendht.so.0.0.0
> 
> .include <bsd.port.mk>
>diff --git devel/p5-CBOR-XS/Makefile devel/p5-CBOR-XS/Makefile
>index d306a3f..c28606d 100644
>--- devel/p5-CBOR-XS/Makefile
>+++ devel/p5-CBOR-XS/Makefile
>@@ -21,7 +21,7 @@ BUILD_DEPENDS=	p5-Types-Serialiser>=0:devel/p5-Types-Serialiser \
> 		p5-common-sense>=0:devel/p5-common-sense
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/CBOR/XS/XS.so
> 
> .include <bsd.port.mk>
>diff --git devel/p5-Data-Peek/Makefile devel/p5-Data-Peek/Makefile
>index e33be61..d7796f8 100644
>--- devel/p5-Data-Peek/Makefile
>+++ devel/p5-Data-Peek/Makefile
>@@ -18,7 +18,7 @@ TEST_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
> USES=		perl5 tar:tgz
> USE_PERL5=	configure
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Data/Peek/Peek.so
> 
> .include <bsd.port.mk>
>diff --git devel/pcre/Makefile devel/pcre/Makefile
>index ac96707..3d5f787 100644
>--- devel/pcre/Makefile
>+++ devel/pcre/Makefile
>@@ -90,7 +90,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e "/^\.rs/d" ${WRKSRC}/doc/*.3 ${WRKSRC}/doc/*.1
> 	@${REINPLACE_CMD} -e "s/Â£//g" ${WRKSRC}/doc/pcre_compile2.3
> 
>-post-stage:
>+post-install:
> 	${LN} -s libpcre.so.1 ${STAGEDIR}${PREFIX}/lib/libpcre.so.3
> 
> .include <bsd.port.post.mk>
>diff --git devel/py-llfuse/Makefile devel/py-llfuse/Makefile
>index 08dc41e..2d12a05 100644
>--- devel/py-llfuse/Makefile
>+++ devel/py-llfuse/Makefile
>@@ -16,7 +16,7 @@ BROKEN_powerpc64=	Does not build
> USES=		compiler:c++11-lang fuse pkgconfig python tar:bz2
> USE_PYTHON=	autoplist distutils
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/llfuse.so
> 
> .include <bsd.port.mk>
>diff --git devel/rapidjson/Makefile devel/rapidjson/Makefile
>index 8f12b64..1942e31 100644
>--- devel/rapidjson/Makefile
>+++ devel/rapidjson/Makefile
>@@ -45,7 +45,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|.*travis.*||' ${WRKSRC}/CMakeLists.txt   # travis_doc breaks cmake, see https://github.com/miloyip/rapidjson/issues/715
> 	@${REINPLACE_CMD} -e 's|add_subdirectory.*googletest.*|link_directories(${LOCALBASE}/lib)|' ${WRKSRC}/test/CMakeLists.txt
> 
>-post-stage:
>+post-install:
> 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/CMake*
> 
> .include <bsd.port.mk>
>diff --git devel/rubygem-rice/Makefile devel/rubygem-rice/Makefile
>index 3d1afdb..8cc5168 100644
>--- devel/rubygem-rice/Makefile
>+++ devel/rubygem-rice/Makefile
>@@ -14,7 +14,7 @@ USE_AUTOTOOLS=	aclocal autoconf
> INSTDIR=	${PREFIX}/${GEM_LIB_DIR}
> 
> # Fixup path in mkmf-rice.rb so things that build using it can find -lrice.
>-post-stage:
>+post-install:
> 	${REINPLACE_CMD} -e 's,${STAGEDIR}${INSTDIR},${INSTDIR},g' \
> 		${STAGEDIR}${INSTDIR}/ruby/lib/mkmf-rice.rb
> 
>diff --git devel/spatialindex/Makefile devel/spatialindex/Makefile
>index 9561434..6ed3454 100644
>--- devel/spatialindex/Makefile
>+++ devel/spatialindex/Makefile
>@@ -16,7 +16,7 @@ USES=		gmake libtool pathfix tar:bzip2
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libspatialindex*.so.*
> 
> .include <bsd.port.mk>
>diff --git dns/adns/Makefile dns/adns/Makefile
>index 68d05db..a5c1c75 100644
>--- dns/adns/Makefile
>+++ dns/adns/Makefile
>@@ -39,7 +39,7 @@ post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR})
> 
>-post-stage:
>+post-install:
> .for f in ${TOSTRIP}
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${f}
> .endfor
>diff --git dns/powerdns/Makefile dns/powerdns/Makefile
>index e4bcbcd..934605f 100644
>--- dns/powerdns/Makefile
>+++ dns/powerdns/Makefile
>@@ -122,7 +122,7 @@ TINYDNS_DESC=		TinyDNS backend
> TOOLS_DESC=		Build extra tools
> ZEROMQ_DESC=		Enable ZeroMQ connector (Implies REMOTE enabled)
> 
>-post-stage::
>+post-install::
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	@${STAGEDIR}${LOCALBASE}/sbin/pdns_server --module-dir=${STAGEDIR}${LOCALBASE}/lib/pdns --launch="pipe bind ${MODULES}" --config > ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
> 	@${REINPLACE_CMD} -e 's;${STAGEDIR};;' -i '' ${STAGEDIR}${EXAMPLESDIR}/pdns.conf
>diff --git emulators/pipelight/Makefile emulators/pipelight/Makefile
>index 3af9084..b6fa7fd 100644
>--- emulators/pipelight/Makefile
>+++ emulators/pipelight/Makefile
>@@ -63,10 +63,10 @@ pre-configure:
> 		${WRKSRC}/pluginloader-v${DISTVERSION}.tar.gz.sig
> 	${MKDIR} ${WRKDIR}/.gnupg
> 
>-post-stage:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pipelight/libpipelight.so
>-
> post-install:
> 	${INSTALL_SCRIPT} ${WRKDIR}/pipelight-mkufs ${STAGEDIR}${PREFIX}/bin/
> 
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pipelight/libpipelight.so
>+
>+
> .include <bsd.port.post.mk>
>diff --git finance/bitcoin-armory/Makefile finance/bitcoin-armory/Makefile
>index 119af6f..3e0d40f 100644
>--- finance/bitcoin-armory/Makefile
>+++ finance/bitcoin-armory/Makefile
>@@ -45,7 +45,9 @@ post-patch:
> 	@${REINPLACE_CMD} 's/python-config/$${PYTHON_CONFIG}/' ${WRKSRC}/cppForSwig/Makefile
> 	@${REINPLACE_CMD} 's/O_DSYNC/O_SYNC/' ${WRKSRC}/cppForSwig/mdb/mdb.c
> 
>-post-stage:
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so
>+
> 	@${SED} -i.bak -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${STAGEDIR}/${LOCALBASE}/bin/armory && \
> 		${RM} ${STAGEDIR}/${LOCALBASE}/bin/armory.bak
> 	@${REINPLACE_CMD} 's|Exec=/usr/bin/armory|Exec=${LOCALBASE}/bin/armory|' ${STAGEDIR}/${LOCALBASE}/share/applications/*.desktop
>@@ -55,7 +57,4 @@ post-stage:
> 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/armoryicon.png
> .endfor
> 
>-post-install:
>-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/armory/_CppBlockUtils.so
>-
> .include <bsd.port.mk>
>diff --git graphics/libart_lgpl/Makefile graphics/libart_lgpl/Makefile
>index 5ede726..c4ba5fb 100644
>--- graphics/libart_lgpl/Makefile
>+++ graphics/libart_lgpl/Makefile
>@@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE=	yes
> 
> CONFLICTS=	libart-[0-9]*
> 
>-post-stage:
>+post-install:
> 	${LN} -s libart_lgpl_2.so.2 ${STAGEDIR}${PREFIX}/lib/libart_lgpl_2.so.5
> 
> .include <bsd.port.mk>
>diff --git graphics/linux-c6-dri/Makefile graphics/linux-c6-dri/Makefile
>index 355c8d8..252025f 100644
>--- graphics/linux-c6-dri/Makefile
>+++ graphics/linux-c6-dri/Makefile
>@@ -27,7 +27,7 @@ USE_LINUX_RPM=	yes
> USE_LDCONFIG=	yes
> DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib/libGL.so.1
> 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib64/libGL.so.1
> 
>diff --git graphics/linux-c7-dri/Makefile graphics/linux-c7-dri/Makefile
>index 244f6bf..83c02ce 100644
>--- graphics/linux-c7-dri/Makefile
>+++ graphics/linux-c7-dri/Makefile
>@@ -31,7 +31,7 @@ USE_LINUX_RPM=	yes
> USE_LDCONFIG=	yes
> DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib/libEGL.so.1
> 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib/libGL.so.1
> 	@${RM} ${STAGEDIR}${PREFIX}/usr/lib64/libEGL.so.1
>diff --git graphics/pfstools/Makefile graphics/pfstools/Makefile
>index 616e647..87c1a2e 100644
>--- graphics/pfstools/Makefile
>+++ graphics/pfstools/Makefile
>@@ -80,7 +80,7 @@ octave_OLD_CMD?=/usr/bin/octave
> octave_CMD?=	${OCTAVE_BASE}/bin/octave
> .endif
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib//libpfs-1.2.so.0.0.0
> 
> .include <bsd.port.mk>
>diff --git graphics/py-graph-dot/Makefile graphics/py-graph-dot/Makefile
>index fd984dc..b4c1cde 100644
>--- graphics/py-graph-dot/Makefile
>+++ graphics/py-graph-dot/Makefile
>@@ -21,11 +21,11 @@ PROJECTHOST=	python-graph
> USES=		python
> USE_PYTHON=	distutils autoplist
> 
>-# post-stage and add-plist-post should not act as reference on how to fix
>+# post-install and add-plist-post should not act as reference on how to fix
> # egg-based conflicts.
> # https://code.google.com/p/python-graph/issues/detail?id=121 contains the
> # report for this issue.
>-post-stage:
>+post-install:
> .for suffix in py pyc pyo
> 	rm ${STAGEDIR}${PYTHON_SITELIBDIR}/pygraph/readwrite/__init__.${suffix}
> .endfor
>diff --git irc/bopm/Makefile irc/bopm/Makefile
>index f358d94..aa80e5c 100644
>--- irc/bopm/Makefile
>+++ irc/bopm/Makefile
>@@ -29,7 +29,7 @@ post-patch:
> 		-e 's,/some/path/scan.log,/var/log/bopm/scan.log,g' \
> 		${WRKSRC}/bopm.conf.sample
> 
>-post-stage:
>+post-install:
> 	@${MKDIR} ${STAGEDIR}/var/run/bopm
> 
> .include <bsd.port.mk>
>diff --git japanese/ebnetd/Makefile japanese/ebnetd/Makefile
>index ad0d282..2f7da94 100644
>--- japanese/ebnetd/Makefile
>+++ japanese/ebnetd/Makefile
>@@ -40,7 +40,7 @@ post-patch:
> 		-e "s/%%EBNETD_GROUP%%/${EBNETD_GROUP}/" \
> 		${WRKSRC}/ebnetd.conf.sample.in
> 
>-post-stage:
>+post-install:
> 	${MKDIR} -m 0755 ${STAGEDIR}${RUNDIR}/${PORTNAME}
> 
> .include <bsd.port.mk>
>diff --git lang/dmd2/Makefile.bootstrap lang/dmd2/Makefile.bootstrap
>index 70360af..fa4c8ae 100644
>--- lang/dmd2/Makefile.bootstrap
>+++ 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 lang/gcc/Makefile lang/gcc/Makefile
>index 25ebf5e..da4a87f 100644
>--- lang/gcc/Makefile
>+++ lang/gcc/Makefile
>@@ -153,7 +153,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc46/Makefile lang/gcc46/Makefile
>index b474cb5..c149b8a 100644
>--- lang/gcc46/Makefile
>+++ lang/gcc46/Makefile
>@@ -121,7 +121,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc47/Makefile lang/gcc47/Makefile
>index 02dcf26..da7d780 100644
>--- lang/gcc47/Makefile
>+++ lang/gcc47/Makefile
>@@ -129,7 +129,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc48/Makefile lang/gcc48/Makefile
>index b27832d..4f721e0 100644
>--- lang/gcc48/Makefile
>+++ lang/gcc48/Makefile
>@@ -154,7 +154,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc49/Makefile lang/gcc49/Makefile
>index a78a18a..69c12da 100644
>--- lang/gcc49/Makefile
>+++ lang/gcc49/Makefile
>@@ -158,7 +158,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc5-aux/Makefile lang/gcc5-aux/Makefile
>index 65aa4ae..39eae66 100644
>--- lang/gcc5-aux/Makefile
>+++ lang/gcc5-aux/Makefile
>@@ -266,7 +266,7 @@ do-install:
> 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
> #	Don't activate until this port builds gnatdroid
> #	Otherwise it will conflict with lang/gcc-aux
>-#	Add "share" after {PORTNAME} on 3rd line of post-stage target
>+#	Add "share" after {PORTNAME} on 2nd find below
> #	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
> #		${STAGEDIR}${PREFIX}/share/dejagnu/config
> #	${INSTALL_DATA} ${FILESDIR}/android.exp \
>@@ -274,7 +274,6 @@ do-install:
> #	${INSTALL_DATA} ${FILESDIR}/gnatdroid.exp \
> #		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
> 
>-post-stage:
> 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
> 		${SORT} -dr | ${XARGS} ${RMDIR})
> 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} \
>diff --git lang/gcc5-devel/Makefile lang/gcc5-devel/Makefile
>index 9572ccb..b9ea98e 100644
>--- lang/gcc5-devel/Makefile
>+++ lang/gcc5-devel/Makefile
>@@ -160,7 +160,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc5/Makefile lang/gcc5/Makefile
>index 85b638d..03c4782 100644
>--- lang/gcc5/Makefile
>+++ lang/gcc5/Makefile
>@@ -160,7 +160,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc6-aux/Makefile lang/gcc6-aux/Makefile
>index 0e5063f..db727dd 100644
>--- lang/gcc6-aux/Makefile
>+++ lang/gcc6-aux/Makefile
>@@ -260,7 +260,6 @@ do-install:
> 	${INSTALL_DATA} ${FILESDIR}/gnatdroid6.exp \
> 		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
> 
>-post-stage:
> 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
> 		${SORT} -dr | ${XARGS} ${RMDIR})
> 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
>diff --git lang/gcc6-devel/Makefile lang/gcc6-devel/Makefile
>index 96c1a30..70e956a 100644
>--- lang/gcc6-devel/Makefile
>+++ lang/gcc6-devel/Makefile
>@@ -163,7 +163,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc6/Makefile lang/gcc6/Makefile
>index cf6ed2b..1995790 100644
>--- lang/gcc6/Makefile
>+++ lang/gcc6/Makefile
>@@ -164,7 +164,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
> 	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
>diff --git lang/gcc7-devel/Makefile lang/gcc7-devel/Makefile
>index 9d61332..4425aaf 100644
>--- lang/gcc7-devel/Makefile
>+++ lang/gcc7-devel/Makefile
>@@ -136,7 +136,7 @@ full-regression-test: build
> 	; ${WRKSRC}/contrib/test_summary
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/man/man7/*
> 	# Add target libraries and include files to packaging list.
> 	${RM} ${WRKDIR}/PLIST.lib
>diff --git lang/gnatdroid-armv7/Makefile lang/gnatdroid-armv7/Makefile
>index 1dc3f32..ead4408 100644
>--- lang/gnatdroid-armv7/Makefile
>+++ lang/gnatdroid-armv7/Makefile
>@@ -140,7 +140,6 @@ do-install:
> 	${MV} ${STAGEDIR}${PREFIX}/bin/ada \
> 		${STAGEDIR}${PREFIX}/bin/${DROID_TARGET}-ada
> 
>-post-stage:
> .for loop in A B
> 	(cd ${STAGEDIR}${PREFIX}; ${FIND} * -type d -empty | \
> 		${SORT} -dr | ${XARGS} ${RMDIR})
>diff --git lang/p5-List-MoreUtils/Makefile lang/p5-List-MoreUtils/Makefile
>index 969e8ea..a02f139 100644
>--- lang/p5-List-MoreUtils/Makefile
>+++ 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 lang/py-mx-base/Makefile lang/py-mx-base/Makefile
>index 8e7f34f..e6db458 100644
>--- lang/py-mx-base/Makefile
>+++ 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 lang/smlnj/Makefile lang/smlnj/Makefile
>index afd2d9e..ddf0b7a 100644
>--- lang/smlnj/Makefile
>+++ 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} ; \
>diff --git mail/dcc-dccd/Makefile mail/dcc-dccd/Makefile
>index e6ed050..3200cba 100644
>--- mail/dcc-dccd/Makefile
>+++ mail/dcc-dccd/Makefile
>@@ -117,7 +117,7 @@ PLIST_SUB+=	IFD_MILT=""
> PLIST_SUB+=	IFD_MILT="@comment "
> .endif
> 
>-post-stage:
>+post-install:
> 	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
> 		${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
> 	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
>diff --git mail/fetchmail/Makefile mail/fetchmail/Makefile
>index 962fcb7..892e9f6 100644
>--- mail/fetchmail/Makefile
>+++ mail/fetchmail/Makefile
>@@ -79,7 +79,7 @@ post-patch:
> post-build:
> 	@${MAKE_CMD} -C ${WRKSRC} check
> 
>-post-stage:
>+post-install:
> 	${INSTALL} -d ${STAGEDIR}/var/run/fetchmail
> 	${INSTALL_DATA} ${FILESDIR}/fetchmailrc.sample \
> 		${STAGEDIR}${PREFIX}/etc/fetchmailrc.sample
>diff --git mail/libsrs2/Makefile mail/libsrs2/Makefile
>index a3d2af5..416a099 100644
>--- mail/libsrs2/Makefile
>+++ mail/libsrs2/Makefile
>@@ -16,7 +16,7 @@ USES=		libtool
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=		yes
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsrs2.so.0.0.0
> 
> .include <bsd.port.mk>
>diff --git mail/libsrs_alt/Makefile mail/libsrs_alt/Makefile
>index b405808..a82d32b 100644
>--- mail/libsrs_alt/Makefile
>+++ mail/libsrs_alt/Makefile
>@@ -29,7 +29,7 @@ post-patch:
> 	@${REINPLACE_CMD} -E 's,^(test_LDFLAGS.*$$),\1 -lcompat,' \
> 		${WRKSRC}/Makefile.in
> 
>-post-stage:
>+post-install:
> 	${MV} ${STAGEDIR}${PREFIX}/bin/srs ${STAGEDIR}${PREFIX}/bin/srs_alt
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsrs_alt.so.1.0.0
> 
>diff --git mail/msmtp/Makefile mail/msmtp/Makefile
>index 06fead8..842950a 100644
>--- mail/msmtp/Makefile
>+++ mail/msmtp/Makefile
>@@ -58,7 +58,7 @@ post-extract:
> 		${WRKSRC}/doc/msmtp.1
> 
> .if ${PORT_OPTIONS:MMSMTPQ}
>-post-stage:
>+post-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtp-queue ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/msmtpq/msmtpq ${STAGEDIR}${PREFIX}/bin
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
>diff --git mail/postfix-current/Makefile mail/postfix-current/Makefile
>index b2af666..be3e8b2 100644
>--- mail/postfix-current/Makefile
>+++ mail/postfix-current/Makefile
>@@ -328,11 +328,6 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
>-do-install-TEST-on:
>-	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>-
>-post-stage:
> # == do not overwrite existing config
> 	${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
> 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
>@@ -362,4 +357,8 @@ post-stage:
> 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
> 	-@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so
> 
>+do-install-TEST-on:
>+	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>+
> .include <bsd.port.mk>
>diff --git mail/postfix/Makefile mail/postfix/Makefile
>index c8661c9..2f2c418 100644
>--- mail/postfix/Makefile
>+++ mail/postfix/Makefile
>@@ -329,11 +329,6 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
>-do-install-TEST-on:
>-	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>-
>-post-stage:
> # == do not overwrite existing config
> 	${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
> 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
>@@ -363,4 +358,8 @@ post-stage:
> 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
> 	-@${STRIP_CMD} ${STAGEDIR}${SHLIB_DIRECTORY}/*.so
> 
>+do-install-TEST-on:
>+	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>+
> .include <bsd.port.mk>
>diff --git mail/postfix211/Makefile mail/postfix211/Makefile
>index 483abef..5387a16 100644
>--- mail/postfix211/Makefile
>+++ mail/postfix211/Makefile
>@@ -339,11 +339,6 @@ do-install:
> 	${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${STAGEDIR}${PREFIX}/bin/qshape
> 	${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${STAGEDIR}${MANPREFIX}/man/man1
> 
>-do-install-TEST-on:
>-	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>-
>-post-stage:
> # == do not overwrite existing config
> 	${MV} ${STAGEDIR}${ETCDIR}/main.cf ${STAGEDIR}${ETCDIR}/main.cf.sample
> 	${MV} ${STAGEDIR}${ETCDIR}/master.cf ${STAGEDIR}${ETCDIR}/master.cf.sample
>@@ -355,4 +350,8 @@ post-stage:
> 	-@${STRIP_CMD} ${STRIP_LIBEXEC:S|^|${STAGEDIR}${DAEMONDIR}/|}
> 	-@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/*
> 
>+do-install-TEST-on:
>+	${INSTALL_PROGRAM} ${BINTEST:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_MAN} ${MANTEST:S|^|${WRKSRC}/man/man1/|} ${STAGEDIR}${MANPREFIX}/man/man1
>+
> .include <bsd.port.mk>
>diff --git mail/rmilter/Makefile mail/rmilter/Makefile
>index 6eca02e..f428243 100644
>--- mail/rmilter/Makefile
>+++ mail/rmilter/Makefile
>@@ -52,6 +52,6 @@ do-install:
> 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/rmilter ${STAGEDIR}${PREFIX}/sbin
> 	${INSTALL_DATA} ${WRKSRC}/rmilter.conf.sample ${STAGEDIR}${PREFIX}/etc/
> 
>-post-stage:
> 	${INSTALL} -d ${STAGEDIR}/var/run/rmilter
>+
> .include <bsd.port.post.mk>
>diff --git mail/rspamd-devel/Makefile mail/rspamd-devel/Makefile
>index 6332cdd..0227b452 100644
>--- mail/rspamd-devel/Makefile
>+++ mail/rspamd-devel/Makefile
>@@ -93,7 +93,10 @@ WITH_DEBUG=	yes
>  PLIST_SUB+=	REDIRECTOR="@comment "
> .endif
> 
>-post-stage:
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>+
> 	${INSTALL} -d \
> 		${STAGEDIR}/var/log/rspamd \
> 		${STAGEDIR}/var/db/rspamd \
>@@ -104,8 +107,4 @@ post-stage:
> 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
> 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
> 
>-post-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>-	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>-
> .include <bsd.port.mk>
>diff --git mail/rspamd/Makefile mail/rspamd/Makefile
>index cac0162..474d064 100644
>--- mail/rspamd/Makefile
>+++ mail/rspamd/Makefile
>@@ -82,7 +82,10 @@ USE_GNOME=	glib20
>  PLIST_SUB+=	REDIRECTOR="@comment "
> .endif
> 
>-post-stage:
>+post-install:
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>+	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>+
> 	${INSTALL} -d \
> 		${STAGEDIR}/var/log/rspamd \
> 		${STAGEDIR}/var/db/rspamd \
>@@ -93,8 +96,4 @@ post-stage:
> 	${RM} ${STAGEDIR}/${ETCDIR}/rspamd.sysvinit.conf
> 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
> 
>-post-install:
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>-	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
>-
> .include <bsd.port.mk>
>diff --git math/p5-Math-Int128/Makefile math/p5-Math-Int128/Makefile
>index 603c1f0..5605563 100644
>--- math/p5-Math-Int128/Makefile
>+++ math/p5-Math-Int128/Makefile
>@@ -30,7 +30,7 @@ CC=	/usr/bin/clang
> USE_GCC=	yes
> .endif
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Math/Int128/Int128.so
> 
> .include <bsd.port.post.mk>
>diff --git multimedia/libav/Makefile multimedia/libav/Makefile
>index c05af59..28bb528 100644
>--- multimedia/libav/Makefile
>+++ multimedia/libav/Makefile
>@@ -221,7 +221,7 @@ post-patch:
> post-configure-DOCS-off:
> 	@${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak
> 
>-post-stage:
>+post-install:
> .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\
> 	lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\
> 	lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\
>diff --git multimedia/mpv/Makefile multimedia/mpv/Makefile
>index 16bf102..4c3ab89 100644
>--- multimedia/mpv/Makefile
>+++ multimedia/mpv/Makefile
>@@ -158,7 +158,7 @@ post-patch:
> 	@${FIND} ${WRKSRC}/DOCS/man -name '*.rst' | ${XARGS} ${REINPLACE_CMD} \
> 		-e 's|/usr/local|${PREFIX}|g'
> 
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mpv
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmpv.so
> 
>diff --git multimedia/transcode/Makefile multimedia/transcode/Makefile
>index f89f5d4..4c044ff 100644
>--- multimedia/transcode/Makefile
>+++ multimedia/transcode/Makefile
>@@ -157,7 +157,7 @@ post-patch-OPTIMIZED_CFLAGS-off:
> 	@${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \
> 		-e 's|-O[236]|${CFLAGS}|'
> 
>-post-stage:
>+post-install:
> 	@(cd ${STAGEDIR}${PREFIX} && \
> 		${FIND} -s lib/transcode -type f -or -type l >> ${TMPPLIST})
> 
>diff --git net-im/libpurple/Makefile net-im/libpurple/Makefile
>index 1f27d0d..fcc1b7f 100644
>--- net-im/libpurple/Makefile
>+++ net-im/libpurple/Makefile
>@@ -333,7 +333,7 @@ post-patch:
> .endif
> 
> .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL}
>-post-stage:
>+post-install:
> 	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
> 		${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist
> .endif
>diff --git net-im/pidgin/Makefile net-im/pidgin/Makefile
>index cc10ae2..7716073 100644
>--- net-im/pidgin/Makefile
>+++ net-im/pidgin/Makefile
>@@ -29,7 +29,7 @@ CONFIGURE_ARGS=	--disable-consoleui \
> 		--enable-screensaver \
> 		--with-dynamic_prpls=${PRPL_MODULES:S/,$//}
> 
>-post-stage-PERL-on:
>+post-install-PERL-on:
> 	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
> 		${STAGEDIR}${PREFIX}/lib/pidgin/perl/auto/Pidgin/.packlist
> 
>diff --git net-im/ring-daemon/Makefile net-im/ring-daemon/Makefile
>index 18b7531..7d7be24 100644
>--- net-im/ring-daemon/Makefile
>+++ net-im/ring-daemon/Makefile
>@@ -72,7 +72,7 @@ pre-configure:
> 	    cd contrib/native && \
> 	    ../bootstrap && \
> 	    ${GMAKE} .pjproject)
>-post-stage:
>+post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libring.so
> 
> .include <bsd.port.mk>
>diff --git net-im/ring-gnome/Makefile net-im/ring-gnome/Makefile
>index 912acd7..ebaa536 100644
>--- net-im/ring-gnome/Makefile
>+++ net-im/ring-gnome/Makefile
>@@ -46,7 +46,7 @@ OPTIONS_DEFINE=	NLS
> NLS_CMAKE_ON=	-DFREEBSD_NLS_ON:BOOL=ON
> OPTIONS_SUB=	yes
> 
>-post-stage:
>+post-install:
> 	@${GZIP_CMD} ${GZIP} < ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg > ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svgz
> 	@${RM} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ring.svg
> 
>diff --git net-mgmt/netmagis-topo/Makefile net-mgmt/netmagis-topo/Makefile
>index d44f04e..9af89c4 100644
>--- net-mgmt/netmagis-topo/Makefile
>+++ net-mgmt/netmagis-topo/Makefile
>@@ -22,7 +22,7 @@ PLIST=		${.CURDIR}/pkg-plist
> 
> ALL_TARGET=build${PKGNAMESUFFIX?=}
> 
>-post-stage:
>+post-install:
> 	@${MKDIR} ${STAGEDIR}/var/netmagis/eqgen ${STAGEDIR}/var/netmagis/eqvirt
> 
> .include "${MASTERDIR}/Makefile"
>diff --git net-mgmt/prometheus/Makefile net-mgmt/prometheus/Makefile
>index a741341..df1da21 100644
>--- net-mgmt/prometheus/Makefile
>+++ net-mgmt/prometheus/Makefile
>@@ -27,12 +27,11 @@ do-build:
> 	(cd ${GO_WRKSRC}/cmd/prometheus ; ${SETENV} ${GO_ENV} go install)
> 	(cd ${GO_WRKSRC}/cmd/promtool ; ${SETENV} ${GO_ENV} go install)
> 
>-post-stage:
>-	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus
>-
> do-install:
> 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/prometheus ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/promtool ${STAGEDIR}${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/documentation/examples/prometheus.yml ${STAGEDIR}${LOCALBASE}/etc/prometheus.yml.sample
> 
>+	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/prometheus
>+
> .include <bsd.port.mk>
>diff --git net-p2p/btsync/Makefile net-p2p/btsync/Makefile
>index 19d748f..26ffb9e 100644
>--- net-p2p/btsync/Makefile
>+++ net-p2p/btsync/Makefile
>@@ -46,7 +46,6 @@ do-install:
> 	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"storage_path"[[:space:]]*:[[:space:]]*$"/.*",$$;\1"/var/db/${PORTNAME}",;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 	${REINPLACE_CMD} -e 's;^//$[[:space:]]*"pid_file"[[:space:]]*:[[:space:]]*"/var/run/${PORTNAME}/${PORTNAME}.pid",$$$;\1;' ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
> 
>-post-stage:
> 	${MKDIR} ${STAGEDIR}/var/db/${PORTNAME}
> 
> .include <bsd.port.post.mk>
>diff --git net/bctoolbox/Makefile net/bctoolbox/Makefile
>index e204949..72524d8 100644
>--- net/bctoolbox/Makefile
>+++ net/bctoolbox/Makefile
>@@ -22,7 +22,7 @@ INSTALL_TARGET=	install-strip
> USES=		libtool pathfix pkgconfig
> USE_LDCONFIG=	yes
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/bctoolbox-tester.pc
> 
> .include <bsd.port.mk>
>diff --git net/chrony/Makefile net/chrony/Makefile
>index 58f31f2..0aac25a 100644
>--- net/chrony/Makefile
>+++ net/chrony/Makefile
>@@ -40,7 +40,7 @@ OPTIONS_DEFINE=		IPV6
> IPV6_CATEGORIES=	ipv6
> IPV6_CONFIGURE_OFF=	--disable-ipv6
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
> 	${INSTALL_DATA} ${EXTRAPORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
>diff --git net/h323plus/Makefile net/h323plus/Makefile
>index 1448ed5..a497f45 100644
>--- net/h323plus/Makefile
>+++ net/h323plus/Makefile
>@@ -27,7 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
> 
> MAKE_JOBS_UNSAFE=yes
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libh323.so.1.26.5
> 
> .include <bsd.port.mk>
>diff --git net/kamailio/Makefile net/kamailio/Makefile
>index 21ef436..0e90d9a 100644
>--- net/kamailio/Makefile
>+++ net/kamailio/Makefile
>@@ -136,7 +136,12 @@ pre-build:
> do-build:
> 	cd ${WRKSRC} && ${GMAKE} ${ALL_TARGET}
> 
>-post-stage:
>+do-install:
>+	cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET}
>+.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
>+	${RMDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
>+.endif
>+
> # Strip modules in lib/kamailio/modules
> 	@${ECHO_CMD} "Stripping modules in ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/modules/"
> 
>@@ -195,10 +200,4 @@ post-stage:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/${k}
> .endfor
> 
>-do-install:
>-	cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET}
>-.if ! ${PORT_OPTIONS:MMYSQL} && ! ${PORT_OPTIONS:MPGSQL}
>-	${RMDIR} ${STAGEDIR}${PREFIX}/share/${PORTNAME}
>-.endif
>-
> .include <bsd.port.mk>
>diff --git net/libp0f/Makefile net/libp0f/Makefile
>index 1b319f6..e77d538 100644
>--- net/libp0f/Makefile
>+++ net/libp0f/Makefile
>@@ -19,7 +19,7 @@ INSTALL_TARGET=	install-strip
> USES=		gmake libtool pathfix pkgconfig tar:tgz
> USE_LDCONFIG=	yes
> 
>-post-stage:
>+post-install:
> 	${RM} ${STAGEDIR}${LOCALBASE}/bin/p0f
> 	${MV} ${STAGEDIR}/etc/p0f ${STAGEDIR}${LOCALBASE}/etc/libp0f
> 	${RM} -r ${STAGEDIR}/etc
>diff --git net/linphone/Makefile net/linphone/Makefile
>index 017f50a..06a6b95 100644
>--- net/linphone/Makefile
>+++ net/linphone/Makefile
>@@ -58,7 +58,7 @@ VIDEO_CONFIGURE_ENABLE=	video
> CONFIGURE_ARGS+=--enable-debug
> .endif
> 
>-post-stage:
>+post-install:
> 	${RM} -r ${STAGEDIR}${PREFIX}/share/gnome
> 
> .include <bsd.port.mk>
>diff --git net/mosquitto/Makefile net/mosquitto/Makefile
>index 44d653f..53babc7 100644
>--- net/mosquitto/Makefile
>+++ net/mosquitto/Makefile
>@@ -33,7 +33,7 @@ post-patch:
> 	${REINPLACE_CMD} -e '/ldconfig/d' ${WRKSRC}/src/CMakeLists.txt \
> 		${WRKSRC}/lib/CMakeLists.txt ${WRKSRC}/lib/cpp/CMakeLists.txt
> 
>-post-stage:
>+post-install:
> # Adjust configuration files
> 	${MV} ${STAGEDIR}${ETCDIR}/mosquitto.conf ${STAGEDIR}${ETCDIR}/mosquitto.conf.sample
> 	${MV} ${STAGEDIR}${ETCDIR}/pwfile.example ${STAGEDIR}${ETCDIR}/pwfile.sample
>diff --git net/openggsn/Makefile net/openggsn/Makefile
>index 6c59c25..9501215 100644
>--- net/openggsn/Makefile
>+++ net/openggsn/Makefile
>@@ -22,7 +22,7 @@ USE_LDCONFIG=	yes
> post-patch:
> 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgtp.so.0
> 
> .include <bsd.port.mk>
>diff --git net/openntpd/Makefile net/openntpd/Makefile
>index 56eb528..6378604 100644
>--- net/openntpd/Makefile
>+++ net/openntpd/Makefile
>@@ -27,7 +27,7 @@ pre-build:
> 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
> 	    ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8
> 
>-post-stage:
>+post-install:
> 	cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample
> 
> .include <bsd.port.pre.mk>
>diff --git net/opensips/Makefile net/opensips/Makefile
>index c16c301..22b0d41 100644
>--- net/opensips/Makefile
>+++ net/opensips/Makefile
>@@ -173,20 +173,19 @@ do-build:
> do-install:
> 	cd ${WRKSRC} && ${OPENSIPS_MAKE_ENV} ${GMAKE} ${INSTALL_TARGET}
> 
>-do-install-TESTS-on:
>-	(cp -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/opensips)
>-
>-do-install-EXAMPLES-on:
>-	(cp -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/opensips)
>-
>-post-stage:
> 	@${REINPLACE_CMD} -e "s|^# MD5=.*|MD5=\"md5\"|" ${STAGEDIR}${PREFIX}/etc/opensips/opensipsctlrc.sample
> 	@${REINPLACE_CMD} -e "s|^# GREP=.*|GREP=\"${LOCALBASE}/bin/grep\"|" ${STAGEDIR}${PREFIX}/etc/opensips/opensipsctlrc.sample
> 	@${REINPLACE_CMD} -e "s|^# MD5=.*|MD5=\"md5\"|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample
> 	@${REINPLACE_CMD} -e "s|^# GREP=.*|GREP=\"${LOCALBASE}/bin/egrep\"|" ${STAGEDIR}${PREFIX}/etc/opensips/osipsconsolerc.sample
> 	(cp ${FILESDIR}/opensips.cfg.sample ${STAGEDIR}${ETCDIR}/opensips.cfg.sample)
> 
>-post-stage-RADIUS-on:
>+do-install-TESTS-on:
>+	(cp -r ${WRKSRC}/test ${STAGEDIR}${PREFIX}/tests/opensips)
>+
>+do-install-EXAMPLES-on:
>+	(cp -r ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/examples/opensips)
>+
>+post-install-RADIUS-on:
> 	(mv ${STAGEDIR}${ETCDIR}/dictionary.opensips ${STAGEDIR}${ETCDIR}/dictionary.opensips.sample)
> 
> # Strip binaries in sbin
>diff --git net/whois/Makefile net/whois/Makefile
>index 90a5837..5619e0c 100644
>--- net/whois/Makefile
>+++ net/whois/Makefile
>@@ -40,7 +40,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h
> .endif
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mwhois
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkpasswd
> 
>diff --git net/yate/Makefile net/yate/Makefile
>index 9718c4f..e63f2b8 100644
>--- net/yate/Makefile
>+++ net/yate/Makefile
>@@ -87,7 +87,7 @@ SQLITE_USES=		pkgconfig sqlite
> post-extract:
> 	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/yate
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libyate*.so.5.5.0
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/yate/*.yate
>diff --git science/gnudatalanguage/Makefile science/gnudatalanguage/Makefile
>index 7d681a5..0a49d8d 100644
>--- science/gnudatalanguage/Makefile
>+++ science/gnudatalanguage/Makefile
>@@ -111,7 +111,7 @@ do-install:
> .endif
> 
> .if !defined(BUILD_PYTHON_MODULE)
>-post-stage:
>+post-install:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
> 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
> .endif
>diff --git science/mcstas/Makefile science/mcstas/Makefile
>index 3b23514..01021e5 100644
>--- science/mcstas/Makefile
>+++ science/mcstas/Makefile
>@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
> PLIST_SUB+=	PORTVERSION=${PORTVERSION}
> SUB_FILES=	pkg-deinstall pkg-install
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcformat
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/mcstas/${PORTVERSION}/bin/mcstas
> 
>diff --git security/fwknop/Makefile security/fwknop/Makefile
>index 148a078..3f86217 100644
>--- security/fwknop/Makefile
>+++ security/fwknop/Makefile
>@@ -41,7 +41,7 @@ PF_CONFIGURE_WITH=	pf=/sbin/pfctl
> GPGME_LIB_DEPENDS=	libgpgme.so:security/gpgme
> GPGME_CONFIGURE_WITH=	gpgme
> 
>-post-stage:
>+post-install:
> 	(cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} access.conf access.conf.sample)
> 	(cd ${STAGEDIR}${PREFIX}/etc/fwknop && ${MV} fwknopd.conf fwknopd.conf.sample)
> 
>diff --git security/libressl-devel/Makefile security/libressl-devel/Makefile
>index 2fea72f..c766a10 100644
>--- security/libressl-devel/Makefile
>+++ security/libressl-devel/Makefile
>@@ -33,13 +33,13 @@ CFLAGS+=	-fpic -DPIC
> INSTALL_TARGET=	install-strip
> TEST_TARGET=	check
> 
>-post-stage-NC-on:
>+post-install:
>+	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
>+
>+post-install-NC-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/apps/nc/.libs/nc ${STAGEDIR}/${PREFIX}/bin/nc
> 	${INSTALL_MAN} ${WRKSRC}/apps/nc/nc.1 ${STAGEDIR}/${PREFIX}/man/man1/nc.1
> 
>-post-stage:
>-	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
>-
> post-install-MAN3-off:
> 	${RM} -r ${STAGEDIR}/${PREFIX}/man/man3
> 	${REINPLACE_CMD} -e '/^man\/man3/d' ${TMPPLIST}
>diff --git security/libressl/Makefile security/libressl/Makefile
>index 7676054..02ce5fe 100644
>--- security/libressl/Makefile
>+++ security/libressl/Makefile
>@@ -34,11 +34,11 @@ CFLAGS+=	-fpic -DPIC
> INSTALL_TARGET=	install-strip
> TEST_TARGET=	check
> 
>-post-stage-NC-on:
>+post-install:
>+	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
>+
>+post-install-NC-on:
> 	${INSTALL_PROGRAM} ${WRKSRC}/apps/nc/.libs/nc ${STAGEDIR}/${PREFIX}/bin/nc
> 	${INSTALL_MAN} ${WRKSRC}/apps/nc/nc.1 ${STAGEDIR}/${PREFIX}/man/man1/nc.1
> 
>-post-stage:
>-	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
>-
> .include <bsd.port.mk>
>diff --git security/openca-tools-forked/Makefile security/openca-tools-forked/Makefile
>index 2ccd149..149ece4 100644
>--- security/openca-tools-forked/Makefile
>+++ security/openca-tools-forked/Makefile
>@@ -21,7 +21,7 @@ USES=		gmake perl5 ssl
> CONFIGURE_ARGS+=	--with-openssl-prefix=${OPENSSLBASE}
> 
> # security/openssl already has a verify.1 manpage.
>-post-stage:
>+post-install:
> .for f in sign.1 verify.1
> 	@${MV} ${STAGEDIR}${PREFIX}/man/man1/${f} ${STAGEDIR}${PREFIX}/man/man1/openca-${f}
> .endfor
>diff --git security/p5-Crypt-GCrypt/Makefile security/p5-Crypt-GCrypt/Makefile
>index 1116f5b..f04289c 100644
>--- security/p5-Crypt-GCrypt/Makefile
>+++ security/p5-Crypt-GCrypt/Makefile
>@@ -19,7 +19,7 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
> USE_PERL5=	configure
> USES=		localbase perl5
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/GCrypt/GCrypt.so
> 
> .include <bsd.port.mk>
>diff --git security/p5-Crypt-OpenSSL-X509/Makefile security/p5-Crypt-OpenSSL-X509/Makefile
>index 98ad2b9..30befc8 100644
>--- security/p5-Crypt-OpenSSL-X509/Makefile
>+++ security/p5-Crypt-OpenSSL-X509/Makefile
>@@ -22,7 +22,7 @@ MAKE_ARGS+=	PASTHRU_INC=-I${OPENSSLINC}
> post-patch:
> 	@${REINPLACE_CMD} -e '/cc_optimize_flags/ s| -Werror||' ${WRKSRC}/Makefile.PL
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Crypt/OpenSSL/X509/X509.so
> 
> .include <bsd.port.mk>
>diff --git security/p5-Crypt-SMIME/Makefile security/p5-Crypt-SMIME/Makefile
>index 6ea7f6e..acffbd6 100644
>--- security/p5-Crypt-SMIME/Makefile
>+++ security/p5-Crypt-SMIME/Makefile
>@@ -26,7 +26,7 @@ USE_PERL5=	configure
> 
> CONFIGURE_ENV=	LIBCRYPTO_CFLAGS="-I${OPENSSLINC}" LIBCRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto"
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Crypt/SMIME/SMIME.so
> 
> .include <bsd.port.mk>
>diff --git security/p5-Digest-GOST/Makefile security/p5-Digest-GOST/Makefile
>index fcb8ca1..223226b 100644
>--- security/p5-Digest-GOST/Makefile
>+++ security/p5-Digest-GOST/Makefile
>@@ -18,7 +18,7 @@ BROKEN_mips64=	fails to build: Cannot detect CPU architechture
> USES=		perl5
> USE_PERL5=	configure
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${SITE_ARCH}/auto/Digest/GOST/GOST.so
> 
> .include <bsd.port.mk>
>diff --git security/p5-openxpki/Makefile security/p5-openxpki/Makefile
>index af9d078..786890d 100644
>--- security/p5-openxpki/Makefile
>+++ security/p5-openxpki/Makefile
>@@ -108,11 +108,6 @@ post-patch:
> 	)
> 	@${MKDIR} ${WRKSRC}/t/var/log/openxpki
> 
>-post-stage:
>-	@${MKDIR} ${STAGEDIR}/var/openxpki/session
>-	@${MKDIR} ${STAGEDIR}/var/log/openxpki
>-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openxpki
>-
> .include <bsd.port.pre.mk>
> 
> .if ${SSL_DEFAULT:Mlibressl*}
>@@ -124,6 +119,10 @@ OXLIB=	${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/OpenXPKI/OpenXPKI.so
> post-install:
> 	${STRIP_CMD} ${OXLIB}
> 
>+	@${MKDIR} ${STAGEDIR}/var/openxpki/session
>+	@${MKDIR} ${STAGEDIR}/var/log/openxpki
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/openxpki
>+
> post-install-EXAMPLES-on:
> 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	(cd ${WRKSRC}/../.. && ${COPYTREE_SHARE} config ${STAGEDIR}${EXAMPLESDIR})
>diff --git sysutils/amtc/Makefile sysutils/amtc/Makefile
>index c91152d..e1b4aad 100644
>--- sysutils/amtc/Makefile
>+++ sysutils/amtc/Makefile
>@@ -22,7 +22,7 @@ SHEBANG_FILES=	${WRKSRC}/../amtc-web/cli/amtc-web.phpsh
> 
> WRKSRC_SUBDIR=	src
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/amtc
> 
> .include <bsd.port.mk>
>diff --git sysutils/clone/Makefile sysutils/clone/Makefile
>index af8a0b9..1927e1b 100644
>--- sysutils/clone/Makefile
>+++ sysutils/clone/Makefile
>@@ -16,7 +16,7 @@ USES=		compiler:c11
> PLIST_FILES=	bin/clone \
> 		man/man1/clone.1.gz
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/clone
> 
> .include <bsd.port.mk>
>diff --git sysutils/osquery/Makefile sysutils/osquery/Makefile
>index 7043734..faea764 100644
>--- sysutils/osquery/Makefile
>+++ sysutils/osquery/Makefile
>@@ -70,7 +70,6 @@ do-install:
> 	${INSTALL_DATA} ${WRKSRC}/tools/deployment/osquery.example.conf \
> 		${STAGEDIR}${PREFIX}/etc/osquery.conf.sample
> 
>-post-stage:
> 	${MKDIR} ${STAGEDIR}/var/db/osquery
> 
> .include <bsd.port.post.mk>
>diff --git textproc/expat2/Makefile textproc/expat2/Makefile
>index 20660b0..17ce2d2 100644
>--- textproc/expat2/Makefile
>+++ textproc/expat2/Makefile
>@@ -14,7 +14,7 @@ ALL_TARGET=	default
> USES=		libtool pathfix tar:bz2
> USE_LDCONFIG=	yes
> 
>-post-stage:
>+post-install:
> 	${LN} -s libexpat.so.1 ${STAGEDIR}${PREFIX}/lib/libexpat.so.6
> 
> .include <bsd.port.mk>
>diff --git textproc/libwps03/Makefile textproc/libwps03/Makefile
>index 42f9ce2..47ad9d9 100644
>--- textproc/libwps03/Makefile
>+++ textproc/libwps03/Makefile
>@@ -32,7 +32,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
> CONFIGURE_ARGS+=	--with-sharedptr=boost
> .endif
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/bin/*
> 
> .include <bsd.port.post.mk>
>diff --git textproc/libxslt/Makefile textproc/libxslt/Makefile
>index 463b8ce..92f897e 100644
>--- textproc/libxslt/Makefile
>+++ textproc/libxslt/Makefile
>@@ -50,7 +50,7 @@ post-patch:
> 		${WRKSRC}/doc/Makefile.in
> 
> .if !defined(MASTERDIR)
>-post-stage:
>+post-install:
> 	${LN} -s libxslt.so.1 ${STAGEDIR}${PREFIX}/lib/libxslt.so.2
> 	${LN} -s libexslt.so.0 ${STAGEDIR}${PREFIX}/lib/libexslt.so.8
> .endif
>diff --git textproc/p5-Net-IDN-Encode/Makefile textproc/p5-Net-IDN-Encode/Makefile
>index 52fbc9a..07c427a 100644
>--- textproc/p5-Net-IDN-Encode/Makefile
>+++ textproc/p5-Net-IDN-Encode/Makefile
>@@ -18,6 +18,7 @@ BUILD_DEPENDS=	p5-Test-NoWarnings>=0:devel/p5-Test-NoWarnings
> USES=		perl5
> USE_PERL5=	modbuild
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/IDN/Punycode/Punycode.so
>+
> .include <bsd.port.mk>
>diff --git www/gitea/Makefile www/gitea/Makefile
>index c4dd0d7..9666b51 100644
>--- www/gitea/Makefile
>+++ www/gitea/Makefile
>@@ -46,11 +46,6 @@ GO_TAGS+=	pam
> GO_TAGS+=	sqlite
> .endif
> 
>-post-stage:
>-	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/${PORTNAME}
>-	${MKDIR} ${STAGEDIR}${DESTDIR}/var/log/${PORTNAME}
>-	${MKDIR} ${STAGEDIR}${DESTDIR}/var/run/${PORTNAME}
>-
> do-install:
> 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin
> 	${MKDIR} ${STAGEDIR}${ETCDIR}/conf
>@@ -59,4 +54,8 @@ do-install:
> 	${MKDIR} ${STAGEDIR}${DATADIR}
> 	(cd ${GO_WRKSRC} && ${COPYTREE_SHARE} "public templates" ${STAGEDIR}${DATADIR})
> 
>+	${MKDIR} ${STAGEDIR}${DESTDIR}/var/db/${PORTNAME}
>+	${MKDIR} ${STAGEDIR}${DESTDIR}/var/log/${PORTNAME}
>+	${MKDIR} ${STAGEDIR}${DESTDIR}/var/run/${PORTNAME}
>+
> .include <bsd.port.mk>
>diff --git www/libapreq2/Makefile www/libapreq2/Makefile
>index 9f9cd41..1b68201 100644
>--- www/libapreq2/Makefile
>+++ www/libapreq2/Makefile
>@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} --with-expat=${LOCALBASE}
> SHLIB_MAJOR=	11
> PLIST_SUB=	SHLIB_MAJOR="${SHLIB_MAJOR}"
> 
>-post-stage:
>+post-install:
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libapreq2.so.3.8.0
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${APACHEMODDIR}/mod_apreq2.so
> 
>diff --git www/madsonic/Makefile www/madsonic/Makefile
>index 9abd37e..27556a4 100644
>--- www/madsonic/Makefile
>+++ www/madsonic/Makefile
>@@ -149,7 +149,6 @@ pre-install:
> do-install:
> 	cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTDIRNAME} ${STAGEDIR}${WEBAPPDIR}
> 
>-post-stage:
> 	${MKDIR} ${STAGEDIR}${MADSONIC_HOME}
> 	${MKDIR} ${STAGEDIR}${MADSONIC_HOME}/transcode
> 
>diff --git www/p5-libapreq2/Makefile www/p5-libapreq2/Makefile
>index 862f2ac..34b05f0 100644
>--- www/p5-libapreq2/Makefile
>+++ www/p5-libapreq2/Makefile
>@@ -36,7 +36,7 @@ RUN_DEPENDS=	libapreq2>0:www/libapreq2 \
> post-patch:
> 	@${REINPLACE_CMD} -i '' -e "s!%%APACHEINCLUDEDIR%%!${APACHEINCLUDEDIR}!" \
> 		${WRKSRC}/glue/perl/Makefile.PL
>-post-stage:
>+post-install:
> 	# remove all the non-perl stuff
> 	${RM} ${STAGEDIR}${PREFIX}/bin/apreq2-config
> 	${RM} -r ${STAGEDIR}${PREFIX}/include/apreq2
>diff --git www/py-goobook/Makefile www/py-goobook/Makefile
>index 0f53879..4e5698d 100644
>--- www/py-goobook/Makefile
>+++ www/py-goobook/Makefile
>@@ -23,7 +23,7 @@ USES=		python:-2.7
> USE_PYTHON=	autoplist distutils
> PLIST_FILES=	man/man1/goobook.1.gz
> 
>-post-stage:
>+post-install:
> 	${INSTALL_DATA} ${WRKSRC}/goobook.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
> 
> .include <bsd.port.mk>
>diff --git www/subsonic/Makefile www/subsonic/Makefile
>index 561a9f3..c5e3233 100644
>--- www/subsonic/Makefile
>+++ www/subsonic/Makefile
>@@ -144,7 +144,6 @@ pre-install:
> do-install:
> 	cd ${WRKDIR} && ${COPYTREE_SHARE} ${PORTDIRNAME} ${STAGEDIR}${WEBAPPDIR}
> 
>-post-stage:
> 	${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}
> 	${MKDIR} ${STAGEDIR}${SUBSONIC_HOME}/transcode
> 
>diff --git www/wt/Makefile www/wt/Makefile
>index a2eba0f..620390b 100644
>--- www/wt/Makefile
>+++ www/wt/Makefile
>@@ -219,7 +219,7 @@ USE_MYSQL=	yes
> CMAKE_ARGS+=	-DMYSQL_PREFIX:STRING=${LOCALBASE}
> .endif
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${ETCDIR}/wt_config.xml
> 	@${MKDIR} ${STAGEDIR}${ETCDIR}
> 	@${CP} -p ${BUILD_WRKSRC}/wt_config.xml \
>diff --git x11-toolkits/p5-Tk/Makefile x11-toolkits/p5-Tk/Makefile
>index 79783ed..bd42ee9 100644
>--- x11-toolkits/p5-Tk/Makefile
>+++ x11-toolkits/p5-Tk/Makefile
>@@ -49,7 +49,7 @@ post-configure:
> 		-e '/^FULL_AR = / s|.*|FULL_AR = ${AR}|' \
> 		`${FIND} ${WRKSRC} -name Makefile`
> 
>-post-stage:
>+post-install:
> 	@${RM} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk/extralibs.ld
> 	@${RMDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/pTk
> 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Tk/Tk.so

Actions: View | Diff

Attachments on bug 214780: 177328 | 177487