svn commit: r403464 - in head/java/openjdk8: . files

[Jung-uk Kim]

Author: jkim
Date: Thu Dec 10 18:43:51 2015
New Revision: 403464
URL: https://svnweb.freebsd.org/changeset/ports/403464

Log:
  Fix regression introduced in r372338, i.e., mis-merged fix for JDK-8031581.
  
  PR:		205192

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

Modified: head/java/openjdk8/Makefile
==============================================================================
--- head/java/openjdk8/Makefile	Thu Dec 10 15:15:14 2015	(r403463)
+++ head/java/openjdk8/Makefile	Thu Dec 10 18:43:51 2015	(r403464)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \

Added: head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c	Thu Dec 10 18:43:51 2015	(r403464)
@@ -0,0 +1,23 @@
+--- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig	2015-12-10 18:40:39 UTC
++++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c
+@@ -435,11 +435,6 @@ Java_sun_management_OperatingSystemImpl_
+ }
+ 
+ 
+-#ifdef _ALLBSD_SOURCE
+-#define FD_DIR "/dev/fd"
+-#else
+-#define FD_DIR "/proc/self/fd"
+-#endif
+ 
+ JNIEXPORT jlong JNICALL
+ Java_sun_management_OperatingSystemImpl_getOpenFileDescriptorCount
+@@ -500,6 +495,8 @@ Java_sun_management_OperatingSystemImpl_
+ #define FD_DIR aix_fd_dir
+     char aix_fd_dir[32];     /* the pid has at most 19 digits */
+     snprintf(aix_fd_dir, 32, "/proc/%d/fd", getpid());
++#elif defined(_ALLBSD_SOURCE)
++#define FD_DIR "/dev/fd"
+ #else
+ #define FD_DIR "/proc/self/fd"
+ #endif