From 79a375545bd0f0804d33b1bd38f062b860125b41 Mon Sep 17 00:00:00 2001
From: Mia <mia-dl@tuta.io>
Date: Sun, 14 Aug 2022 06:33:18 -0400
Subject: [PATCH] bit of work done; compiles with jdk8 -- jdk11 fails, being
 looked into

---
 Makefile | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index f1e64f5..32484c1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,17 @@ COMMENT=	Lightweight Java Game Library v3
 
 LICENSE=	BSD3CLAUSE
 
-ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
-
 BROKEN_i386=	ld: error: undefined symbol: __stack_smash_handler # openbsd reports this error, however I am unable to test it
+BROKEN_java11=	java.nio.file.NoSuchFileException: bin/classes/lwjgl/core/module-info.class
+# this error seems to come from freebsd as openbsd builds with java 11 fine
+ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	ant:devel/apache-ant \
 		unzip:archivers/unzip \
 		ant:devel/apache-ant \
 		${PREFIX}/libdata/pkgconfig/bullet.pc:devel/bullet \
-		${PREFIX}/include/dynload.h:devel/dyncall\
+		${PREFIX}/include/dynload.h:devel/dyncall \
+		${PREFIX}/openjdk8/jre/lib/jce.jar:java/openjdk8 \
 		${PREFIX}/libdata/pkgconfig/liblz4.pc:archivers/liblz4
 LIB_DEPENDS=	libopenal.so:audio/openal-soft \
 		libopus.so:audio/opus \
@@ -38,17 +40,20 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	kmosiejczuk
 GH_TAGNAME=	3b9d8ce
 GH_PROJECT=	${PORTNAME}
+# there is a CRKatri fork directly for freebsd that kmosiejczuk's fork cherrypicked from
+# future testing will be done with that fork to see if it fixes some issues
 
 DOS2UNIX_REGEX=	.*.[^jp][^an][^rg]$
 USE_JAVA=	yes
 USE_ANT=	yes
 USE_XORG=	xcursor xrandr xxf86vm
-MAKE_ENV+=	LWJGL_BUILD_OFFLINE=true
+MAKE_ENV+=	LWJGL_BUILD_OFFLINE=true JAVA8_HOME=${PREFIX}/openjdk8/
+# openbsd has JAVA8_HOME=${JAVA_HOME}; but this fails as openjdk11/jre is missing
+#
 ALL_TARGET=	compile-templates generate compile release
 
-JAVA_VERSION= 8
-# LWJGL3 calls for 10+ however bindings /fails/ to compile on newer than 8
-# lang/rhino might fix this
+JAVA_VERSION=8
+# upstream changes need to be merged to allow for 15+ compiliation
 
 LWJGL3_HOME=	${JAVASHAREDIR}/lwjgl3
 
@@ -56,10 +61,18 @@ LWJGL3_HOME=	${JAVASHAREDIR}/lwjgl3
 
 post-extract:
 	${MKDIR} ${WRKSRC}/bin/libs
-	${LOCALBASE}/bin/unzip -oq -d ${WRKSRC}/bin/libs/ \
+	${UNZIP_CMD} -oq -d ${WRKSRC}/bin/libs/ \
 		${DISTDIR}/kotlin-compiler-1.3.61.zip
 	${TAR} -C ${WRKSRC}/bin/libs -zxf \
 		${DISTDIR}/lwjgl3-maven-20210208.tar.gz
+
+pre-configure:
+	${SED} -i -e 's,/usr/X11R6,${X11BASE},g' \
+		${WRKSRC}/build.xml
+	${SED} -i -e 's,/usr/local,${LOCALBASE},g' \
+		${WRKSRC}/build.xml
+	:> ${WRKSRC}/bin/libs/touch.txt
+
 do-install:
 	${SETENV} ${MAKE_ENV} LWJGL_BUILD_OFFLINE=true
 	${RM} ${WRKSRC}/bin/RELEASE/lwjgl*/lwjgl-*-sources.jar