gsed related clean up.

* Stop to treat NetBSD's sed as GNU sed, not full compatible.
  * Then, no need to reset TOOLS_PLATFORM.gsed for NetBSD if USE_TOOLS+=gsed and
    real GNU sed is required.
  * In addition, convert simple USE_TOOLS+=gsed to conditionally, without NetBSD.
* convert {BUILD_,}DEPENDS+=gsed to USE_TOOLS, all tools from gsed are real gsed.

20 files changed, 55 insertions, 85 deletions

diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 4df161c32a8..358f91bda31 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2011/05/11 10:45:57 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2012/01/14 07:44:33 obache Exp $
 
 DISTNAME=	abcde-2.3.99.7_p235
 PKGNAME=	abcde-2.3.99.7
@@ -58,10 +58,6 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/cddb-tool.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed=	# empty
-.endif
-
 .if ${OPSYS} == "SunOS"
 USE_TOOLS+=	ftp:run
 
diff --git a/chat/empathy/Makefile b/chat/empathy/Makefile
index 369e5481a6a..9cf96b9e644 100644
--- a/chat/empathy/Makefile
+++ b/chat/empathy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/01/13 10:54:51 obache Exp $
+# $NetBSD: Makefile,v 1.30 2012/01/14 07:44:33 obache Exp $
 
 DISTNAME=	empathy-2.34.0
 PKGREVISION=	6
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gawk gmake intltool msgfmt pkg-config
+USE_TOOLS+=		gawk gmake gsed intltool msgfmt pkg-config
 USE_TOOLS+=		autoconf
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
@@ -29,8 +29,6 @@ BUILDLINK_TRANSFORM+=	rm:-Werror
 # notyet
 #CONFIGURE_ARGS+=	--enable-meego
 
-BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
-
 .include "../../audio/libcanberra/buildlink3.mk"
 .include "../../chat/telepathy-farsight/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 6af250a5ebb..155a8ae684b 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2010/07/15 11:48:21 obache Exp $
+# $NetBSD: Makefile,v 1.37 2012/01/14 07:44:33 obache Exp $
 #
 
 DISTNAME=	ircservices-5.0.64
@@ -15,8 +15,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
+.include "../../mk/bsd.prefs.mk"
+
 HAS_CONFIGURE=	YES
-USE_TOOLS+=	gmake grep gsed perl
+USE_TOOLS+=	gmake grep perl
+.if ${OPSYS} != "NetBSD"
+USE_TOOLS+=	gsed
+.endif
 RCD_SCRIPTS=	ircservices
 PKG_GROUPS=	services
 BUILD_DEFS=	VARBASE
diff --git a/chat/telepathy-logger/Makefile b/chat/telepathy-logger/Makefile
index ff916523e6f..337e7dbe512 100644
--- a/chat/telepathy-logger/Makefile
+++ b/chat/telepathy-logger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/11/23 19:30:08 marino Exp $
+# $NetBSD: Makefile,v 1.9 2012/01/14 07:44:33 obache Exp $
 #
 
 DISTNAME=	telepathy-logger-0.2.7
@@ -16,13 +16,11 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake intltool msgfmt
+USE_TOOLS+=	pkg-config gmake gsed intltool msgfmt
 
 PKGCONFIG_OVERRIDE+=	extensions/tpl-extensions.pc.in
 PKGCONFIG_OVERRIDE+=	telepathy-logger/telepathy-logger-0.1.pc.in
 
-BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
-
 DEPENDS=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/editors/notecase/Makefile b/editors/notecase/Makefile
index c8ac40a4c23..e0911356c00 100644
--- a/editors/notecase/Makefile
+++ b/editors/notecase/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/01/14 03:40:12 hans Exp $
+# $NetBSD: Makefile,v 1.20 2012/01/14 07:44:33 obache Exp $
 #
 
 DISTNAME=	notecase-1.8.8_src
@@ -17,11 +17,6 @@ WRKSRC=		${WRKDIR}/notecase-1.8.8
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake msgfmt pkg-config gsed
 
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed= #empty, override nonsense in tools
-.endif
-
 INSTALLATION_DIRS=	share/doc/notecase share/locale/fr_CA/LC_MESSAGES \
 			share/locale/no/LC_MESSAGES
 
diff --git a/graphics/eog-plugins/Makefile.common b/graphics/eog-plugins/Makefile.common
index 4d606e6873d..2310e87ebbe 100644
--- a/graphics/eog-plugins/Makefile.common
+++ b/graphics/eog-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2012/01/14 03:24:15 hans Exp $
+# $NetBSD: Makefile.common,v 1.7 2012/01/14 07:44:34 obache Exp $
 #
 # used by graphics/eog-plugins/Makefile
 # used by graphics/eog-plugins-map/Makefile
@@ -18,10 +18,5 @@ DISTINFO_FILE=	${.CURDIR}/../../graphics/eog-plugins/distinfo
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	intltool pkg-config gmake gsed msgfmt
-# XXX pkgsrc tries to trick us into using NetBSD's sed
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed=
-.endif
 
 .include "../../graphics/eog/buildlink3.mk"
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index d96f897c73e..1e85144d103 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2010/02/14 06:58:25 dholland Exp $
+# $NetBSD: Makefile,v 1.33 2012/01/14 07:44:34 obache Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		5
@@ -17,12 +17,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PATCH_SITES=		${MASTER_SITE_LOCAL}
 PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
 
-BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
-
 NOT_FOR_PLATFORM+=	Interix-*-* *-*-x86_64
 
 WRKSRC=			${WRKDIR}/gcc-2.95.3
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake gsed
 USE_NCURSES=		yes
 PLIST_SRC=		PLIST
 
diff --git a/mail/freepops/Makefile b/mail/freepops/Makefile
index cbb66a11e00..ea6957179a3 100644
--- a/mail/freepops/Makefile
+++ b/mail/freepops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/12/17 12:49:27 marino Exp $
+# $NetBSD: Makefile,v 1.16 2012/01/14 07:44:34 obache Exp $
 #
 
 DISTNAME=		freepops-0.2.8
@@ -14,8 +14,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 MAKE_JOBS_SAFE=		no
 
+.include "../../mk/bsd.prefs.mk"
+
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		bash:run bison gmake gsed patch tar
+USE_TOOLS+=		bash:run bison gmake patch tar
+.if ${OPSYS} != "NetBSD"
+USE_TOOLS+=		gsed
+.endif
 USE_LIBTOOL=		yes
 REPLACE_BASH=		configure.sh
 HAS_CONFIGURE=		yes
@@ -43,8 +48,6 @@ SUBST_MESSAGE.paths=	Adjusting paths.
 
 BUILD_DEFS+=		VARBASE
 
-.include "../../mk/bsd.prefs.mk"
-
 RCD_SCRIPTS=			freepopsd
 FREEPOPSD_USER?=		freepops
 FREEPOPSD_GROUP?=		freepops
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index 6a95721a7f2..5c9f012c776 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2011/11/01 06:02:01 sbd Exp $
+# $NetBSD: Makefile,v 1.100 2012/01/14 07:44:34 obache Exp $
 #
 
 DISTNAME=		gcalctool-5.32.2
@@ -17,11 +17,9 @@ GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		HAVE_YACC=yes
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		bison gmake intltool flex msgfmt pkg-config
+USE_TOOLS+=		bison gmake gsed intltool flex msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
 
-BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
-
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/schemas.mk"
diff --git a/math/octave/Makefile b/math/octave/Makefile
index ffd4f66c111..0218dfa01f8 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2012/01/14 03:36:42 hans Exp $
+# $NetBSD: Makefile,v 1.97 2012/01/14 07:44:34 obache Exp $
 
 DISTNAME=	octave-${OCTAVE_VER}
 CATEGORIES=	math
@@ -37,12 +37,6 @@ CONFIGURE_ARGS+=	--enable-dl
 CONFIGURE_ARGS+=	--enable-static
 CONFIGURE_ARGS+=	--enable-shared
 
