From owner-svn-ports-head@freebsd.org Thu Dec 10 18:43:52 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C586A9D6769; Thu, 10 Dec 2015 18:43:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 746A1180B; Thu, 10 Dec 2015 18:43:52 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBAIhpLY009626; Thu, 10 Dec 2015 18:43:51 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBAIhpWV009624; Thu, 10 Dec 2015 18:43:51 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201512101843.tBAIhpWV009624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 10 Dec 2015 18:43:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403464 - in head/java/openjdk8: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Dec 2015 18:43:52 -0000 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