Sat Oct 25 17:43:33 2008 UTC ()
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++


(adrianp)
diff -r1.24 -r1.25 pkgsrc/devel/apache-ant/Makefile
diff -r1.8 -r1.9 pkgsrc/devel/apache-ant/distinfo
diff -r1.1 -r1.2 pkgsrc/devel/apache-ant/patches/patch-aa
cvs diff -r1.24 -r1.25 pkgsrc/devel/apache-ant/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/apache-ant/Makefile 2008/05/25 21:42:21 1.24
+++ pkgsrc/devel/apache-ant/Makefile 2008/10/25 17:43:33 1.25
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.24 2008/05/25 21:42:21 joerg Exp $ 1# $NetBSD: Makefile,v 1.25 2008/10/25 17:43:33 adrianp Exp $
2# 2#
3 3
4DISTNAME= apache-ant-1.7.0 4DISTNAME= apache-ant-1.7.0
 5PKGREVISION= 1
5CATEGORIES= devel java 6CATEGORIES= devel java
6MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=ant/binaries/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}-bin${EXTRACT_SUFX}
9 10
10MAINTAINER= tonio@NetBSD.org 11MAINTAINER= tonio@NetBSD.org
11HOMEPAGE= http://ant.apache.org/ 12HOMEPAGE= http://ant.apache.org/
12COMMENT= Apache Project's Java-Based make(1) replacement 13COMMENT= Apache Project's Java-Based make(1) replacement
13 14
14# Up to version 1.5.1 inclusive this was known as "jakarta-ant". 15# Up to version 1.5.1 inclusive this was known as "jakarta-ant".
15CONFLICTS= jakarta-ant>=0 16CONFLICTS= jakarta-ant>=0
16 17
17PKG_DESTDIR_SUPPORT= user-destdir 18PKG_DESTDIR_SUPPORT= user-destdir
cvs diff -r1.8 -r1.9 pkgsrc/devel/apache-ant/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/apache-ant/distinfo 2007/01/16 11:03:38 1.8
+++ pkgsrc/devel/apache-ant/distinfo 2008/10/25 17:43:33 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.8 2007/01/16 11:03:38 tonio Exp $ 1$NetBSD: distinfo,v 1.9 2008/10/25 17:43:33 adrianp Exp $
2 2
3SHA1 (apache-ant-1.7.0-bin.tar.bz2) = 5c65a8f98cb333382f0f718b203c6c8da1a1326c 3SHA1 (apache-ant-1.7.0-bin.tar.bz2) = 5c65a8f98cb333382f0f718b203c6c8da1a1326c
4RMD160 (apache-ant-1.7.0-bin.tar.bz2) = 2d8a443342e08836fc6079e61b719ce0434823c5 4RMD160 (apache-ant-1.7.0-bin.tar.bz2) = 2d8a443342e08836fc6079e61b719ce0434823c5
5Size (apache-ant-1.7.0-bin.tar.bz2) = 7467376 bytes 5Size (apache-ant-1.7.0-bin.tar.bz2) = 7467376 bytes
6SHA1 (patch-aa) = bcc0f10596466e0069fb406893a387c8be437f34 6SHA1 (patch-aa) = 87a048e639a8a4df3de56b5d473dba6bd4f1d23d
cvs diff -r1.1 -r1.2 pkgsrc/devel/apache-ant/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/apache-ant/patches/Attic/patch-aa 2005/09/03 22:59:25 1.1
+++ pkgsrc/devel/apache-ant/patches/Attic/patch-aa 2008/10/25 17:43:33 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-aa,v 1.1 2005/09/03 22:59:25 tonio Exp $ 1$NetBSD: patch-aa,v 1.2 2008/10/25 17:43:33 adrianp Exp $
2 2
3--- bin/ant.orig 2005-05-19 14:37:16.000000000 +0200 3--- bin/ant.orig 2005-05-19 14:37:16.000000000 +0200
4+++ bin/ant 2005-05-25 14:38:03.000000000 +0200 4+++ bin/ant 2005-05-25 14:38:03.000000000 +0200
5@@ -86,6 +86,15 @@ 5@@ -86,6 +86,15 @@
6 ;; 6 ;;
7 esac 7 esac
8  8
9+if [ "$ANT_HOME" = "" ] ; then 9+if [ "$ANT_HOME" = "" ] ; then
10+ # try to find ANT 10+ # try to find ANT
11+ ANT_HOME=@PREFIX@ 11+ ANT_HOME=@PREFIX@
12+fi 12+fi
13+ 13+
14+if [ "$JAVA_HOME" = "" ] ; then 14+if [ "$JAVA_HOME" = "" ] ; then
@@ -16,19 +16,19 @@ $NetBSD: patch-aa,v 1.1 2005/09/03 22:59 @@ -16,19 +16,19 @@ $NetBSD: patch-aa,v 1.1 2005/09/03 22:59
16+fi 16+fi
17+ 17+
18 if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then 18 if [ -z "$ANT_HOME" -o ! -d "$ANT_HOME" ] ; then
19 ## resolve links - $0 may be a link to ant's home 19 ## resolve links - $0 may be a link to ant's home
20 PRG="$0" 20 PRG="$0"
21@@ -117,7 +126,12 @@ 21@@ -117,7 +126,12 @@
22 fi 22 fi
23  23
24 # set ANT_LIB location 24 # set ANT_LIB location
25-ANT_LIB="${ANT_HOME}/lib" 25-ANT_LIB="${ANT_HOME}/lib"
26+ANT_LIB="${ANT_HOME}/lib/java/ant" 26+ANT_LIB="${ANT_HOME}/lib/java/ant"
27+ 27+
28+# use ${PREFIX}/bin/java (wrapper) 28+# use ${PREFIX}/bin/java (wrapper)
29+if [ "$JAVACMD" = "" ] ; then 29+if [ "$JAVACMD" = "" ] && [ -f @PREFIX@/bin/java ] ; then
30+ JAVACMD=@PREFIX@/bin/java 30+ JAVACMD=@PREFIX@/bin/java
31+fi 31+fi
32  32
33 if [ -z "$JAVACMD" ] ; then 33 if [ -z "$JAVACMD" ] ; then
34 if [ -n "$JAVA_HOME" ] ; then 34 if [ -n "$JAVA_HOME" ] ; then