From owner-svn-ports-all@FreeBSD.ORG  Wed Sep 25 20:50:01 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 BDF35892;
 Wed, 25 Sep 2013 20:50:01 +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 90ED62305;
 Wed, 25 Sep 2013 20:50:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8PKo1tl024999;
 Wed, 25 Sep 2013 20:50:01 GMT (envelope-from olgeni@svn.freebsd.org)
Received: (from olgeni@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8PKo10g024997;
 Wed, 25 Sep 2013 20:50:01 GMT (envelope-from olgeni@svn.freebsd.org)
Message-Id: <201309252050.r8PKo10g024997@svn.freebsd.org>
From: Jimmy Olgeni <olgeni@FreeBSD.org>
Date: Wed, 25 Sep 2013 20:50:01 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r328314 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Sep 2013 20:50:01 -0000

Author: olgeni
Date: Wed Sep 25 20:50:00 2013
New Revision: 328314
URL: http://svnweb.freebsd.org/changeset/ports/328314

Log:
  - Do not change ARCH
  - Do not mute install commands
  - Disable a test that tries to access the builder's home

Modified:
  head/devel/jna/Makefile
  head/devel/jna/files/patch-build.xml

Modified: head/devel/jna/Makefile
==============================================================================
--- head/devel/jna/Makefile	Wed Sep 25 20:19:42 2013	(r328313)
+++ head/devel/jna/Makefile	Wed Sep 25 20:50:00 2013	(r328314)
@@ -14,7 +14,7 @@ USE_ANT=	yes
 USE_JAVA=	1.4+
 USE_XORG=	x11 xt
 MAKE_ARGS=	-DCC=${CC} -DLD=${LD}
-MAKE_ENV+=      ANT_OPTS=-Drelease
+MAKE_ENV+=      ANT_OPTS=-Drelease -DARCH=${ANT_ARCH}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	twall
@@ -31,9 +31,9 @@ PORTDOCS=	javadoc platform-${PORTVERSION
 .endif
 
 .if ${ARCH} == "i386"
-ARCH=	x86
+ANT_ARCH=	x86
 .elif ${ARCH} == "amd64"
-ARCH=	x86-64
+ANT_ARCH=	x86-64
 .endif
 
 NO_STAGE=	yes
@@ -48,8 +48,8 @@ post-build-script:
 .endif
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ARCH}.jar ${JAVAJARDIR}/jna-platform.jar
-	@${INSTALL_DATA} ${WRKSRC}/build/jna.jar ${JAVAJARDIR}/jna.jar
+	${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ANT_ARCH}.jar ${JAVAJARDIR}/jna-platform.jar
+	${INSTALL_DATA} ${WRKSRC}/build/jna.jar ${JAVAJARDIR}/jna.jar
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} javadoc ${DOCSDIR}

Modified: head/devel/jna/files/patch-build.xml
==============================================================================
--- head/devel/jna/files/patch-build.xml	Wed Sep 25 20:19:42 2013	(r328313)
+++ head/devel/jna/files/patch-build.xml	Wed Sep 25 20:50:00 2013	(r328314)
@@ -8,7 +8,7 @@ $FreeBSD$
      <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">
++  <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">
      <equals arg1="${os.prefix}" arg2="w32ce-arm"/>
    </condition>
    <property name="dist-jar" value="${dist}/${jar}"/>