Index: head/java/berkeley-db/Makefile
===================================================================
--- head/java/berkeley-db/Makefile	(revision 386167)
+++ head/java/berkeley-db/Makefile	(revision 386168)
@@ -1,74 +1,72 @@
 # Created by: Mikhail Teterin
 # $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/	\
 		http://download-west.oracle.com/berkeley-db/
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Berkeley DB Java Edition
 
 OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
 USE_JAVA=	yes
 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
 	#
 	if ! (cd ${BUILD_WRKSRC} ; ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${.TARGET}) ; \
 	then	\
 		${ECHO_MSG} Please, review test failures and consider \
 			reporting them via \
 			http://forums.oracle.com/forums/forum.jspa?forumID=273 ; \
 		${FALSE} ; \
 	fi
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTEST}
 post-build:	test
 	#
 	# Please, review the reported failures (if any) and consider
 	# reporting them to the developers via:
 	# 	http://forums.oracle.com/forums/forum.jspa?forumID=273
 	# You can re-run the tests without rebuilding the port by
 	# simply doing `make test'
 	#
 .else
 post-build:
 	#
 	# Doing `make test' now might be useful (if time-consuming).
 	# Please, review the reported failures (if any) and consider
 	# reporting them via
 	# 	http://forums.oracle.com/forums/forum.jspa?forumID=273
 	#
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} "s,/usr/local,${PREFIX}," ${WRKSRC}/build.xml
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${STAGEDIR}${JAVAJARDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
Index: head/java/berkeley-db/distinfo
===================================================================
--- head/java/berkeley-db/distinfo	(revision 386167)
+++ head/java/berkeley-db/distinfo	(revision 386168)
@@ -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
Index: head/java/berkeley-db/files/patch-junit
===================================================================
--- head/java/berkeley-db/files/patch-junit	(revision 386167)
+++ head/java/berkeley-db/files/patch-junit	(revision 386168)
@@ -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 @@
      </path>
  
 +    <property environment="env"/>
      <path id="unittest.classpath">
        <path refid="class.path"/>
 +      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
++      <pathelement location="${env.JAVALIBDIR}/hamcrest.jar"/>
        <pathelement location="${unittest.destdir}"/>
-     </path>
-@@ -469,4 +471,5 @@
-           <property name="destdir" value="${unittest.testevolvedir}"/>
+       <pathelement path="${junit.jarfile}"/>
+@@ -872,5 +875,5 @@
+     </target>
+ 
+-    <target name="compile-unittest" depends="compile-src, get-junit-jar">
++    <target name="compile-unittest" depends="compile-src">
+       <ant antfile="ant/compile.xml" dir="." inheritall="false">
+         <property name="srcdir" value="${unittest.srcdir}"/>
+@@ -917,4 +920,5 @@
+           <property name="destdir" value="${unittest.testserialdir}"/>
            <reference refid="class.path" torefid="compile.classpath"/>
 +          <reference refid="unittest.classpath" torefid="compile.classpath"/>
        </ant>
-     </target>
-@@ -1224,5 +1227,4 @@
+ 
+@@ -2127,5 +2131,4 @@
        <mkdir dir="${installdir}"/>
        <mkdir dir="${installdir}/docs"/>
 -      <mkdir dir="${installdir}/bin"/>
        <mkdir dir="${installdir}/lib"/>
        <copy todir="${installdir}/docs">
-@@ -1233,7 +1235,4 @@
-       <copy todir="${installdir}/lib">
+@@ -2137,7 +2140,4 @@
  	 <fileset dir="lib"/>
--      </copy>
+       </copy>
 -      <copy todir="${installdir}/bin">
 -	 <fileset dir="bin"/>
-       </copy>
+-      </copy>
      </target>
+ 
Index: head/java/berkeley-db/pkg-descr
===================================================================
--- head/java/berkeley-db/pkg-descr	(revision 386167)
+++ head/java/berkeley-db/pkg-descr	(revision 386168)
@@ -1,25 +1,24 @@
 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/
 
 "Berkeley DB JE was designed from the ground up in Java. It takes full
  advantage of the Java environment. The Berkeley DB JE API provides a
  Java Collections-style interface, as well as a programmatic interface
  similar to the Berkeley DB API.
 
  Berkeley DB JE is different from all other Java databases available
  today. Berkeley DB JE is not a relational engine built in Java. It
  is a Berkeley DB-style embedded store, with an interface designed
  for programmers, not DBAs. Berkeley DB JE's architecture employs a
  log-based, no-overwrite storage system, enabling high concurrency and
  speed while providing ACID transactions and record-level locking.
  Berkeley DB JE efficiently caches most commonly used data in memory,
  without exceeding application-specified limits. In this way Berkeley
  DB JE works with an application to use available JVM resources while
  providing access to very large data sets.
 
  The Berkeley DB JE architecture provides an underlying storage layer
  for any Java application requiring high performance, transactional
  integrity and recoverability."