On Mon, Sep 05, 2011 at 02:18:08PM -0500, Amit Kulkarni wrote:
> >> > So, is junit4 going to be a separate port or what's going on?
> >>
> >> I was the one holding out for junit3 and 4 ports, but on thinking
> >> about it, anybody that's truly dependant on 3.8 will likely have it
> >> and the other jars that depend on 3.8 cached in their project source/lib
> >> directory anyway, so maybe it's OK to just have junit4. At he least it
> >> might encourage somebody to upgrade their test suite :-)
> > In that case, would my diff be the way to move forward (and adjust
> > jeoip/postgresql-jdbc where needed (build-wise))?
Yes. Say no to version numbers ;-)
> I was trying to test your junit4 diff with latest postgresql-jdbc
> yesterday but ran into problems checking out postgresql-jdbc...
> Specifically, I couldn't get Class.forName("org.postgresql.Driver"); I
> will try it later today...
See diff to postgresql-jdbc below (please note that you also need
the recently committed change in pre-regress, which removed the
createlang bits).
> what do you guys think of having RUN_DEPENDS on databases-postgresql
> for the databases/postgresql-jdbc port?
No. The java client doesn't need postgresql (neither the server nor
the client).
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 5 Sep 2011 18:41:29 -0000 1.13
+++ Makefile 5 Sep 2011 19:37:12 -0000
@@ -3,12 +3,10 @@
COMMENT-main= JDBC Driver for PostgreSQL
COMMENT-docs= API docs for PostgreSQL JDBC Driver
-V= 8.2-505
+V= 9.0-801
DISTNAME= postgresql-jdbc-$V
PKGNAME-main= postgresql-jdbc-${V:S/-/./}
-REVISION-main= 3
PKGNAME-docs= postgresql-jdbc-docs-${V:S/-/./}
-REVISION-docs= 0
PKG_ARCH-docs= *
CATEGORIES= databases
@@ -34,10 +32,10 @@ MODJAVA_BUILD= ant
MODJAVA_BUILD_TARGET= all publicapi
REGRESS_DEPENDS= databases/postgresql \
- java/junit=3.8.2
+ java/junit
RUN_DEPENDS-docs=
-JUNIT_JAR= ${LOCALBASE}/share/java/classes/junit-3.8.2/junit.jar
+JUNIT_JAR= ${LOCALBASE}/share/java/classes/junit/junit.jar
WRKDIST= ${WRKDIR}/${DISTNAME}.src
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/postgresql-jdbc/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 30 May 2007 23:29:42 -0000 1.2
+++ distinfo 5 Sep 2011 19:37:12 -0000
@@ -1,5 +1,5 @@
-MD5 (postgresql-jdbc-8.2-505.src.tar.gz) = LcXzsiBPG0c3LyHan4GSCg==
-RMD160 (postgresql-jdbc-8.2-505.src.tar.gz) = Ktl3Ac1IHXbG7EM5UkA3uZc4o1E=
-SHA1 (postgresql-jdbc-8.2-505.src.tar.gz) = CCxRNf+YtGzSsInKDwT7ZqTun/s=
-SHA256 (postgresql-jdbc-8.2-505.src.tar.gz) =
dr8qperQ0EPYHfHDHbn2VObrnYD6noqX+3QylQqBl7Y=
-SIZE (postgresql-jdbc-8.2-505.src.tar.gz) = 498495
+MD5 (postgresql-jdbc-9.0-801.src.tar.gz) = MhiBCSUfjaJ2bad7F0IyvA==
+RMD160 (postgresql-jdbc-9.0-801.src.tar.gz) = RSP9kbtuzbsv+NHwrrpGOlA2nDA=
+SHA1 (postgresql-jdbc-9.0-801.src.tar.gz) = yIayacPkIYfU9GTh8/VuqNZZVGU=
+SHA256 (postgresql-jdbc-9.0-801.src.tar.gz) =
zHljFEXZd4IvZnDMQFWNw1trdK5izHAUvF6CbXEwbGM=
+SIZE (postgresql-jdbc-9.0-801.src.tar.gz) = 608457
Index: patches/patch-build_xml
===================================================================
RCS file: /cvs/ports/databases/postgresql-jdbc/patches/patch-build_xml,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_xml
--- patches/patch-build_xml 11 Apr 2007 12:54:25 -0000 1.1.1.1
+++ patches/patch-build_xml 5 Sep 2011 19:37:12 -0000
@@ -1,13 +1,13 @@
$OpenBSD: patch-build_xml,v 1.1.1.1 2007/04/11 12:54:25 kili Exp $
---- build.xml.orig Wed Nov 29 05:00:15 2006
-+++ build.xml Mon Jan 15 22:29:26 2007
-@@ -406,7 +406,7 @@
- <fail message="Your version of ant doesn't seem to have the junit task
available. I looked for
org.apache.tools.ant.taskdefs.optional.junit.JUnitTask, but I couldn't find
it." unless="junit.task" />
-
- <delete file="postgresql-jdbc-tests.debug.txt"/>
+--- build.xml.orig Wed Jul 1 07:00:39 2009
++++ build.xml Mon Sep 5 20:28:14 2011
+@@ -362,7 +362,7 @@
+ <property name="testResultsDir" value="${builddir}/testresults" />
+ <mkdir dir="${testResultsDir}" />
+
- <junit>
+ <junit haltonerror="on">
<formatter type="brief" usefile="false"/>
+ <formatter type="xml" usefile="true" />
- <sysproperty key="server" value="${server}" />
