From owner-svn-ports-all@FreeBSD.ORG Wed Mar 12 19:54:03 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 101D41E5; Wed, 12 Mar 2014 19:54:03 +0000 (UTC) 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 F093C9F3; Wed, 12 Mar 2014 19:54:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2CJs2NB071846; Wed, 12 Mar 2014 19:54:02 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2CJs2iV071844; Wed, 12 Mar 2014 19:54:02 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201403121954.s2CJs2iV071844@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 12 Mar 2014 19:54:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348000 - 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.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Mar 2014 19:54:03 -0000 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 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)); + } +