[pkgsrc/trunk]: pkgsrc/misc/xdg-utils Use the full path to GNU tools grep and...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/803ede94f5b7
branches:  trunk
changeset: 352507:803ede94f5b7
user:      richard <richard%pkgsrc.org@localhost>
date:      Thu Sep 15 16:16:52 2016 +0000

description:
Use the full path to GNU tools grep and sed.
Cleans build and fixes runtime on Linux and on SunOS.
Bump PKGREVISION to pick up fixed up scripts.

diffstat:

 misc/xdg-utils/Makefile |  20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diffs (41 lines):

diff -r 22a45ff46add -r 803ede94f5b7 misc/xdg-utils/Makefile
--- a/misc/xdg-utils/Makefile   Thu Sep 15 15:59:30 2016 +0000
+++ b/misc/xdg-utils/Makefile   Thu Sep 15 16:16:52 2016 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/06/13 21:40:22 youri Exp $
+# $NetBSD: Makefile,v 1.10 2016/09/15 16:16:52 richard Exp $
 
 DISTNAME=      xdg-utils-1.1.1
 PKGNAME=       ${DISTNAME:S/-rc/rc/}
+PKGREVISION=   1
 CATEGORIES=    misc
 MASTER_SITES=  http://portland.freedesktop.org/download/
 
@@ -15,15 +16,22 @@
 
 GNU_CONFIGURE= yes
 USE_LANGUAGES= # none
-USE_TOOLS+=    bash:run gmake gsed:run
+USE_TOOLS+=    bash:run gmake grep:run gsed:run
 
 SUBST_CLASSES+=                gsed
-SUBST_FILES.gsed=      scripts/xdg-*
-SUBST_STAGE.gsed=      post-build
-SUBST_MESSAGE.gsed=    Use GNU sed instead of sed.
-SUBST_SED.gsed+=       -e "s/sed /gsed /g"
+SUBST_FILES.gsed=      scripts/xdg-*.in
+SUBST_STAGE.gsed=      pre-configure
+SUBST_MESSAGE.gsed=    Use GNU grep/sed instead of grep/sed.
+SUBST_SED.gsed+=       -e "s, sed , ${TOOLS_PATH.gsed} ,g"
+SUBST_SED.gsed+=       -e "s, grep , ${TOOLS_PATH.grep} ,g"
 
 # "foo > /dev/null 2> /dev/null" gives "foo: not found" with NetBSD's sh
 REPLACE_BASH+= scripts/xdg-*
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+TOOLS_PLATFORM.grep=   # use pkgsrc ggrep
+.endif
+
 .include "../../mk/bsd.pkg.mk"