summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/openjdk17/Makefile1
-rw-r--r--java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk9
2 files changed, 10 insertions, 0 deletions
diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index b048691e65a1..50d43bd35a2f 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -2,6 +2,7 @@ PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
CATEGORIES= java devel
+PORTREVISION= 1
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
MAINTAINER= java@FreeBSD.org
diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
index 65f66318255d..11eaa6868f3e 100644
--- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
+++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
@@ -1,5 +1,14 @@
--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700
+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700
+@@ -435,7 +435,7 @@
+
+ ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
+ LIBFONTMANAGER_EXTRA_SRC =
+- BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
++ BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS)
+ else
+ LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
+
@@ -530,7 +530,7 @@
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
LDFLAGS_aix := -Wl$(COMMA)-berok, \