update to ant v1.5.1;

*) take MAINTAINER

devel/jakarta-ant/Makefile

@@ -1,45 +1,49 @@
-# $OpenBSD: Makefile,v 1.6 2002/12/01 02:20:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2003/02/08 15:38:34 reinhard Exp $
 
 ONLY_FOR_ARCHS= i386
 
 COMMENT=        "java equivalent to make"
 
-DISTNAME=       jakarta-ant-1.3
-CATEGORIES=     devel
+V=		1.5.1
+DISTNAME=	jakarta-ant-${V}
+CATEGORIES=	devel
 
-HOMEPAGE=       http://jakarta.apache.org/ant/
+HOMEPAGE=	http://jakarta.apache.org/ant/
+
+MAINTAINER=	Reinhard J. Sammer <reinhard@openbsd.org>
 
 # Apache Software License
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-ant/release/v1.3/bin/
+MASTER_SITES=	http://jakarta.apache.org/builds/jakarta-ant/release/v${V}/bin/
 EXTRACT_SUFX=	-bin.tar.gz
 
-RUN_DEPENDS=    ::devel/jdk/1.2-blackdown
+BUILD_DEPENDS=	::archivers/gtar
+RUN_DEPENDS=	:jdk*->=1.1:devel/jdk/1.3-linux
 
-NO_BUILD=       Yes
+NO_BUILD=	Yes
 NO_REGRESS=	Yes
 
-ANTDIR=	${PREFIX}/share/doc/java/${PKGNAME}
-TXT=	LICENSE README TODO WHATSNEW
+TAR=		${LOCALBASE}/bin/gtar
+
+ANTDOCS=	${PREFIX}/share/doc/java/ant
+TXT=		README WHATSNEW
 
 post-patch:
 	@cd ${WRKSRC}/bin && perl -pi -e 's|_anthome_|${PREFIX}/bin|' ant
-	@cd ${WRKSRC}/bin && perl -pi -e 's|_antlibs_|${PREFIX}/lib/java|' ant
-	@cd ${WRKSRC}/bin && perl -pi -e 's|_antlibs_|"${PREFIX}/lib/java"|' runant.pl
-	@cd ${WRKSRC}/bin && perl -pi -e 's|\r||' runant.pl
+	@cd ${WRKSRC}/bin && perl -pi -e 's|_antlibs_|${PREFIX}/lib/java/ant|' ant
+	@cd ${WRKSRC}/bin && perl -pi -e 's|_antlibs_|"${PREFIX}/lib/java/ant"|' runant.pl
 
 do-install:
-	@${INSTALL_DATA_DIR} ${ANTDIR}
 	@cd ${WRKDIST}/bin && \
 		${INSTALL_SCRIPT} ant antRun runant.pl ${PREFIX}/bin
