Date: Wed, 12 Mar 2014 19:54:02 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348000 - in head/devel/jna: . files Message-ID: <201403121954.s2CJs2iV071844@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Mar 12 19:54:02 2014 New Revision: 348000 URL: http://svnweb.freebsd.org/changeset/ports/348000 QAT: https://qat.redports.org/buildarchive/r348000/ Log: - Work around unit test failures with java/openjdk6 and unbreak the port. createTempFile() creates a file like "/tmp//foo" but matchLibrary() returns its real path, e. g., "/tmp/foo". java/openjdk7 does not have the problem. - Remove redundant USE_GCC and support staging. Added: head/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java (contents, props changed) Modified: head/devel/jna/Makefile Modified: head/devel/jna/Makefile ============================================================================== --- head/devel/jna/Makefile Wed Mar 12 19:49:57 2014 (r347999) +++ head/devel/jna/Makefile Wed Mar 12 19:54:02 2014 (r348000) @@ -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> Added: head/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/jna/files/patch-test__com__sun__jna__NativeLibraryTest.java Wed Mar 12 19:54:02 2014 (r348000) @@ -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)); + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403121954.s2CJs2iV071844>