Attachment #156251 for bug #199869

Lines 2-8 Link Here

(-)/usr/home/pi/myp/java/berkeley-db/Makefile (-1 / +1 lines)
2	# $FreeBSD: head/java/berkeley-db/Makefile 369870 2014-10-03 07:22:52Z ale $	2	# $FreeBSD: head/java/berkeley-db/Makefile 369870 2014-10-03 07:22:52Z ale $
3		3
4	PORTNAME= je	4	PORTNAME= je
5	PORTVERSION= 6.1.5	5	PORTVERSION= 6.2.31
6	CATEGORIES= java databases	6	CATEGORIES= java databases
7	MASTER_SITES= http://download.oracle.com/berkeley-db/ \	7	MASTER_SITES= http://download.oracle.com/berkeley-db/ \
8	http://download-east.oracle.com/berkeley-db/ \	8	http://download-east.oracle.com/berkeley-db/ \

Lines 1-2 Link Here

(-)/usr/home/pi/myp/java/berkeley-db/distinfo (-2 / +2 lines)
1	SHA256 (je-6.1.5.tar.gz) = 778122759dc79080e599410c3540ce2e64e6bcaf26c9b4944639fdfe66d2cc8a	1	SHA256 (je-6.2.31.tar.gz) = d8854f6385e8369232c9805ef94232c8e9c4800ec0c60ff79a6e60d00036b969
2	SIZE (je-6.1.5.tar.gz) = 11171411	2	SIZE (je-6.2.31.tar.gz) = 11198631




--- build.xml.orig	2015-05-02 19:11:37 UTC
+++ build.xml
@@ -134,8 +134,11 @@
       <pathelement location="${android.libdir}"/>
     </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>
 
@@ -468,6 +471,7 @@
             <property name="jdk.boot.class.path"
                       value="${jdk.boot.class.path}"/>
         </ant>
+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
     </target>
 
     <!-- for jar packaging -->
@@ -2131,7 +2135,6 @@ ${testcase}"/>
              value="${installdestdir}/JE.${release.major}.${release.minor}"/>
       <mkdir dir="${installdir}"/>
       <mkdir dir="${installdir}/docs"/>
-      <mkdir dir="${installdir}/bin"/>
       <mkdir dir="${installdir}/lib"/>
       <copy todir="${installdir}/docs">
          <fileset dir="docs">
@@ -2141,9 +2144,6 @@ ${testcase}"/>
       <copy todir="${installdir}/lib">
 	 <fileset dir="lib"/>
       </copy>
-      <copy todir="${installdir}/bin">
-	 <fileset dir="bin"/>
-      </copy>
     </target>
 
     <!-- ============================================================ -->




--- build.xml	Wed Sep 20 18:10:10 2006
+++ build.xml	2014-09-29 14:22:48.000000000 -0400
@@ -135,6 +135,8 @@
     </path>
 
+    <property environment="env"/>
     <path id="unittest.classpath">
       <path refid="class.path"/>
+      <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
       <pathelement location="${unittest.destdir}"/>
     </path>
@@ -469,4 +471,5 @@
           <property name="destdir" value="${unittest.testevolvedir}"/>
           <reference refid="class.path" torefid="compile.classpath"/>
+          <reference refid="unittest.classpath" torefid="compile.classpath"/>
       </ant>
     </target>
@@ -1224,5 +1227,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">
 	 <fileset dir="lib"/>
-      </copy>
-      <copy todir="${installdir}/bin">
-	 <fileset dir="bin"/>
       </copy>
     </target>

Lines 1-6 Link Here

(-)/usr/home/pi/myp/java/berkeley-db/pkg-descr (-2 / +1 lines)
1	This is a pure-Java implementation of Berkeley DB by SleepyCat (now	1	This is a pure-Java implementation of Berkeley DB by SleepyCat (now
2	Oracle). Java-1.5 is required for building, although the result should	2	Oracle). Java-1.7 is required for building. From the
3	be usable with 1.4 too. From the
4		3
5	WWW: http://www.oracle.com/technetwork/database/berkeleydb/	4	WWW: http://www.oracle.com/technetwork/database/berkeleydb/
6		5

Return to bug 199869

Line 0 Link Here

(-)/usr/home/pi/myp/java/berkeley-db/files/patch-build.xml (+40 lines)
	1	--- build.xml.orig 2015-05-02 19:11:37 UTC
	2	+++ build.xml
	3	@@ -134,8 +134,11 @@
	4	<pathelement location="${android.libdir}"/>
	5	</path>
	6
	7	+ <property environment="env"/>
	8	<path id="unittest.classpath">
	9	<path refid="class.path"/>
	10	+ <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
	11	+ <pathelement location="${env.JAVALIBDIR}/hamcrest.jar"/>
	12	<pathelement location="${unittest.destdir}"/>
	13	</path>
	14
	15	@@ -468,6 +471,7 @@
	16	<property name="jdk.boot.class.path"
	17	value="${jdk.boot.class.path}"/>
	18	</ant>
	19	+ <reference refid="unittest.classpath" torefid="compile.classpath"/>
	20	</target>
	21
	22	<!-- for jar packaging -->
	23	@@ -2131,7 +2135,6 @@ ${testcase}"/>
	24	value="${installdestdir}/JE.${release.major}.${release.minor}"/>
	25	<mkdir dir="${installdir}"/>
	26	<mkdir dir="${installdir}/docs"/>
	27	- <mkdir dir="${installdir}/bin"/>
	28	<mkdir dir="${installdir}/lib"/>
	29	<copy todir="${installdir}/docs">
	30	<fileset dir="docs">
	31	@@ -2141,9 +2144,6 @@ ${testcase}"/>
	32	<copy todir="${installdir}/lib">
	33	<fileset dir="lib"/>
	34	</copy>
	35	- <copy todir="${installdir}/bin">
	36	- <fileset dir="bin"/>
	37	- </copy>
	38	</target>
	39
	40	<!-- ============================================================ -->

Lines 1-31 Link Here

(-)/usr/home/pi/myp/java/berkeley-db/files/patch-junit (-31 lines)
1	--- build.xml Wed Sep 20 18:10:10 2006
2	+++ build.xml 2014-09-29 14:22:48.000000000 -0400
3	@@ -135,6 +135,8 @@
4	</path>
5
6	+ <property environment="env"/>
7	<path id="unittest.classpath">
8	<path refid="class.path"/>
9	+ <pathelement location="${env.JAVALIBDIR}/junit.jar"/>
10	<pathelement location="${unittest.destdir}"/>
11	</path>
12	@@ -469,4 +471,5 @@
13	<property name="destdir" value="${unittest.testevolvedir}"/>
14	<reference refid="class.path" torefid="compile.classpath"/>
15	+ <reference refid="unittest.classpath" torefid="compile.classpath"/>
16	</ant>
17	</target>
18	@@ -1224,5 +1227,4 @@
19	<mkdir dir="${installdir}"/>
20	<mkdir dir="${installdir}/docs"/>
21	- <mkdir dir="${installdir}/bin"/>
22	<mkdir dir="${installdir}/lib"/>
23	<copy todir="${installdir}/docs">
24	@@ -1233,7 +1235,4 @@
25	<copy todir="${installdir}/lib">
26	<fileset dir="lib"/>
27	- </copy>
28	- <copy todir="${installdir}/bin">
29	- <fileset dir="bin"/>
30	</copy>
31	</target>