diff options
author | mat <mat@FreeBSD.org> | 2016-07-19 19:04:13 +0800 |
---|---|---|
committer | mat <mat@FreeBSD.org> | 2016-07-19 19:04:13 +0800 |
commit | 363acdd313a37f491e4b2d6b9a807df489cfc5d9 (patch) | |
tree | be6eebf3e77ddf9fcf383081091d8b8b336dd71c /java | |
parent | 64a47229a8791073130cac02039b944cc8102750 (diff) | |
download | freebsd-ports-gnome-363acdd313a37f491e4b2d6b9a807df489cfc5d9.tar.gz freebsd-ports-gnome-363acdd313a37f491e4b2d6b9a807df489cfc5d9.tar.zst freebsd-ports-gnome-363acdd313a37f491e4b2d6b9a807df489cfc5d9.zip |
When there is a do-install target, do not use a post-install target, do
everything at once. Sometime, rename post-install into a options helper
target.
I did not fix ports that were such a mess that I could not figure out
what they really wanted to do. I also did not change ports that had
some version of an auto-plist code in post-install, for the same reason.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'java')
-rw-r--r-- | java/java3d/Makefile | 10 | ||||
-rw-r--r-- | java/netbeans/Makefile | 1 | ||||
-rw-r--r-- | java/netrexx/Makefile | 1 | ||||
-rw-r--r-- | java/openjfx8-devel/Makefile | 1 |
4 files changed, 3 insertions, 10 deletions
diff --git a/java/java3d/Makefile b/java/java3d/Makefile index 4546dbe7e212..5b1eab76b51a 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -28,8 +28,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - post-patch: ${REINPLACE_CMD} -e "s/gcc/${CC}/g" \ ${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml @@ -41,12 +39,12 @@ do-build: -Dis${OPSYS}=yes \ -Dports.localbase=${LOCALBASE} \ jar-opt -.if ${PORT_OPTIONS:MDOCS} + +post-build-DOCS-on: cd ${WRKSRC}/j3d-core \ && ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \ -Dis${OPSYS}=yes \ docs-public -.endif do-install: @${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext @@ -60,10 +58,8 @@ do-install: ${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \ ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH} -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${DOCSSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}) -.endif .include <bsd.port.mk> diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile index c179362ba727..c5634e42cc3a 100644 --- a/java/netbeans/Makefile +++ b/java/netbeans/Makefile @@ -45,7 +45,6 @@ do-install: ${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/bin/netbeans ${LN} -sf ${DATADIR}/bin/netbeans ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-${PORTVERSION} -post-install: ${FIND} ${STAGEDIR}${DATADIR} -type f -ipath "*/bin/*" | ${XARGS} ${CHMOD} ${BINMODE} .include <bsd.port.mk> diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile index 2aa42e13c231..98b48a7f6bdf 100644 --- a/java/netrexx/Makefile +++ b/java/netrexx/Makefile @@ -37,7 +37,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/bin/hello.nrx ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/browse && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) -post-install: @${ECHO} "==================== IBM LICENSE ====================" @${CAT} ${WRKSRC}/browse/license.txt @${ECHO} "-------------------------------------------------------" diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile index a642f76aa9de..553f128438a6 100644 --- a/java/openjfx8-devel/Makefile +++ b/java/openjfx8-devel/Makefile @@ -56,7 +56,6 @@ do-install: && ${TAR} -C ${STAGEDIR}${JAVA_HOME} \ -xf ${WRKSRC}/build/bundles/javafx-sdk-overlay.zip) -post-install: @${FIND} ${STAGEDIR}${JAVA_HOME}/jre -name '*.so' -exec ${STRIP_CMD} \{\} \; .include <bsd.port.mk> |