diff --git a/devel/luajava/Makefile b/devel/luajava/Makefile index 0e975560f360..359aaced2b5f 100644 --- a/devel/luajava/Makefile +++ b/devel/luajava/Makefile @@ -1,46 +1,47 @@ PORTNAME= luajava PORTVERSION= 1.1 PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= http://luaforge.net/frs/download.php/2105/ MAINTAINER= sunghyuk@gmail.com COMMENT= Lua scripting tool for Java WWW= http://www.keplerproject.org/luajava/ USES= gmake dos2unix java lua:51 +JAVA_VERSION= 8 USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes ALL_TARGET= run DOS2UNIX_REGEX= .*\.* OPTIONS_DEFINE= DOCS .include .if ${JAVA_PORT_VERSION:M*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 @${REINPLACE_CMD} -e 's|%%LUA_INCDIR%%|${LUA_INCDIR}|' ${WRKSRC}/config @${REINPLACE_CMD} -e 's|%%LUA_VER%%|${LUA_VER}|' ${WRKSRC}/config @${REINPLACE_CMD} -e 's|%%JAVA_HOME%%|${JAVA_HOME}|' ${WRKSRC}/config @${REINPLACE_CMD} -e 's|linux|freebsd|' ${WRKSRC}/config do-install: ${MKDIR} ${STAGEDIR}${LUA_MODLIBDIR} ${INSTALL_PROGRAM} ${WRKSRC}/libluajava-1.1.so ${STAGEDIR}${LUA_MODLIBDIR} ${MKDIR} ${STAGEDIR}${JAVAJARDIR} ${INSTALL_DATA} ${WRKSRC}/luajava-1.1.jar ${STAGEDIR}${JAVAJARDIR} do-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include diff --git a/devel/luajava/files/patch-Makefile b/devel/luajava/files/patch-Makefile index 4b1b1f134c8e..6dc82243a7c2 100644 --- a/devel/luajava/files/patch-Makefile +++ b/devel/luajava/files/patch-Makefile @@ -1,18 +1,11 @@ ---- Makefile.orig 2015-09-10 23:58:50.499075000 -0700 -+++ Makefile 2015-09-11 00:01:10.958396000 -0700 -@@ -55,7 +55,14 @@ +--- Makefile.orig 2025-12-11 16:03:19 UTC ++++ Makefile +@@ -55,7 +55,7 @@ apidoc: # Create the API Documentation # apidoc: - $(JDK)/bin/javadoc -public -classpath src/java/ -quiet -d "doc/us/API" $(DOC_CLASSES) -+ case $(JDK) in \ -+ *openjdk8*) \ -+ $(JDK)/bin/javadoc -Xdoclint:none -public -classpath src/java/ -quiet -d "doc/us/API" $(DOC_CLASSES) \ -+ ;; \ -+ *) \ -+ $(JDK)/bin/javadoc -public -classpath src/java/ -quiet -d "doc/us/API" $(DOC_CLASSES) \ -+ ;; \ -+ esac ++ $(JDK)/bin/javadoc -Xdoclint:none -public -classpath src/java/ -quiet -d "doc/us/API" $(DOC_CLASSES) # # Build .c files.