CVS commit: pkgsrc/misc/xdg-utils

["Richard PALO" <richard%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   richard
Date:           Thu Sep 15 16:16:52 UTC 2016

Modified Files:
        pkgsrc/misc/xdg-utils: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/xdg-utils/Makefile

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

Modified files:

Index: pkgsrc/misc/xdg-utils/Makefile
diff -u pkgsrc/misc/xdg-utils/Makefile:1.9 pkgsrc/misc/xdg-utils/Makefile:1.10
--- pkgsrc/misc/xdg-utils/Makefile:1.9  Mon Jun 13 21:40:22 2016
+++ pkgsrc/misc/xdg-utils/Makefile      Thu Sep 15 16:16:52 2016
@@ -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 @@ BUILD_DEPENDS+=     w3m-[0-9]*:../../www/w3m
 
 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"