Re: UPDATE: java/junit 3.8.2 == 4.8.2 (plus databases/postgresql-jdbc)

2011-09-06 Thread Amit Kulkarni 
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).


Everything just works. this can go in today! I will rm -rf postgresql-jdbc 
in github/openbsd-wip

thanks

 
  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 -   1.13
 +++ Makefile  5 Sep 2011 19:37:12 -
 @@ -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 -  1.2
 +++ distinfo  5 Sep 2011 19:37:12 -
 @@ -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 -  1.1.1.1
 +++ patches/patch-build_xml   5 Sep 2011 19:37:12 -
 @@ -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.xmlMon 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.xmlMon 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} /

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Jasper Lievisse Adriaanse 
On Fri, Sep 02, 2011 at 12:51:47PM -0500, Amit Kulkarni wrote:
  Hi Kili@ !
  can you please test with this diff?
 
  https://github.com/jasperla/openbsd-wip/commit/371f4c352abd96a2aef99bcf5beffbb9575cf91d
 
  I can add the latest junit 4.9 and update postgresql-jdbc  geo/jeoip
  to github if somebody is willing to test them out.
 
  thanks
 
  I hadn't noticed you were already working on a junit update. But here's my 
  diff:
 
  I'ld like to move the java ports to a non-version jar install. If they 
  install
  multiple jars, put them into ${MOJAVA_JAR_DIR}/project_name/ (without
  version). That way you prevent needing to touch other ports just because you
  updated one.
 
 
 I was planning to do it today.
 
 Your and kurt@ design of MODJAVA et al. is simply superb. It allows
 much flexibility in choosing versions.
 
 thanks

So, is junit4 going to be a separate port or what's going on? 

-- 
Cheers,
Jasper

Capable, generous men do not create victims, they nurture them.

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Ian Darwin 
   I'ld like to move the java ports to a non-version jar install. If they 
   install
   multiple jars, put them into ${MOJAVA_JAR_DIR}/project_name/ (without
   version). That way you prevent needing to touch other ports just because 
   you
   updated one.
  
  
  I was planning to do it today.
  
  Your and kurt@ design of MODJAVA et al. is simply superb. It allows
  much flexibility in choosing versions.

I agree with that sentiment.

 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 :-)

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Jasper Lievisse Adriaanse 
On Mon, Sep 05, 2011 at 09:24:38AM -0400, Ian Darwin wrote:
I'ld like to move the java ports to a non-version jar install. If they 
install
multiple jars, put them into ${MOJAVA_JAR_DIR}/project_name/ (without
version). That way you prevent needing to touch other ports just 
because you
updated one.
   
   
   I was planning to do it today.
   
   Your and kurt@ design of MODJAVA et al. is simply superb. It allows
   much flexibility in choosing versions.
 
 I agree with that sentiment.
Thanks :)
 
  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))?

-- 
Cheers,
Jasper

Capable, generous men do not create victims, they nurture them.

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Amit Kulkarni 
   Your and kurt@ design of MODJAVA et al. is simply superb. It allows
   much flexibility in choosing versions.

 I agree with that sentiment.
 Thanks :)

  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))?


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...

what do you guys think of having RUN_DEPENDS on databases-postgresql
for the databases/postgresql-jdbc port?

and can somebody check out geo/jeoip with latest junit and latest
postgresql-jdbc?

thanks!

Re: UPDATE: java/junit 3.8.2 == 4.8.2 (plus databases/postgresql-jdbc)

2011-09-05 Thread Matthias Kilian 
On Mon, Sep 05, 2011 at 09:45:22PM +0200, Matthias Kilian wrote:
 See diff to postgresql-jdbc below

and now with updated pkg/PLIST_docs


Index: Makefile
===
RCS file: /cvs/ports/databases/postgresql-jdbc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile5 Sep 2011 18:41:29 -   1.13
+++ Makefile5 Sep 2011 19:58:54 -
@@ -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
--- distinfo30 May 2007 23:29:42 -  1.2
+++ distinfo5 Sep 2011 19:58:54 -
@@ -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 -  1.1.1.1
+++ patches/patch-build_xml 5 Sep 2011 19:58:54 -
@@ -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} /
Index: pkg/PLIST-docs
===
RCS file: /cvs/ports/databases/postgresql-jdbc/pkg/PLIST-docs,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST-docs
--- pkg/PLIST-docs  11 Apr 2007 12:54:25 -  1.1.1.1
+++ pkg/PLIST-docs  5 Sep 2011 19:58:54 -
@@ -14,6 +14,16 @@ share/doc/postgresql-jdbc/org/postgresql
 share/doc/postgresql-jdbc/org/postgresql/PGRefCursorResultSet.html
 share/doc/postgresql-jdbc/org/postgresql/PGResultSetMetaData.html
 share/doc/postgresql-jdbc/org/postgresql/PGStatement.html
