diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-12-02 11:58:21 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-12-02 11:58:21 +0000 |
| commit | 8b4093cba5775260e98d51f74cd187fb9af825a8 (patch) | |
| tree | 4a28bf50f532fa82a149cbc3f9c041d48a23921b | |
| parent | f38d6cb92bbd96d100bae02b23ace94acea1cf8e (diff) | |
| download | ports-8b4093cba5775260e98d51f74cd187fb9af825a8.tar.gz ports-8b4093cba5775260e98d51f74cd187fb9af825a8.zip | |
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
Notes
Notes:
svn path=/head/; revision=427552
119 files changed, 163 insertions, 187 deletions
diff --git a/archivers/p5-Compress-LZ4/Makefile b/archivers/p5-Compress-LZ4/Makefile index cb90b45ccc18..294314798c9a 100644 --- a/archivers/p5-Compress-LZ4/Makefile +++ b/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 a/astro/p5-Starlink-AST/Makefile b/astro/p5-Starlink-AST/Makefile index 0ba8ed2fef30..aed3bfd9096d 100644 --- a/astro/p5-Starlink-AST/Makefile +++ b/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 a/audio/libogg/Makefile b/audio/libogg/Makefile index 827072b73aad..541ad9c7257b 100644 --- a/audio/libogg/Makefile +++ b/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 a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile index 33cac574c8c3..f19baf061b94 100644 --- a/audio/libvorbis/Makefile +++ b/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 a/audio/p5-Net-FreeDB/Makefile b/audio/p5-Net-FreeDB/Makefile index 05eac8a95eb7..b8a09a3b0cb4 100644 --- a/audio/p5-Net-FreeDB/Makefile +++ b/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 a/biology/cd-hit/Makefile b/biology/cd-hit/Makefile index 00c9d2e7c763..b28743051285 100644 --- a/biology/cd-hit/Makefile +++ b/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 a/cad/tkgate/Makefile b/cad/tkgate/Makefile index 12c0cb8bfafc..a3023fef7d72 100644 --- a/cad/tkgate/Makefile +++ b/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 a/comms/qsstv/Makefile b/comms/qsstv/Makefile index 3f523d49a202..595cfd4c1abf 100644 --- a/comms/qsstv/Makefile +++ b/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 a/comms/svxlink/Makefile b/comms/svxlink/Makefile index e1031c7dfe98..150fac055754 100644 --- a/comms/svxlink/Makefile +++ b/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 a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 66bcec9a46ec..51d58fd56581 100644 --- a/comms/trustedqsl/Makefile +++ b/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 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 diff --git a/devel/R-cran-plyr/Makefile b/devel/R-cran-plyr/Makefile index 0d4a3fc052af..392f0948a517 100644 --- a/devel/R-cran-plyr/Makefile +++ b/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 a/devel/arm-none-eabi-gcc492/Makefile b/devel/arm-none-eabi-gcc492/Makefile index dd5b75e68d8d..eb504eb9f749 100644 --- a/devel/arm-none-eabi-gcc492/Makefile +++ b/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 a/devel/avr-gcc-devel/Makefile b/devel/avr-gcc-devel/Makefile index 4b280da834b0..88c133f86622 100644 --- a/devel/avr-gcc-devel/Makefile +++ b/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 a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile index 56bd04c3455d..bc836ff93a68 100644 --- a/devel/avr-gcc/Makefile +++ b/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 a/devel/efl/Makefile b/devel/efl/Makefile index 62dc56676754..f6a3e4353e29 100644 --- a/devel/efl/Makefile +++ b/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 a/devel/gcc-msp430-ti-toolchain/Makefile b/devel/gcc-msp430-ti-toolchain/Makefile index e8b481f3234f..4e2239d6e7bf 100644 --- a/devel/gcc-msp430-ti-toolchain/Makefile +++ b/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 a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile index 72f8a2ab7417..648ec51ea2d9 100644 --- a/devel/google-gdata/Makefile +++ b/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 a/devel/google-perftools/Makefile b/devel/google-perftools/Makefile index f026d9a3d00b..235fe5a68bb7 100644 --- a/devel/google-perftools/Makefile +++ b/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 a/devel/icu/Makefile b/devel/icu/Makefile index b885e47ceea0..2b4feca55360 100644 --- a/devel/icu/Makefile +++ b/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 a/devel/ivykis/Makefile b/devel/ivykis/Makefile index d9a1c568100f..71b1a1ad6d2a 100644 --- a/devel/ivykis/Makefile +++ b/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 a/devel/lfcbase/Makefile b/devel/lfcbase/Makefile index 955bbbec604d..ea36b89331b9 100644 --- a/devel/lfcbase/Makefile +++ b/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 a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile index 06e1c4ea50fb..a080aa8d576b 100644 --- a/devel/libmpsse/Makefile +++ b/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 a/devel/liborcus07/Makefile b/devel/liborcus07/Makefile index 36cb45d31ebd..6c211f3ae841 100644 --- a/devel/liborcus07/Makefile +++ b/devel/liborcus07/Makefile @@ -30,7 +30,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 a/devel/libtermkey/Makefile b/devel/libtermkey/Makefile index 17ad6159e3e2..6f239329bfe1 100644 --- a/devel/libtermkey/Makefile +++ b/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 a/devel/mongo-c-driver/Makefile b/devel/mongo-c-driver/Makefile index 4cea6f5998c5..181f4928b012 100644 --- a/devel/mongo-c-driver/Makefile +++ b/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 a/devel/msgpack/Makefile b/devel/msgpack/Makefile index 702366b17e45..8ba4ef9b79df 100644 --- a/devel/msgpack/Makefile +++ b/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 a/devel/ocaml-camlp4/Makefile b/devel/ocaml-camlp4/Makefile index 38d4fa5f43f8..56692428b933 100644 --- a/devel/ocaml-camlp4/Makefile +++ b/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 a/devel/ocaml-ppx-tools/Makefile b/devel/ocaml-ppx-tools/Makefile index 98adf90ef336..12e044049c0f 100644 --- a/devel/ocaml-ppx-tools/Makefile +++ b/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 a/devel/opendht/Makefile b/devel/opendht/Makefile index 4a1310bc9e84..c090371f99b5 100644 --- a/devel/opendht/Makefile +++ b/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 a/devel/p5-CBOR-XS/Makefile b/devel/p5-CBOR-XS/Makefile index d306a3fa6a06..c28606d03f31 100644 --- a/devel/p5-CBOR-XS/Makefile +++ b/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 a/devel/p5-Data-Peek/Makefile b/devel/p5-Data-Peek/Makefile index e33be61105cd..d7796f84e396 100644 --- a/devel/p5-Data-Peek/Makefile +++ b/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 a/devel/pcre/Makefile b/devel/pcre/Makefile index ac96707d0633..3d5f78711145 100644 --- a/devel/pcre/Makefile +++ b/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 a/devel/py-llfuse/Makefile b/devel/py-llfuse/Makefile index 08dc41e2749d..2d12a05c7c56 100644 --- a/devel/py-llfuse/Makefile +++ b/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 a/devel/rapidjson/Makefile b/devel/rapidjson/Makefile index 8f12b64c5473..1942e3134b2a 100644 --- a/devel/rapidjson/Makefile +++ b/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 a/devel/rubygem-rice/Makefile b/devel/rubygem-rice/Makefile index 3d1afdb34e31..8cc516821871 100644 --- a/devel/rubygem-rice/Makefile +++ b/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 a/devel/spatialindex/Makefile b/devel/spatialindex/Makefile index 9561434d81d5..6ed34542efd5 100644 --- a/devel/spatialindex/Makefile +++ b/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 a/dns/adns/Makefile b/dns/adns/Makefile index 68d05dba0d73..a5c1c75a7c34 100644 --- a/dns/adns/Makefile +++ b/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 a/dns/powerdns/Makefile b/dns/powerdns/Makefile index b913c910091c..0f5fd24b6e27 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -123,7 +123,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 a/emulators/pipelight/Makefile b/emulators/pipelight/Makefile index 3af9084faaed..b6fa7fde4d48 100644 --- a/emulators/pipelight/Makefile +++ b/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 a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile index 119af6f3bb1b..3e0d40f2df00 100644 --- a/finance/bitcoin-armory/Makefile +++ b/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 a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile index 5ede726b28a1..c4ba5fb32d59 100644 --- a/graphics/libart_lgpl/Makefile +++ b/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 a/graphics/linux-c6-dri/Makefile b/graphics/linux-c6-dri/Makefile index 355c8d813145..252025fe6571 100644 --- a/graphics/linux-c6-dri/Makefile +++ b/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 a/graphics/linux-c7-dri/Makefile b/graphics/linux-c7-dri/Makefile index 244f6bffdc89..83c02cef0d33 100644 --- a/graphics/linux-c7-dri/Makefile +++ b/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 a/graphics/pfstools/Makefile b/graphics/pfstools/Makefile index 616e6475c7b4..87c1a2e136f3 100644 --- a/graphics/pfstools/Makefile +++ b/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 a/graphics/py-graph-dot/Makefile b/graphics/py-graph-dot/Makefile index fd984dc896cb..b4c1cdebf578 100644 --- a/graphics/py-graph-dot/Makefile +++ b/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 a/irc/bopm/Makefile b/irc/bopm/Makefile index f358d946c14d..aa80e5c00fdc 100644 --- a/irc/bopm/Makefile +++ b/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 a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile index ad0d282f7137..2f7da944d084 100644 --- a/japanese/ebnetd/Makefile +++ b/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 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} ; \ diff --git a/mail/dcc-dccd/Makefile b/mail/dcc-dccd/Makefile index e6ed0508a7fd..3200cba3d07c 100644 --- a/mail/dcc-dccd/Makefile +++ b/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 a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index bb1da69b1509..36efd8996a47 100644 --- a/mail/fetchmail/Makefile +++ b/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 a/mail/libsrs2/Makefile b/mail/libsrs2/Makefile index a3d2af5747ea..416a099cf46b 100644 --- a/mail/libsrs2/Makefile +++ b/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 a/mail/libsrs_alt/Makefile b/mail/libsrs_alt/Makefile index b40580863289..a82d32b4f5b0 100644 --- a/mail/libsrs_alt/Makefile +++ b/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 a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 06fead86dfe9..842950aa6376 100644 --- a/mail/msmtp/Makefile +++ b/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 a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index b2af666fbe97..be3e8b274969 100644 --- a/mail/postfix-current/Makefile +++ b/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 a/mail/postfix/Makefile b/mail/postfix/Makefile index c8661c9288c1..2f2c41873def 100644 --- a/mail/postfix/Makefile +++ b/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 a/mail/postfix211/Makefile b/mail/postfix211/Makefile index 483abefa469d..5387a167a369 100644 --- a/mail/postfix211/Makefile +++ b/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 a/mail/rmilter/Makefile b/mail/rmilter/Makefile index 6eca02e95aa5..f428243312cc 100644 --- a/mail/rmilter/Makefile +++ b/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 a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 31ddb46efe4a..3b2ba3e3318d 100644 --- a/mail/rspamd/Makefile +++ b/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 a/math/p5-Math-Int128/Makefile b/math/p5-Math-Int128/Makefile index 603c1f0c7851..5605563b9b15 100644 --- a/math/p5-Math-Int128/Makefile +++ b/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 a/multimedia/libav/Makefile b/multimedia/libav/Makefile index c05af593d9f9..28bb528db7cb 100644 --- a/multimedia/libav/Makefile +++ b/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 a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 226cea4bfa89..81dea45ac71b 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -157,7 +157,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 a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index ff001d6e4d6b..4b0faf360e67 100644 --- a/net-im/libpurple/Makefile +++ b/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 a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile index 887a92593d94..38e20e0ae2ba 100644 --- a/net-im/pidgin/Makefile +++ b/net-im/pidgin/Makefile @@ -30,7 +30,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 a/net-im/ring-daemon/Makefile b/net-im/ring-daemon/Makefile index 005d0176b199..1eb1a39d2eef 100644 --- a/net-im/ring-daemon/Makefile +++ b/net-im/ring-daemon/Makefile @@ -78,7 +78,7 @@ pre-configure: cd contrib/native && \ ../bootstrap && \ ${GMAKE} .pjproject) -post-stage: +post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libring.so .include <bsd.port.post.mk> diff --git a/net-im/ring-gnome/Makefile b/net-im/ring-gnome/Makefile index 912acd7eb456..ebaa536f3791 100644 --- a/net-im/ring-gnome/Makefile +++ b/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 a/net-mgmt/netmagis-topo/Makefile b/net-mgmt/netmagis-topo/Makefile index 8e1f71f07764..0d915dcbcdaa 100644 --- a/net-mgmt/netmagis-topo/Makefile +++ b/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 a/net-mgmt/prometheus/Makefile b/net-mgmt/prometheus/Makefile index 86ef90f99152..8f18d923f69e 100644 --- a/net-mgmt/prometheus/Makefile +++ b/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 a/net-p2p/btsync/Makefile b/net-p2p/btsync/Makefile index 19d748f58866..26ffb9e28871 100644 --- a/net-p2p/btsync/Makefile +++ b/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 a/net/bctoolbox/Makefile b/net/bctoolbox/Makefile index e2049494fe0b..72524d8b7e0d 100644 --- a/net/bctoolbox/Makefile +++ b/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 a/net/chrony/Makefile b/net/chrony/Makefile index 293dca76bcee..e8535d865865 100644 --- a/net/chrony/Makefile +++ b/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 a/net/h323plus/Makefile b/net/h323plus/Makefile index 1448ed522474..a497f45a6b96 100644 --- a/net/h323plus/Makefile +++ b/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 a/net/kamailio/Makefile b/net/kamailio/Makefile index 21ef4360092f..0e90d9aeec24 100644 --- a/net/kamailio/Makefile +++ b/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 a/net/libp0f/Makefile b/net/libp0f/Makefile index 1b319f6e2864..e77d5380d362 100644 --- a/net/libp0f/Makefile +++ b/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 a/net/linphone/Makefile b/net/linphone/Makefile index 017f50a1b8bc..06a6b95c368b 100644 --- a/net/linphone/Makefile +++ b/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 a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 44d653fce4e7..53babc78ee60 100644 --- a/net/mosquitto/Makefile +++ b/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 a/net/openggsn/Makefile b/net/openggsn/Makefile index 6c59c25a61c2..950121521844 100644 --- a/net/openggsn/Makefile +++ b/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 a/net/openntpd/Makefile b/net/openntpd/Makefile index 56eb52892345..6378604954f4 100644 --- a/net/openntpd/Makefile +++ b/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 a/net/opensips/Makefile b/net/opensips/Makefile index c16c3015381d..22b0d41ff637 100644 --- a/net/opensips/Makefile +++ b/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 a/net/whois/Makefile b/net/whois/Makefile index 90a5837cb2c6..5619e0c29d12 100644 --- a/net/whois/Makefile +++ b/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 a/net/yate/Makefile b/net/yate/Makefile index 9718c4f734ec..e63f2b8c9724 100644 --- a/net/yate/Makefile +++ b/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 a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index 7d681a52616e..0a49d8d6baca 100644 --- a/science/gnudatalanguage/Makefile +++ b/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 a/science/mcstas/Makefile b/science/mcstas/Makefile index 3b2351440e37..01021e5fe9c7 100644 --- a/science/mcstas/Makefile +++ b/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 a/security/fwknop/Makefile b/security/fwknop/Makefile index c01babfca60a..cf8e92a810c5 100644 --- a/security/fwknop/Makefile +++ b/security/fwknop/Makefile @@ -42,7 +42,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 a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile index 2fea72f544ff..c766a109f1a5 100644 --- a/security/libressl-devel/Makefile +++ b/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 a/security/libressl/Makefile b/security/libressl/Makefile index 767605485442..02ce5fe98895 100644 --- a/security/libressl/Makefile +++ b/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 a/security/openca-tools-forked/Makefile b/security/openca-tools-forked/Makefile index 6a126f6727bc..5c02c2deac28 100644 --- a/security/openca-tools-forked/Makefile +++ b/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 a/security/p5-Crypt-GCrypt/Makefile b/security/p5-Crypt-GCrypt/Makefile index 1116f5bf3ce7..f04289c706c3 100644 --- a/security/p5-Crypt-GCrypt/Makefile +++ b/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 a/security/p5-Crypt-OpenSSL-X509/Makefile b/security/p5-Crypt-OpenSSL-X509/Makefile index f46f3908a5ee..293f0742ddc8 100644 --- a/security/p5-Crypt-OpenSSL-X509/Makefile +++ b/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.pre.mk> diff --git a/security/p5-Crypt-SMIME/Makefile b/security/p5-Crypt-SMIME/Makefile index 6ea7f6e11e20..acffbd6e7780 100644 --- a/security/p5-Crypt-SMIME/Makefile +++ b/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 a/security/p5-Digest-GOST/Makefile b/security/p5-Digest-GOST/Makefile index fcb8ca13f66b..223226bedb10 100644 --- a/security/p5-Digest-GOST/Makefile +++ b/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 a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile index af9d078baca3..786890d7494d 100644 --- a/security/p5-openxpki/Makefile +++ b/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 a/sysutils/amtc/Makefile b/sysutils/amtc/Makefile index c91152d3043c..e1b4aad1cac7 100644 --- a/sysutils/amtc/Makefile +++ b/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 a/sysutils/clone/Makefile b/sysutils/clone/Makefile index af8a0b99cdfd..1927e1b2604c 100644 --- a/sysutils/clone/Makefile +++ b/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 a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 7fd54dd23497..cabed861c02b 100644 --- a/sysutils/osquery/Makefile +++ b/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 a/textproc/expat2/Makefile b/textproc/expat2/Makefile index bfa81983e836..9e7c494009e3 100644 --- a/textproc/expat2/Makefile +++ b/textproc/expat2/Makefile @@ -17,7 +17,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 a/textproc/libwps03/Makefile b/textproc/libwps03/Makefile index 1cd7c484886c..1a7e23438295 100644 --- a/textproc/libwps03/Makefile +++ b/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 a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 463b8ceb53d5..92f897eb7f99 100644 --- a/textproc/libxslt/Makefile +++ b/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 a/textproc/p5-Net-IDN-Encode/Makefile b/textproc/p5-Net-IDN-Encode/Makefile index 52fbc9aafd7d..07c427aecdda 100644 --- a/textproc/p5-Net-IDN-Encode/Makefile +++ b/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 a/www/gitea/Makefile b/www/gitea/Makefile index c4dd0d716b81..9666b515876f 100644 --- a/www/gitea/Makefile +++ b/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 a/www/libapreq2/Makefile b/www/libapreq2/Makefile index 9f9cd41f37e2..1b68201468bd 100644 --- a/www/libapreq2/Makefile +++ b/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 a/www/madsonic/Makefile b/www/madsonic/Makefile index 9abd37eb5a0a..27556a407ab4 100644 --- a/www/madsonic/Makefile +++ b/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 a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile index 862f2ac74ffa..34b05f0d0c03 100644 --- a/www/p5-libapreq2/Makefile +++ b/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 a/www/py-goobook/Makefile b/www/py-goobook/Makefile index 0f53879cd68e..4e5698d72914 100644 --- a/www/py-goobook/Makefile +++ b/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 a/www/subsonic/Makefile b/www/subsonic/Makefile index 561a9f3c7edf..c5e3233a23ca 100644 --- a/www/subsonic/Makefile +++ b/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 a/www/wt/Makefile b/www/wt/Makefile index 0c1c7cec28f6..0e46842ca0df 100644 --- a/www/wt/Makefile +++ b/www/wt/Makefile @@ -220,7 +220,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 a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile index 79783edf6bd4..bd42ee98be6a 100644 --- a/x11-toolkits/p5-Tk/Makefile +++ b/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 |