CVS commit: pkgsrc/devel/java-jna

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Feb  2 01:18:24 UTC 2021

Modified Files:
        pkgsrc/devel/java-jna: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/java-jna/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/java-jna/Makefile
diff -u pkgsrc/devel/java-jna/Makefile:1.7 pkgsrc/devel/java-jna/Makefile:1.8
--- pkgsrc/devel/java-jna/Makefile:1.7  Sat Jan 23 01:18:48 2021
+++ pkgsrc/devel/java-jna/Makefile      Tue Feb  2 01:18:24 2021
@@ -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+=    -Ddynlink.native=true
 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 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unknown-wa
 
 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} \