From owner-svn-ports-head@FreeBSD.ORG Sat Oct 5 11:35:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2251681E; Sat, 5 Oct 2013 11:35:00 +0000 (UTC) (envelope-from olgeni@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA4DC2B5C; Sat, 5 Oct 2013 11:34:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r95BYxuJ041851; Sat, 5 Oct 2013 11:34:59 GMT (envelope-from olgeni@svn.freebsd.org) Received: (from olgeni@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r95BYx4C041845; Sat, 5 Oct 2013 11:34:59 GMT (envelope-from olgeni@svn.freebsd.org) Message-Id: <201310051134.r95BYx4C041845@svn.freebsd.org> From: Jimmy Olgeni Date: Sat, 5 Oct 2013 11:34:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329442 - in head/devel/jna: . 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.14 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: Sat, 05 Oct 2013 11:35:00 -0000 Author: olgeni Date: Sat Oct 5 11:34:59 2013 New Revision: 329442 URL: http://svnweb.freebsd.org/changeset/ports/329442 Log: Fix loading of libc.so after r251668 ("turn libc.so into an ld script.") Submitted by: jkim Added: head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java (contents, props changed) Modified: head/devel/jna/Makefile Modified: head/devel/jna/Makefile ============================================================================== --- head/devel/jna/Makefile Sat Oct 5 11:28:42 2013 (r329441) +++ head/devel/jna/Makefile Sat Oct 5 11:34:59 2013 (r329442) @@ -2,6 +2,7 @@ PORTNAME= jna PORTVERSION= 4.0 +PORTREVISION= 1 CATEGORIES= devel java MASTER_SITES= GH Added: head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java Sat Oct 5 11:34:59 2013 (r329442) @@ -0,0 +1,29 @@ +--- src/com/sun/jna/NativeLibrary.java.orig 2013-07-04 14:42:30.000000000 -0400 ++++ src/com/sun/jna/NativeLibrary.java 2013-10-04 17:28:07.000000000 -0400 +@@ -203,7 +203,7 @@ + } + catch(UnsatisfiedLinkError e2) { e = e2; } + } +- else if (Platform.isLinux()) { ++ else if (Platform.isLinux() || Platform.isFreeBSD()) { + // + // Failed to load the library normally - try to match libfoo.so.* + // +@@ -382,7 +382,7 @@ + + // Use current process to load libraries we know are already + // loaded by the VM to ensure we get the correct version +- if ((Platform.isLinux() || Platform.isAIX()) ++ if ((Platform.isLinux() || Platform.isFreeBSD() || Platform.isAIX()) + && Platform.C_LIBRARY_NAME.equals(libraryName)) { + libraryName = null; + } +@@ -702,7 +702,7 @@ + } + return name; + } +- else if (Platform.isLinux()) { ++ else if (Platform.isLinux() || Platform.isFreeBSD()) { + if (isVersionedName(libName) || libName.endsWith(".so")) { + // A specific version was requested - use as is for search + return libName;