Date: Sat, 24 May 2014 07:01:48 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354988 - head/devel/luajava Message-ID: <201405240701.s4O71mio025031@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405240701.s4O71mio025031>