CVS commit: pkgsrc/devel/java-jna

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

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sat Jan 23 01:18:49 UTC 2021

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

Log Message:
java-jna: non-NetBSD build fixes

This package expects GNU grep, and also makes assumptions about tool
paths that don't always hold (mostly relating to SunOS derivates).
Force use of pkgsrc-supplied tools.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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.6 pkgsrc/devel/java-jna/Makefile:1.7
--- pkgsrc/devel/java-jna/Makefile:1.6  Fri Jan 22 01:22:46 2021
+++ pkgsrc/devel/java-jna/Makefile      Sat Jan 23 01:18:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/01/22 01:22:46 gutteridge Exp $
+# $NetBSD: Makefile,v 1.7 2021/01/23 01:18:48 gutteridge Exp $
 
 DISTNAME=      jna-5.2.0
 PKGNAME=       java-${DISTNAME}
@@ -40,7 +40,7 @@ ONLY_FOR_PLATFORM+=   NetBSD-*-i386 NetBSD
 USE_LANGUAGES= c
 USE_JAVA=      yes
 USE_JAVA2=     yes
-USE_TOOLS+=    autoreconf automake autoconf gmake pkg-config pax
+USE_TOOLS+=    autoreconf automake autoconf ggrep gmake pkg-config pax
 USE_LIBTOOL=   yes
 
 OPSYSVARS+=    JNIPFX JNISFX
@@ -62,7 +62,7 @@ DEPENDS+=     openjdk8>=1.8.202:../../lang/o
 # JDK 11 or later doesn't generate frames
 PLIST_SRC=     PLIST
 .if ${PKG_JVM} == "sun-jdk7" || ${PKG_JVM} == "oracle-jdk8" || ${PKG_JVM} == "openjdk8"
-PLIST_SRC+=    PLIST.java8-javadoc     
+PLIST_SRC+=    PLIST.java8-javadoc
 .else
 PLIST_SRC+=    PLIST.java11-javadoc
 .endif
@@ -86,7 +86,9 @@ BUILDLINK_TRANSFORM+= rm:-Wno-unknown-wa
 
 do-build:
        cd ${WRKSRC} && \
-           ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
+           ${_ULIMIT_CMD}${SETENV} ${MAKE_ENV} \
+           -Dgrep=grep -Dmake=make -Dmake.PATH=PATH=${PATH:Q} \
+           ${PREFIX}/bin/ant ${ANT_ARGS} ${ANT_TARGET}
 
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/build/native-*/${JNIPFX}jnidispatch.${JNISFX} \