diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-05 00:12:09 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-06-05 00:12:09 +0000 |
| commit | bac404b95c52636c076743160a092217398f444d (patch) | |
| tree | a0c27cf2c0ed483d6c392907e8b020cee96f2118 /science/hdf-java | |
| parent | 03de3b0c47f1eeeae6cc712d29b0c6dac55d8dd7 (diff) | |
| download | ports-bac404b95c52636c076743160a092217398f444d.tar.gz ports-bac404b95c52636c076743160a092217398f444d.zip | |
Notes
Diffstat (limited to 'science/hdf-java')
| -rw-r--r-- | science/hdf-java/Makefile | 12 | ||||
| -rw-r--r-- | science/hdf-java/pkg-plist | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/science/hdf-java/Makefile b/science/hdf-java/Makefile index f965fc2b8c9b..5af5801891d3 100644 --- a/science/hdf-java/Makefile +++ b/science/hdf-java/Makefile @@ -15,7 +15,7 @@ LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 \ libjpeg.so:${PORTSDIR}/graphics/jpeg USE_JAVA= yes -JAVA_VERSION= 1.6+ +JAVA_VERSION= 1.6 1.7 JAVA_BUILD= yes JAVA_RUN= yes @@ -48,6 +48,14 @@ CONFIGURE_ARGS+= --without-libsz ALL_TARGET= all javadocs .endif +.include <bsd.port.pre.mk> + +.if ${JAVA_PORT_VERSION} == "1.6.0" +PLIST_SUB+= JDK6="" +.else +PLIST_SUB+= JDK6="@comment " +.endif + post-patch: @${REINPLACE_CMD} -e 's|"/libhdf.$$LLEXT"|"${LOCALBASE}/lib"|' \ -e 's|$$z_lib"/libz."$$LLEXT|"/lib/libz.so.*"|' \ @@ -77,4 +85,4 @@ post-install: regression-test: build @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} check -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/science/hdf-java/pkg-plist b/science/hdf-java/pkg-plist index 1f1f97c7ad32..ee923b45162b 100644 --- a/science/hdf-java/pkg-plist +++ b/science/hdf-java/pkg-plist @@ -369,7 +369,7 @@ bin/hdfview.sh %%PORTDOCS%%%%DOCSDIR%%/javadocs/overview-tree.html %%PORTDOCS%%%%DOCSDIR%%/javadocs/package-list %%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/background.gif -%%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/inherit.gif +%%JDK6%%%%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/inherit.gif %%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/tab.gif %%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/titlebar.gif %%PORTDOCS%%%%DOCSDIR%%/javadocs/resources/titlebar_end.gif |