git: 22a5ad0dc893 - main - java/openjdk8: Update to 8u332 GA

The branch main has been updated by glewis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=22a5ad0dc8937a270008aeaeb6fb8d89489140d4

commit 22a5ad0dc8937a270008aeaeb6fb8d89489140d4
Author:     Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2022-05-05 01:33:34 +0000
Commit:     Greg Lewis <glewis@FreeBSD.org>
CommitDate: 2022-05-05 01:34:18 +0000

    java/openjdk8: Update to 8u332 GA
---
 java/openjdk8/Makefile                             |  5 ++---
 java/openjdk8/distinfo                             |  6 +++---
 java/openjdk8/files/patch-make-common-MakeBase.gmk | 14 ++++++++++++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index c56e619dd6f3..9addd3e34e55 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER}.${BSD_JDK_VERSION}
-PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/jkim:jtreg
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
@@ -52,8 +51,8 @@ INSTALLDIR=	${PREFIX}/${PKGBASE}
 NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	8
-JDK_UPDATE_VERSION=	322
-JDK_BUILD_NUMBER=	06
+JDK_UPDATE_VERSION=	332
+JDK_BUILD_NUMBER=	09
 BSD_JDK_VERSION=	1
 JTREG_VERSION=		4.1
 JTREG_BUILD_NUMBER=	b08
diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo
index 14c5011f8bd0..480f11064325 100644
--- a/java/openjdk8/distinfo
+++ b/java/openjdk8/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1644473705
+TIMESTAMP = 1651712203
 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c
 SIZE (jtreg4.1-b08.tar.gz) = 6834252
-SHA256 (battleblow-jdk8u-8.322.06.1-jdk8u322-b06.1_GH0.tar.gz) = ad0a6f33c44c785ad1bf1586fb49ca6490e0f0dea572d9cb90080d0bffa53c4e
-SIZE (battleblow-jdk8u-8.322.06.1-jdk8u322-b06.1_GH0.tar.gz) = 88717354
+SHA256 (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 7dda7e79b920d8dd79f54dc28a236126c360c42ef14874447339afd2906a6599
+SIZE (battleblow-jdk8u-8.332.09.1-jdk8u332-b09.1_GH0.tar.gz) = 88705654
diff --git a/java/openjdk8/files/patch-make-common-MakeBase.gmk b/java/openjdk8/files/patch-make-common-MakeBase.gmk
new file mode 100644
index 000000000000..b7a7ffaa719e
--- /dev/null
+++ b/java/openjdk8/files/patch-make-common-MakeBase.gmk
@@ -0,0 +1,14 @@
+--- make/common/MakeBase.gmk.orig	2022-05-04 18:19:33.661930000 -0700
++++ make/common/MakeBase.gmk	2022-05-04 18:19:45.573627000 -0700
+@@ -318,11 +318,6 @@
+ # Emit the scm:id pair to $@
+ define GetSourceTips
+ 	$(CD) $(SRC_ROOT) ; \
+-	if [ -d $(SCM_DIR) -a "$(SCM_VERSION)" != "" ] ; then \
+-	  $(ID_COMMAND) >> $@ ; \
+-	elif [ -f $(SCM_TIP_FILENAME) ] ; then \
+-          $(SCM_TIP_FILECMD) >> $@ ; \
+-	fi;
+ 	$(PRINTF) "\n" >> $@
+ endef
+