diff options
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/jna/Makefile | 10 | ||||
| -rw-r--r-- | devel/jna/files/patch-build.xml | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/jna/Makefile b/devel/jna/Makefile index ff70675002ab..00cf14449a35 100644 --- a/devel/jna/Makefile +++ b/devel/jna/Makefile @@ -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:L}.0-javadoc.jar .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} diff --git a/devel/jna/files/patch-build.xml b/devel/jna/files/patch-build.xml index 298cdf2a390e..495d7e94d25c 100644 --- a/devel/jna/files/patch-build.xml +++ b/devel/jna/files/patch-build.xml @@ -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}"/> |