[pkgsrc/trunk]: pkgsrc/devel/apache-ant It's not much use specifying a path t...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/282faf8c66ca
branches:  trunk
changeset: 548975:282faf8c66ca
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sat Oct 25 17:43:33 2008 +0000

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

 devel/apache-ant/Makefile         |  3 ++-
 devel/apache-ant/distinfo         |  4 ++--
 devel/apache-ant/patches/patch-aa |  4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diffs (43 lines):

diff -r 4c45858dea57 -r 282faf8c66ca devel/apache-ant/Makefile
--- a/devel/apache-ant/Makefile Sat Oct 25 17:08:53 2008 +0000
+++ b/devel/apache-ant/Makefile Sat Oct 25 17:43:33 2008 +0000
@@ -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 -r 4c45858dea57 -r 282faf8c66ca devel/apache-ant/distinfo
--- a/devel/apache-ant/distinfo Sat Oct 25 17:08:53 2008 +0000
+++ b/devel/apache-ant/distinfo Sat Oct 25 17:43:33 2008 +0000
@@ -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 -r 4c45858dea57 -r 282faf8c66ca devel/apache-ant/patches/patch-aa
--- a/devel/apache-ant/patches/patch-aa Sat Oct 25 17:08:53 2008 +0000
+++ b/devel/apache-ant/patches/patch-aa Sat Oct 25 17:43:33 2008 +0000
@@ -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 @@
 +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