* Disconnect devel/jdk/16 from the build
* Update java.port.mk to use jdk/17. No ports are marked
MODJAVA_VER 16 so nothing needs to be bumped.
* Add @pkgpath devel/jdk/16 to jdk/17/pkg/PLIST so that
jdk-17 will replace jdk-16 with pkg_add -u.
I'll remove devel/jdk/16 after this goes in and the
dust settles. Look okay?
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- Makefile 29 Oct 2021 18:16:18 -0000 1.30
+++ Makefile 29 Oct 2021 20:17:22 -0000
@@ -3,7 +3,6 @@
SUBDIR =
SUBDIR += 1.8
SUBDIR += 11
-SUBDIR += 16
SUBDIR += 17
.include <bsd.port.subdir.mk>
Index: java.port.mk
===================================================================
RCS file: /cvs/ports/devel/jdk/java.port.mk,v
retrieving revision 1.40
diff -u -p -u -r1.40 java.port.mk
--- java.port.mk 15 Jul 2021 10:29:19 -0000 1.40
+++ java.port.mk 29 Oct 2021 20:17:22 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: java.port.mk,v 1.40 2021/07/15 10:29:19 kurt Exp $
-# Set MODJAVA_VER to 1.8, 11 or 16 based on the version of the jdk needed
+# Set MODJAVA_VER to 1.8, 11 or 17 based on the version of the jdk needed
# for the port. Append a + (e.g., 11+) if any higher version is acceptable.
MODJAVA_VER?=
@@ -24,8 +24,8 @@ MODJAVA_VER?=
#
.if ${MODJAVA_VER:S/+//} != "1.8" && ${MODJAVA_VER:S/+//} != "11" && \
- ${MODJAVA_VER:S/+//} != "16"
- ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11 or 16 with an optional
+ suffix."
+ ${MODJAVA_VER:S/+//} != "17"
+ ERRORS+="Fatal: MODJAVA_VER must be one of 1.8, 11 or 17 with an optional
+ suffix."
.endif
.if ${MODJAVA_VER:S/+//} == "1.8"
@@ -41,8 +41,8 @@ MODJAVA_VER?=
JAVA_HOME= ${LOCALBASE}/jdk-11
MODJAVA_BUILD_DEPENDS+= jdk->=11v0,<12v0:devel/jdk/11
.else
- JAVA_HOME= ${LOCALBASE}/jdk-16
- MODJAVA_BUILD_DEPENDS+= jdk->=16v0,<17v0:devel/jdk/16
+ JAVA_HOME= ${LOCALBASE}/jdk-17
+ MODJAVA_BUILD_DEPENDS+= jdk->=17v0,<18v0:devel/jdk/17
.endif
.if ${MODJAVA_VER:M*+}
Index: 17/Makefile
===================================================================
RCS file: /cvs/ports/devel/jdk/17/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- 17/Makefile 29 Oct 2021 18:15:15 -0000 1.1.1.1
+++ 17/Makefile 29 Oct 2021 20:17:22 -0000
@@ -13,6 +13,7 @@ PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${
PKGNAME= jdk-${PACKAGE_VER}
PKGSTEM= jdk-17
EPOCH= 0
+REVISION= 0
DIST_SUBDIR= jdk
DISTNAME= jdk-${VERSION_STR}
Index: 17/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/jdk/17/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- 17/pkg/PLIST 29 Oct 2021 18:15:16 -0000 1.1.1.1
+++ 17/pkg/PLIST 29 Oct 2021 20:17:23 -0000
@@ -2,6 +2,7 @@
@option no-default-conflict
@option is-branch
@conflict jdk->=17v0,<18v0
+@pkgpath devel/jdk/16
@pkgpath devel/jdk/17
%%ci%%
jdk-17/
