- update to jna-4.1.0

- update homepage
- switch to using GH_*

tested with clojure

java/jna/Makefile

@@ -1,24 +1,19 @@
-# $OpenBSD: Makefile,v 1.13 2014/05/07 15:42:16 kurt Exp $
+# $OpenBSD: Makefile,v 1.14 2015/09/01 19:29:22 jasper Exp $
 
 COMMENT=	Java Native Access (JNA)
 
-V=		3.5.1
-DISTNAME=	jna-$V-a31faf3026
-PKGNAME=	jna-$V
-EXTRACT_SUFX=	.zip
+GH_PROJECT=	jna
+GH_ACCOUNT=	java-native-access
+GH_TAGNAME=	4.1.0
+DISTNAME=	${GH_PROJECT}-${GH_TAGNAME}
 CATEGORIES=	devel
-REVISION=	1
-
 MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>
 
-HOMEPAGE=	https://github.com/twall/jna
+HOMEPAGE=	https://github.com/java-native-access/jna
 
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM=	Yes
 
-# git tag of $V
-MASTER_SITES=	http://distfiles.nl/
-
 MODULES=	java
 MODJAVA_VER=	1.6+
 MODJAVA_BUILD=	ant
@@ -28,16 +23,13 @@ USE_GMAKE=	Yes
 
 BUILD_DEPENDS=	sysutils/ggrep
 
-_BD = build
-.if ${MACHINE_ARCH} != "i386"
-_BD = build-*
-.endif
+GNU_ARCH=	${ARCH:S/amd64/x86-64/}
 
 do-install:
 	${INSTALL_DATA_DIR} ${MODJAVA_JAR_DIR} ${MODJAVA_DOC_DIR}/jna/
-	${INSTALL_DATA} ${WRKSRC}/${_BD}/openbsd-${ARCH}.jar \
+	${INSTALL_DATA} ${WRKSRC}/build/openbsd-${GNU_ARCH}.jar \
 		${MODJAVA_JAR_DIR}/jna-platform.jar
-	${INSTALL_DATA} ${WRKSRC}/${_BD}/jna.jar ${MODJAVA_JAR_DIR}
+	${INSTALL_DATA} ${WRKSRC}/build/jna*.jar ${MODJAVA_JAR_DIR}
 	cp -r ${WRKSRC}/www/javadoc/ ${MODJAVA_DOC_DIR}
 
 do-test:

java/jna/distinfo

@@ -1,2 +1,2 @@
-SHA256 (jna-3.5.1-a31faf3026.zip) = RL0/ty/7pgi14PTgAsoKoX6/ygq2ZcWSeZApEnjYZZc=
-SIZE (jna-3.5.1-a31faf3026.zip) = 46112819
+SHA256 (jna-4.1.0.tar.gz) = DgFKFi+wUlr99oA+hU4zPmSes6mAyGSepB8TnM4E1D8=
+SIZE (jna-4.1.0.tar.gz) = 52993397

java/jna/patches/patch-build_xml

@@ -1,16 +1,16 @@
-$OpenBSD: patch-build_xml,v 1.1 2013/03/08 10:25:34 jasper Exp $
---- build.xml.orig	Tue Feb 12 23:28:31 2013
-+++ build.xml	Tue Feb 12 23:29:10 2013
-@@ -105,7 +105,7 @@
+$OpenBSD: patch-build_xml,v 1.2 2015/09/01 19:29:22 jasper Exp $
+--- build.xml.orig	Thu Mar  6 17:06:40 2014
++++ build.xml	Tue Sep  1 21:13:00 2015
+@@ -128,7 +128,7 @@
    <!-- Miscellaneous -->
    <property name="build.compiler.emacs" value="true"/>
  
 -  <target name="default" depends="test" description="Build and Test."/>
-+  <target name="default" depends="javadoc,jar,contrib-jars" description="Build and Test."/>
++  <target name="default" depends="-enable-native,jar,javadoc" description="Build and Test."/>
  
    <target name="init" depends="-setup"/>
    <target name="compile-test-single" depends="compile-tests"/>
-@@ -716,9 +716,6 @@ osname=macos
+@@ -827,9 +827,6 @@ osname=macosx;processor=x86;processor=x86-64;processor
      <jar jarfile="${build}/jws/jnidispatch.jar">
        <fileset dir="${build.native}" includes="*jnidispatch.*"/>
      </jar>

java/jna/pkg/PLIST

@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2013/03/08 10:25:34 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2015/09/01 19:29:22 jasper Exp $
 share/java/
 share/java/classes/
+share/java/classes/jna-min.jar
 share/java/classes/jna-platform.jar
 share/java/classes/jna.jar
 share/java/doc/