svn commit: r328314 - in head/devel/jna: . files

[Jimmy Olgeni]

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}"/>