+share/doc/postgresql-jdbc/org/postgresql/copy/
+share/doc/postgresql-jdbc/org/postgresql/copy/CopyIn.html
+share/doc/postgresql-jdbc/org/postgresql/copy/CopyManager.html
+share/doc/postgresql-jdbc/org/postgresql/copy/CopyOperation.html
+share/doc/postgresql-jdbc/org/postgresql/copy/CopyOut.html
+share/doc/postgresql-jdbc/org/postgresql/copy/PGCopyInputStream.html
+share/doc/postgresql-jdbc/org/postgresql/copy/PGCopyOutputStream.html
+share/doc/postgresql-jdbc/org/postgresql/copy/package-frame.html
+share/doc/postgresql-jdbc/org/postgresql/copy/package-summary.html
+share/doc/postgresql-jdbc/org/postgresql/copy/package-tree.html
 share/doc/postgresql-jdbc/org/postgresql/ds/
 share/doc/postgresql-jdbc/org/postgresql/ds/PGConnectionPoolDataSource.html
 share/doc/postgresql-jdbc/org/postgresql/ds/PGPooledConnection.html
@@ -62,10

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Matthias Kilian 
On Mon, Sep 05, 2011 at 07:29:31PM +0200, Jasper Lievisse Adriaanse wrote:
  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))?

And here's the diff for jeoip:

Index: Makefile
===
RCS file: /cvs/ports/geo/jeoip/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile5 Sep 2011 08:57:43 -   1.16
+++ Makefile5 Sep 2011 20:06:58 -
@@ -24,13 +24,13 @@ MODJAVA_JRERUN= Yes
 MODJAVA_BUILD= ant
 MODJAVA_BUILD_TARGET=  jar docs
 
-BUILD_DEPENDS= java/junit=3.8.2
+BUILD_DEPENDS= java/junit
 REGRESS_DEPENDS=   net/GeoIP \
-   java/junit=3.8.2
+   java/junit
 RUN_DEPENDS=   net/GeoIP\
java/javaPathHelper
 MAKE_ENV=  JAVA_HOME=${JAVA_HOME} \
-   
CLASSPATH=${LOCALBASE}/share/java/classes/junit-3.8.2/junit.jar
+   
CLASSPATH=${LOCALBASE}/share/java/classes/junit/junit.jar
 
 WRKDIST=   ${WRKDIR}/jeoip

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-05 Thread Jasper Lievisse Adriaanse 
On Mon, Sep 05, 2011 at 10:09:27PM +0200, Matthias Kilian wrote:
 On Mon, Sep 05, 2011 at 07:29:31PM +0200, Jasper Lievisse Adriaanse wrote:
   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))?
 
 And here's the diff for jeoip:
I had that diff too ;-) And jeoip's tests are happy. So unless Ian objects I'd
like to commit it tomorrow.
 
 Index: Makefile
 ===
 RCS file: /cvs/ports/geo/jeoip/Makefile,v
 retrieving revision 1.16
 diff -u -p -r1.16 Makefile
 --- Makefile  5 Sep 2011 08:57:43 -   1.16
 +++ Makefile  5 Sep 2011 20:06:58 -
 @@ -24,13 +24,13 @@ MODJAVA_JRERUN=   Yes
  MODJAVA_BUILD=   ant
  MODJAVA_BUILD_TARGET=jar docs
  
 -BUILD_DEPENDS=   java/junit=3.8.2
 +BUILD_DEPENDS=   java/junit
  REGRESS_DEPENDS= net/GeoIP \
 - java/junit=3.8.2
 + java/junit
  RUN_DEPENDS= net/GeoIP\
   java/javaPathHelper
  MAKE_ENV=JAVA_HOME=${JAVA_HOME} \
 - 
 CLASSPATH=${LOCALBASE}/share/java/classes/junit-3.8.2/junit.jar
 + 
 CLASSPATH=${LOCALBASE}/share/java/classes/junit/junit.jar
  
  WRKDIST= ${WRKDIR}/jeoip
  
 

-- 
Cheers,
Jasper