-# trick pkgsrc into real gsed, needed for "mkf77def"
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed=	#empty
-.endif
-
 .include "options.mk"
 
 INFO_FILES=	yes
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index e62386d3675..b9f3ba45667 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.44 2011/11/17 19:01:31 joerg Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.45 2012/01/14 07:44:34 obache Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -37,7 +37,6 @@ TOOLS_PLATFORM.gawk?=		${TOOLS_PLATFORM.awk}
 .endif
 TOOLS_PLATFORM.grep?=		/usr/bin/grep
 TOOLS_PLATFORM.groff?=		/usr/bin/groff
-TOOLS_PLATFORM.gsed?=		${TOOLS_PLATFORM.sed}		# GNUish
 TOOLS_PLATFORM.gsoelim?=	${TOOLS_PLATFORM.soelim}	# GNUish
 TOOLS_PLATFORM.gunzip?=		/usr/bin/gunzip -f
 TOOLS_PLATFORM.gzcat?=		/usr/bin/gzcat
diff --git a/print/evince/Makefile b/print/evince/Makefile
index 8adb4074c57..c990caa54c5 100644
--- a/print/evince/Makefile
+++ b/print/evince/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2011/11/01 06:02:24 sbd Exp $
+# $NetBSD: Makefile,v 1.75 2012/01/14 07:44:34 obache Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--enable-comics
 CONFIGURE_ARGS+=	--disable-nautilus
 GCONF_SCHEMAS+=		evince-thumbnailer-comics.schemas
 
-BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
+USE_TOOLS+=	gsed
 
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/schemas.mk"
diff --git a/print/pdf2djvu/Makefile b/print/pdf2djvu/Makefile
index e376e88dec7..d5b16ad0964 100644
--- a/print/pdf2djvu/Makefile
+++ b/print/pdf2djvu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/01/14 03:43:36 hans Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/14 07:44:34 obache Exp $
 #
 
 DISTNAME=	pdf2djvu_0.7.7
@@ -15,19 +15,13 @@ LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	djvulibre-tools-[0-9]*:../../graphics/djvulibre-tools
-DEPENDS+=	gsed>=4.2:../../textproc/gsed
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c++ c
-USE_TOOLS+=		pkg-config gmake intltool msgfmt xgettext gsed
-
-# We really need GNU sed not NetBSD's GNUish sed
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed=	# empty
-.endif
+USE_TOOLS+=		pkg-config gmake intltool msgfmt xgettext gsed:run
+TOOLS_DEPENDS.gsed=	gsed>=4.2:../../textproc/gsed
 
 .include "../../graphics/djvulibre-lib/buildlink3.mk"
 .include "../../print/poppler/buildlink3.mk"
diff --git a/security/CoolKey/Makefile b/security/CoolKey/Makefile
index 76ec34b2815..dee2d9d8a7e 100644
--- a/security/CoolKey/Makefile
+++ b/security/CoolKey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:44 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/14 07:44:35 obache Exp $
 #
 
 DISTNAME=	coolkey-1.1.0
@@ -15,13 +15,17 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NOT_FOR_PLATFORM=	NetBSD-[0-3].*-* NetBSD-4.[0-9].*-*
 NOT_FOR_PLATFORM+=	NetBSD-4.[0-8]*.*-* NetBSD-4.9[0-8].*-*
 
+.include "../../mk/bsd.prefs.mk"
+
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 USE_TOOLS+=	autoconf
 USE_TOOLS+=	gmake
 USE_TOOLS+=	grep
+.if ${OPSYS} != "NetBSD"
 USE_TOOLS+=	gsed
+.endif
 USE_LANGUAGES=	c c++
 AUTOCONF_REQD=	2.59
 
diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile
index eaf9f0d5ae0..4096fe19578 100644
--- a/security/avcheck/Makefile
+++ b/security/avcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2012/01/14 07:44:35 obache Exp $
 
 DISTNAME=	avcheck-0.9
 CATEGORIES=	security mail
@@ -10,7 +10,11 @@ COMMENT=	Mail content filter for SMTP servers
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "NetBSD"
 USE_TOOLS+=	gsed
