cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Disconnect devel/jdk/16 from the build

Browse Source 
* 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.
okay sthen@
This commit is contained in:
kurt 2021-10-30 00:31:15 +00:00
parent 4a88a35ac3
commit 0b1c5328fb
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/jdk/17/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2021/10/29 18:15:15 kurt Exp $
# $OpenBSD: Makefile,v 1.2 2021/10/30 00:31:15 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64 aarch64
USE_WXNEEDED= Yes
@ -13,6 +13,7 @@ PACKAGE_VER= ${BASE_VER}.${PATCH_VER}.${BSD_PORT_REL}
PKGNAME= jdk-${PACKAGE_VER}
PKGSTEM= jdk-17
EPOCH= 0
REVISION= 0
DIST_SUBDIR= jdk
DISTNAME= jdk-${VERSION_STR}

3
devel/jdk/17/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2021/10/29 18:15:16 kurt Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/10/30 00:31:15 kurt Exp $
@option no-default-conflict
@option is-branch
@conflict jdk->=17v0,<18v0
@pkgpath devel/jdk/16
@pkgpath devel/jdk/17
%%ci%%
jdk-17/

3
devel/jdk/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.30 2021/10/29 18:16:18 kurt Exp $
# $OpenBSD: Makefile,v 1.31 2021/10/30 00:31:15 kurt Exp $
SUBDIR =
SUBDIR += 1.8
SUBDIR += 11
SUBDIR += 16
SUBDIR += 17
.include <bsd.port.subdir.mk>

12
devel/jdk/java.port.mk
View File

@ -1,6 +1,6 @@
# $OpenBSD: java.port.mk,v 1.40 2021/07/15 10:29:19 kurt Exp $
# $OpenBSD: java.port.mk,v 1.41 2021/10/30 00:31:15 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*+}