diff --git a/java/Makefile b/java/Makefile index be1eb18fb3226..2221f31f44e14 100644 --- a/java/Makefile +++ b/java/Makefile @@ -92,6 +92,7 @@ SUBDIR += netrexx SUBDIR += netty SUBDIR += openjdk11 + SUBDIR += openjdk11-jre SUBDIR += openjdk12 SUBDIR += openjdk13 SUBDIR += openjdk14 diff --git a/java/openjdk11-jre/Makefile b/java/openjdk11-jre/Makefile new file mode 100644 index 0000000000000..362f2d4b73c57 --- /dev/null +++ b/java/openjdk11-jre/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre + +COMMENT= Java Runtime Environment ${JDK_MAJOR_VERSION} + +BUILD_JRE= yes +MASTERDIR= ${.CURDIR}/../openjdk11 + +.include "${MASTERDIR}/Makefile" diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 62cb3bb45aa4b..e0bc675a7f6d5 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -7,7 +7,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 @@ -49,7 +49,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}-normal-${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 @@ -97,7 +101,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