Upgrade to version 4.1.0.

Submitted by:	jkim

5 files changed, 12 insertions, 62 deletions

diff --git a/devel/jna/Makefile b/devel/jna/Makefile
index f3cf574acb50..104311ae530c 100644
--- a/devel/jna/Makefile
+++ b/devel/jna/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jna
-PORTVERSION=	4.0
-PORTREVISION=	1
+PORTVERSION=	4.1.0
 CATEGORIES=	devel java
 MASTER_SITES=	GH
 
@@ -19,7 +18,7 @@ MAKE_ENV+=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
 USE_GITHUB=	yes
 GH_ACCOUNT=	twall
 GH_TAG=		${PORTVERSION}
-GH_COMMIT=	9b7ba38
+GH_COMMIT=	c490fc9
 
 PLIST_FILES=	%%JAVAJARDIR%%/jna-platform.jar \
 		%%JAVAJARDIR%%/jna.jar
@@ -29,7 +28,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	javadoc platform-${PORTVERSION:L}.0-javadoc.jar
+PORTDOCS=	javadoc platform-${PORTVERSION}-javadoc.jar
 .endif
 
 .if ${ARCH} == "i386"
@@ -39,8 +38,8 @@ ANT_ARCH=	x86-64
 .endif
 
 post-patch:
-	@${CHMOD} 755 ${WRKSRC}/native/libffi/configure
-	@${CHMOD} 755 ${WRKSRC}/native/libffi/install-sh
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+	    ${WRKSRC}/native/Makefile
 
 post-build-script:
 .if ${PORT_OPTIONS:MDOCS}
@@ -56,7 +55,7 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && \
 	    ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION:L}.0-javadoc.jar \
+	${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION}-javadoc.jar \
 	    ${STAGEDIR}${DOCSDIR}
 .endif
 
diff --git a/devel/jna/distinfo b/devel/jna/distinfo
index f842b1645c35..fd12f1fc089b 100644
--- a/devel/jna/distinfo
+++ b/devel/jna/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jna-4.0.tar.gz) = cedac34ca1a565961ce2d1bca84f7d6afed32980d7f46aee8d4620c2625c2c63
-SIZE (jna-4.0.tar.gz) = 51695145
+SHA256 (jna-4.1.0.tar.gz) = ac3f2767f5c16b3343e50edcd38532e66c7f8b4fe16be410b65b8c47027a11f6
+SIZE (jna-4.1.0.tar.gz) = 52993672
diff --git a/devel/jna/files/patch-native_Makefile b/devel/jna/files/patch-native_Makefile
index 5d7decc8dc27..4ddc15aa30bd 100644
--- a/devel/jna/files/patch-native_Makefile
+++ b/devel/jna/files/patch-native_Makefile
@@ -1,5 +1,5 @@
---- ./native/Makefile.orig	2013-09-16 23:52:29.000000000 -0700
-+++ ./native/Makefile	2013-09-16 23:53:09.000000000 -0700
+--- native/Makefile.orig	2014-03-06 11:06:40.000000000 -0500
++++ native/Makefile	2014-03-12 17:29:37.000000000 -0400
 @@ -36,6 +36,8 @@
  # protection simply by defining HAVE_PROTECTION.  This option has been only
  # been enabled for those platforms on which it has been tested successfully.
@@ -9,12 +9,12 @@
  OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
  	                -e 's/MINGW32.*/win32/g' \
                          -e 's/SunOS.*/solaris/g' \
-@@ -249,7 +251,7 @@
+@@ -245,7 +247,7 @@
  ifneq (,$(findstring bsd,$(OS)))
  ARCH=$(shell uname -m | sed 's/i.86/i386/g')
  PCFLAGS+=-fPIC
 -CINCLUDES+=-I/usr/X11R6/include
-+CINCLUDES+=-I/usr/local/include
++CINCLUDES+=-I%%LOCALBASE%%/include
  LDFLAGS=-o $@ -shared
  CDEFINES+=-DHAVE_PROTECTION -DFFI_MMAP_EXEC_WRIT -DUSE_DEAFULT_LIBNAME_ENCODING
  endif
diff --git a/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java b/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java
deleted file mode 100644
index ceff137a216c..000000000000
--- a/devel/jna/files/patch-src__com__sun__jna__NativeLibrary.java
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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;
diff --git a/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java b/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java
deleted file mode 100644
index f0cd369e0f0d..000000000000
--- a/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/com/sun/jna/NativeLibraryTest.java.orig	2013-07-04 14:42:30.000000000 -0400
-+++ test/com/sun/jna/NativeLibraryTest.java	2014-03-12 14:42:59.000000000 -0400
-@@ -190,7 +190,7 @@
-     	lib1_1.deleteOnExit();
-     	List path = Arrays.asList(new String[] { dir.getAbsolutePath() });
-     	assertEquals("Latest versioned library not found when unversioned requested",
--                     lib1_1.getAbsolutePath(),	
-+                     lib1_1.getCanonicalPath(),
-                      NativeLibrary.matchLibrary(name, path));
-     }
-     
-@@ -205,7 +205,7 @@
-         lib1.deleteOnExit();
-     	List path = Arrays.asList(new String[] { dir.getAbsolutePath() });
-     	assertEquals("Library with similar prefix should be ignored",
--                     lib0.getAbsolutePath(),	
-+                     lib0.getCanonicalPath(),
-                      NativeLibrary.matchLibrary(name, path));
-     }
-