From f899c758a653ca8ff2f8a63aafcb2519a0b524ed Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Tue, 19 Jul 2016 11:04:13 +0000 Subject: 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 --- java/java3d/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'java/java3d') 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 - 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 -- cgit v1.2.3