From owner-svn-ports-all@FreeBSD.ORG  Sat May 24 07:01:49 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 4E2B2D93;
 Sat, 24 May 2014 07:01:49 +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 0DDED2171;
 Sat, 24 May 2014 07:01:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4O71mYI025033;
 Sat, 24 May 2014 07:01:48 GMT (envelope-from vanilla@svn.freebsd.org)
Received: (from vanilla@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4O71mio025031;
 Sat, 24 May 2014 07:01:48 GMT (envelope-from vanilla@svn.freebsd.org)
Message-Id: <201405240701.s4O71mio025031@svn.freebsd.org>
From: "Vanilla I. Shu" <vanilla@FreeBSD.org>
Date: Sat, 24 May 2014 07:01:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r354988 - head/devel/luajava
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: Sat, 24 May 2014 07:01:49 -0000

Author: vanilla
Date: Sat May 24 07:01:48 2014
New Revision: 354988
URL: http://svnweb.freebsd.org/changeset/ports/354988
QAT: https://qat.redports.org/buildarchive/r354988/

Log:
  Fix pkg-plist error on openjdk7.
  
  Submitted by:	swills@

Modified:
  head/devel/luajava/Makefile
  head/devel/luajava/pkg-plist

Modified: head/devel/luajava/Makefile
==============================================================================
--- head/devel/luajava/Makefile	Sat May 24 06:56:11 2014	(r354987)
+++ head/devel/luajava/Makefile	Sat May 24 07:01:48 2014	(r354988)
@@ -23,6 +23,14 @@ MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	run
 DOS2UNIX_REGEX=	.*\.*
 
+.include <bsd.port.pre.mk>
+
+.if ${JAVA_PORT_VERSION} == 1.7
+PLIST_SUB+= 	JDK17=""
+.else
+PLIST_SUB+= 	JDK17="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LUA_DIR%%|${PREFIX}|' ${WRKSRC}/config
 	@${REINPLACE_CMD} -e 's|%%LUA_LIBDIR%%|${LUA_LIBDIR}|' ${WRKSRC}/config
@@ -42,4 +50,4 @@ post-install:
 	(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/devel/luajava/pkg-plist
==============================================================================
--- head/devel/luajava/pkg-plist	Sat May 24 06:56:11 2014	(r354987)
+++ head/devel/luajava/pkg-plist	Sat May 24 07:01:48 2014	(r354988)
@@ -24,11 +24,11 @@
 %%PORTDOCS%%%%DOCSDIR%%/us/API/org/keplerproject/luajava/package-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/overview-tree.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/package-list
-%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/background.gif
+%%JDK17%%%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/background.gif
 %%PORTDOCS%%%%DOCSDIR%%/us/API/resources/inherit.gif
-%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/tab.gif
-%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar.gif
-%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar_end.gif
+%%JDK17%%%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/tab.gif
+%%JDK17%%%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar.gif
+%%JDK17%%%%PORTDOCS%%%%DOCSDIR%%/us/API/resources/titlebar_end.gif
 %%PORTDOCS%%%%DOCSDIR%%/us/API/serialized-form.html
 %%PORTDOCS%%%%DOCSDIR%%/us/API/stylesheet.css
 %%PORTDOCS%%%%DOCSDIR%%/us/examples.html