summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorrichard <richard@pkgsrc.org>2016-09-15 16:16:52 +0000
committerrichard <richard@pkgsrc.org>2016-09-15 16:16:52 +0000
commit96d8f86836d801aeb71c60732349288d2f6f64c0 (patch)
tree03a26756a4328fd3d8ce6fa934ebf4bda9b0af75 /misc
parentf8bef0c1e783ad8ea609ba1fa23e493c08764847 (diff)
downloadpkgsrc-96d8f86836d801aeb71c60732349288d2f6f64c0.tar.gz
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 (limited to 'misc')
-rw-r--r--misc/xdg-utils/Makefile20
1 files changed, 14 insertions, 6 deletions
diff --git a/misc/xdg-utils/Makefile b/misc/xdg-utils/Makefile
index 55bd37312a8..260a0bdaf77 100644
--- a/misc/xdg-utils/Makefile
+++ b/misc/xdg-utils/Makefile
@@ -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"