svn commit: r312084 - in head/java/openjdk7: . files

[Jung-uk Kim]

Author: jkim
Date: Mon Feb 11 23:53:16 2013
New Revision: 312084
URL: http://svnweb.freebsd.org/changeset/ports/312084

Log:
  Add a patch to fix MulticastSocket.setInterface().
  
  http://hg.openjdk.java.net/bsd-port/bsd-port/jdk/rev/bfa676f5b5db
  
  Submitted by:	oliver

Added:
  head/java/openjdk7/files/patch-PlainDatagramSocketImpl.c   (contents, props changed)
Modified:
  head/java/openjdk7/Makefile

Modified: head/java/openjdk7/Makefile
==============================================================================
--- head/java/openjdk7/Makefile	Mon Feb 11 23:45:25 2013	(r312083)
+++ head/java/openjdk7/Makefile	Mon Feb 11 23:53:16 2013	(r312084)
@@ -7,7 +7,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}/promoted/b${JDK_BUILD_NUMBER}/ \
 		http://download.java.net/jaxp/1.4.5/:jaxp \

Added: head/java/openjdk7/files/patch-PlainDatagramSocketImpl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-PlainDatagramSocketImpl.c	Mon Feb 11 23:53:16 2013	(r312084)
@@ -0,0 +1,47 @@
+
+# HG changeset patch
+# User kurt
+# Date 1359762569 18000
+# Node ID bfa676f5b5db6a9c1c0e158eb40856c1b7f5f258
+# Parent c721254e908da6aea0879f3d0e715003ff675525
+- Fix MulticastSocket.setInterface() for BSD. Report and fix from Oliver
+  Lehmann on bsd-port list.
+
+--- jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Jan 25 11:40:12 2013 -0500
++++ jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c	Fri Feb 01 18:49:29 2013 -0500
+@@ -1358,7 +1358,7 @@ static void setMulticastInterface(JNIEnv
+          * value is an InetAddress.
+          */
+ #ifdef AF_INET6
+-#if defined(__solaris__) || defined(MACOSX)
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_addr_v6(env, this, fd, value);
+         } else {
+@@ -1381,7 +1381,7 @@ static void setMulticastInterface(JNIEnv
+          * value is a NetworkInterface.
+          */
+ #ifdef AF_INET6
+-#if defined(__solaris__) || defined(MACOSX)
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+         if (ipv6_available()) {
+             mcast_set_if_by_if_v6(env, this, fd, value);
+         } else {
+@@ -1464,7 +1464,7 @@ static void setMulticastLoopbackMode(JNI
+ static void setMulticastLoopbackMode(JNIEnv *env, jobject this, int fd,
+                                   jint opt, jobject value) {
+ #ifdef AF_INET6
+-#if defined(__solaris__) || defined(MACOSX)
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         mcast_set_loop_v6(env, this, fd, value);
+     } else {
+@@ -2038,7 +2038,7 @@ Java_java_net_PlainDatagramSocketImpl_se
+     }
+     /* setsockopt to be correct ttl */
+ #ifdef AF_INET6
+-#if defined(__solaris__) || defined(MACOSX)
++#if defined(__solaris__) || defined(_ALLBSD_SOURCE)
+     if (ipv6_available()) {
+         setHopLimit(env, fd, ttl);
+     } else {