From owner-svn-ports-all@FreeBSD.ORG  Thu Jun  5 00:12:10 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0B8D3340;
 Thu,  5 Jun 2014 00:12:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D2A5D2449;
 Thu,  5 Jun 2014 00:12:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s550C9Hl002186;
 Thu, 5 Jun 2014 00:12:09 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s550C9UY002184;
 Thu, 5 Jun 2014 00:12:09 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201406050012.s550C9UY002184@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 5 Jun 2014 00:12:09 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356558 - head/science/hdf-java
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jun 2014 00:12:10 -0000

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