FreeBSD Bugzilla – Attachment 156251 Details for
Bug 199869
[patch update] java/berkeley-db fix build with updated junit 4.12
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch which also updates to 6.2.31
berkeley-db.diff (text/plain), 4.50 KB, created by
Kurt Jaeger
on 2015-05-02 20:16:11 UTC
(
hide
)
Description:
patch which also updates to 6.2.31
Filename:
MIME Type:
Creator:
Kurt Jaeger
Created:
2015-05-02 20:16:11 UTC
Size:
4.50 KB
patch
obsolete
>diff -r -u -N java/berkeley-db/Makefile /usr/home/pi/myp/java/berkeley-db/Makefile >--- java/berkeley-db/Makefile 2014-10-03 21:25:06.000000000 +0200 >+++ /usr/home/pi/myp/java/berkeley-db/Makefile 2015-05-02 21:29:43.000000000 +0200 >@@ -2,7 +2,7 @@ > # $FreeBSD: head/java/berkeley-db/Makefile 369870 2014-10-03 07:22:52Z ale $ > > 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/ \ >diff -r -u -N java/berkeley-db/distinfo /usr/home/pi/myp/java/berkeley-db/distinfo >--- java/berkeley-db/distinfo 2014-09-30 21:26:27.000000000 +0200 >+++ /usr/home/pi/myp/java/berkeley-db/distinfo 2015-05-02 21:30:36.000000000 +0200 >@@ -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 >diff -r -u -N java/berkeley-db/files/patch-build.xml /usr/home/pi/myp/java/berkeley-db/files/patch-build.xml >--- java/berkeley-db/files/patch-build.xml 1970-01-01 01:00:00.000000000 +0100 >+++ /usr/home/pi/myp/java/berkeley-db/files/patch-build.xml 2015-05-02 21:12:02.000000000 +0200 >@@ -0,0 +1,40 @@ >+--- 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> >+ >+ <!-- ============================================================ --> >diff -r -u -N java/berkeley-db/files/patch-junit /usr/home/pi/myp/java/berkeley-db/files/patch-junit >--- java/berkeley-db/files/patch-junit 2014-09-30 21:26:27.000000000 +0200 >+++ /usr/home/pi/myp/java/berkeley-db/files/patch-junit 1970-01-01 01:00:00.000000000 +0100 >@@ -1,31 +0,0 @@ >---- 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> >diff -r -u -N java/berkeley-db/pkg-descr /usr/home/pi/myp/java/berkeley-db/pkg-descr >--- java/berkeley-db/pkg-descr 2014-09-30 21:26:27.000000000 +0200 >+++ /usr/home/pi/myp/java/berkeley-db/pkg-descr 2015-05-02 21:43:42.000000000 +0200 >@@ -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/ >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 199869
:
156249
| 156251