Date: Thu, 5 Jun 2014 00:12:09 +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: r356558 - head/science/hdf-java Message-ID: <201406050012.s550C9UY002184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Thu Jun 5 00:12:09 2014 New Revision: 356558 URL: http://svnweb.freebsd.org/changeset/ports/356558 QAT: https://qat.redports.org/buildarchive/r356558/ Log: Fix PLIST when DOCS is enabled and built with javadoc from java/openjdk7. Note it fails to build with java/openjdk8 and it is just a stopgap. Reported by: exp-run (PR190511) Modified: head/science/hdf-java/Makefile head/science/hdf-java/pkg-plist Modified: head/science/hdf-java/Makefile ============================================================================== --- head/science/hdf-java/Makefile Wed Jun 4 23:21:57 2014 (r356557) +++ head/science/hdf-java/Makefile Thu Jun 5 00:12:09 2014 (r356558) @@ -15,7 +15,7 @@ LIB_DEPENDS= libhdf5.so:${PORTSDIR}/scie 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> Modified: head/science/hdf-java/pkg-plist ============================================================================== --- head/science/hdf-java/pkg-plist Wed Jun 4 23:21:57 2014 (r356557) +++ head/science/hdf-java/pkg-plist Thu Jun 5 00:12:09 2014 (r356558) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406050012.s550C9UY002184>