diff options
| author | adrianp <adrianp> | 2008-10-25 17:43:33 +0000 |
|---|---|---|
| committer | adrianp <adrianp> | 2008-10-25 17:43:33 +0000 |
| commit | 6c070c3dfcf8d77d2b214a8c825da8f3c6e2055e (patch) | |
| tree | df85bd992819e2ce9670e5271685620d7d81ecc5 /devel/apache-ant | |
| parent | 308973fac9e248fb6f9cb2328c7d49beae21952b (diff) | |
| download | pkgsrc-6c070c3dfcf8d77d2b214a8c825da8f3c6e2055e.tar.gz | |
It's not much use specifying a path to a java wrapper that may not exist.
Test for the wrapper and if it does not exist fall back to auto-detection
PKGREVISION++
Diffstat (limited to 'devel/apache-ant')
| -rw-r--r-- | devel/apache-ant/Makefile | 3 | ||||
| -rw-r--r-- | devel/apache-ant/distinfo | 4 | ||||
| -rw-r--r-- | devel/apache-ant/patches/patch-aa | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile index 388c1420607..b3c094908c3 100644 --- a/devel/apache-ant/Makefile +++ b/devel/apache-ant/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:21 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2008/10/25 17:43:33 adrianp Exp $ # DISTNAME= apache-ant-1.7.0 +PKGREVISION= 1 CATEGORIES= devel java MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/apache-ant/distinfo b/devel/apache-ant/distinfo index 314315e23da..c28cb2b6ba8 100644 --- a/devel/apache-ant/distinfo +++ b/devel/apache-ant/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.8 2007/01/16 11:03:38 tonio Exp $ +$NetBSD: distinfo,v 1.9 2008/10/25 17:43:33 adrianp Exp $ SHA1 (apache-ant-1.7.0-bin.tar.bz2) = 5c65a8f98cb333382f0f718b203c6c8da1a1326c RMD160 (apache-ant-1.7.0-bin.tar.bz2) = 2d8a443342e08836fc6079e61b719ce0434823c5 Size (apache-ant-1.7.0-bin.tar.bz2) = 7467376 bytes -SHA1 (patch-aa) = bcc0f10596466e0069fb406893a387c8be437f34 +SHA1 (patch-aa) = 87a048e639a8a4df3de56b5d473dba6bd4f1d23d diff --git a/devel/apache-ant/patches/patch-aa b/devel/apache-ant/patches/patch-aa index 1f34a1e8fef..0f4f9feddb7 100644 --- a/devel/apache-ant/patches/patch-aa +++ b/devel/apache-ant/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2005/09/03 22:59:25 tonio Exp $ +$NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $ --- bin/ant.orig 2005-05-19 14:37:16.000000000 +0200 +++ bin/ant 2005-05-25 14:38:03.000000000 +0200 @@ -26,7 +26,7 @@ $NetBSD: patch-aa,v 1.1 2005/09/03 22:59:25 tonio Exp $ +ANT_LIB="${ANT_HOME}/lib/java/ant" + +# use ${PREFIX}/bin/java (wrapper) -+if [ "$JAVACMD" = "" ] ; then ++if [ "$JAVACMD" = "" ] && [ -f @PREFIX@/bin/java ] ; then + JAVACMD=@PREFIX@/bin/java +fi |