Capable, generous men do not create victims, they nurture them.

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-02 Thread Jasper Lievisse Adriaanse 
On Thu, Sep 01, 2011 at 06:10:41PM -0500, Amit Kulkarni wrote:
 On Sun, Jul 17, 2011 at 5:37 PM, Matthias Kilian k...@outback.escape.de 
 wrote:
  On Sun, Jul 17, 2011 at 04:25:10PM -0500, Amit Kulkarni wrote:
   I was planning on working on the newest pgsql-jdbc (which is a dev
   version) since it works with jdk1.7.
  
   Doesn't postgresql-jdbc 9.0 Build 801 work with jdk1.7? I'm not a big
   fan of updating the port to a version that's still under development.
  
 
  From http://jdbc.postgresql.org/changes.html#version_9.1dev-900
 
  -- Support building with the 1.7 JDK. (jurka)
 
  build != work. if an oficcially released version needs some older
  jdk to build but still works with jdk7, this would be the way to
  go (for now). If it doesn't work (at runtime) with jdk7 when built
  with an older jdk, jdk7 is busted.
 
  I'll give a (non-dev) versio of postgresql-jdbc built with jdk1.5
  a try on a jdk7 in a few days. If time permits (no promise)
 
  Ciao,
  ? ? ? ?Kili
 
 
 Hi Kili@ !
 can you please test with this diff?
 
 https://github.com/jasperla/openbsd-wip/commit/371f4c352abd96a2aef99bcf5beffbb9575cf91d
 
 I can add the latest junit 4.9 and update postgresql-jdbc  geo/jeoip
 to github if somebody is willing to test them out.
 
 thanks

I hadn't noticed you were already working on a junit update. But here's my diff:

I'ld like to move the java ports to a non-version jar install. If they install
multiple jars, put them into ${MOJAVA_JAR_DIR}/project_name/ (without
version). That way you prevent needing to touch other ports just because you
updated one.

Index: Makefile
===
RCS file: /cvs/ports/java/junit/Makefile,v
retrieving revision 1.24
diff -p -u -r1.24 Makefile
--- Makefile30 Aug 2011 17:16:36 -  1.24
+++ Makefile31 Aug 2011 19:06:01 -
@@ -2,19 +2,15 @@
 
 COMMENT=   regression testing utility for use with the Java language
 
-VERSION=   3.8.2
+VERSION=   4.9
 DISTNAME=  junit${VERSION}
 PKGNAME=   junit-${VERSION}
-REVISION=  7
-# INSTALLDIR must not be set to ${PKGNAME}. Doing so will break
-# the regress target in dependant ports if the patch level is bumped.
-INSTALLDIR=junit-${VERSION}
-SUBST_VARS+=   INSTALLDIR
+
 CATEGORIES=devel
 
 HOMEPAGE=  http://www.junit.org/
 
-MAINTAINER=Ian Darwin i...@openbsd.org
+MAINTAINER=Ian Darwin i...@openbsd.org
 
 # Common Public License - v1.0
 # Commercial distribution defend and indemnify clauses
@@ -23,34 +19,27 @@ PERMIT_PACKAGE_FTP= Yes
 PERMIT_DISTFILES_CDROM=No
 PERMIT_DISTFILES_FTP=  Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=junit/}
-EXTRACT_SUFX=  .zip 
+# github is bad for getting reliable distfiles from.
+MASTER_SITES=  http://distfiles.nl/
+EXTRACT_SUFX=  .zip
 
 MODULES=   java
-MODJAVA_VER=   1.4+
+MODJAVA_VER=   1.6+
 MODJAVA_JRERUN=yes
 
-BUILD_DEPENDS= devel/apache-ant
-
-MAKE_ENV=  JAVA_HOME=${JAVA_HOME}
+NO_BUILD=  Yes
+NO_REGRESS=Yes
 
