diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2020-07-16 05:09:12 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2020-07-16 05:09:12 +0000 |
| commit | a27facd93aa0a901966921032235d1adeaeecd49 (patch) | |
| tree | 5c9257bf033d170d1201e20434867068a7decd43 /java | |
| parent | Update to 0.28. (diff) | |
Update to 13.0.4
Notes
Notes:
svn path=/head/; revision=542321
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk13/Makefile | 5 | ||||
| -rw-r--r-- | java/openjdk13/distinfo | 6 | ||||
| -rw-r--r-- | java/openjdk13/files/patch-10-af5c725b | 25 |
3 files changed, 5 insertions, 31 deletions
diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile index 10228869476e..d337e41386bb 100644 --- a/java/openjdk13/Makefile +++ b/java/openjdk13/Makefile @@ -3,7 +3,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -56,8 +55,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 13 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 3 -JDK_BUILD_NUMBER= 3 +JDK_PATCH_VERSION= 4 +JDK_BUILD_NUMBER= 8 BSD_JDK_VERSION= 1 JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 diff --git a/java/openjdk13/distinfo b/java/openjdk13/distinfo index 037e379f69b6..1fb3d7635528 100644 --- a/java/openjdk13/distinfo +++ b/java/openjdk13/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587165572 -SHA256 (battleblow-openjdk-jdk13u-jdk-13.0.3+3-1_GH0.tar.gz) = b14b0c4bb188e16b330b86f7b0127635f9867339b48c3029572310319e2fdf06 -SIZE (battleblow-openjdk-jdk13u-jdk-13.0.3+3-1_GH0.tar.gz) = 108824252 +TIMESTAMP = 1594872563 +SHA256 (battleblow-openjdk-jdk13u-jdk-13.0.4+8-1_GH0.tar.gz) = 0e657f69c75ef87f95b69d08f577b451e5b0ed4911705502158260a411a2ab37 +SIZE (battleblow-openjdk-jdk13u-jdk-13.0.4+8-1_GH0.tar.gz) = 108945332 diff --git a/java/openjdk13/files/patch-10-af5c725b b/java/openjdk13/files/patch-10-af5c725b deleted file mode 100644 index 0e4ec063a266..000000000000 --- a/java/openjdk13/files/patch-10-af5c725b +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk -index 8de519fc606..221e9455960 100644 ---- make/common/MakeBase.gmk -+++ make/common/MakeBase.gmk -@@ -525,15 +525,16 @@ DependOnVariableFileName = \ - # Param 2 - (optional) name of file to store value in - DependOnVariableHelper = \ - $(strip \ -- $(eval -include $(call DependOnVariableFileName, $1, $2)) \ -+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \ -+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \ - $(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\ -- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \ -+ $(call MakeDir, $(dir $($1_filename))) \ - $(if $(findstring $(LOG_LEVEL), trace), \ - $(info NewVariable $1: >$(strip $($1))<) \ - $(info OldVariable $1: >$(strip $($1_old))<)) \ - $(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \ -- $(call DependOnVariableFileName, $1, $2))) \ -- $(call DependOnVariableFileName, $1, $2) \ -+ $($1_filename))) \ -+ $($1_filename) \ - ) - - # Main macro |