Date: Thu, 5 Jun 2014 22:41:57 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r356720 - head/dns/dnsjava Message-ID: <201406052241.s55Mfvig030329@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jun 5 22:41:56 2014 New Revision: 356720 URL: http://svnweb.freebsd.org/changeset/ports/356720 QAT: https://qat.redports.org/buildarchive/r356720/ Log: - Fix build with JDK7 and later. [1] - Make the build options actually work. - Make portlint happy. Reported by: exp-run (PR190511) [1] Modified: head/dns/dnsjava/Makefile head/dns/dnsjava/pkg-plist Modified: head/dns/dnsjava/Makefile ============================================================================== --- head/dns/dnsjava/Makefile Thu Jun 5 22:21:43 2014 (r356719) +++ head/dns/dnsjava/Makefile Thu Jun 5 22:41:56 2014 (r356720) @@ -12,24 +12,38 @@ COMMENT= Implementation of DNS in Java USE_JAVA= yes JAVA_VERSION= 1.6+ USE_ANT= yes -ALL_TARGET= jar docs +ALL_TARGET= jar OPTIONS_DEFINE= DOCS EXAMPLES SAMPLE_FILES= examples.html USAGE dig.java jnamed.java lookup.java update.java OTHERDOCS= README Changelog -do-build: - @(cd ${BUILD_WRKSRC}; \ - ${SETENV} ${MAKE_ENV} ${ANT} ${ALL_TARGET}) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} +ALL_TARGET+= docs +.endif + +.include <bsd.port.pre.mk> + +.if ${JAVA_PORT_VERSION} == "1.6.0" +PLIST_SUB= JDK6="" +.else +PLIST_SUB= JDK6="@comment " +.endif do-install: @${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} ${TAR} -C ${WRKSRC}/doc -cf - . | ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf - ${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ +.endif +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${SAMPLE_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/ +.endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> Modified: head/dns/dnsjava/pkg-plist ============================================================================== --- head/dns/dnsjava/pkg-plist Thu Jun 5 22:21:43 2014 (r356719) +++ head/dns/dnsjava/pkg-plist Thu Jun 5 22:41:56 2014 (r356720) @@ -164,7 +164,7 @@ %%PORTDOCS%%%%DOCSDIR%%/overview-tree.html %%PORTDOCS%%%%DOCSDIR%%/package-list %%PORTDOCS%%%%DOCSDIR%%/resources/background.gif -%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif +%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/resources/inherit.gif %%PORTDOCS%%%%DOCSDIR%%/resources/tab.gif %%PORTDOCS%%%%DOCSDIR%%/resources/titlebar.gif %%PORTDOCS%%%%DOCSDIR%%/resources/titlebar_end.gif @@ -177,11 +177,11 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lookup.java %%PORTEXAMPLES%%%%EXAMPLESDIR%%/update.java share/java/classes/dnsjava.jar -%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/resources -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/org/xbill/DNS/utils -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/org/xbill/DNS/spi -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/org/xbill/DNS -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/org/xbill -%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/org -%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% +%%PORTDOCS%%@dirrm %%DOCSDIR%%/resources +%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS/utils +%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS/spi +%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/xbill/DNS +%%PORTDOCS%%@dirrm %%DOCSDIR%%/org/xbill +%%PORTDOCS%%@dirrm %%DOCSDIR%%/org +%%PORTDOCS%%@dirrm %%DOCSDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406052241.s55Mfvig030329>