[Midnightbsd-cvs] mports [19783] trunk/java/berkeley-db/pkg-descr: bdb for java 6.2.31

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Tue Aug 18 19:51:30 EDT 2015


Revision: 19783
          http://svnweb.midnightbsd.org/mports/?rev=19783
Author:   laffer1
Date:     2015-08-18 19:51:29 -0400 (Tue, 18 Aug 2015)
Log Message:
-----------
bdb for java 6.2.31

Modified Paths:
--------------
    trunk/java/berkeley-db/Makefile
    trunk/java/berkeley-db/distinfo
    trunk/java/berkeley-db/files/patch-junit
    trunk/java/berkeley-db/pkg-descr

Property Changed:
----------------
    trunk/java/berkeley-db/files/patch-junit

Modified: trunk/java/berkeley-db/Makefile
===================================================================
--- trunk/java/berkeley-db/Makefile	2015-08-18 23:47:12 UTC (rev 19782)
+++ trunk/java/berkeley-db/Makefile	2015-08-18 23:51:29 UTC (rev 19783)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	je
-PORTVERSION=	3.2.76
-PORTREVISION=	2
+PORTVERSION=	6.2.31
 CATEGORIES=	java databases
 MASTER_SITES=	http://download.oracle.com/berkeley-db/	\
 		http://download-east.oracle.com/berkeley-db/	\
@@ -11,18 +10,15 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Berkeley DB Java Edition
 
-LICENSE=	other
+OPTIONS_DEFINE=	DOCS EXAMPLES TEST
 
-OPTIONS_DEFINE=	TEST
-
 BUILD_DEPENDS=	${JAVALIBDIR}/junit.jar:${PORTSDIR}/java/junit
 
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 USE_ANT=	yes
 MAKE_ENV+=	JAVALIBDIR="${JAVALIBDIR}"
 MAKE_ARGS+=	-cp ${JAVALIBDIR}/junit.jar
-USE_DOS2UNIX=	build.xml
 
 PLIST_FILES=	%%JAVAJARDIR%%/je.jar
 
@@ -29,11 +25,11 @@
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-test:
+regression-test check test: build
 	#
 	# Running the vendor-provided self-tests. This may take a while
 	#
-	if ! (cd ${BUILD_WRKSRC} ; ${MAKE_ENV} ${ANT} ${MAKE_ARGS} ${.TARGET}) ; \
+	if ! (cd ${BUILD_WRKSRC} ; ${MAKE_ENV} ${ANT} ${MAKE_ARGS} test) ; \
 	then	\
 		${ECHO_MSG} Please, review test failures and consider \
 			reporting them via \
@@ -62,19 +58,14 @@
 	#
 .endif
 
-
 post-patch:
 	@${REINPLACE_CMD} "s,/usr/local,${PREFIX}," ${WRKSRC}/build.xml
 
 do-install:
-	@${INSTALL_DATA} ${WRKSRC}/build/lib/je.jar ${JAVAJARDIR}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	@(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \*  ${EXAMPLESDIR})
-.endif
+	${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>

Modified: trunk/java/berkeley-db/distinfo
===================================================================
--- trunk/java/berkeley-db/distinfo	2015-08-18 23:47:12 UTC (rev 19782)
+++ trunk/java/berkeley-db/distinfo	2015-08-18 23:51:29 UTC (rev 19783)
@@ -1,2 +1,2 @@
-SHA256 (je-3.2.76.tar.gz) = 017744ec57580d709c7f8dca985b71f81f5e41615d014ad187368a0a14627b02
-SIZE (je-3.2.76.tar.gz) = 4873715
+SHA256 (je-6.2.31.tar.gz) = d8854f6385e8369232c9805ef94232c8e9c4800ec0c60ff79a6e60d00036b969
+SIZE (je-6.2.31.tar.gz) = 11198631

Modified: trunk/java/berkeley-db/files/patch-junit
===================================================================
--- trunk/java/berkeley-db/files/patch-junit	2015-08-18 23:47:12 UTC (rev 19782)
+++ trunk/java/berkeley-db/files/patch-junit	2015-08-18 23:51:29 UTC (rev 19783)
@@ -1,32 +1,39 @@
---- build.xml	Wed Sep 20 18:10:10 2006
-+++ build.xml	Fri Oct  6 20:12:12 2006
-@@ -80,7 +80,9 @@
+--- 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">
-       <pathelement location="${destdir}"/>
-       <pathelement location="."/>
+       <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>
+ 


Property changes on: trunk/java/berkeley-db/files/patch-junit
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/java/berkeley-db/pkg-descr
===================================================================
--- trunk/java/berkeley-db/pkg-descr	2015-08-18 23:47:12 UTC (rev 19782)
+++ trunk/java/berkeley-db/pkg-descr	2015-08-18 23:51:29 UTC (rev 19783)
@@ -1,8 +1,7 @@
 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/database/berkeley-db/index.html
+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



More information about the Midnightbsd-cvs mailing list