From d7226c6fe2ddc59538228f137b6caabd3b4100d2 Mon Sep 17 00:00:00 2001 From: ryoon Date: Mon, 30 Dec 2013 07:02:28 +0000 Subject: Bump PKGREVISION * Fix "java.lang.InternalError: platform not recognized" error on *BSD with apache-tomcat7 --- lang/openjdk7/Makefile | 4 ++-- lang/openjdk7/distinfo | 3 ++- ...es_sun_nio_ch_DefaultAsynchronousChannelProvider.java | 16 ++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java (limited to 'lang') diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 227ee073c4f..661cf0ac5ef 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.55 2013/09/30 03:40:14 ryoon Exp $ +# $NetBSD: Makefile,v 1.56 2013/12/30 07:02:28 ryoon Exp $ DISTNAME= openjdk-1.7.25-20130626 PKGNAME= openjdk7-1.7.25 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 1685582e8b7..133feaa11fa 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.32 2013/09/30 03:40:14 ryoon Exp $ +$NetBSD: distinfo,v 1.33 2013/12/30 07:02:28 ryoon Exp $ SHA1 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = 7d3c9ee89536b82cd21c680088b1bced16017253 RMD160 (openjdk7/UnlimitedJCEPolicyJDK7.zip) = a4a6a284579f43d2df3532d279e143d2f03c2c3f @@ -157,6 +157,7 @@ SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_imageioJPEG.c) = 8502fc7da30 SHA1 (patch-jdk_src_share_native_sun_awt_image_jpeg_jpegdecoder.c) = ca10ce2d79f11925b7ec52fc1b5dfad9b25ddddb SHA1 (patch-jdk_src_share_native_sun_security_ec_impl_ecc__impl.h) = 13aae05b649af0d1f908b0a9b6f60c55d8baa7d4 SHA1 (patch-jdk_src_solaris_bin_ergo__i586.c) = 7b1d1c7f84e752ef7c53d5419dc3ab5213fec716 +SHA1 (patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java) = 86ce16bd53c85bc3830ef3f21d52f9a8107b5350 SHA1 (patch-jdk_src_solaris_classes_sun_nio_fs_BsdFileSystemProvider.java) = b57411309b8d46de6a9ab3606d72690908989d50 SHA1 (patch-jdk_src_solaris_native_java_net_NetworkInterface.c) = f65f616965c2e1149b72297d7c9b803d7adc4e8a SHA1 (patch-jdk_src_solaris_native_sun_awt_X11Color.c) = 928e9fbc11d8e64a69e27573efa13482acb62480 diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java new file mode 100644 index 00000000000..02a0e58f9f9 --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java @@ -0,0 +1,16 @@ +$NetBSD: patch-jdk_src_solaris_classes_sun_nio_ch_DefaultAsynchronousChannelProvider.java,v 1.1 2013/12/30 07:02:28 ryoon Exp $ + +* Fix apache-tomcat7's error, "java.lang.InternalError: platform not recognized" + patch is from http://www.freebsd.org/cgi/query-pr.cgi?pr=183389 + +--- jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java.orig 2013-06-25 14:32:43.000000000 +0000 ++++ jdk/src/solaris/classes/sun/nio/ch/DefaultAsynchronousChannelProvider.java +@@ -50,7 +50,7 @@ public class DefaultAsynchronousChannelP + return new SolarisAsynchronousChannelProvider(); + if (osname.equals("Linux")) + return new LinuxAsynchronousChannelProvider(); +- if (osname.contains("OS X")) ++ if (osname.contains("OS X") || osname.contains("DragonFly") || osname.contains("FreeBSD") || osname.contains("NetBSD") || osname.contains("OpenBSD")) + return new BsdAsynchronousChannelProvider(); + throw new InternalError("platform not recognized"); + } -- cgit v1.2.3