-	@${INSTALL_DATA_DIR} ${ANTDIR}/docs
-	@cd ${WRKDIST} && tar cf - docs | (cd ${ANTDIR} && tar -xf -)
+	@${INSTALL_DATA_DIR} ${ANTDOCS}
+	@cp -Rp ${WRKDIST}/docs/* ${ANTDOCS}
 	@${INSTALL_DATA_DIR} ${PREFIX}/lib/java/ant
 	@cd ${WRKDIST}/lib && ${INSTALL_DATA} *.jar ${PREFIX}/lib/java/ant
-	@cd ${WRKDIST} && ${INSTALL_DATA} ${TXT} ${ANTDIR}
+	@cd ${WRKDIST} && ${INSTALL_DATA} ${TXT} ${ANTDOCS}
 
 .include <bsd.port.mk>

devel/jakarta-ant/distinfo

@@ -1,3 +1,3 @@
-MD5 (jakarta-ant-1.3-bin.tar.gz) = dff4deb325b1be0178c1710050ef75c1
-RMD160 (jakarta-ant-1.3-bin.tar.gz) = a172b3604add70e447d09b2c653562789115c312
-SHA1 (jakarta-ant-1.3-bin.tar.gz) = bca557ef330bdb3de9467fcca8c0c3c1854f513a
+MD5 (jakarta-ant-1.5.1-bin.tar.gz) = 2be27d9e09011bf1cc3d1967ee34f7d1
+RMD160 (jakarta-ant-1.5.1-bin.tar.gz) = e102375cde72bc357a62b03019e97ca6ca991890
+SHA1 (jakarta-ant-1.5.1-bin.tar.gz) = 855dfe0959a602d95767adfb359dedf0d2526ec9

devel/jakarta-ant/patches/patch-bin_ant

@@ -1,45 +1,28 @@
-$OpenBSD: patch-bin_ant,v 1.1.1.1 2001/06/17 12:15:52 reinhard Exp $
---- bin/ant	Sun Apr 15 17:35:15 2001
-+++ bin/ant2	Sun Apr 15 17:37:27 2001
-@@ -21,14 +21,7 @@ if $cygwin; then
- fi
+$OpenBSD: patch-bin_ant,v 1.2 2003/02/08 15:38:34 reinhard Exp $
+--- bin/ant.orig	Wed Oct  2 10:55:12 2002
++++ bin/ant	Thu Jan 30 05:59:39 2003
+@@ -34,14 +34,7 @@ case "`uname`" in
+ esac
  
- if [ "$ANT_HOME" = "" ] ; then
+ if [ -z "$ANT_HOME" ] ; then
 -  # try to find ANT
 -  if [ -d /opt/ant ] ; then 
 -    ANT_HOME=/opt/ant
 -  fi
 -
--  if [ -d ${HOME}/opt/ant ] ; then 
--    ANT_HOME=${HOME}/opt/ant
+-  if [ -d "${HOME}/opt/ant" ] ; then 
+-    ANT_HOME="${HOME}/opt/ant"
 -  fi
-+    ANT_HOME=_anthome_
++  ANT_HOME=_anthome_
  
    ## resolve links - $0 may be a link to ant's home
-   PRG=$0
-@@ -48,6 +41,16 @@ if [ "$ANT_HOME" = "" ] ; then
- 
+   PRG="$0"
+@@ -80,7 +73,7 @@ if $cygwin ; then
  fi
  
-+# trying to find ANT_LIBS
-+if  [ "$ANT_LIBS" = "" ] ; then
-+  # try to find ANT
-+    if [ -d _antlibs_ ] ; then
-+        ANT_LIBS=_antlibs_
-+    fi
-+    else
-+	echo "ANT_LIBS was not found."
-+fi
-+
- if [ "$JAVA_HOME" != "" ] ; then
-   if [ "$JAVACMD" = "" ] ; then 
-     JAVACMD=$JAVA_HOME/bin/java
-@@ -59,7 +62,7 @@ else
- fi
-  
- # add in the dependency .jar files
--DIRLIBS=${ANT_HOME}/lib/*.jar
-+DIRLIBS=${ANT_LIBS}/*.jar
- for i in ${DIRLIBS}
- do
-     # if the directory is empty, then it will return the input string
+ # set ANT_LIB location
+-ANT_LIB="${ANT_HOME}/lib"
++ANT_LIB="_antlibs_"
+ 
+ if [ -z "$JAVACMD" ] ; then 
+   if [ -n "$JAVA_HOME"  ] ; then

devel/jakarta-ant/patches/patch-bin_runant_pl

@@ -1,35 +1,12 @@
-$OpenBSD: patch-bin_runant_pl,v 1.1.1.1 2001/06/17 12:15:52 reinhard Exp $
---- bin/runant.pl	Sun Apr 15 17:35:20 2001
-+++ bin/runant2.pl	Sun Apr 15 17:38:07 2001
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #######################################################################
- #
- # runant.pl
-@@ -48,6 +48,16 @@ if ($HOME eq "")
-     die "\n\nANT_HOME *MUST* be set!\n\n";
- 	}
- 
-+my $LIBS = $ENV{ANT_LIBS};
-+if ($LIBS eq "")
-+{	if (-d _antlibs_ )
-+	{	$LIBS = _antlibs_;
-+	}
-+	else
-+	{	die "\n\nANT_LIBS not found!\n\n";
-+	}
-+}
-+
- my $JAVACMD = $ENV{JAVACMD};
- $JAVACMD = "java" if $JAVACMD eq "";
- 
-@@ -69,7 +79,7 @@ if ($localpath eq "")
- 	}
- 
- #add jar files. I am sure there is a perl one liner to do this.
--my $jarpattern="$HOME/lib/*.jar";
-+my $jarpattern="$LIBS/*.jar";
- my @jarfiles =glob($jarpattern);
- print "jarfiles=@jarfiles\n" if ($debug);
- my $jar;
+$OpenBSD: patch-bin_runant_pl,v 1.2 2003/02/08 15:38:34 reinhard Exp $
+--- bin/runant.pl.orig	Thu Jan 30 05:59:40 2003
++++ bin/runant.pl	Thu Jan 30 06:02:27 2003
+@@ -87,7 +87,7 @@ if ($onnetware == 1)
+ } 
+ 
+ #add jar files. I am sure there is a perl one liner to do this.
+-my $jarpattern="$HOME/lib/*.jar";
++my $jarpattern="$_antlibs_/*.jar";
+ my @jarfiles =glob($jarpattern);
+ print "jarfiles=@jarfiles\n" if ($debug);
+ my $jar;

devel/jakarta-ant/pkg/DESCR

@@ -1,4 +1,4 @@
 Ant is a Java based build tool. In theory it is kind of like make
-without make's wrinkles. 
+without make's wrinkles.
 
 WWW: ${HOMEPAGE}