[pkgsrc/trunk]: pkgsrc/devel/java-jna java-jna: use ANT_ARGS consistently (fo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/44aa8007f6c3
branches:  trunk
changeset: 445958:44aa8007f6c3
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Tue Feb 02 01:18:24 2021 +0000

description:
java-jna: use ANT_ARGS consistently (follow-on build fix)

Fix my previous fix: apparently I misread something that was right in
front of me, whoops.

diffstat:

 devel/java-jna/Makefile |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 9b28d314b74d -r 44aa8007f6c3 devel/java-jna/Makefile
--- a/devel/java-jna/Makefile   Mon Feb 01 20:51:24 2021 +0000
+++ b/devel/java-jna/Makefile   Tue Feb 02 01:18:24 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/01/23 01:18:48 gutteridge Exp $
+# $NetBSD: Makefile,v 1.8 2021/02/02 01:18:24 gutteridge Exp $
 
 DISTNAME=      jna-5.2.0
 PKGNAME=       java-${DISTNAME}
@@ -76,6 +76,9 @@
 ANT_ARGS+=     -Dbuild-native=true
 ANT_ARGS+=     -Dcflags_extra.native=""
 ANT_ARGS+=     -DCC=${CC}
+ANT_ARGS+=     -Dgrep=grep
+ANT_ARGS+=     -Dmake=make
+ANT_ARGS+=     -Dmake.PATH=PATH=${PATH:Q}
 ANT_TARGET=    jar contrib-jars javadoc
 
 # Needed with recent GCC versions, e.g., 9.3.
@@ -86,9 +89,7 @@
 
 do-build:
        cd ${WRKSRC} && \
-           ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} \
-           -Dgrep=grep -Dmake=make -Dmake.PATH=PATH=${PATH:Q} \
-           ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
+           ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
 
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \