From owner-svn-ports-all@FreeBSD.ORG Thu Sep 27 00:18:42 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CE7A106566B; Thu, 27 Sep 2012 00:18:42 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 27DD18FC08; Thu, 27 Sep 2012 00:18:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8R0Igi9018424; Thu, 27 Sep 2012 00:18:42 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8R0IfMF018420; Thu, 27 Sep 2012 00:18:41 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201209270018.q8R0IfMF018420@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 27 Sep 2012 00:18:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r304940 - head/java/openjdk6/files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2012 00:18:42 -0000 Author: jkim Date: Thu Sep 27 00:18:41 2012 New Revision: 304940 URL: http://svn.freebsd.org/changeset/ports/304940 Log: Tidy up patches. No functional change. Modified: head/java/openjdk6/files/alsa-enable.patch head/java/openjdk6/files/patch-set head/java/openjdk6/files/patch-test Modified: head/java/openjdk6/files/alsa-enable.patch ============================================================================== --- head/java/openjdk6/files/alsa-enable.patch Thu Sep 27 00:07:44 2012 (r304939) +++ head/java/openjdk6/files/alsa-enable.patch Thu Sep 27 00:18:41 2012 (r304940) @@ -23,8 +23,8 @@ void getALSAVersion(char* buffer, int len) { if (!hasGottenALSAVersion) { +#ifdef __FreeBSD__ -+ // XXX We do not use ALSA drivers. Just copy the library version. -+ strcpy(ALSAVersionString, SND_LIB_VERSION_STR); ++ // XXX We do not use ALSA drivers. Just copy the library version. ++ strcpy(ALSAVersionString, SND_LIB_VERSION_STR); +#else // get alsa version from proc interface FILE* file; Modified: head/java/openjdk6/files/patch-set ============================================================================== --- head/java/openjdk6/files/patch-set Thu Sep 27 00:07:44 2012 (r304939) +++ head/java/openjdk6/files/patch-set Thu Sep 27 00:18:41 2012 (r304940) @@ -5837,23 +5837,36 @@ } inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) ---- hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-05-01 17:15:07.000000000 -0400 -+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 17:05:10.000000000 -0400 -@@ -44,7 +44,7 @@ +--- hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:40:10.000000000 -0400 ++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:43:30.000000000 -0400 +@@ -34,6 +34,12 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#define GDB_LAUNCHER "gdb /proc/%d/file %d" ++#else ++#define GDB_LAUNCHER "gdb /proc/%d/exe %d" ++#endif ++ + void VMError::show_message_box(char *buf, int buflen) { + bool yes; + do { +@@ -44,7 +50,7 @@ jio_snprintf(p, buflen - len, "\n\n" "Do you want to debug the problem?\n\n" - "To debug, run 'gdb /proc/%d/exe %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" -+ "To debug, run 'gdb /proc/%d/file %d'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" ++ "To debug, run '" GDB_LAUNCHER "'; then switch to thread " INTX_FORMAT " (" INTPTR_FORMAT ")\n" "Enter 'yes' to launch gdb automatically (PATH must include gdb)\n" "Otherwise, press RETURN to abort...", os::current_process_id(), os::current_process_id(), -@@ -54,7 +54,7 @@ +@@ -54,7 +60,7 @@ if (yes) { // yes, user asked VM to launch debugger - jio_snprintf(buf, buflen, "gdb /proc/%d/exe %d", -+ jio_snprintf(buf, buflen, "gdb /proc/%d/file %d", ++ jio_snprintf(buf, buflen, GDB_LAUNCHER, os::current_process_id(), os::current_process_id()); os::fork_and_exec(buf); Modified: head/java/openjdk6/files/patch-test ============================================================================== --- head/java/openjdk6/files/patch-test Thu Sep 27 00:07:44 2012 (r304939) +++ head/java/openjdk6/files/patch-test Thu Sep 27 00:18:41 2012 (r304940) @@ -130,15 +130,6 @@ sc.socket().shutdownInput(); --- jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-05-01 17:18:45.000000000 -0400 +++ jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Launcher.c 2012-09-26 19:07:59.000000000 -0400 -@@ -123,7 +123,7 @@ - - /* - * We need to close all file descriptors except for serviceFd. To -- * get the list of open file descriptos we read through /proc/self/fd -+ * get the list of open file descriptos we read through /dev/fd - * but to open this requires a file descriptor. We could use a specific - * file descriptor and fdopendir but Linux doesn't seem to support - * fdopendir. Instead we use opendir and make an assumption on the @@ -135,7 +135,7 @@ } close(thisFd);