-post-extract:
-   cp ${FILESDIR}/build.xml ${WRKDIST}
-
-do-build:
-   @cd ${WRKDIST}  exec ${SETENV} ${MAKE_ENV} ant -q \
-   -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
+JAR_DIR=   ${PREFIX}/share/java/classes/junit/
+DOC_DIR=   ${PREFIX}/share/java/junit/
 
 do-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/java/classes/${INSTALLDIR}
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/java/${INSTALLDIR}
-   ${INSTALL_DATA} ${WRKSRC}/README.html ${PREFIX}/share/java/${INSTALLDIR}
-   ${INSTALL_DATA} ${WRKSRC}/cpl-v10.html 
${PREFIX}/share/java/${INSTALLDIR}
-   cp ${WRKSRC}/*.jar ${PREFIX}/share/java/classes/${INSTALLDIR}
-   cp -R ${WRKSRC}/doc ${PREFIX}/share/java/${INSTALLDIR}
-   cp -R ${WRKSRC}/javadoc ${PREFIX}/share/java/${INSTALLDIR}
-
-do-regress:
-   ${JAVA_HOME}/bin/java -cp ${WRKSRC}/build junit.tests.AllTests
+   ${INSTALL_DATA_DIR} ${JAR_DIR} ${DOC_DIR}
+   ${INSTALL_DATA} ${WRKSRC}/README.html ${DOC_DIR}
+   ${INSTALL_DATA} ${WRKSRC}/cpl-v10.html ${DOC_DIR}
+   cp ${WRKSRC}/junit-${VERSION}.jar ${JAR_DIR}/junit.jar
+   cp ${WRKSRC}/junit-${VERSION}-src.jar ${JAR_DIR}/junit-src.jar
+   cp -R ${WRKSRC}/doc ${DOC_DIR}
+   cp -R ${WRKSRC}/javadoc ${DOC_DIR}
 
-.include bsd.port.mk 
+.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/java/junit/distinfo,v
retrieving revision 1.5
diff -p -u -r1.5 distinfo
--- distinfo15 Apr 2007 23:08:22 -  1.5
+++ distinfo31 Aug 2011 19:06:01 -
@@ -1,5 +1,5 @@
-MD5 (junit3.8.2.zip) = m4ljuiFHpkvV8VdLb9KJyw==
-RMD160 (junit3.8.2.zip) = xm1k2KpzhGBJDmL9MywRIHbZtmI=
-SHA1 (junit3.8.2.zip) = cBV4MC4kTlFz3KMEDM4HdKXDlkU=
-SHA256 (junit3.8.2.zip) = quI9IOb03EW0vwsQ/ty9IJwQA0KgyvzhqgfS2m2h8ko=
-SIZE (junit3.8.2.zip) = 461426
+MD5 (junit4.9.zip) = skwzi+F0HslWlibU7RGM6A==
+RMD160

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-02 Thread Amit Kulkarni 
 Hi Kili@ !
 can you please test with this diff?

 https://github.com/jasperla/openbsd-wip/commit/371f4c352abd96a2aef99bcf5beffbb9575cf91d

 I can add the latest junit 4.9 and update postgresql-jdbc  geo/jeoip
 to github if somebody is willing to test them out.

 thanks

 I hadn't noticed you were already working on a junit update. But here's my 
 diff:

 I'ld like to move the java ports to a non-version jar install. If they install
 multiple jars, put them into ${MOJAVA_JAR_DIR}/project_name/ (without
 version). That way you prevent needing to touch other ports just because you
 updated one.


I was planning to do it today.

Your and kurt@ design of MODJAVA et al. is simply superb. It allows
much flexibility in choosing versions.

thanks

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-09-01 Thread Amit Kulkarni 
On Sun, Jul 17, 2011 at 5:37 PM, Matthias Kilian k...@outback.escape.de wrote:
 On Sun, Jul 17, 2011 at 04:25:10PM -0500, Amit Kulkarni wrote:
  I was planning on working on the newest pgsql-jdbc (which is a dev
  version) since it works with jdk1.7.
 
  Doesn't postgresql-jdbc 9.0 Build 801 work with jdk1.7? I'm not a big
  fan of updating the port to a version that's still under development.
 

 From http://jdbc.postgresql.org/changes.html#version_9.1dev-900

 -- Support building with the 1.7 JDK. (jurka)

 build != work. if an oficcially released version needs some older
 jdk to build but still works with jdk7, this would be the way to
 go (for now). If it doesn't work (at runtime) with jdk7 when built
 with an older jdk, jdk7 is busted.

 I'll give a (non-dev) versio of postgresql-jdbc built with jdk1.5
 a try on a jdk7 in a few days. If time permits (no promise)

 Ciao,
        Kili


Hi Kili@ !
can you please test with this diff?

https://github.com/jasperla/openbsd-wip/commit/371f4c352abd96a2aef99bcf5beffbb9575cf91d

I can add the latest junit 4.9 and update postgresql-jdbc  geo/jeoip
to github if somebody is willing to test them out.

thanks

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-17 Thread Matthias Kilian 
On Wed, Jul 13, 2011 at 12:40:55PM -0500, Amit Kulkarni wrote:
 kili@,
 I was planning on working on the newest pgsql-jdbc (which is a dev
 version) since it works with jdk1.7.

Doesn't postgresql-jdbc 9.0 Build 801 work with jdk1.7? I'm not a big
fan of updating the port to a version that's still under development.

Ciao,
Kili

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-17 Thread Amit Kulkarni 
 kili@,
 I was planning on working on the newest pgsql-jdbc (which is a dev
 version) since it works with jdk1.7.

 Doesn't postgresql-jdbc 9.0 Build 801 work with jdk1.7? I'm not a big
 fan of updating the port to a version that's still under development.


From http://jdbc.postgresql.org/changes.html#version_9.1dev-900

-- Support building with the 1.7 JDK. (jurka)

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-17 Thread Matthias Kilian 
On Sun, Jul 17, 2011 at 04:25:10PM -0500, Amit Kulkarni wrote:
  I was planning on working on the newest pgsql-jdbc (which is a dev
  version) since it works with jdk1.7.
 
  Doesn't postgresql-jdbc 9.0 Build 801 work with jdk1.7? I'm not a big
  fan of updating the port to a version that's still under development.
 
 
 From http://jdbc.postgresql.org/changes.html#version_9.1dev-900
 
 -- Support building with the 1.7 JDK. (jurka)

build != work. if an oficcially released version needs some older
jdk to build but still works with jdk7, this would be the way to
go (for now). If it doesn't work (at runtime) with jdk7 when built
with an older jdk, jdk7 is busted.

I'll give a (non-dev) versio of postgresql-jdbc built with jdk1.5
a try on a jdk7 in a few days. If time permits (no promise)

Ciao,
Kili

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-13 Thread Ian Darwin 
  COMMENT= regression testing utility for use with the Java language
  
 -VERSION= 3.8.2
 +VERSION= 4.8.2

You cannot eliminate JUnit 3.8 because there are still things that 
use it that don't work on 4, at least last time I checked.

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-13 Thread Amit Kulkarni 
  COMMENT=     regression testing utility for use with the Java language

 -VERSION=     3.8.2
 +VERSION=     4.8.2

 You cannot eliminate JUnit 3.8 because there are still things that
 use it that don't work on 4, at least last time I checked.


Can you elaborate what things? I will report if they still don't work,
or if they work now.

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-13 Thread Nigel Taylor 

On 07/13/11 16:09, Amit Kulkarni wrote:

  COMMENT= regression testing utility for use with the Java language

-VERSION= 3.8.2
+VERSION= 4.8.2


You cannot eliminate JUnit 3.8 because there are still things that
use it that don't work on 4, at least last time I checked.



Can you elaborate what things? I will report if they still don't work,
or if they work now.



Hi,

There are two ports with a specific dependency set.

databases/postgresql-jdbc
geo/jeoip

They use STEM-=3.8.2:java/junit, so are insisting on the specific 
version 3.8.2, your change will break these.



Regards

Nigel Taylor

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-13 Thread Matthias Kilian 
On Wed, Jul 13, 2011 at 05:33:17PM +0100, Nigel Taylor wrote:
 You cannot eliminate JUnit 3.8 because there are still things that
 use it that don't work on 4, at least last time I checked.
 
 
 Can you elaborate what things? I will report if they still don't work,
 or if they work now.
 
 There are two ports with a specific dependency set.
 
 databases/postgresql-jdbc

That one needs an update anyway (will do so next weekend, and also
check with a newer junit).

Ciao,
Kili

Re: UPDATE: java/junit 3.8.2 == 4.8.2

2011-07-13 Thread Amit Kulkarni 
  COMMENT=     regression testing utility for use with the Java language

 -VERSION=     3.8.2
 +VERSION=     4.8.2

 You cannot eliminate JUnit 3.8 because there are still things that
 use it that don't work on 4, at least last time I checked.


 Can you elaborate what things? I will report if they still don't work,
 or if they work now.


 Hi,

 There are two ports with a specific dependency set.

 databases/postgresql-jdbc
 geo/jeoip

 They use STEM-=3.8.2:java/junit, so are insisting on the specific version
 3.8.2, your change will break these.


Nigel/ Ian,

I compile tested both jeoip and pgsql-jdbc with newer junit, both on
amd64. Can somebody who uses either report success or failure with the
diff I sent earlier? There are only few ports which use junit, and I
think I covered them both. libre/open office build without junit. Are
the libre/open office which are causing problem with junit?

kili@,
I was planning on working on the newest pgsql-jdbc (which is a dev
version) since it works with jdk1.7.

btw, anybody working on latest jdk1.7 b147 which is probably going to
be final build?

thanks