1: Upgrade to 4.2.2.

2: pet portlint.
3: s/LICENSE_FOLE/LICENSE_FILE/

4 files changed, 17 insertions, 26 deletions

diff --git a/devel/jna/Makefile b/devel/jna/Makefile
index cfb6982..f0899cb 100644
--- a/devel/jna/Makefile
+++ b/devel/jna/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jna
-PORTVERSION=	4.1.0
+PORTVERSION=	4.2.2
 CATEGORIES=	devel java
 
 MAINTAINER=	ports@FreeBSD.org
@@ -9,18 +9,18 @@ COMMENT=	Java access to native shared libraries
 
 LICENSE=	LGPL21+ APACHE20
 LICENSE_COMB=	dual
-LICENSE_FOLE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_FILE_LGPL21+ =	${WRKSRC}/LGPL2.1
 LICENSE_FILE_APACHE20=	${WRKSRC}/ASL2.0
 
 BROKEN_FreeBSD_9_i386=	does not build
 
-USES=		gmake
+USES=		autoreconf:build gmake libtool
 USE_ANT=	yes
 USE_JAVA=	yes
 USE_XORG=	x11 xt
 MAKE_ARGS=	-DCC="${CC}" -DLD="${LD}"
-MAKE_ENV=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
+MAKE_ENV=	ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	twall
diff --git a/devel/jna/distinfo b/devel/jna/distinfo
index cec5465..e9d4e86 100644
--- a/devel/jna/distinfo
+++ b/devel/jna/distinfo
@@ -1,2 +1,3 @@
-SHA256 (twall-jna-4.1.0_GH0.tar.gz) = 0e014a162fb0525afdf6803e854e333e649eb3a980c8649ea41f139cce04d43f
-SIZE (twall-jna-4.1.0_GH0.tar.gz) = 52993397
+TIMESTAMP = 1482632331
+SHA256 (twall-jna-4.2.2_GH0.tar.gz) = 46330123be97fa5c11b1747c74470a39f2b1a3396d66fd6ead4d034660eb094a
+SIZE (twall-jna-4.2.2_GH0.tar.gz) = 58638853
diff --git a/devel/jna/files/patch-build.xml b/devel/jna/files/patch-build.xml
index b6aedef..26b41ff 100644
--- a/devel/jna/files/patch-build.xml
+++ b/devel/jna/files/patch-build.xml
@@ -1,29 +1,19 @@
---- ./build.xml.orig
-+++ ./build.xml
+--- build.xml.orig	2016-03-16 14:37:28 UTC
++++ build.xml
 @@ -99,7 +99,7 @@
    <condition property="test.compatibility" value="1.5" else="${compatibility}">
      <equals arg1="${compatibility}" arg2="1.4"/>
    </condition>
--  <condition property="tests.exclude-patterns" value="**/VarArgsTest.java,**/AnnotatedLibraryTest.java,**/WebStartTest.java,**/PointerBufferTest.java,**/HeadlessLoadLibraryTest.java,**/StructureBufferFieldTest.java,**/PerformanceTest.java,**/*BufferArgumentsMarshalTest.java" else="**/wince/*.java">
-+  <condition property="tests.exclude-patterns" value="**/VarArgsTest.java,**/AnnotatedLibraryTest.java,**/WebStartTest.java,**/PointerBufferTest.java,**/HeadlessLoadLibraryTest.java,**/StructureBufferFieldTest.java,**/PerformanceTest.java,**/*BufferArgumentsMarshalTest.java" else="**/wince/*.java **/LibraryLoadTest.java **/WebStartTest.java">
+-  <condition property="tests.exclude-patterns" value="**/VarArgsTest.java,**/AnnotatedLibraryTest.java,**/WebStartTest.java,**/PointerBufferTest.java,**/HeadlessLoadLibraryTest.java,**/StructureBufferFieldTest.java,**/PerformanceTest.java,**/*BufferArgumentsMarshalTest.java" else="**/wince/*.java,**/WebStartTest.java">
++  <condition property="tests.exclude-patterns" value="**/VarArgsTest.java,**/AnnotatedLibraryTest.java,**/WebStartTest.java,**/PointerBufferTest.java,**/HeadlessLoadLibraryTest.java,**/StructureBufferFieldTest.java,**/PerformanceTest.java,**/*BufferArgumentsMarshalTest.java" else="**/wince/*.java,**/WebStartTest.java,**/LibraryLoadTest.java">
      <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
    </condition>
    <property name="dist-jar" value="${dist}/${jar}"/>
-@@ -805,9 +805,6 @@
-     <jar jarfile="${build}/jws/jnidispatch.jar">
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
-     </jar>
--    <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
--      <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar,clover.jar"/>
--    </signjar>
-   </target>
- 
-   <target name="android-test-setup" depends="compile-tests"
-@@ -965,7 +962,6 @@
+@@ -1084,7 +1084,6 @@ osname=macosx;processor=x86;processor=x8
        <doctitle>JNA API Documentation</doctitle>
        <header>${header}</header>
        <bottom>${footer}</bottom>
--      <link href="http://download.oracle.com/javase/1.4.2/docs/api/"/>
+-      <link href="http://download.oracle.com/javase/${compatibility}/docs/api/"/>
  
        <packageset dir="${src}" defaultexcludes="yes">
          <patternset>
diff --git a/devel/jna/files/patch-native_Makefile b/devel/jna/files/patch-native_Makefile
index 4ddc15a..217567a 100644
--- a/devel/jna/files/patch-native_Makefile
+++ b/devel/jna/files/patch-native_Makefile
@@ -1,6 +1,6 @@
---- 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 @@
+--- native/Makefile.orig	2016-03-16 14:37:28 UTC
++++ native/Makefile
+@@ -39,6 +39,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,7 +9,7 @@
  OS=$(shell uname | sed -e 's/CYGWIN.*/win32/g' \
  	                -e 's/MINGW32.*/win32/g' \
                          -e 's/SunOS.*/solaris/g' \
-@@ -245,7 +247,7 @@
+@@ -270,7 +272,7 @@ endif
  ifneq (,$(findstring bsd,$(OS)))
  ARCH=$(shell uname -m | sed 's/i.86/i386/g')
  PCFLAGS+=-fPIC