From 284711a4584f1e4afdf40026c779f01dff9ecacf Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Mon, 4 Apr 2022 12:50:27 -0400
Subject: [PATCH] openjdk14-bootstrap: fix version, xlint

---
 srcpkgs/openjdk14-bootstrap/template | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 5c15ca3f32c..768b9463319 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -1,15 +1,12 @@
 # Template file for 'openjdk14-bootstrap'
-_java_ver=14
-_java_min_ver=0
-_java_sec_ver=2
-_jdk_update=12
-_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
-_base_version="${_java_ver}.${_java_min_ver}.${_java_sec_ver}"
-
 pkgname=openjdk14-bootstrap
-version="${_base_version}+${_jdk_update}"
+version=14.0.2+12
 revision=1
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+_java_ver="${version%%.*}"
+_jdk_update="${version#*+}"
+_base_version="${version%+*}"
+_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
 build_style=gnu-configure
 configure_args="--disable-warnings-as-errors
  --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -37,13 +34,13 @@ hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
 makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
  giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
  fontconfig-devel zlib-devel lcms2-devel openjdk13-bootstrap"
-provides="java-environment-${version}_1 java-runtime-${version}_1"
 short_desc="OpenJDK Java Development Kit (bootstrap version 14)"
 maintainer="classabbyamp <void@placeviolette.net>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="http://openjdk.java.net/"
 distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-${version}.tar.gz"
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
+provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
 
 # Build is still parallel, but don't use -jN.