From 701f037632a18f528fd7d28eb4584266b7e6be5e Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 12 Jan 2022 21:33:11 -0500
Subject: [PATCH] java/openjdk17-jre: Add JRE-only package for java/openjdk17

---
 java/Makefile               |  1 +
 java/openjdk17-jre/Makefile |  8 ++++++++
 java/openjdk17/Makefile     | 12 ++++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 java/openjdk17-jre/Makefile

diff --git a/java/Makefile b/java/Makefile
index 18cae5108cc8..fe25cba44b73 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -96,6 +96,7 @@
     SUBDIR += openjdk15
     SUBDIR += openjdk16
     SUBDIR += openjdk17
+    SUBDIR += openjdk17-jre
     SUBDIR += openjdk7
     SUBDIR += openjdk7-jre
     SUBDIR += openjdk8
diff --git a/java/openjdk17-jre/Makefile b/java/openjdk17-jre/Makefile
new file mode 100644
index 000000000000..15798e22188e
--- /dev/null
+++ b/java/openjdk17-jre/Makefile
@@ -0,0 +1,8 @@
+PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
+
+COMMENT=	Java Runtime Environment ${JDK_MAJOR_VERSION}
+
+BUILD_JRE=	yes
+MASTERDIR=	${.CURDIR}/../openjdk17
+
+.include "${MASTERDIR}/Makefile"
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index bf439e6a8661..c1d45bfad152 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
-COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
+COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
 
 LICENSE=	GPLv2
 
@@ -50,7 +50,11 @@ MAKE_ENV=	LANG="C" \
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
+.if defined(BUILD_JRE)
+JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jre
+.else
 JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
+.endif
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NOPRECIOUSMAKEVARS=	yes
@@ -99,7 +103,11 @@ CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
+.if defined(BUILD_JRE)
+ALL_TARGET=		legacy-images
+.else
 ALL_TARGET=		images
+.endif
 JDK_BUILD_TYPE=		release
 
 .include <bsd.port.pre.mk>
@@ -135,7 +143,7 @@ CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
 
 .if ${COMPILER_TYPE} == gcc
 USE_GCC=	yes
-CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
+CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
 			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
 .else