diff options
| -rw-r--r-- | lang/compiler-rt/Makefile | 10 | ||||
| -rw-r--r-- | lang/rust/Makefile | 6 | ||||
| -rw-r--r-- | misc/xdg-utils/Makefile | 12 | ||||
| -rw-r--r-- | x11/gtk2/Makefile | 11 | ||||
| -rw-r--r-- | x11/gtk3/Makefile | 10 |
5 files changed, 11 insertions, 38 deletions
diff --git a/lang/compiler-rt/Makefile b/lang/compiler-rt/Makefile index 43f1e12c77b..8e039bcd481 100644 --- a/lang/compiler-rt/Makefile +++ b/lang/compiler-rt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2018/08/10 15:57:54 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= compiler-rt-6.0.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -13,6 +13,7 @@ LICENSE= modified-bsd OR mit USE_LANGUAGES= c99 c++11 USE_CMAKE= yes +USE_TOOLS+= ggrep GCC_REQD+= 4.8 SSP_SUPPORTED= no @@ -40,13 +41,6 @@ PYTHON_FOR_BUILD_ONLY= yes post-extract: ${RUN} mkdir -p ${WRKDIR}/build -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep>=0:../../textproc/grep -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep -.endif - .include "../../devel/googletest/buildlink3.mk" .include "../../lang/llvm/buildlink3.mk" .include "../../lang/python/tool.mk" diff --git a/lang/rust/Makefile b/lang/rust/Makefile index f77b0c3d5bf..c371ff34c01 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2018/10/15 11:22:23 he Exp $ +# $NetBSD: Makefile,v 1.59 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= rustc-1.29.1-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} @@ -14,7 +14,7 @@ LICENSE= mit OR apache-2.0 USE_GCC_RUNTIME= yes USE_LANGUAGES= c c++11 USE_LIBTOOL= yes -USE_TOOLS+= bash gmake perl:build pkg-config +USE_TOOLS+= bash ggrep gmake perl:build pkg-config # For internal llvm BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake @@ -230,9 +230,7 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-bootstrap .endif .if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep>=0:../../textproc/grep BUILD_DEPENDS+= coreutils>=0:../../sysutils/coreutils -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep TOOLS_CREATE+= md5sum TOOLS_PATH.md5sum= ${PREFIX}/bin/gmd5sum .endif diff --git a/misc/xdg-utils/Makefile b/misc/xdg-utils/Makefile index 8b6d20afe5c..ee26e15ecf1 100644 --- a/misc/xdg-utils/Makefile +++ b/misc/xdg-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2018/08/20 00:43:33 leot Exp $ +# $NetBSD: Makefile,v 1.15 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= xdg-utils-1.1.3 PKGREVISION= 1 @@ -15,14 +15,14 @@ BUILD_DEPENDS+= w3m-[0-9]*:../../www/w3m GNU_CONFIGURE= yes USE_LANGUAGES= # none -USE_TOOLS+= bash:run gmake grep:run gsed:run +USE_TOOLS+= bash:run gmake ggrep:run gsed:run SUBST_CLASSES+= gsed 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" +SUBST_SED.gsed+= -e "s, grep , ${TOOLS_PATH.ggrep} ,g" SUBST_CLASSES+= paths SUBST_FILES.paths= scripts/xdg-*.in @@ -34,10 +34,4 @@ SUBST_SED.paths+= -e "s,/etc,${PKG_SYSCONFDIR},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" diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index bf14916f5c5..e9dbe4bc995 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.299 2018/08/22 09:48:01 wiz Exp $ +# $NetBSD: Makefile,v 1.300 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= gtk+-2.24.32 PKGNAME= ${DISTNAME:S/gtk/gtk2/} @@ -21,7 +21,7 @@ CONFLICTS+= gail-[0-9]* SUPERSEDES= gail-[0-9]* USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake msgfmt perl pkg-config +USE_TOOLS+= ggrep gmake msgfmt perl pkg-config USE_LANGUAGES= c c++ USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes @@ -59,13 +59,6 @@ CONFIGURE_ARGS.Darwin+= --disable-visibility .include "../../mk/bsd.prefs.mk" -# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms -# which do not have it. -.if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep -.endif - CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" #SUBST_CLASSES+= pthread diff --git a/x11/gtk3/Makefile b/x11/gtk3/Makefile index 1c04f10596b..76aa1e348a4 100644 --- a/x11/gtk3/Makefile +++ b/x11/gtk3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.118 2018/08/22 09:48:01 wiz Exp $ +# $NetBSD: Makefile,v 1.119 2018/10/17 08:39:13 jperkin Exp $ DISTNAME= gtk+-3.22.30 PKGNAME= ${DISTNAME:S/gtk/gtk3/} @@ -13,7 +13,7 @@ COMMENT= GIMP Toolkit v3 - libraries for building X11 user interfaces LICENSE= gnu-lgpl-v2.1 USE_PKGLOCALEDIR= yes -USE_TOOLS+= gmake perl pkg-config bash xgettext msgmerge +USE_TOOLS+= ggrep gmake perl pkg-config bash xgettext msgmerge USE_LANGUAGES= c c++ USE_LIBTOOL= yes PTHREAD_AUTO_VARS= yes @@ -47,12 +47,6 @@ BUILD_DIRS= . demos/gtk-demo .include "../../mk/bsd.prefs.mk" -# gtk/Makefile.am hardcodes 'grep -o' so require GNU grep on platforms -# which do not have it. -.if ${OPSYS} == "SunOS" -BUILD_DEPENDS+= grep-[0-9]*:../../textproc/grep -TOOLS_PATH.grep= ${PREFIX}/bin/ggrep -.endif # isnan and isinf are part of libc, not libm on DragonFly # conf tests fail detection due to conflicting definitions, just skip them CONFIGURE_ENV.DragonFly+= ac_cv_func_isinf=yes |