From owner-svn-ports-all@FreeBSD.ORG Tue May 12 19:03:32 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46A4786C; Tue, 12 May 2015 19:03:32 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 347B2188B; Tue, 12 May 2015 19:03:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4CJ3Wek034037; Tue, 12 May 2015 19:03:32 GMT (envelope-from mi@FreeBSD.org) Received: (from mi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4CJ3VEB034033; Tue, 12 May 2015 19:03:31 GMT (envelope-from mi@FreeBSD.org) Message-Id: <201505121903.t4CJ3VEB034033@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mi set sender to mi@FreeBSD.org using -f From: Mikhail Teterin Date: Tue, 12 May 2015 19:03:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386168 - in head/java/berkeley-db: . 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.20 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: Tue, 12 May 2015 19:03:32 -0000 Author: mi Date: Tue May 12 19:03:30 2015 New Revision: 386168 URL: https://svnweb.freebsd.org/changeset/ports/386168 Log: Fix the build in the case of newer JUnit, that, in its turn, uses hamcrest now. Upgrade from 6.1.5 to 6.2.31. Based on: PR: 156251 Submitted by: pi Now that the test-target fully works, add "regression-test" alias to it so it can be used for that purpose. Modified: head/java/berkeley-db/Makefile head/java/berkeley-db/distinfo head/java/berkeley-db/files/patch-junit head/java/berkeley-db/pkg-descr Modified: head/java/berkeley-db/Makefile ============================================================================== --- head/java/berkeley-db/Makefile Tue May 12 18:25:21 2015 (r386167) +++ head/java/berkeley-db/Makefile Tue May 12 19:03:30 2015 (r386168) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= je -PORTVERSION= 6.1.5 +PORTVERSION= 6.2.31 CATEGORIES= java databases MASTER_SITES= http://download.oracle.com/berkeley-db/ \ http://download-east.oracle.com/berkeley-db/ \ @@ -20,15 +20,13 @@ JAVA_VERSION= 1.7+ USE_ANT= yes MAKE_ENV+= JAVALIBDIR="${JAVALIBDIR}" MAKE_ARGS+= -cp ${JAVALIBDIR}/junit.jar -USES= dos2unix -DOS2UNIX_FILES= build.xml PLIST_FILES= %%JAVAJARDIR%%/je.jar PORTDOCS= * PORTEXAMPLES= * -test: +regression-test check test: # # Running the vendor-provided self-tests. This may take a while # Modified: head/java/berkeley-db/distinfo ============================================================================== --- head/java/berkeley-db/distinfo Tue May 12 18:25:21 2015 (r386167) +++ head/java/berkeley-db/distinfo Tue May 12 19:03:30 2015 (r386168) @@ -1,2 +1,2 @@ -SHA256 (je-6.1.5.tar.gz) = 778122759dc79080e599410c3540ce2e64e6bcaf26c9b4944639fdfe66d2cc8a -SIZE (je-6.1.5.tar.gz) = 11171411 +SHA256 (je-6.2.31.tar.gz) = d8854f6385e8369232c9805ef94232c8e9c4800ec0c60ff79a6e60d00036b969 +SIZE (je-6.2.31.tar.gz) = 11198631 Modified: head/java/berkeley-db/files/patch-junit ============================================================================== --- head/java/berkeley-db/files/patch-junit Tue May 12 18:25:21 2015 (r386167) +++ head/java/berkeley-db/files/patch-junit Tue May 12 19:03:30 2015 (r386168) @@ -1,31 +1,39 @@ ---- build.xml Wed Sep 20 18:10:10 2006 -+++ build.xml 2014-09-29 14:22:48.000000000 -0400 -@@ -135,6 +135,8 @@ +--- build.xml 2014-12-17 02:30:51 UTC ++++ build.xml 2015-05-12 12:14:56 -0400 +@@ -132,6 +132,9 @@ + + ++ - -@@ -469,4 +471,5 @@ - + +@@ -872,5 +875,5 @@ + + +- ++ + + +@@ -917,4 +920,5 @@ + + - -@@ -1224,5 +1227,4 @@ + +@@ -2127,5 +2131,4 @@ - -@@ -1233,7 +1235,4 @@ - +@@ -2137,7 +2140,4 @@ -- + - - - +- + Modified: head/java/berkeley-db/pkg-descr ============================================================================== --- head/java/berkeley-db/pkg-descr Tue May 12 18:25:21 2015 (r386167) +++ head/java/berkeley-db/pkg-descr Tue May 12 19:03:30 2015 (r386168) @@ -1,6 +1,5 @@ This is a pure-Java implementation of Berkeley DB by SleepyCat (now -Oracle). Java-1.5 is required for building, although the result should -be usable with 1.4 too. From the +Oracle). Java-1.7 is required for building. From the WWW: http://www.oracle.com/technetwork/database/berkeleydb/