+.endif
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/doc/avcheck \
 			share/examples/avcheck
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index 181a83dd973..5a4b1e40aaf 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2011/11/01 06:02:31 sbd Exp $
+# $NetBSD: Makefile,v 1.32 2012/01/14 07:44:35 obache Exp $
 #
 
 DISTNAME=	brasero-2.32.1
@@ -17,11 +17,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 # gnome-common provides m4 files we need
 #
 BUILD_DEPENDS+=         gnome-common>=2.26.0:../../devel/gnome-common
-BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake intltool gawk msgfmt
+USE_TOOLS+=	pkg-config gmake gsed intltool gawk msgfmt
 
 CONFIGURE_ARGS+=	--disable-inotify
 
diff --git a/sysutils/nautilus-sendto/Makefile b/sysutils/nautilus-sendto/Makefile
index 51da0757d10..f3ac3f20d06 100644
--- a/sysutils/nautilus-sendto/Makefile
+++ b/sysutils/nautilus-sendto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2011/11/01 06:02:35 sbd Exp $
+# $NetBSD: Makefile,v 1.22 2012/01/14 07:44:35 obache Exp $
 #
 
 DISTNAME=		nautilus-sendto-2.32.0
@@ -15,13 +15,11 @@ LICENSE=		gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		gmake gsed intltool msgfmt pkg-config
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-plugins="evolution nautilus-burn pidgin removable-devices"
 
-BUILD_DEPENDS+=	gsed-[0-9]*:../../textproc/gsed
-
 #XXX: needs libempathy-gtk >= 2.25.2
 #.include "../../chat/empathy/buildlink3.mk"
 # XXX: not in pkgsrc proper yet
diff --git a/textproc/dict-mueller7/Makefile b/textproc/dict-mueller7/Makefile
index b05418c1332..0c8fbf0cf82 100644
--- a/textproc/dict-mueller7/Makefile
+++ b/textproc/dict-mueller7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/10/09 10:02:44 cheusov Exp $
+# $NetBSD: Makefile,v 1.3 2012/01/14 07:44:35 obache Exp $
 
 DISTNAME=	Mueller7GPL
 PKGNAME=	dict-mueller7-1.2
@@ -22,7 +22,12 @@ WRKSRC=		${WRKDIR}/usr/local/share/dict
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		gsed perl tar gzip
+.include "../../mk/bsd.prefs.mk"
+
+USE_TOOLS+=		perl tar gzip
+.if ${OPSYS} != "NetBSD"
+USE_TOOLS+=		gsed
+.endif
 
 INSTALLATION_DIRS+=	share/dictd
 
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index 42fb72049a2..76b04b63b0e 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2012/01/09 02:54:29 obache Exp $
+# $NetBSD: Makefile,v 1.33 2012/01/14 07:44:35 obache Exp $
 
 DISTNAME=	source-highlight-3.1.4
 PKGREVISION=	2
@@ -30,12 +30,5 @@ INFO_FILES=	YES
 USE_TOOLS+=	gmake gsed
 TEST_TARGET=	check
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# We really need GNU sed not NetBSD's GNUish sed
-TOOLS_PLATFORM.gsed=	# empty
-.endif
-
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wbar/Makefile b/wm/wbar/Makefile
index 8c6ab71ffe1..ac854f4996e 100644
--- a/wm/wbar/Makefile
+++ b/wm/wbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2012/01/14 03:38:20 hans Exp $
+# $NetBSD: Makefile,v 1.4 2012/01/14 07:44:35 obache Exp $
 #
 
 DISTNAME=	wbar-2.2.2
@@ -27,12 +27,6 @@ SUBST_SED.sed=		-e "s/sed -i/gsed -i/"
 SUBST_STAGE.sed=	post-extract
 SUBST_MESSAGE.sed=	Needs GNU sed.
 
-# trick pkgsrc into real gsed, needed for "sed -i"
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "NetBSD"
-TOOLS_PLATFORM.gsed=	#empty
-.endif
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"