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 -0000 1.16
> +++ Makefile 5 Sep 2011 20:06:58 -0000
> @@ -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."
