diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-06 06:41:56 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-06 06:41:56 +0800 |
| commit | fb16e47866d332bb2c51549a170f1745b33d3011 (patch) | |
| tree | 216a9e6c034cc6c31df1f546ca38cffa828a3c82 /dns | |
| parent | 471df77e6140deffd965d7402d07533451b48e0d (diff) | |
| download | freebsd-ports-gnome-fb16e47866d332bb2c51549a170f1745b33d3011.tar.gz freebsd-ports-gnome-fb16e47866d332bb2c51549a170f1745b33d3011.tar.zst freebsd-ports-gnome-fb16e47866d332bb2c51549a170f1745b33d3011.zip | |
- Fix build with JDK7 and later. [1]
- Make the build options actually work.
- Make portlint happy.
Reported by: exp-run (PR190511) [1]
Diffstat (limited to 'dns')
| -rw-r--r-- | dns/dnsjava/Makefile | 28 | ||||
| -rw-r--r-- | dns/dnsjava/pkg-plist | 18 |
2 files changed, 30 insertions, 16 deletions
diff --git a/dns/dnsjava/Makefile b/dns/dnsjava/Makefile index 4dc435975bf2..d0b284fe3838 100644 --- a/dns/dnsjava/Makefile +++ b/dns/dnsjava/Makefile @@ -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> diff --git a/dns/dnsjava/pkg-plist b/dns/dnsjava/pkg-plist index 9838b53e2d7b..e0c509ef6150 100644 --- a/dns/dnsjava/pkg-plist +++ b/dns/dnsjava/pkg-plist @@ -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%% |