1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

Update to 13.0.4

This commit is contained in:
Greg Lewis 2020-07-16 05:09:12 +00:00
parent 9dab4ef210
commit a27facd93a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=542321
3 changed files with 5 additions and 31 deletions

View File

@ -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

View File

@ -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

View File

@ -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