diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-12 19:54:02 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2014-03-12 19:54:02 +0000 |
| commit | 01296a17371180f027a9b581611a733d66224c54 (patch) | |
| tree | 97fdabef0ae66e7057c244bc5259d2c8d248eb2e /devel/jna | |
| parent | a3b11ecea65d8b2957b39600eb8fba3661fe161d (diff) | |
Notes
Diffstat (limited to 'devel/jna')
| -rw-r--r-- | devel/jna/Makefile | 21 | ||||
| -rw-r--r-- | devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java | 20 |
2 files changed, 30 insertions, 11 deletions
diff --git a/devel/jna/Makefile b/devel/jna/Makefile index 37cb6c78a019..f3cf574acb50 100644 --- a/devel/jna/Makefile +++ b/devel/jna/Makefile @@ -9,12 +9,9 @@ MASTER_SITES= GH MAINTAINER= olgeni@FreeBSD.org COMMENT= Java access to native shared libraries -BROKEN= Build fails due to test failures - USES= gmake -USE_GCC= any USE_ANT= yes -USE_JAVA= 1.4+ +USE_JAVA= yes USE_XORG= x11 xt MAKE_ARGS= -DCC=${CC} -DLD=${LD} MAKE_ENV+= ANT_OPTS=-Drelease -DARCH=${ANT_ARCH} @@ -41,8 +38,6 @@ ANT_ARCH= x86 ANT_ARCH= x86-64 .endif -NO_STAGE= yes - post-patch: @${CHMOD} 755 ${WRKSRC}/native/libffi/configure @${CHMOD} 755 ${WRKSRC}/native/libffi/install-sh @@ -53,12 +48,16 @@ post-build-script: .endif do-install: - ${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ANT_ARCH}.jar ${JAVAJARDIR}/jna-platform.jar - ${INSTALL_DATA} ${WRKSRC}/build/jna.jar ${JAVAJARDIR}/jna.jar + ${INSTALL_DATA} ${WRKSRC}/build/freebsd-${ANT_ARCH}.jar \ + ${STAGEDIR}${JAVAJARDIR}/jna-platform.jar + ${INSTALL_DATA} ${WRKSRC}/build/jna.jar \ + ${STAGEDIR}${JAVAJARDIR}/jna.jar .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} javadoc ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION:L}.0-javadoc.jar ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && \ + ${COPYTREE_SHARE} javadoc ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/dist/platform-${PORTVERSION:L}.0-javadoc.jar \ + ${STAGEDIR}${DOCSDIR} .endif .include <bsd.port.mk> diff --git a/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java b/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java new file mode 100644 index 000000000000..4dde53c39762 --- /dev/null +++ b/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java @@ -0,0 +1,20 @@ +--- test/com/sun/jna/NativeLibraryTest.java.orig 2013-07-04 14:42:30.000000000 -0400 ++++ test/com/sun/jna/NativeLibraryTest.java 2014-03-12 14:42:59.000000000 -0400 +@@ -190,7 +190,7 @@ + lib1_1.deleteOnExit(); + List path = Arrays.asList(new String[] { dir.getAbsolutePath() }); + assertEquals("Latest versioned library not found when unversioned requested", +- lib1_1.getAbsolutePath(), ++ lib1_1.getCanonicalPath(), + NativeLibrary.matchLibrary(name, path)); + } + +@@ -205,7 +205,7 @@ + lib1.deleteOnExit(); + List path = Arrays.asList(new String[] { dir.getAbsolutePath() }); + assertEquals("Library with similar prefix should be ignored", +- lib0.getAbsolutePath(), ++ lib0.getCanonicalPath(), + NativeLibrary.matchLibrary(name, path)); + } + |