svn commit: r352579 - head/java/jakarta-commons-collections
Max Brazhnikov
makc at FreeBSD.org
Tue Apr 29 06:48:03 UTC 2014
Author: makc
Date: Tue Apr 29 06:48:03 2014
New Revision: 352579
URL: http://svnweb.freebsd.org/changeset/ports/352579
QAT: https://qat.redports.org/buildarchive/r352579/
Log:
java/jakarta-commons-collections:
- Add stage support
- Drop unneeded JAVA_VERSION
- Convert NOPORTDOCS to option
- Clean up Makefile
Modified:
head/java/jakarta-commons-collections/Makefile
Modified: head/java/jakarta-commons-collections/Makefile
==============================================================================
--- head/java/jakarta-commons-collections/Makefile Tue Apr 29 06:01:16 2014 (r352578)
+++ head/java/jakarta-commons-collections/Makefile Tue Apr 29 06:48:03 2014 (r352579)
@@ -13,40 +13,28 @@ MAINTAINER= ports at FreeBSD.org
COMMENT= Classes that extend/augment the Java Collections Framework
USE_JAVA= yes
-JAVA_VERSION= 1.6+
USE_ANT= yes
ALL_TARGET= jar
-.if !defined(NOPORTDOCS)
-ALL_TARGET+= javadoc
+PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar
OTHERDOCS= DEVELOPERS-GUIDE.html LICENSE.txt PROPOSAL.html README.txt RELEASE-NOTES.html
PORTDOCS= apidocs ${OTHERDOCS}
-.endif
-JARFILE= ${PORTNAME}-${PORTVERSION}.jar
-DESTJARFILE= ${PORTNAME}.jar
-PLIST_FILES+= %%JAVAJARDIR%%/${DESTJARFILE}
-
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-JDK_API!= (${FIND} -s ${LOCALBASE}/share/doc/jdk1.? -maxdepth 1 -name api -type d 2>/dev/null || ${ECHO_CMD}) | ${TAIL} -n 1
-.if ${JDK_API} != ""
-MAKE_ARGS+= -Djavadoc.links=${JDK_API}
-.endif
+
+OPTIONS_DEFINE= DOCS
+
+DOCS_ALL_TARGET= javadoc
+
+.include <bsd.port.options.mk>
do-install:
- @${ECHO_MSG} -n ">> Installing JAR as ${JAVAJARDIR}/${DESTJARFILE}..."
- @${MKDIR} ${JAVAJARDIR}
- @${INSTALL_DATA} ${WRKSRC}/build/${JARFILE} ${JAVAJARDIR}/${DESTJARFILE}
- @${ECHO_MSG} " [ DONE ]"
-
-.if !defined(NOPORTDOCS)
- @${ECHO_MSG} -n ">> Installing documentation in ${DOCSDIR}..."
- @${MKDIR} ${DOCSDIR}
- @cd ${WRKSRC}/build/docs && ${FIND} apidocs \
- | ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} > /dev/null 2>&1
- @${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
- @${ECHO_MSG} " [ DONE ]"
+ @${MKDIR} ${STAGEDIR}${JAVAJARDIR}
+ ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-${PORTVERSION}.jar \
+ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+.if ${PORT_OPTIONS:MDOCS}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKSRC}/build/docs && \
+ ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
+ ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
More information about the svn-ports-all
mailing list