- update to apache-ant-1.9.7

- simplify patch

devel/apache-ant/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.38 2015/07/16 23:13:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2016/05/02 11:53:49 jasper Exp $
 
 COMMENT=        build tool for java applications
 
-DISTNAME=	apache-ant-1.9.6
+DISTNAME=	apache-ant-1.9.7
 CATEGORIES=	devel
 
 HOMEPAGE=	http://ant.apache.org/

devel/apache-ant/distinfo

@@ -1,2 +1,2 @@
-SHA256 (apache-ant-1.9.6-bin.tar.bz2) = pDsJKJYNY9ax4r7Tfhzk/Y+heIuoTgg4i/6VE/AujbM=
-SIZE (apache-ant-1.9.6-bin.tar.bz2) = 4385004
+SHA256 (apache-ant-1.9.7-bin.tar.bz2) = vi/zAmzGVdwAK7zOEAvWck1EjGP3AqqCttmJmyLbeAg=
+SIZE (apache-ant-1.9.7-bin.tar.bz2) = 4392108

devel/apache-ant/patches/patch-bin_ant

@@ -1,33 +1,12 @@
-$OpenBSD: patch-bin_ant,v 1.8 2013/07/15 06:58:29 jasper Exp $
---- bin/ant.orig	Thu May 16 04:35:45 2013
-+++ bin/ant	Wed Jul 10 15:34:48 2013
-@@ -135,27 +135,9 @@ fi
+$OpenBSD: patch-bin_ant,v 1.9 2016/05/02 11:53:49 jasper Exp $
+--- bin/ant.orig	Mon May  2 12:49:24 2016
++++ bin/ant	Mon May  2 12:49:45 2016
+@@ -136,6 +136,8 @@ fi
  # set ANT_LIB location
  ANT_LIB="${ANT_HOME}/lib"
  
--if [ -z "$JAVACMD" ] ; then
--  if [ -n "$JAVA_HOME"  ] ; then
--    # IBM's JDK on AIX uses strange locations for the executables
--    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
--      JAVACMD="$JAVA_HOME/jre/sh/java"
--    elif [ -x "$JAVA_HOME/jre/bin/java" ] ; then
--      JAVACMD="$JAVA_HOME/jre/bin/java"
--    else
--      JAVACMD="$JAVA_HOME/bin/java"
--    fi
--  else
--    JAVACMD=`which java 2> /dev/null `
--    if [ -z "$JAVACMD" ] ; then
--        JAVACMD=java
--    fi
--  fi
--fi
 +JAVACMD=$(javaPathHelper -c apache-ant)
- 
--if [ ! -x "$JAVACMD" ] ; then
--  echo "Error: JAVA_HOME is not defined correctly."
--  echo "  We cannot execute $JAVACMD"
-+if [ -z "${JAVACMD}" ]; then
-   exit 1
- fi
- 
++
+ if [ -z "$JAVACMD" ] ; then
+   if [ -n "$JAVA_HOME"  ] ; then
+     # IBM's JDK on AIX uses strange locations for the executables