head 1.8; access; symbols pkgsrc-2020Q1:1.7.0.26 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.48 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.44 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.42 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.40 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.38 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.36 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.34 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.32 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.30 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.28 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.24 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.22 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.20 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.18 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.16 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.14 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.12 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.10 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.7.0.8 pkgsrc-2015Q2-base:1.7 pkgsrc-2015Q1:1.7.0.6 pkgsrc-2015Q1-base:1.7 pkgsrc-2014Q4:1.7.0.4 pkgsrc-2014Q4-base:1.7 pkgsrc-2014Q3:1.7.0.2 pkgsrc-2014Q3-base:1.7 pkgsrc-2014Q2:1.6.0.10 pkgsrc-2014Q2-base:1.6 pkgsrc-2014Q1:1.6.0.8 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.6.0.6 pkgsrc-2013Q4-base:1.6 pkgsrc-2013Q3:1.6.0.4 pkgsrc-2013Q3-base:1.6 pkgsrc-2013Q2:1.6.0.2 pkgsrc-2013Q2-base:1.6 pkgsrc-2013Q1:1.4.0.8 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.18 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.16 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.14 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.12 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.10 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.8 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.6 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.4 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.2 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2; locks; strict; comment @# @; 1.8 date 2020.05.17.00.47.06; author tnn; state dead; branches; next 1.7; commitid by06jUrXKAUzQw8C; 1.7 date 2014.07.25.20.35.14; author ryoon; state Exp; branches; next 1.6; commitid NmBUQOBGGiH8FNJx; 1.6 date 2013.06.15.09.31.05; author jperkin; state Exp; branches 1.6.10.1; next 1.5; commitid gr72iqj6cRdUZGTw; 1.5 date 2013.06.02.06.12.28; author ryoon; state Exp; branches; next 1.4; commitid j8SPqZax02Hdk0Sw; 1.4 date 2012.05.22.05.57.50; author joerg; state Exp; branches; next 1.3; 1.3 date 2010.01.15.19.18.42; author tnn; state Exp; branches; next 1.2; 1.2 date 2009.11.08.17.57.46; author tnn; state dead; branches; next 1.1; 1.1 date 2009.11.08.00.22.07; author tnn; state Exp; branches; next ; 1.6.10.1 date 2014.07.27.12.36.21; author spz; state Exp; branches; next ; commitid f7GPXXrOJYN2X0Kx; desc @@ 1.8 log @retire lang/openjdk7 @ text @$NetBSD: patch-ak,v 1.7 2014/07/25 20:35:14 ryoon Exp $ Additional rpaths. --- jdk/make/common/Defs-bsd.gmk.orig 2014-06-14 20:38:28.000000000 +0000 +++ jdk/make/common/Defs-bsd.gmk @@@@ -328,8 +328,8 @@@@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY)) -LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN -LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%) +LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} + # # -L paths for finding and -ljava @@@@ -380,6 +380,11 @@@@ endif # Using map files currently break compilation on FreeBSD during shared library # checks for some of the AWT native libraries. +ifeq ($(OS_VENDOR), DragonFly) +LDNOMAP=true +endif + +# ifeq ($(OS_VENDOR), FreeBSD) LDNOMAP=true endif @@@@ -391,7 +396,7 @@@@ endif # the library itself should not. # VM_NAME = server -JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm +JVMLIB = -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm JAVALIB = -ljava $(JVMLIB) # @@@@ -454,6 +459,14 @@@@ ifeq ($(OS_VENDOR), OpenBSD) SYSTEM_ZLIB = true endif +ifeq ($(OS_VENDOR), NetBSD) + SYSTEM_ZLIB = true +endif + +ifeq ($(OS_VENDOR), DragonFlyBSD) + SYSTEM_ZLIB = true +endif + # # Japanese manpages # @ 1.7 log @Bump PKGREVISION * Use working bootstrap kits for DragonFly from DPorts. * Borrow patches from DragonFly Dports. Fix build under DragonFly 3.6.2 and 3.8.1. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.6 2013/06/15 09:31:05 jperkin Exp $ @ 1.6 log @Add SunOS/GCC support. With huge thanks to "jesse" from #SmartOS who did the bulk of the porting work. Tested on SmartOS 32-bit. 64-bit builds currently fail, they should hopefully be fixed soon. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.5 2013/06/02 06:12:28 ryoon Exp $ d5 1 a5 1 --- jdk/make/common/Defs-bsd.gmk.orig 2013-05-29 03:57:57.000000000 +0000 d7 1 a7 1 @@@@ -336,8 +336,8 @@@@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink d18 13 a30 1 @@@@ -399,7 +399,7 @@@@ endif d39 1 a39 1 @@@@ -462,6 +462,14 @@@@ ifeq ($(OS_VENDOR), OpenBSD) @ 1.6.10.1 log @Pullup ticket #4465 - requested by dholland lang/openjdk7: fix for netbsd-5 Revisions pulled up: - lang/openjdk7/Makefile 1.71-1.72 - lang/openjdk7/bootstrap.mk 1.11 - lang/openjdk7/distinfo 1.50-1.51 - lang/openjdk7/patches/patch-aa 1.12 - lang/openjdk7/patches/patch-ak 1.7 - lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java 1.1 - lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c 1.1 - lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h 1.1 - lang/openjdk7/patches/patch-jdk_test_jprt.config 1.1 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: ryoon Date: Mon Jul 21 00:15:41 UTC 2014 Modified Files: pkgsrc/lang/openjdk7: Makefile distinfo Added Files: pkgsrc/lang/openjdk7/patches: patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c Log Message: Bump PKGREVISION. Fix PR pkg/48982. * Use fork instead of posix_spawn under NetBSD 5. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 pkgsrc/lang/openjdk7/Makefile cvs rdiff -u -r1.49 -r1.50 pkgsrc/lang/openjdk7/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_classes_java_lang_UNIXProcess.java.bsd \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_UNIXProcess__md.c ------------------------------------------------------------------- Module Name: pkgsrc Committed By: ryoon Date: Fri Jul 25 20:35:14 UTC 2014 Modified Files: pkgsrc/lang/openjdk7: Makefile bootstrap.mk distinfo pkgsrc/lang/openjdk7/patches: patch-aa patch-ak Added Files: pkgsrc/lang/openjdk7/patches: patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java patch-jdk_make_java_net_FILES__c.gmk patch-jdk_src_solaris_native_java_lang_java__props__md.c patch-jdk_src_solaris_native_java_net_net__util__md.h patch-jdk_test_jprt.config Log Message: Bump PKGREVISION * Use working bootstrap kits for DragonFly from DPorts. * Borrow patches from DragonFly Dports. Fix build under DragonFly 3.6.2 and 3.8.1. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 pkgsrc/lang/openjdk7/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/lang/openjdk7/bootstrap.mk cvs rdiff -u -r1.50 -r1.51 pkgsrc/lang/openjdk7/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/openjdk7/patches/patch-aa cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk7/patches/patch-ak cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/openjdk7/patches/patch-hotspot_agent_src_share_classes_sun_jvm_hotspot_utilities_PlatformInfo.java \ pkgsrc/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_lang_java__props__md.c \ pkgsrc/lang/openjdk7/patches/patch-jdk_src_solaris_native_java_net_net__util__md.h \ pkgsrc/lang/openjdk7/patches/patch-jdk_test_jprt.config @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- jdk/make/common/Defs-bsd.gmk.orig 2014-06-14 20:38:28.000000000 +0000 d7 1 a7 1 @@@@ -328,8 +328,8 @@@@ Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlink d18 1 a18 13 @@@@ -380,6 +380,11 @@@@ endif # Using map files currently break compilation on FreeBSD during shared library # checks for some of the AWT native libraries. +ifeq ($(OS_VENDOR), DragonFly) +LDNOMAP=true +endif + +# ifeq ($(OS_VENDOR), FreeBSD) LDNOMAP=true endif @@@@ -391,7 +396,7 @@@@ endif d27 1 a27 1 @@@@ -454,6 +459,14 @@@@ ifeq ($(OS_VENDOR), OpenBSD) @ 1.5 log @Update to 1.7.21 (7u21) * Update with FreeBSD ports' patch-set file. * Add patches from icedtea's rhino.patch file. * Tested on NetBSD/amd64 current, NetBSD/i386 6.1, NetBSD/amd64 6.0.1, and DragonFly/i386 3.2.2. Changelog: * Unknown because I do not know previous version, 1.7.0.147.20110811. * Many bugs and security bugs should be fixed. @ text @d1 3 a3 1 $NetBSD: patch-ak,v 1.4 2012/05/22 05:57:50 joerg Exp $ @ 1.4 log @Fix rpath usage. Discussed with tnn@@, tested on i386 by hans@@ and on amd64 by me. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.3 2010/01/15 19:18:42 tnn Exp $ d3 1 a3 1 --- jdk/make/common/Defs-bsd.gmk.orig 2012-05-06 14:17:19.000000000 +0000 d5 8 a12 8 @@@@ -230,8 +230,7 @@@@ ifeq ($(OS_VENDOR), Apple) LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -rpath -Xlinker @@loader_path/%) LDFLAGS_COMMON += -Xlinker -install_name -Xlinker @@rpath/$(@@F) else - LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN - LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%) + LDFLAGS_COMMON += -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH}/server -Xlinker -rpath -Xlinker ${PREFIX}/java/openjdk7/jre/lib/${LIBARCH} endif d15 6 a20 5 @@@@ -299,7 +298,7 @@@@ VM_NAME = server ifeq ($(OS_VENDOR),Apple) JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm else -JVMLIB = -Xlinker -rpath -Xlinker $(LIBDIR)/$(LIBARCH)/$(VM_NAME) -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm a21 1 endif d24 2 a25 1 @@@@ -365,6 +364,14 @@@@ ifeq ($(OS_VENDOR), OpenBSD) @ 1.3 log @Update to openjdk7 b78 snapshot. (b79 is released but not yet merged on the bsd-port branch) @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- jdk/make/common/Defs-bsd.gmk.orig 2010-01-11 16:46:18.000000000 +0000 d5 20 a24 1 @@@@ -339,6 +339,14 @@@@ ifeq ($(OS_VENDOR), OpenBSD) @ 1.2 log @Use full pathname to libfontconfig.so. Really fixes NullPointerException in getDefaultPlatformFont. Remove previous hack and bump revision again. @ text @d1 1 a1 1 $NetBSD: patch-ak,v 1.1 2009/11/08 00:22:07 tnn Exp $ d3 17 a19 14 --- jdk/src/solaris/classes/sun/awt/X11FontManager.java.orig 2009-11-08 01:12:18.000000000 +0100 +++ jdk/src/solaris/classes/sun/awt/X11FontManager.java @@@@ -790,6 +790,11 @@@@ public class X11FontManager extends SunF getFontConfigManager().initFontConfigFonts(false); FontConfigManager.FcCompFont[] fontConfigFonts = getFontConfigManager().getFontConfigFonts(); + if (fontConfigFonts == null) { + info[0] = "nonexistent"; + info[1] = "/nonexistent.ttf"; + return info; + } for (int i=0; i