From f46c1de7cbdec5bc8a818069ff8760cb0b3581d2 Mon Sep 17 00:00:00 2001 From: apb Date: Sat, 25 Oct 2008 22:27:34 +0000 Subject: [PATCH] Use ${TOOL_SED} instead if plain sed in Makefiles. --- bin/csh/Makefile | 4 +-- dist/tcpdump/Makefile.in | 2 +- distrib/bebox/floppies/ramdisk/Makefile | 8 ++--- distrib/cdrom/Makefile | 11 ++++-- distrib/common/Makefile.makedev | 5 +-- distrib/notes/Makefile.inc | 4 +-- distrib/sun2/miniroot/Makefile | 4 +-- distrib/sun3/miniroot/Makefile | 4 +-- distrib/syspkg/mk/bsd.syspkg.mk | 4 +-- distrib/utils/sysinst/Makefile.inc | 11 +++--- external/bsd/dhcpcd/sbin/dhcpcd/Makefile | 4 +-- .../bin/missing-apps/rstart/Makefile.rstart | 4 +-- external/mit/xorg/bin/ssh-askpass/Makefile | 4 +-- external/mit/xorg/bin/twm/Makefile | 4 +-- external/mit/xorg/share/fonts/Makefile | 5 +-- .../mit/xorg/share/fonts/Makefile.fccache | 5 +-- external/mit/xorg/share/nls/Makefile | 7 ++-- gnu/lib/libbfd/Makefile | 16 ++++----- gnu/lib/libgcc4/libgcc_s/Makefile | 5 +-- gnu/usr.bin/binutils/c++filt/Makefile | 4 +-- gnu/usr.bin/gcc4/backend/Makefile | 17 +++++---- gnu/usr.bin/gdb6/bfd/Makefile | 16 ++++----- gnu/usr.bin/gdb6/sim/ppc/Makefile | 10 +++--- gnu/usr.bin/groff/Makefile.inc | 9 ++--- gnu/usr.bin/groff/font/Makefile.tty | 8 +++-- gnu/usr.bin/groff/font/devps/Makefile | 4 +-- gnu/usr.bin/groff/src/libs/libgroff/Makefile | 4 +-- gnu/usr.bin/groff/src/roff/troff/Makefile | 8 +++-- gnu/usr.bin/groff/tmac/Makefile | 8 ++--- gnu/usr.bin/send-pr/Makefile | 10 +++--- gnu/usr.bin/send-pr/Makefile.in | 17 ++++----- gnu/usr.bin/texinfo/Makefile | 4 +-- gnu/usr.bin/xcvs/cvsbug/Makefile | 6 ++-- share/atf/Makefile | 6 ++-- share/doc/atf/Makefile | 4 +-- share/doc/iso/wisc/Makefile | 11 +++--- share/i18n/csmapper/CP/Makefile.inc | 4 +-- share/i18n/csmapper/GEORGIAN/Makefile.inc | 4 +-- share/i18n/esdb/APPLE/Makefile.inc | 4 +-- share/i18n/esdb/AST/Makefile.inc | 4 +-- share/i18n/esdb/BIG5/Makefile.inc | 7 ++-- share/i18n/esdb/CP/Makefile.inc | 4 +-- share/i18n/esdb/DEC/Makefile.inc | 4 +-- share/i18n/esdb/EBCDIC/Makefile.inc | 4 +-- share/i18n/esdb/GEORGIAN/Makefile.inc | 4 +-- share/i18n/esdb/ISO-8859/Makefile.inc | 4 +-- share/i18n/esdb/ISO646/Makefile.inc | 4 +-- share/i18n/esdb/KOI/Makefile.inc | 4 +-- share/i18n/esdb/UTF/Makefile.inc | 8 +++-- share/locale/ctype/Makefile | 6 ++-- share/man/man0/Makefile | 4 +-- share/me/Makefile | 6 ++-- share/misc/Makefile | 4 +-- share/mk/bsd.dep.mk | 4 +-- share/mk/bsd.x11.mk | 4 +-- share/tmac/Makefile | 4 +-- sys/arch/acorn26/Makefile | 5 +-- sys/arch/acorn32/Makefile | 5 +-- sys/arch/algor/Makefile | 4 +-- sys/arch/alpha/Makefile | 4 +-- sys/arch/alpha/conf/Makefile.alpha | 4 +-- sys/arch/alpha/stand/Makefile.bootxx | 4 +-- sys/arch/amd64/Makefile | 5 +-- sys/arch/amiga/Makefile | 5 +-- sys/arch/amiga/conf/Makefile | 4 +-- sys/arch/amiga/dev/Makefile | 11 +++--- sys/arch/arc/Makefile | 4 +-- sys/arch/atari/Makefile | 4 +-- sys/arch/atari/stand/tostools/Makefile.inc | 5 +-- sys/arch/cats/Makefile | 5 +-- sys/arch/cobalt/Makefile | 5 +-- sys/arch/dreamcast/Makefile | 5 +-- sys/arch/evbarm/Makefile | 5 +-- sys/arch/evbarm/conf/Makefile.evbarm.inc | 4 +-- sys/arch/evbmips/Makefile | 5 +-- sys/arch/evbsh3/Makefile | 5 +-- sys/arch/hp300/Makefile | 5 +-- sys/arch/hp700/stand/xxboot/Makefile | 6 ++-- sys/arch/hpcarm/Makefile | 5 +-- sys/arch/hpcsh/Makefile | 5 +-- sys/arch/i386/Makefile | 5 +-- .../i386/stand/bootxx/bootxx_cd9660/Makefile | 4 +-- sys/arch/i386/stand/cdboot/Makefile | 5 +-- sys/arch/i386/stand/fatboot/Makefile.fat | 4 +-- sys/arch/i386/stand/mbr/Makefile.mbr | 4 +-- sys/arch/iyonix/Makefile | 5 +-- sys/arch/landisk/Makefile | 5 +-- sys/arch/luna68k/Makefile | 5 +-- sys/arch/m68k/fpsp/Makefile | 4 +-- sys/arch/mac68k/Makefile | 5 +-- sys/arch/macppc/Makefile | 5 +-- sys/arch/mipsco/Makefile | 5 +-- sys/arch/mmeye/Makefile | 5 +-- sys/arch/netwinder/Makefile | 5 +-- sys/arch/news68k/Makefile | 5 +-- sys/arch/newsmips/Makefile | 5 +-- sys/arch/next68k/Makefile | 5 +-- sys/arch/pmax/Makefile | 5 +-- sys/arch/prep/Makefile | 5 +-- sys/arch/rs6000/Makefile | 5 +-- sys/arch/sgimips/Makefile | 5 +-- sys/arch/shark/Makefile | 5 +-- sys/arch/sparc/Makefile | 5 +-- sys/arch/sparc64/Makefile | 5 +-- sys/arch/x68k/Makefile | 5 +-- sys/arch/x68k/stand/boot_ufs/Makefile | 4 +-- sys/arch/x68k/stand/boot_ustar/Makefile | 14 +++++--- sys/arch/xen/Makefile | 5 +-- sys/arch/zaurus/Makefile | 5 +-- sys/compat/svr4_32/Makefile | 4 +-- sys/conf/Makefile.kern.inc | 36 +++++++++++-------- sys/lkm/arch/mac68k/iwm/Makefile | 4 +-- sys/lkm/dev/isa/Makefile.inc | 4 +-- sys/rump/librump/rumpkern/Makefile.rumpkern | 14 ++++---- usr.bin/krb5-config/Makefile | 4 +-- usr.bin/make/unit-tests/Makefile | 4 +-- usr.bin/nvi/catalog/Makefile | 12 +++---- usr.bin/vi/catalog/Makefile | 12 +++---- usr.bin/vi/docs/USD.doc/vi.ref/Makefile | 6 ++-- usr.sbin/ipf/ipf/Makefile | 10 +++--- usr.sbin/ipf/ipftest/Makefile | 26 +++++++------- usr.sbin/ipf/ipmon/Makefile | 10 +++--- usr.sbin/ipf/ipnat/Makefile | 10 +++--- usr.sbin/ipf/ippool/Makefile | 10 +++--- usr.sbin/mopd/common/Makefile | 4 +-- usr.sbin/tcpdump/Makefile | 4 +-- x11/bin/rstart/Makefile.rstart | 4 +-- x11/bin/ssh-askpass/Makefile | 4 +-- x11/bin/twm/Makefile | 4 +-- x11/lib/dps/Makefile | 6 ++-- x11/lib/freetype2/freetype/Makefile | 4 +-- x11/share/fonts/Makefile | 5 +-- x11/share/nls/Makefile | 5 +-- 133 files changed, 453 insertions(+), 369 deletions(-) diff --git a/bin/csh/Makefile b/bin/csh/Makefile index f1a025d22d1b..9bbb488e9f15 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2008/08/29 00:02:21 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.29 2008/10/25 22:27:34 apb Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -41,7 +41,7 @@ const.h: const.c rm -f ${.TARGET} echo '/* Do not edit this file, make creates it. */' > ${.TARGET} ${CC} -E ${CPPFLAGS} ${.ALLSRC} | egrep 'Char STR' | \ - sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ + ${TOOL_SED} -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \ sort >> ${.TARGET} .if make(install) diff --git a/dist/tcpdump/Makefile.in b/dist/tcpdump/Makefile.in index 1dfce24826a3..021fcdb637fa 100644 --- a/dist/tcpdump/Makefile.in +++ b/dist/tcpdump/Makefile.in @@ -154,7 +154,7 @@ version.o: version.c version.c: $(srcdir)/VERSION @rm -f $@ - sed -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@ + ${TOOL_SED} -e 's/.*/char version[] = "&";/' $(srcdir)/VERSION > $@ install: [ -d $(DESTDIR)$(sbindir) ] || \ diff --git a/distrib/bebox/floppies/ramdisk/Makefile b/distrib/bebox/floppies/ramdisk/Makefile index 31437705c6ac..7a3c90e2c063 100644 --- a/distrib/bebox/floppies/ramdisk/Makefile +++ b/distrib/bebox/floppies/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/10/26 07:25:33 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:34 apb Exp $ TOP= ${.CURDIR}/.. @@ -27,13 +27,13 @@ MTREECONF= mtree.conf DISKTYPE= floppy3 install.sh: install.tmpl - sed "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} upgrade.sh: upgrade.tmpl - sed "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} start.sh: start.tmpl - sed "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" < ${.ALLSRC} > ${.TARGET} all: ${AUXTARGETS} ${CBIN} dd if=/dev/zero of=${IMAGE} count=3074 diff --git a/distrib/cdrom/Makefile b/distrib/cdrom/Makefile index b700567ae87a..74ebfb0692a9 100644 --- a/distrib/cdrom/Makefile +++ b/distrib/cdrom/Makefile @@ -1,9 +1,11 @@ -# $NetBSD: Makefile,v 1.37 2007/12/08 12:30:18 tsutsui Exp $ +# $NetBSD: Makefile,v 1.38 2008/10/25 22:27:34 apb Exp $ # # Consult "*.conf" for the configuration variables; this Makefile is typically # not edited for basic configuration changes. ############################################################################## +.include + all: .if exists(site.conf) @@ -412,7 +414,12 @@ size-${image}: stage-${image} extfileprep fileprep-${image} .if !empty(BASE_PORTS.${image}:Mmacppc) ${MACPPC_MKBOOTHFSDIR}/macppc_mkboothfs ${MACPPC_MKBOOTHFSDIR}/boothfs .endif - @size=$$((`cd ${STAGEDIR}/${image} && ${MKISOFS} ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} -print-size . 2>&1 | tee /dev/stderr | sed '/=/!d;s/^[^=]*=//'` * 2048)) && \ + @size=$$((`cd ${STAGEDIR}/${image} && \ + ${MKISOFS} ${MKISOFS_ARGS} ${MKISOFS_ARGS.${image}} \ + -print-size . 2>&1 + | tee /dev/stderr \ + | ${TOOL_SED} '/=/!d;s/^[^=]*=//'` + * 2048)) && \ if [ "${SUN_BOOT_ARGS.${image}}" != "" ]; then \ size=$$(($$(($$size + 327679)) / 327680 * 327680)) && \ bootfiles=`for f in ${SUN_BOOT_ARGS.${image}:N-:O}; do echo $$f; done | uniq` && \ diff --git a/distrib/common/Makefile.makedev b/distrib/common/Makefile.makedev index 9fc404d9aa1a..0d5759d70b40 100644 --- a/distrib/common/Makefile.makedev +++ b/distrib/common/Makefile.makedev @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.makedev,v 1.14 2008/05/03 05:08:45 tsutsui Exp $ +# $NetBSD: Makefile.makedev,v 1.15 2008/10/25 22:27:34 apb Exp $ # # Makefile snippet to add ${MAKEDEVTARGETS} devices to the mtree list # (if set), otherwise copy .OBJDIR-of-etc/MAKEDEV to ./dev @@ -46,7 +46,8 @@ ${MAKEDEVSPEC}: ${MAKEDEVSCRIPT} -rm -f ${.TARGET} ${.TARGET}.tmp MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \ ${HOST_SH} ${MAKEDEVSCRIPT} -s ${MAKEDEVTARGETS} \ - | sed -e '/^\. type=dir/d' -e 's,^\.,./dev,' > ${.TARGET}.tmp \ + | ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' \ + > ${.TARGET}.tmp \ && sort -o ${.TARGET} ${.TARGET}.tmp .else # ! MAKEDEVTARGETS diff --git a/distrib/notes/Makefile.inc b/distrib/notes/Makefile.inc index cecca2b3a6a3..733c53739368 100644 --- a/distrib/notes/Makefile.inc +++ b/distrib/notes/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.40 2007/12/11 20:57:19 jnemeth Exp $ +# $NetBSD: Makefile.inc,v 1.41 2008/10/25 22:27:34 apb Exp $ # # Ross Harvey @@ -74,7 +74,7 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DISTRIBVERDEP} # TOCPROC= 2>&1 >/dev/null |\ - sed -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }' + ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }' ${TARG}.PostScript.toc: ${SRCS} ${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp diff --git a/distrib/sun2/miniroot/Makefile b/distrib/sun2/miniroot/Makefile index 3f30ad496c56..9a46154b6d56 100644 --- a/distrib/sun2/miniroot/Makefile +++ b/distrib/sun2/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2008/04/29 17:42:35 tsutsui Exp $ +# $NetBSD: Makefile,v 1.27 2008/10/25 22:27:34 apb Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -48,7 +48,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${CRUNCHBIN}: libhack.o install.sub: ${DISTRIBDIR}/miniroot/install.sub - sed -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@ + ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@ CLEANFILES+= install.sub diff --git a/distrib/sun3/miniroot/Makefile b/distrib/sun3/miniroot/Makefile index c47f4d36701a..590acdd1b535 100644 --- a/distrib/sun3/miniroot/Makefile +++ b/distrib/sun3/miniroot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2008/04/29 17:30:34 tsutsui Exp $ +# $NetBSD: Makefile,v 1.38 2008/10/25 22:27:34 apb Exp $ .include .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" @@ -49,7 +49,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack ${CRUNCHBIN}: libhack.o install.sub: ${DISTRIBDIR}/miniroot/install.sub - sed -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@ + ${TOOL_SED} -e "/^VERSION=/s/=.*/=${DISTRIBREV}/" < $? > $@ CLEANFILES+= install.sub diff --git a/distrib/syspkg/mk/bsd.syspkg.mk b/distrib/syspkg/mk/bsd.syspkg.mk index fb4ebbb67b85..d1acce96b640 100644 --- a/distrib/syspkg/mk/bsd.syspkg.mk +++ b/distrib/syspkg/mk/bsd.syspkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.syspkg.mk,v 1.4 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: bsd.syspkg.mk,v 1.5 2008/10/25 22:27:34 apb Exp $ # # This file is derived from: # @@ -113,7 +113,7 @@ MKDIR?= /bin/mkdir -p MV?= /bin/mv PKG_TOOLS_BIN?= /usr/sbin RM?= /bin/rm -SED?= /usr/bin/sed +SED?= ${TOOL_SED:U/usr/bin/sed} SETENV?= /usr/bin/env SH?= /bin/sh TEST?= test # Shell builtin diff --git a/distrib/utils/sysinst/Makefile.inc b/distrib/utils/sysinst/Makefile.inc index 661b3f52af9a..dea3cf1ada95 100644 --- a/distrib/utils/sysinst/Makefile.inc +++ b/distrib/utils/sysinst/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.46 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: Makefile.inc,v 1.47 2008/10/25 22:27:34 apb Exp $ # # Makefile for sysinst @@ -107,24 +107,25 @@ msgtouch: ${DISTRIBVERDEP} msg.def: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch ${_MKTARGET_CREATE} - sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET} menus.def: menus.mi ${MENUS_MD} msgtouch ${_MKTARGET_CREATE} - sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC} | \ ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" > ${.TARGET} sysinstmsgs.fmtcnt: msg.mi.${SYSINSTLANG} ${MSG_MD} msgtouch msg_defs.h ${_MKTARGET_CREATE} - sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${SYSINSTLANG}} | \ + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" \ + ${.ALLSRC:M*.${SYSINSTLANG}} | \ ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \ ${HOST_SH} ${MSG_XLAT_SH} -c > ${.TARGET} .for LANG in ${LANGUAGES:N${SYSINSTLANG}} sysinstmsgs.${LANG}: msg.mi.${LANG} ${MSG_MD:S/.${SYSINSTLANG}$/.${LANG}/} msgtouch msg_defs.h sysinstmsgs.fmtcnt ${_MKTARGET_CREATE} - sed "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${LANG}} | \ + ${TOOL_SED} "s/@@VERSION@@/${DISTRIBVER}/" ${.ALLSRC:M*.${LANG}} | \ ${TOOL_AWK} -f ${UNIF_AWK} -v defines="${MD_OPTIONS}" | \ ${HOST_SH} ${MSG_XLAT_SH} -f sysinstmsgs.fmtcnt > ${.TARGET} diff --git a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile index 74b6d541c5f7..d04ee25f9746 100644 --- a/external/bsd/dhcpcd/sbin/dhcpcd/Makefile +++ b/external/bsd/dhcpcd/sbin/dhcpcd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/09/20 17:38:19 chris Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:34 apb Exp $ # PROG= dhcpcd @@ -31,7 +31,7 @@ CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \ .for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8 ${f}: ${f}.in - sed -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \ + ${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \ -e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \ -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' ${DIST}/${f}.in > $@ .endfor diff --git a/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart b/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart index d6aecf9e9651..779bbc7f52cd 100644 --- a/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart +++ b/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rstart,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile.rstart,v 1.2 2008/10/25 22:27:34 apb Exp $ .include @@ -9,7 +9,7 @@ FILESDIR= ${X11ETCDIR}/rstart/${CFDIR} ${_F}.sed: ${_F} ${_MKTARGET_CREATE} rm -f ${.TARGET} - sed ${CFSED} < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} ${CFSED} < ${.ALLSRC} > ${.TARGET} CONFIGFILES+= ${_F}.sed CLEANFILES+= ${_F}.sed diff --git a/external/mit/xorg/bin/ssh-askpass/Makefile b/external/mit/xorg/bin/ssh-askpass/Makefile index ed00315c2220..bb6d67993254 100644 --- a/external/mit/xorg/bin/ssh-askpass/Makefile +++ b/external/mit/xorg/bin/ssh-askpass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:34 apb Exp $ NOMAN= yes @@ -32,7 +32,7 @@ CLEANFILES+= SshAskpass_ad.h SshAskpass_ad.h: SshAskpass.ad ${_MKTARGET_CREATE} rm -f ${.TARGET} - sed -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET} LDADD+= -lXt -lSM -lICE -lXext -lX11 DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} diff --git a/external/mit/xorg/bin/twm/Makefile b/external/mit/xorg/bin/twm/Makefile index bb6bc74c590d..e93e6709ef14 100644 --- a/external/mit/xorg/bin/twm/Makefile +++ b/external/mit/xorg/bin/twm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:34 apb Exp $ .include @@ -34,7 +34,7 @@ deftwmrc.c: system.twmrc deftwmrc.sed echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ echo ' */' >>$@ echo 'char *defTwmrc[] = {' >>$@ - sed -f ${TWMDIR}/src/deftwmrc.sed \ + ${TOOL_SED} -f ${TWMDIR}/src/deftwmrc.sed \ < ${TWMDIR}/src/system.twmrc >>$@ echo ' (char *) 0 };' >>$@ diff --git a/external/mit/xorg/share/fonts/Makefile b/external/mit/xorg/share/fonts/Makefile index 33338dbd395a..269fc95eb532 100644 --- a/external/mit/xorg/share/fonts/Makefile +++ b/external/mit/xorg/share/fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2008/08/30 07:15:17 rtr Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:34 apb Exp $ .include @@ -15,7 +15,8 @@ afterinstall: .if ${MKUNPRIVED} != "no" cd ${DESTDIR} \ && find ./${X11FONTDIR} -name fonts.cache-1 \ - | sed -e 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ + | ${TOOL_SED} -e \ + 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ | ${METALOG.add} .endif .endif diff --git a/external/mit/xorg/share/fonts/Makefile.fccache b/external/mit/xorg/share/fonts/Makefile.fccache index 3208959af33c..36cda31ddfa1 100644 --- a/external/mit/xorg/share/fonts/Makefile.fccache +++ b/external/mit/xorg/share/fonts/Makefile.fccache @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.fccache,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ +# $NetBSD: Makefile.fccache,v 1.2 2008/10/25 22:27:34 apb Exp $ .ifndef _MAKEFILE_FCCACHE_ _MAKEFILE_FCCACHE_=1 @@ -13,7 +13,8 @@ afterinstall: .if ${MKUNPRIVED} != "no" cd ${DESTDIR} \ && find ./${X11FONTDIR} -name fonts.cache-1 \ - | sed -e 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ + | ${TOOL_SED} -e \ + 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ | ${METALOG.add} .endif diff --git a/external/mit/xorg/share/nls/Makefile b/external/mit/xorg/share/nls/Makefile index 00018c1d19c7..b6ed013bc5b4 100644 --- a/external/mit/xorg/share/nls/Makefile +++ b/external/mit/xorg/share/nls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $ .include @@ -34,7 +34,8 @@ ${_F}.lt: ${_F}.pre ( \ ${CPP} -undef -traditional \ < ${.ALLSRC} | ${X11TOOL_UNXCOMM} \ - | sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d'; \ + | ${TOOL_SED} -e \ + '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d'; \ ${CPP} -undef -traditional \ < ${.ALLSRC} | ${X11TOOL_UNXCOMM} ; \ ) > ${.TARGET} @@ -58,6 +59,6 @@ realall: ${FILES} build_subdirs: .for _dir in ${SUBDIR} mkdir ${.CURDIR}/${_dir} - printf '# $$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile + printf '# $$NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $$\n\nNLS_SUBDIR= ${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile .endfor diff --git a/gnu/lib/libbfd/Makefile b/gnu/lib/libbfd/Makefile index 8dc6ad5ba553..20b68842a4f2 100644 --- a/gnu/lib/libbfd/Makefile +++ b/gnu/lib/libbfd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2008/04/20 07:11:22 mrg Exp $ +# $NetBSD: Makefile,v 1.44 2008/10/25 22:27:35 apb Exp $ NOLINKLIB= # defined NOLINT= # defined @@ -54,28 +54,28 @@ targets.o targets.so: targmatch.h Makefile targmatch.h: config.bfd targmatch.sed ${_MKTARGET_CREATE} - sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@ + ${TOOL_SED} -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@ elf32-target.h: elfxx-target.h ${_MKTARGET_CREATE} - sed -e s/NN/32/g < $> > $@ + ${TOOL_SED} -e s/NN/32/g < $> > $@ elf64-target.h: elfxx-target.h ${_MKTARGET_CREATE} - sed -e s/NN/64/g < $> > $@ + ${TOOL_SED} -e s/NN/64/g < $> > $@ elf32-ia64.c: elfxx-ia64.c ${_MKTARGET_CREATE} - sed -e s/NN/32/g < $> > $@ + ${TOOL_SED} -e s/NN/32/g < $> > $@ elf64-ia64.c: elfxx-ia64.c ${_MKTARGET_CREATE} - sed -e s/NN/64/g < $> > $@ + ${TOOL_SED} -e s/NN/64/g < $> > $@ peigen.c: peXXigen.c ${_MKTARGET_CREATE} - sed -e s/XX/pe/g < $> > $@ + ${TOOL_SED} -e s/XX/pe/g < $> > $@ pepigen.c: peXXigen.c ${_MKTARGET_CREATE} - sed -e s/XX/pep/g < $> > $@ + ${TOOL_SED} -e s/XX/pep/g < $> > $@ diff --git a/gnu/lib/libgcc4/libgcc_s/Makefile b/gnu/lib/libgcc4/libgcc_s/Makefile index 1f1a90e64526..153ed0c61f71 100644 --- a/gnu/lib/libgcc4/libgcc_s/Makefile +++ b/gnu/lib/libgcc4/libgcc_s/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:35 apb Exp $ REQUIRETOOLS= yes NOLINT= # defined @@ -41,7 +41,8 @@ libgcc.map: ${LIBGCC_S_OBJS} ${G_SHLIB_MKMAP} ${G_SHLIB_MAPFILES} ${NM} ${G_SHLIB_NM_FLAGS} ${LIBGCC_S_OBJS}; \ echo %%; \ cat ${G_SHLIB_MAPFILES} | \ - sed -e "/^[ ]*#/d" -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \ + ${TOOL_SED} -e "/^[ ]*#/d" \ + -e 's/^%\(if\|else\|elif\|endif\|define\)/#\1/' | \ ${CC} ${G_LIBGCC2_CFLAGS} ${G_INCLUDES} -E -xassembler-with-cpp -; \ } | ${TOOL_AWK} -f ${G_SHLIB_MKMAP} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} diff --git a/gnu/usr.bin/binutils/c++filt/Makefile b/gnu/usr.bin/binutils/c++filt/Makefile index 46207089501c..af6c93d8ea50 100644 --- a/gnu/usr.bin/binutils/c++filt/Makefile +++ b/gnu/usr.bin/binutils/c++filt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/10/21 10:01:20 lukem Exp $ +# $NetBSD: Makefile,v 1.15 2008/10/25 22:27:35 apb Exp $ PROG= c++filt CPPFLAGS+= -DMAIN @@ -12,4 +12,4 @@ CLEANFILES+= c++filt.1 c++filt.1: ${DIST}/binutils/doc/cxxfilt.man ${_MKTARGET_CREATE} - sed -e "s/@PROGRAM@/${PROG}/" < $> > $@ + ${TOOL_SED} -e "s/@PROGRAM@/${PROG}/" < $> > $@ diff --git a/gnu/usr.bin/gcc4/backend/Makefile b/gnu/usr.bin/gcc4/backend/Makefile index 177f040b3e5e..4d9ed6efab46 100644 --- a/gnu/usr.bin/gcc4/backend/Makefile +++ b/gnu/usr.bin/gcc4/backend/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:35 apb Exp $ LIBISPRIVATE= yes @@ -196,21 +196,24 @@ build-rtl.c: rtl.c \ ${G_RTL_H} real.h ${G_GCC_H} errors.h gtype-desc.h ${_MKTARGET_CREATE} rm -f build-rtl.c - sed -e 's/${.TARGET} + ${TOOL_SED} -e 's/${.TARGET} build-rtl.lo: ${HH} build-print-rtl.c: print-rtl.c \ ${G_RTL_H} ${G_TREE_H} hard-reg-set.h ${G_BASIC_BLOCK_H} ${_MKTARGET_CREATE} rm -f buid-print-rtl.c - sed -e 's/${.TARGET} + ${TOOL_SED} -e 's/${.TARGET} build-print-rtl.lo: ${HH} build-bitmap.c: bitmap.c \ ${G_RTL_H} flags.h ${G_BASIC_BLOCK_H} ${REGS_H} ${G_GCC_H} gtype-desc.h ${_MKTARGET_CREATE} rm -f build-bitmap.c - sed -e 's/${.TARGET} + ${TOOL_SED} -e 's/${.TARGET} build-bitmap.lo: ${HH} build-errors.c: errors.c errors.h @@ -223,14 +226,16 @@ build-varray.c: varray.c \ ${G_RTL_H} ${G_GCC_H} ${TREE_H} bitmap.h errors.h ${_MKTARGET_CREATE} rm -f build-varray.c - sed -e 's/${.TARGET} + ${TOOL_SED} -e 's/${.TARGET} build-varray.lo: ${HH} gtype-desc.h build-ggc-none.c: ggc-none.c \ ${G_GCC_H} gtype-desc.h ${_MKTARGET_CREATE} rm -f build-ggc-none.c - sed -e 's/${.TARGET} + ${TOOL_SED} -e 's/${.TARGET} build-ggc-none.lo: ${HH} # diff --git a/gnu/usr.bin/gdb6/bfd/Makefile b/gnu/usr.bin/gdb6/bfd/Makefile index 4015ac06b6ff..998d292ee0c6 100644 --- a/gnu/usr.bin/gdb6/bfd/Makefile +++ b/gnu/usr.bin/gdb6/bfd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $ .include @@ -38,28 +38,28 @@ targets.o targets.so: targmatch.h Makefile targmatch.h: config.bfd targmatch.sed ${_MKTARGET_CREATE} - sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@ + ${TOOL_SED} -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} >$@ elf32-target.h: elfxx-target.h ${_MKTARGET_CREATE} - sed -e s/NN/32/g < $> > $@ + ${TOOL_SED} -e s/NN/32/g < $> > $@ elf64-target.h: elfxx-target.h ${_MKTARGET_CREATE} - sed -e s/NN/64/g < $> > $@ + ${TOOL_SED} -e s/NN/64/g < $> > $@ elf32-ia64.c: elfxx-ia64.c ${_MKTARGET_CREATE} - sed -e s/NN/32/g < $> > $@ + ${TOOL_SED} -e s/NN/32/g < $> > $@ elf64-ia64.c: elfxx-ia64.c ${_MKTARGET_CREATE} - sed -e s/NN/64/g < $> > $@ + ${TOOL_SED} -e s/NN/64/g < $> > $@ peigen.c: peXXigen.c ${_MKTARGET_CREATE} - sed -e s/XX/pe/g < $> > $@ + ${TOOL_SED} -e s/XX/pe/g < $> > $@ pepigen.c: peXXigen.c ${_MKTARGET_CREATE} - sed -e s/XX/pep/g < $> > $@ + ${TOOL_SED} -e s/XX/pep/g < $> > $@ diff --git a/gnu/usr.bin/gdb6/sim/ppc/Makefile b/gnu/usr.bin/gdb6/sim/ppc/Makefile index 15d2f67fc77f..5f261ea9b3c1 100644 --- a/gnu/usr.bin/gdb6/sim/ppc/Makefile +++ b/gnu/usr.bin/gdb6/sim/ppc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/03 14:48:31 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $ LIBISPRIVATE= yes NOGCCERROR= @@ -149,7 +149,7 @@ run-hw: Makefile done ; \ for hw in $$f; do \ echo $$hw; \ - done | sed -e 's/^.*\(hw_.*\)\.c/\1/' \ + done | ${TOOL_SED} -e 's/^.*\(hw_.*\)\.c/\1/' \ -e 's/^/extern const device_descriptor /' \ -e 's/$$/_device_descriptor\[\];/' \ > tmp-hw.h @@ -162,7 +162,7 @@ run-hw: Makefile done ; \ for hw in $$f; do \ echo $$hw; \ - done | sed -e 's/^.*\(hw_.*\)\.c/\1/' \ + done | ${TOOL_SED} -e 's/^.*\(hw_.*\)\.c/\1/' \ -e 's/^/ /' \ -e 's/$$/_device_descriptor,/' > tmp-hw.c ${MIC} tmp-hw.h hw.h @@ -185,7 +185,7 @@ run-pk: $(PACKAGE_SRC) done ; \ for pk in $$f; do \ echo $$pk; \ - done | sed -e 's/^.*pk_\(.*\)\.c/\1/' \ + done | ${TOOL_SED} -e 's/^.*pk_\(.*\)\.c/\1/' \ -e 's/^/extern package_create_instance_callback pk_/' \ -e 's/$$/_create_instance;/' > tmp-pk.h ${MIC} tmp-pk.h pk.h @@ -196,7 +196,7 @@ DPSRCS+= ${PK_H} DEFINES_H= defines.h ${DEFINES_H}: run-defines run-defines: - sed -n -e '/^#define HAVE_/s/ 1$$/",/' \ + ${TOOL_SED} -n -e '/^#define HAVE_/s/ 1$$/",/' \ -e '/^#define HAVE_/s//"HAVE_/p' \ < ${.CURDIR}/../arch/${MACHINE_ARCH}/config.h > tmp-defines.h ${MIC} tmp-defines.h defines.h diff --git a/gnu/usr.bin/groff/Makefile.inc b/gnu/usr.bin/groff/Makefile.inc index 7164f2712d00..bc55e6e5e36e 100644 --- a/gnu/usr.bin/groff/Makefile.inc +++ b/gnu/usr.bin/groff/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.16 2006/06/02 22:16:23 mrg Exp $ +# $NetBSD: Makefile.inc,v 1.17 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $ @@ -110,12 +110,13 @@ CLEANFILES+= ${GROFFYSRCS:.y=.cpp} ${GROFFYSRCS:.y=_tab.h} .SUFFIXES: .man .1 .2 .3 .4 .5 .6 .7 .8 version=`cat $(GROFF_DIST)/VERSION` -revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` +revision=`${TOOL_SED} -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' \ + $(GROFF_DIST)/REVISION` .man.8 .man.7 .man.6 .man.5 .man.4 .man.3 .man.2 .man.1: ${_MKTARGET_CREATE} rm -f $@ - sed -e "s;@BINDIR@;${BINDIR};g" \ + ${TOOL_SED} -e "s;@BINDIR@;${BINDIR};g" \ -e "s;@FONTDIR@;$(fontdir);g" \ -e "s;@LOCALFONTDIR@;$(localfontdir);g" \ -e "s;@LEGACYFONTDIR@;$(legacyfontdir);g" \ @@ -150,7 +151,7 @@ revision=`sed -e 's/^0$$//' -e 's/^[1-9].*$$/.&/' $(GROFF_DIST)/REVISION` .sh .pl: ${_MKTARGET_CREATE} rm -f $@ - sed -e "s|@BINDIR@|${BINDIR}|g" \ + ${TOOL_SED} -e "s|@BINDIR@|${BINDIR}|g" \ -e "s;@FONTDIR@;$(fontdir);g" \ -e 's|@GROFF_BIN_PATH_SETUP@|GROFF_RUNTIME="$${GROFF_BIN_PATH=/usr/bin}:"|g' \ -e "s|@SEP@|:|" \ diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty index 43839f858a47..48d3dad5f4f2 100644 --- a/gnu/usr.bin/groff/font/Makefile.tty +++ b/gnu/usr.bin/groff/font/Makefile.tty @@ -1,7 +1,9 @@ -# $NetBSD: Makefile.tty,v 1.7 2003/10/21 10:01:20 lukem Exp $ +# $NetBSD: Makefile.tty,v 1.8 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.tty,v 2.7 2001/04/17 12:36:42 ru Exp $ +.include + all: ${FONTS} FONTS?=R I B BI S L CW @@ -15,7 +17,7 @@ LPI=6 $(FONTS): R.proto ${_MKTARGET_CREATE} (charwidth=`expr $(RES) / $(CPI)` ; \ - sed -e "s/^name [A-Z]*$$/name ${.TARGET}/" \ + ${TOOL_SED} -e "s/^name [A-Z]*$$/name ${.TARGET}/" \ -e "s/^\\([^ ]*\\) [0-9]+ /\\1 $$charwidth /" \ -e "s/^spacewidth [0-9]+$$/spacewidth $$charwidth/" \ -e "s/^internalname .*$$/internalname $@/" \ @@ -27,7 +29,7 @@ $(FONTS): R.proto DESC: DESC.proto ${_MKTARGET_CREATE} - sed -e "s/^res .*$$/res $(RES)/" \ + ${TOOL_SED} -e "s/^res .*$$/res $(RES)/" \ -e "s/^hor .*$$/hor `expr $(RES) / $(CPI)`/" \ -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \ -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \ diff --git a/gnu/usr.bin/groff/font/devps/Makefile b/gnu/usr.bin/groff/font/devps/Makefile index 89b19f5afff5..a38deb04c79a 100644 --- a/gnu/usr.bin/groff/font/devps/Makefile +++ b/gnu/usr.bin/groff/font/devps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/10/21 10:01:20 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/font/devps/Makefile,v 1.3 2003/05/01 13:22:18 ru Exp $ @@ -36,7 +36,7 @@ DESC: DESC.in ${PSFILES}: ${_MKTARGET_CREATE} rm -f $@ - sed -f ${DIST_DIR}/psstrip.sed $? >$@ + ${TOOL_SED} -f ${DIST_DIR}/psstrip.sed $? >$@ .include "../Makefile.dev" diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile index 3b42a3c7ee6c..d1fdfff737e2 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/05/03 14:48:30 lukem Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/libs/libgroff/Makefile,v 1.5 2003/05/01 13:22:19 ru Exp $ @@ -32,5 +32,5 @@ version.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION echo 'const char *version_string = "'$$v'";' ;\ echo 'const char *revision_string = "'$$r'";' ;\ echo 'extern "C" const char *Version_string = "'$$v'.'$$r'";' |\ - sed -e 's/\.0\"/\"/'; \ + ${TOOL_SED} -e 's/\.0\"/\"/'; \ ) > ${.TARGET} diff --git a/gnu/usr.bin/groff/src/roff/troff/Makefile b/gnu/usr.bin/groff/src/roff/troff/Makefile index 66c6e29db874..093731f55ca9 100644 --- a/gnu/usr.bin/groff/src/roff/troff/Makefile +++ b/gnu/usr.bin/groff/src/roff/troff/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/02/26 03:20:07 lukem Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/src/roff/troff/Makefile,v 1.4 2003/05/01 13:22:20 ru Exp $ @@ -17,8 +17,10 @@ USETBL= majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION ${_MKTARGET_CREATE} (\ - maj=`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION` ;\ - min=`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION` ;\ + maj=`${TOOL_SED} -e 's/^\([^.]*\)\..*$$/\1/' \ + ${GROFF_DIST}/VERSION` ;\ + min=`${TOOL_SED} -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' \ + ${GROFF_DIST}/VERSION` ;\ r=`cat ${GROFF_DIST}/REVISION` ;\ echo 'const char *major_version = "'$$maj'";' ;\ echo 'const char *minor_version = "'$$min'";' ;\ diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 5e4e45c8e50b..af0f69db1885 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2006/02/06 18:29:48 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2008/10/25 22:27:35 apb Exp $ # $FreeBSD: src/gnu/usr.bin/groff/tmac/Makefile,v 1.41 2003/05/01 13:22:21 ru Exp $ @@ -54,7 +54,7 @@ FILES+= $f-s FILESNAME_$f-s=mdoc/$f $f-s: $f ${_MKTARGET_CREATE} - sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET} .endfor .for f in ${STRIPFILES} @@ -62,7 +62,7 @@ FILES+= $f-s FILESNAME_$f-s=$f $f-s: $f ${_MKTARGET_CREATE} - sed -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -f ${DIST_DIR}/strip.sed ${.ALLSRC} > ${.TARGET} .endfor .for f in ${SPECIALFILES} @@ -70,7 +70,7 @@ FILES+= $f-s FILESNAME_$f-s=$f $f-s: $f ${_MKTARGET_CREATE} - sed -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \ + ${TOOL_SED} -e "s;@TMAC_AN_PREFIX@;${tmac_an_prefix};g" \ -e "s;@TMAC_S_PREFIX@;${tmac_s_prefix};g" \ -e "s;@PNMTOPS_NOSETPAGE@;pnmtops -nosetpage;g" \ ${.ALLSRC} > ${.TARGET} diff --git a/gnu/usr.bin/send-pr/Makefile b/gnu/usr.bin/send-pr/Makefile index 2965a1516bf7..2ebf277d7d29 100644 --- a/gnu/usr.bin/send-pr/Makefile +++ b/gnu/usr.bin/send-pr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2003/12/04 23:32:37 keihan Exp $ +# $NetBSD: Makefile,v 1.30 2008/10/25 22:27:35 apb Exp $ .include @@ -56,7 +56,7 @@ realall: send-pr send-pr.1 send-pr.el install-sid send-pr: send-pr.sh Makefile ${_MKTARGET_CREATE} - sed -e 's,xVERSIONx,$(VERSION),' \ + ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \ -e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \ -e 's,xGNATS_ADDRx,$(GNATS_ADDR),' \ -e 's,xGNATS_SITEx,$(GNATS_SITE),' \ @@ -72,14 +72,14 @@ send-pr: send-pr.sh Makefile install-sid: install-sid.sh Makefile ${_MKTARGET_CREATE} - sed -e 's,xBINDIRx,$(bindir),g' \ + ${TOOL_SED} -e 's,xBINDIRx,$(bindir),g' \ -e 's,xVERSIONx,$(VERSION),g' $(srcdir)/install-sid.sh > $@-t mv -f $@-t $@ chmod 755 $@ send-pr.el: send-pr-el.in Makefile ${_MKTARGET_CREATE} - sed -e 's,xVERSIONx,$(VERSION),' \ + ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \ -e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \ -e 's,xGNATS_SITEx,$(GNATS_SITE),' \ -e 's,xDATADIRx,$(datadir),' \ @@ -91,7 +91,7 @@ send-pr.el: send-pr-el.in Makefile send-pr.1: send-pr.man Makefile ${_MKTARGET_CREATE} - sed -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \ + ${TOOL_SED} -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \ -e 's,xVERSIONx,$(VERSION),g' $(srcdir)/send-pr.man > $@-t mv -f $@-t $@ diff --git a/gnu/usr.bin/send-pr/Makefile.in b/gnu/usr.bin/send-pr/Makefile.in index a9b5f4cc3eda..0f762b2932d1 100644 --- a/gnu/usr.bin/send-pr/Makefile.in +++ b/gnu/usr.bin/send-pr/Makefile.in @@ -122,7 +122,7 @@ states.texi s-usage.texi categ.texi send-pr.sh all: send-pr install-sid send-pr.elc send-pr.1 send-pr: send-pr.sh Makefile - sed -e 's,xVERSIONx,$(VERSION),' \ + ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \ -e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \ -e 's,xGNATS_ADDRx,$(GNATS_ADDR),' \ -e 's,xGNATS_SITEx,$(GNATS_SITE),' \ @@ -137,13 +137,13 @@ send-pr: send-pr.sh Makefile chmod 755 $@ install-sid: install-sid.sh Makefile - sed -e 's,xBINDIRx,$(bindir),g' \ + ${TOOL_SED} -e 's,xBINDIRx,$(bindir),g' \ -e 's,xVERSIONx,$(VERSION),g' $(srcdir)/install-sid.sh > $@-t mv $@-t $@ chmod 755 $@ send-pr.el: send-pr-el.in Makefile - sed -e 's,xVERSIONx,$(VERSION),' \ + ${TOOL_SED} -e 's,xVERSIONx,$(VERSION),' \ -e 's,xGNATS_ROOTx,$(GNATS_ROOT),' \ -e 's,xGNATS_SITEx,$(GNATS_SITE),' \ -e 's,xDATADIRx,$(datadir),' \ @@ -178,13 +178,14 @@ install-gnats-dist: $(INSTALL_DATA) $(srcdir)/README $(datadir)/gnats/dist/README $(INSTALL_DATA) $(srcdir)/INSTALL $(datadir)/gnats/dist/INSTALL $(INSTALL_DATA) $(srcdir)/MANIFEST $(datadir)/gnats/dist/MANIFEST - sed -e 's/"DEFAULT_RELEASE") ".*"/"DEFAULT_RELEASE") "@''DEFAULT_RELEASE@"/' \ + ${TOOL_SED} \ + -e 's/"DEFAULT_RELEASE") ".*"/"DEFAULT_RELEASE") "@''DEFAULT_RELEASE@"/' \ -e 's/"SUBMITTER") ".*"/"SUBMITTER") "@''SUBMITTER@"/' \ -e 's/"DATADIR") ".*"/"DATADIR") "@''DATADIR@"/' \ send-pr.el > $(datadir)/gnats/dist/send-pr-el.inT mv $(datadir)/gnats/dist/send-pr-el.inT \ $(datadir)/gnats/dist/send-pr-el.in - sed -e 's/GNATS_ROOT=.*/GNATS_ROOT=/' \ + ${TOOL_SED} -e 's/GNATS_ROOT=.*/GNATS_ROOT=/' \ -e 's/SUBMITTER=.*/SUBMITTER=@''SUBMITTER@/' \ -e 's/DEFAULT_RELEASE=.*/DEFAULT_RELEASE="@''DEFAULT_RELEASE@"/' \ -e 's/DEFAULT_ORGANIZATION=.*/DEFAULT_ORGANIZATION=/' \ @@ -192,7 +193,7 @@ install-gnats-dist: send-pr > $(datadir)/gnats/dist/send-pr.sh-t mv $(datadir)/gnats/dist/send-pr.sh-t \ $(datadir)/gnats/dist/send-pr.sh - sed -e 's/^BINDIR=.*/BINDIR=@''BINDIR@/' \ + ${TOOL_SED} -e 's/^BINDIR=.*/BINDIR=@''BINDIR@/' \ install-sid > $(datadir)/gnats/dist/install-sid.sT mv $(datadir)/gnats/dist/install-sid.sT \ $(datadir)/gnats/dist/install-sid.sh @@ -237,7 +238,7 @@ version.texi: Makefile mv $@-t $@ send-pr.1: Makefile - sed -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \ + ${TOOL_SED} -e 's,xGNATS_ROOTx,$(GNATS_ROOT),g' \ -e 's,xVERSIONx,$(VERSION),g' $(srcdir)/send-pr.man > $@-t mv $@-t $@ @@ -252,7 +253,7 @@ send-pr.dvi: version.texi gnats-build: stamp-gnats stamp-gnats: Makefile - sed -e 's,^GNATS_ROOT =.*,GNATS_ROOT = $(GNATS_ROOT),' \ + ${TOOL_SED} -e 's,^GNATS_ROOT =.*,GNATS_ROOT = $(GNATS_ROOT),' \ -e 's,^GNATS_ADDR =.*,GNATS_ADDR = $(GNATS_ADDR),' \ -e 's,^GNATS_SITE =.*,GNATS_SITE = $(GNATS_SITE),' \ -e 's,^DEFAULT_RELEASE =.*,DEFAULT_RELEASE = $(DEFAULT_RELEASE),' \ diff --git a/gnu/usr.bin/texinfo/Makefile b/gnu/usr.bin/texinfo/Makefile index adca713e610c..a54d4154498d 100644 --- a/gnu/usr.bin/texinfo/Makefile +++ b/gnu/usr.bin/texinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2008/09/02 08:38:35 christos Exp $ +# $NetBSD: Makefile,v 1.22 2008/10/25 22:27:35 apb Exp $ .include @@ -11,7 +11,7 @@ FILES= epsf.tex texinfo.cat texinfo.dtd texinfo.tex texinfo.xsl VERSION!= sed -n "s/^\#define VERSION \"\(.*\)\"/\1/p" ${NETBSDSRCDIR}/gnu/usr.bin/texinfo/common/config.h texinfo.cat: texinfo-cat.in - sed 's/__VERSION__/${VERSION}/g' ${.ALLSRC} >${.TARGET} + ${TOOL_SED} 's/__VERSION__/${VERSION}/g' ${.ALLSRC} >${.TARGET} realall: texinfo.cat diff --git a/gnu/usr.bin/xcvs/cvsbug/Makefile b/gnu/usr.bin/xcvs/cvsbug/Makefile index 9d132980a36a..2f929c753088 100644 --- a/gnu/usr.bin/xcvs/cvsbug/Makefile +++ b/gnu/usr.bin/xcvs/cvsbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/02/04 16:22:53 christos Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:35 apb Exp $ .include "${.CURDIR}/../Makefile.inc" @@ -11,7 +11,7 @@ CLEANFILES+=.fname cvsbug cvsbug: cvsbug.in ${_MKTARGET_CREATE} - sed -e 's,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g' \ + ${TOOL_SED} -e 's,@PACKAGE_BUGREPORT@,bug-cvs@gnu.org,g' \ -e "s,@VERSION@,`cat .fname`,g" ${.ALLSRC} > ${.TARGET} chmod a+x ${.TARGET} @@ -20,7 +20,7 @@ cvsbug: .fname .fname: configure ${_MKTARGET_CREATE} echo > .fname \ - cvs-`sed < ${.ALLSRC} \ + cvs-`${TOOL_SED} < ${.ALLSRC} \ -e '/PACKAGE_VERSION/!d' \ -e 's/[^0-9.]*\([0-9.]*\).*/\1/' \ -e q` diff --git a/share/atf/Makefile b/share/atf/Makefile index fa6327b9f01f..8e6448ca6d7e 100644 --- a/share/atf/Makefile +++ b/share/atf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/01 15:35:50 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $ .include @@ -22,7 +22,7 @@ FILES+= atf.footer.subr \ realall: atf-c.pc atf-c.pc: atf-c.pc.in - sed -e 's,__ATF_VERSION__,0.5,g' \ + ${TOOL_SED} -e 's,__ATF_VERSION__,0.5,g' \ -e 's,__CC__,gcc,g' \ -e 's,__INCLUDEDIR__,/usr/include,g' \ -e 's,__LIBDIR__,/usr/lib,g' \ @@ -31,7 +31,7 @@ CLEANFILES+= atf-c.pc realall: atf-c++.pc atf-c++.pc: atf-c++.pc.in - sed -e 's,__ATF_VERSION__,0.5,g' \ + ${TOOL_SED} -e 's,__ATF_VERSION__,0.5,g' \ -e 's,__CXX__,g++,g' \ -e 's,__INCLUDEDIR__,/usr/include,g' \ -e 's,__LIBDIR__,/usr/lib,g' \ diff --git a/share/doc/atf/Makefile b/share/doc/atf/Makefile index 30c0605afd7e..a123eac1e7e7 100644 --- a/share/doc/atf/Makefile +++ b/share/doc/atf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/01 15:35:50 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:35 apb Exp $ .include @@ -19,7 +19,7 @@ MAN+= atf-c-api.3 atf-c++-api.3 atf-sh-api.3 CLEANFILES+= atf.7 atf.7.tmp atf.7: atf.7.in - sed -e 's,__DOCDIR__,/usr/share/doc/atf,g' \ + ${TOOL_SED} -e 's,__DOCDIR__,/usr/share/doc/atf,g' \ <${SRCDIR}/doc/atf.7.in >atf.7.tmp mv atf.7.tmp atf.7 diff --git a/share/doc/iso/wisc/Makefile b/share/doc/iso/wisc/Makefile index 4500128605e8..efce1bf4b4d0 100644 --- a/share/doc/iso/wisc/Makefile +++ b/share/doc/iso/wisc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:35 apb Exp $ # # Makefile for the tp documents: # design: TP design/source guide @@ -61,16 +61,17 @@ appendix_c: appendix_a: ctags -x $(SRCS) \ | ${TOOL_AWK} '{printf("%s\t%s\t%s\n", $$1, $$3, $$2)}' \ - | sed -e 's-../../sys/netargo/--' > index_by_func.nr + | ${TOOL_SED} -e 's-../../sys/netargo/--' > index_by_func.nr format -P$(PRINTER) appendix_a.nr appendix_b: ctags -x $(SRCS) \ | ${TOOL_AWK} '{printf("%s\t%s\t%s\n", $$3, $$1, $$2)}' \ - | sed -e 's-../../sys/netargo/--' \ + | ${TOOL_SED} -e 's-../../sys/netargo/--' \ | sort \ | fmtxref -w 80 \ - | sed -e 's/ / /' \ - -e 's/ / /' \ + | ${TOOL_SED} \ + -e 's/ / /' \ + -e 's/ / /' \ > index_by_file.nr format -P$(PRINTER) appendix_b.nr diff --git a/share/i18n/csmapper/CP/Makefile.inc b/share/i18n/csmapper/CP/Makefile.inc index 0b9b3780eb6e..4438956d9f4f 100644 --- a/share/i18n/csmapper/CP/Makefile.inc +++ b/share/i18n/csmapper/CP/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2006/11/04 03:46:19 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.5 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/CP @@ -12,7 +12,7 @@ mapper.dir.CP: ${.CURDIR}/CP/CP.part ${.CURDIR}/CP/mapper.dir.CP.src (\ echo "# CP";\ for i in ${PART_CP}; do \ - f=`echo $$i | sed 's/:/@/'`; \ + f=`echo $$i | ${TOOL_SED} 's/:/@/'`; \ printf '%-32s%-16s%s\n' CP$$i'/UCS' \ mapper_std CP/CP$$f'%UCS.mps';\ printf '%-32s%-16s%s\n' UCS/CP$$i \ diff --git a/share/i18n/csmapper/GEORGIAN/Makefile.inc b/share/i18n/csmapper/GEORGIAN/Makefile.inc index e92854152f16..b653493a0969 100644 --- a/share/i18n/csmapper/GEORGIAN/Makefile.inc +++ b/share/i18n/csmapper/GEORGIAN/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/06/15 15:34:20 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/GEORGIAN @@ -12,7 +12,7 @@ mapper.dir.GEORGIAN: ${.CURDIR}/GEORGIAN/GEORGIAN.part (\ echo "# GEORGIAN";\ for i in ${PART_GEORGIAN}; do \ - f=`echo $$i | sed 's/:/@/'`; \ + f=`echo $$i | ${TOOL_SED} 's/:/@/'`; \ printf '%-32s%-16s%s\n' GEORGIAN-$$i'/UCS' \ mapper_std GEORGIAN/GEORGIAN-$$f'%UCS.mps';\ printf '%-32s%-16s%s\n' UCS/GEORGIAN-$$i \ diff --git a/share/i18n/esdb/APPLE/Makefile.inc b/share/i18n/esdb/APPLE/Makefile.inc index f988bd0f02f5..608f9970abeb 100644 --- a/share/i18n/esdb/APPLE/Makefile.inc +++ b/share/i18n/esdb/APPLE/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/03/13 19:45:36 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/APPLE @@ -13,7 +13,7 @@ SUBDIR_MAC:= APPLE .if !exists(${.CURDIR}/MAC/MAC${i:S/:/@/}.src) MAC${i:S/:/@/}.src: MAC.src ${_MKTARGET_CREATE} - sed 's/changeme/$i/' $> > $@ + ${TOOL_SED} 's/changeme/$i/' $> > $@ CLEANFILES+= MAC${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/AST/Makefile.inc b/share/i18n/esdb/AST/Makefile.inc index c4bf230a27dd..cab930408e5d 100644 --- a/share/i18n/esdb/AST/Makefile.inc +++ b/share/i18n/esdb/AST/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/04/01 04:13:22 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/AST @@ -12,7 +12,7 @@ SUBDIR_ARMSCII:= AST .if !exists(${.CURDIR}/AST/ARMSCII-${i:S/:/@/}.src) ARMSCII-${i:S/:/@/}.src: ARMSCII.src ${_MKTARGET_CREATE} - sed 's/ARMSCII-x/ARMSCII-$i/' $> > $@ + ${TOOL_SED} 's/ARMSCII-x/ARMSCII-$i/' $> > $@ CLEANFILES+= ARMSCII-${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/BIG5/Makefile.inc b/share/i18n/esdb/BIG5/Makefile.inc index d087e81ece08..07bee8530a19 100644 --- a/share/i18n/esdb/BIG5/Makefile.inc +++ b/share/i18n/esdb/BIG5/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/06/19 17:28:25 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/BIG5 @@ -19,8 +19,9 @@ Big5_$i_variable!= sed \ # XXX: FIXME Big5-${i:S/:/@/}.src: Big5.src Big5.variable ${_MKTARGET_CREATE} - sed -e 's/encoding/Big5-$i/' -e 's/variable/${Big5_$i_variable}/' \ - ${.CURDIR}/BIG5/Big5.src > $@ + ${TOOL_SED} -e 's/encoding/Big5-$i/' \ + -e 's/variable/${Big5_$i_variable}/' \ + ${.CURDIR}/BIG5/Big5.src > $@ CLEANFILES+= Big5-${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/CP/Makefile.inc b/share/i18n/esdb/CP/Makefile.inc index d2371cfb1074..00a0d41feb2b 100644 --- a/share/i18n/esdb/CP/Makefile.inc +++ b/share/i18n/esdb/CP/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2003/10/21 10:01:21 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.4 2008/10/25 22:27:35 apb Exp $ .PATH: ${.CURDIR}/CP @@ -10,7 +10,7 @@ SEP_CP:= .if !exists(${.CURDIR}/CP/CP${i:S/:/@/}.src) CP${i:S/:/@/}.src: CP.src ${_MKTARGET_CREATE} - sed 's/CPx/CP$i/' $> > $@ + ${TOOL_SED} 's/CPx/CP$i/' $> > $@ CLEANFILES+= CP${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/DEC/Makefile.inc b/share/i18n/esdb/DEC/Makefile.inc index 8ada2f5beb3e..434b2819f603 100644 --- a/share/i18n/esdb/DEC/Makefile.inc +++ b/share/i18n/esdb/DEC/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2007/04/01 18:52:31 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/DEC @@ -10,7 +10,7 @@ SEP_DEC:= .if !exists(${.CURDIR}/DEC/DEC${i:S/:/@/}.src) DEC${i:S/:/@/}.src: DEC.src ${_MKTARGET_CREATE} - sed 's/DECx/DEC$i/' $> > $@ + ${TOOL_SED} 's/DECx/DEC$i/' $> > $@ CLEANFILES+= DEC${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/EBCDIC/Makefile.inc b/share/i18n/esdb/EBCDIC/Makefile.inc index 5c528b2c46b3..c14d4f913c58 100644 --- a/share/i18n/esdb/EBCDIC/Makefile.inc +++ b/share/i18n/esdb/EBCDIC/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2003/10/21 10:01:21 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.4 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/EBCDIC @@ -8,6 +8,6 @@ CODE:= EBCDIC .for i in ${EBCDIC_PART} EBCDIC-${i:S/:/@/}.src: EBCDIC.src ${_MKTARGET_CREATE} - sed 's/EBCDIC-x/EBCDIC-$i/' $> > $@ + ${TOOL_SED} 's/EBCDIC-x/EBCDIC-$i/' $> > $@ CLEANFILES:= ${CLEANFILES} EBCDIC-${i:S/:/@/}.src .endfor diff --git a/share/i18n/esdb/GEORGIAN/Makefile.inc b/share/i18n/esdb/GEORGIAN/Makefile.inc index bcc61d170d4e..70f4c56fc04f 100644 --- a/share/i18n/esdb/GEORGIAN/Makefile.inc +++ b/share/i18n/esdb/GEORGIAN/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/06/15 15:34:20 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/GEORGIAN @@ -9,7 +9,7 @@ SEP_GEORGIAN:= - .for i in ${GEORGIAN_PART} GEORGIAN-${i}.src: GEORGIAN.src ${_MKTARGET_CREATE} - sed -e 's/GEORGIANx/GEORGIAN-${i}/' \ + ${TOOL_SED} -e 's/GEORGIANx/GEORGIAN-${i}/' \ -e 's/GEORGIANy/GEORGIAN-${i:S/-/:/}/' $> > $@ CLEANFILES+= GEORGIAN-${i}.src .endfor diff --git a/share/i18n/esdb/ISO-8859/Makefile.inc b/share/i18n/esdb/ISO-8859/Makefile.inc index edd8caeea98f..b3ddfeaa74e8 100644 --- a/share/i18n/esdb/ISO-8859/Makefile.inc +++ b/share/i18n/esdb/ISO-8859/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2003/10/21 10:01:21 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.4 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/ISO-8859 @@ -8,6 +8,6 @@ CODE:= ISO-8859 .for i in ${ISO-8859_PART} ISO-8859-$i.src: ISO-8859.src ${_MKTARGET_CREATE} - sed 's/ISO-8859-x/ISO-8859-$i/' $> > $@ + ${TOOL_SED} 's/ISO-8859-x/ISO-8859-$i/' $> > $@ CLEANFILES+= ISO-8859-$i.src .endfor diff --git a/share/i18n/esdb/ISO646/Makefile.inc b/share/i18n/esdb/ISO646/Makefile.inc index 6735f43937b7..36769da79dc0 100644 --- a/share/i18n/esdb/ISO646/Makefile.inc +++ b/share/i18n/esdb/ISO646/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.3 2003/10/21 10:01:21 lukem Exp $ +# $NetBSD: Makefile.inc,v 1.4 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/ISO646 @@ -8,6 +8,6 @@ CODE:= ISO646 .for i in ${ISO646_PART} ISO646-${i:S/:/@/}.src: ISO646.src ${_MKTARGET_CREATE} - sed 's/ISO646-x/ISO646-$i/' $> > $@ + ${TOOL_SED} 's/ISO646-x/ISO646-$i/' $> > $@ CLEANFILES:= ${CLEANFILES} ISO646-${i:S/:/@/}.src .endfor diff --git a/share/i18n/esdb/KOI/Makefile.inc b/share/i18n/esdb/KOI/Makefile.inc index 0ed921337417..bf91c975e918 100644 --- a/share/i18n/esdb/KOI/Makefile.inc +++ b/share/i18n/esdb/KOI/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2006/04/08 14:15:48 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.2 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/KOI @@ -10,7 +10,7 @@ SEP_KOI:= .if !exists(${.CURDIR}/KOI/KOI${i:S/:/@/}.src) KOI${i:S/:/@/}.src: KOI.src ${_MKTARGET_CREATE} - sed 's/KOIx/KOI$i/' $> > $@ + ${TOOL_SED} 's/KOIx/KOI$i/' $> > $@ CLEANFILES+= KOI${i:S/:/@/}.src .endif .endfor diff --git a/share/i18n/esdb/UTF/Makefile.inc b/share/i18n/esdb/UTF/Makefile.inc index 1a42c7e4f6bd..76746efa3fef 100644 --- a/share/i18n/esdb/UTF/Makefile.inc +++ b/share/i18n/esdb/UTF/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2005/03/05 18:05:15 tnozaki Exp $ +# $NetBSD: Makefile.inc,v 1.5 2008/10/25 22:27:36 apb Exp $ .PATH: ${.CURDIR}/UTF @@ -25,6 +25,10 @@ UTF-7-var= utf7 .for i in ${UTF_PART} UTF-$i.src: UTF.src ${_MKTARGET_CREATE} - sed 's/UTF-x/UTF-$i/;s/UTF-mod/${UTF-$i-mod}/;s/UTF-var/${UTF-$i-var}/' $> > $@ + ${TOOL_SED} \ + -e 's/UTF-x/UTF-$i/' \ + -e 's/UTF-mod/${UTF-$i-mod}/' \ + -e 's/UTF-var/${UTF-$i-var}/' \ + $> > $@ CLEANFILES+= UTF-$i.src .endfor diff --git a/share/locale/ctype/Makefile b/share/locale/ctype/Makefile index bb4ba01dd3bf..0b5a6b734e80 100644 --- a/share/locale/ctype/Makefile +++ b/share/locale/ctype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/03/14 15:49:26 tnozaki Exp $ +# $NetBSD: Makefile,v 1.27 2008/10/25 22:27:36 apb Exp $ NOMAN= # defined @@ -313,13 +313,13 @@ ${locale}.out: ${LOCALESRC_${locale}}.src \ ${NETBSDSRCDIR}/lib/libc/locale/runetable.c ${_MKTARGET_CREATE} ${CPP} -I${.CURDIR} < ${.CURDIR}/${LOCALESRC_${locale}}.src | \ - sed -e '/^#/d' | ${TOOL_MKLOCALE} -o ${.TARGET} + ${TOOL_SED} -e '/^#/d' | ${TOOL_MKLOCALE} -o ${.TARGET} .endfor .SUFFIXES: .src .out .src.out: ${_MKTARGET_CREATE} - ${CPP} -I${.CURDIR} < ${.IMPSRC} | sed -e '/^#/d' | \ + ${CPP} -I${.CURDIR} < ${.IMPSRC} | ${TOOL_SED} -e '/^#/d' | \ ${TOOL_MKLOCALE} -o ${.TARGET} # does not work diff --git a/share/man/man0/Makefile b/share/man/man0/Makefile index a231f303e49a..1ac50123ee81 100644 --- a/share/man/man0/Makefile +++ b/share/man/man0/Makefile @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.9 (Berkeley) 7/1/91 -# $NetBSD: Makefile,v 1.15 2006/08/29 14:32:45 hubertf Exp $ +# $NetBSD: Makefile,v 1.16 2008/10/25 22:27:36 apb Exp $ NOOBJ= # defined @@ -58,7 +58,7 @@ man.pdf: for i in ${SECTIONS} ; \ do \ echo Chewing on man$${i}pages.pdf ; \ - sed \ + ${TOOL_SED} \ ${OPTIMIZE_PDF} \ man$${i}pages.ps.tmp ; \ ps2pdf man$${i}pages.ps.tmp man$${i}pages.pdf ; \ diff --git a/share/me/Makefile b/share/me/Makefile index 9f66275fa55c..9bd6f1c5c3c5 100644 --- a/share/me/Makefile +++ b/share/me/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/27/94 -# $NetBSD: Makefile,v 1.25 2004/03/20 20:41:33 dsl Exp $ +# $NetBSD: Makefile,v 1.26 2008/10/25 22:27:36 apb Exp $ MELIB= ${BINDIR}/me #TMLIB= ${BINDIR}/tmac @@ -24,7 +24,7 @@ ${DESTDIR}${MELIB}/${M}: .MADE ${DESTDIR}${MELIB}/${M}: ${M} @rm -f ${.TARGET} ${M}.tmp - sed -f ${.CURDIR}/strip.sed < ${.ALLSRC} > ${M}.tmp + ${TOOL_SED} -f ${.CURDIR}/strip.sed < ${.ALLSRC} > ${M}.tmp ${INSTALL_FILE:N-c} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ ${M}.tmp ${.TARGET} @rm -f ${M}.tmp @@ -42,7 +42,7 @@ ${DESTDIR}${MELIB}/${M}: ${M} #${DESTDIR}${TMLIB}/${M}: ${M} # @rm -f ${.TARGET} ${M}.tmp -# sed -f ${.CURDIR}/strip.sed < ${.ALLSRC} > ${M}.tmp +# ${TOOL_SED} -f ${.CURDIR}/strip.sed < ${.ALLSRC} > ${M}.tmp # ${INSTALL_FILE:N-c} -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \ # ${M}.tmp ${.TARGET} #.endfor diff --git a/share/misc/Makefile b/share/misc/Makefile index 7c3961802f1f..a28278ddca29 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2008/10/19 22:05:20 apb Exp $ +# $NetBSD: Makefile,v 1.33 2008/10/25 22:27:36 apb Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 NOOBJ= # defined @@ -21,7 +21,7 @@ update-domains: echo '# Last update:' `date` ; \ echo '#' ; \ ftp -o - ${DOMAIN_URL} \ - | sed -n -f ${.CURDIR}/domains.sed \ + | ${TOOL_SED} -n -f ${.CURDIR}/domains.sed \ ) > domains ; \ update-na.phone: diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 2e7d678111fe..77bfb558b984 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.dep.mk,v 1.67 2004/04/18 04:34:27 lukem Exp $ +# $NetBSD: bsd.dep.mk,v 1.68 2008/10/25 22:27:36 apb Exp $ ##### Basic targets cleandir: cleandepend @@ -75,6 +75,6 @@ cleandepend: .PHONY tags: ${SRCS} .if defined(SRCS) -cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \ - sed "s;\${.CURDIR}/;;" > tags + ${TOOL_SED} "s;\${.CURDIR}/;;" > tags .endif .endif diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk index aba48a92ef15..e1fd8de52548 100644 --- a/share/mk/bsd.x11.mk +++ b/share/mk/bsd.x11.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.69 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: bsd.x11.mk,v 1.70 2008/10/25 22:27:36 apb Exp $ .include @@ -161,7 +161,7 @@ PRINTX11VERSION=${TOOL_AWK} ' \ # Commandline to convert 'XCOMM' comments and 'XHASH' to '#', among other # things. Transformed from the "CppSedMagic" macro from "Imake.rules". # -X11TOOL_UNXCOMM= sed -e '/^\# *[0-9][0-9]* *.*$$/d' \ +X11TOOL_UNXCOMM= ${TOOL_SED} -e '/^\# *[0-9][0-9]* *.*$$/d' \ -e '/^\#line *[0-9][0-9]* *.*$$/d' \ -e '/^[ ]*XCOMM$$/s/XCOMM/\#/' \ -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \ diff --git a/share/tmac/Makefile b/share/tmac/Makefile index 8b0db937ca74..c25c40a4c38a 100644 --- a/share/tmac/Makefile +++ b/share/tmac/Makefile @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 -# $NetBSD: Makefile,v 1.30 2004/03/29 17:08:25 wiz Exp $ +# $NetBSD: Makefile,v 1.31 2008/10/25 22:27:36 apb Exp $ # IF YOU ADD TO MSRCS, MAKE SURE YOU UPDATE `CATDEPS' IN bsd.man.mk! MSRCS= doc2html @@ -19,7 +19,7 @@ realall: ${MMACS} .for i in ${MSRCS} $i.tmac: $i ${_MKTARGET_CREATE} - sed -f ${STRIP_SED} < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -f ${STRIP_SED} < ${.ALLSRC} > ${.TARGET} .endfor .include diff --git a/sys/arch/acorn26/Makefile b/sys/arch/acorn26/Makefile index 7191e9797871..95a433d2e433 100644 --- a/sys/arch/acorn26/Makefile +++ b/sys/arch/acorn26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:19 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:36 apb Exp $ # Makefile for acorn26 tags file and boot blocks @@ -16,7 +16,8 @@ DACORN26= acorn26 include iobus ioc mainbus vidc tags: TAGS -ctags -wdtf ${TACORN26} ${SACORN26} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AACORN26} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TACORN26} sort -o ${TACORN26} ${TACORN26} diff --git a/sys/arch/acorn32/Makefile b/sys/arch/acorn32/Makefile index d9adc7487845..d819e34a0a85 100644 --- a/sys/arch/acorn32/Makefile +++ b/sys/arch/acorn32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/11 12:16:05 christos Exp $ +# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:36 apb Exp $ # Makefile for acorn32 tags file and boot blocks @@ -15,7 +15,8 @@ DACORN32= dev mainbus podulebus include tags: -ctags -wdtf ${TACORN32} ${SACORN32} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AACORN32} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TACORN32} sort -o ${TACORN32} ${TACORN32} diff --git a/sys/arch/algor/Makefile b/sys/arch/algor/Makefile index c3cf8e2819e6..ae943db5c288 100644 --- a/sys/arch/algor/Makefile +++ b/sys/arch/algor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:21 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:36 apb Exp $ # Makefile for algor tags file and boot blocks @@ -18,7 +18,7 @@ DALGOR= algor include isa pci tags: -ctags -wdtf ${TALGOR} ${SALGOR} ${SMIPS} ${COMM} egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AALGOR} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TARC} sort -o ${TALGOR} ${TALGOR} diff --git a/sys/arch/alpha/Makefile b/sys/arch/alpha/Makefile index bdc797169808..b6439849cfe9 100644 --- a/sys/arch/alpha/Makefile +++ b/sys/arch/alpha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/01/06 17:40:21 lukem Exp $ +# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:36 apb Exp $ # Makefile for alpha tags file and boot blocks @@ -15,7 +15,7 @@ DALPHA= tc include tags: -ctags -wdtf ${TALPHA} ${SALPHA} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AALPHA} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TALPHA} sort -o ${TALPHA} ${TALPHA} diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha index 74d423807df7..f9c7653391ea 100644 --- a/sys/arch/alpha/conf/Makefile.alpha +++ b/sys/arch/alpha/conf/Makefile.alpha @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.alpha,v 1.79 2007/10/17 19:52:57 garbled Exp $ +# $NetBSD: Makefile.alpha,v 1.80 2008/10/25 22:27:36 apb Exp $ # Makefile for NetBSD # @@ -35,7 +35,7 @@ CPPFLAGS+= -Dalpha CFLAGS+= -mno-fp-regs AFLAGS+= -traditional -NORMAL_S= ${CPP} ${AFLAGS} ${CPPFLAGS} $< | sed -e 's,^\#.*,,' | \ +NORMAL_S= ${CPP} ${AFLAGS} ${CPPFLAGS} $< | ${TOOL_SED} -e 's,^\#.*,,' | \ ${AS} -o ${.TARGET} ## diff --git a/sys/arch/alpha/stand/Makefile.bootxx b/sys/arch/alpha/stand/Makefile.bootxx index c60360adf8fd..4628f643e098 100644 --- a/sys/arch/alpha/stand/Makefile.bootxx +++ b/sys/arch/alpha/stand/Makefile.bootxx @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootxx,v 1.7 2005/12/11 12:16:20 christos Exp $ +# $NetBSD: Makefile.bootxx,v 1.8 2008/10/25 22:27:36 apb Exp $ SRCS = start.S bootxx.c booted_dev.c blkdev.c prom.c prom_disp.S \ putstr.c panic_putstr.c @@ -39,7 +39,7 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_USE_CREAD=no ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN} @${LD} -Ttext 0x20000000 -N --verbose 2>&1 \ - | sed -n '/^==========/,/^===========/{/^========/d; \ + | ${TOOL_SED} -n '/^==========/,/^===========/{/^========/d; \ s,^[[:blank:]]*\.eh_frame[[:blank:]]*:, /DISCARD/ : ,;p;}' \ > ${PROG}.lds ${LD} -T ${PROG}.lds -Ttext ${BOOT_RELOC} -N -e start \ diff --git a/sys/arch/amd64/Makefile b/sys/arch/amd64/Makefile index 73082c7291a7..d78e0359782b 100644 --- a/sys/arch/amd64/Makefile +++ b/sys/arch/amd64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/02/17 16:23:12 bouyer Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:36 apb Exp $ # Makefile for amd64 tags file and boot blocks @@ -18,7 +18,8 @@ tags: rm -f ${TAMD64} -echo ${SAMD64} ${COMM} | xargs ctags -wadtf ${TAMD64} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMD64} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TAMD64} sort -o ${TAMD64} ${TAMD64} diff --git a/sys/arch/amiga/Makefile b/sys/arch/amiga/Makefile index 8984854962e6..4cf6ae1ef703 100644 --- a/sys/arch/amiga/Makefile +++ b/sys/arch/amiga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/03/05 21:57:59 aymeric Exp $ +# $NetBSD: Makefile,v 1.21 2008/10/25 22:27:36 apb Exp $ # Makefile for amiga tags file and boot blocks @@ -18,7 +18,8 @@ DAMIGA= amiga dev include tags: -echo ${COMM} | xargs ctags -wdtf ${TAMIGA} ${SAMIGA} ${SM68K} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMIGA} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TAMIGA} sort -o ${TAMIGA} ${TAMIGA} diff --git a/sys/arch/amiga/conf/Makefile b/sys/arch/amiga/conf/Makefile index 2c5d6ed8613a..977ff045ba7f 100644 --- a/sys/arch/amiga/conf/Makefile +++ b/sys/arch/amiga/conf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/10/17 19:53:14 garbled Exp $ +# $NetBSD: Makefile,v 1.14 2008/10/25 22:27:36 apb Exp $ # # Use this file to regenerate DRACO, GENERIC, INSTALL @@ -22,5 +22,5 @@ __generate_config: .USE GENERIC.in Makefile @echo '# Changes will be lost when make is run in this directory.' >> ${.TARGET} @echo '#' >> ${.TARGET} @echo -n '# Created from: ' >> ${.TARGET} - sed -e '1s/$$NetBSD/NetBSD/' GENERIC.in |\ + ${TOOL_SED} -e '1s/$$NetBSD/NetBSD/' GENERIC.in |\ m4 -P -DM4_Target=${.TARGET} >> ${.TARGET} diff --git a/sys/arch/amiga/dev/Makefile b/sys/arch/amiga/dev/Makefile index 02e44edc436e..769fb9e9dd90 100644 --- a/sys/arch/amiga/dev/Makefile +++ b/sys/arch/amiga/dev/Makefile @@ -1,12 +1,15 @@ -# $NetBSD: Makefile,v 1.6 2005/12/11 12:16:27 christos Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:36 apb Exp $ + +.include # ite support for A2410, generate C source from TMS34010 assembler grf_ultms.c: grf_ultms.g - echo '/* $$' 'NetBSD$$ */' | sed -e 's/ N/N/' > ${.TARGET} + echo '/* $$' 'NetBSD$$ */' | ${TOOL_SED} -e 's/ N/N/' > ${.TARGET} echo >> ${.TARGET} echo '/* Generated from' >> ${.TARGET} - grep '$$NetBSD' ${.ALLSRC} | sed -e 's/[^$$]*\$$//' -e 's/\$$.*//' \ - -e 's/^/ /' >> ${.TARGET} + grep '$$NetBSD' ${.ALLSRC} \ + | ${TOOL_SED} -e 's/[^$$]*\$$//' -e 's/\$$.*//' -e 's/^/ /' \ + >> ${.TARGET} echo '*/' >> ${.TARGET} echo >> ${.TARGET} gspa -c tmscode ${.ALLSRC} >> ${.TARGET} diff --git a/sys/arch/arc/Makefile b/sys/arch/arc/Makefile index a9c024ce1e30..d1fbe006396a 100644 --- a/sys/arch/arc/Makefile +++ b/sys/arch/arc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/11 12:16:37 christos Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/25 22:27:36 apb Exp $ # $OpenBSD: Makefile,v 1.5 1997/05/19 10:34:53 pefo Exp $ # from: @(#)Makefile 8.1 (Berkeley) 6/16/93 @@ -21,7 +21,7 @@ DARC= arc dev dti include isa pci jazz tags: -ctags -wdtf ${TARC} ${SARC} ${SMIPS} ${COMM} egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AARC} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TARC} sort -o ${TARC} ${TARC} diff --git a/sys/arch/atari/Makefile b/sys/arch/atari/Makefile index c27b836b2858..d721f5e1107b 100644 --- a/sys/arch/atari/Makefile +++ b/sys/arch/atari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/01/06 17:40:23 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $ # Makefile for atari tags file and boot blocks @@ -18,7 +18,7 @@ DATARI= atari dev include tags: -ctags -wdtf ${TATARI} ${SATARI} ${SM68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AATARI} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TATARI} sort -o ${TATARI} ${TATARI} diff --git a/sys/arch/atari/stand/tostools/Makefile.inc b/sys/arch/atari/stand/tostools/Makefile.inc index b10106c0cf88..12b60acbcdc8 100644 --- a/sys/arch/atari/stand/tostools/Makefile.inc +++ b/sys/arch/atari/stand/tostools/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2001/10/11 07:07:41 leo Exp $ +# $NetBSD: Makefile.inc,v 1.3 2008/10/25 22:27:37 apb Exp $ # # Configurable stuff. @@ -61,4 +61,5 @@ ${OBJS}: ${HEADERS} ${CC} ${CFLAGS} ${CPPFLAGS} -o $@ -c $< .s.o: - ${CPP} ${CPPFLAGS} $< | sed -e 's/%//g' | ${AS} ${ASFLAGS} -o $@ + ${CPP} ${CPPFLAGS} $< | ${TOOL_SED} -e 's/%//g' \ + | ${AS} ${ASFLAGS} -o $@ diff --git a/sys/arch/cats/Makefile b/sys/arch/cats/Makefile index c35607d9217e..2371afabf8a9 100644 --- a/sys/arch/cats/Makefile +++ b/sys/arch/cats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:25 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for cats tags file and boot blocks @@ -15,7 +15,8 @@ DCATS= isa include tags: -ctags -wdtf ${TCATS} ${SCATS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACATS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TCATS} sort -o ${TCATS} ${TCATS} diff --git a/sys/arch/cobalt/Makefile b/sys/arch/cobalt/Makefile index 325d3c85f9aa..dea50ff636fe 100644 --- a/sys/arch/cobalt/Makefile +++ b/sys/arch/cobalt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/01/06 17:40:26 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:37 apb Exp $ # Makefile for cobalt tags file @@ -18,7 +18,8 @@ DCOBALT= pci include tags: -ctags -wdtf ${TCOBALT} ${SCOBALT} ${SMIPS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ACOBALT} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TCOBALT} sort -o ${TCOBALT} ${TCOBALT} diff --git a/sys/arch/dreamcast/Makefile b/sys/arch/dreamcast/Makefile index 1e48ad92e6c8..db1c22effaeb 100644 --- a/sys/arch/dreamcast/Makefile +++ b/sys/arch/dreamcast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:27 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for dreamcast tags file and boot blocks @@ -16,7 +16,8 @@ DDREAMCAST= dreamcast include tags: -ctags -wdtf ${TDREAMCAST} ${SDREAMCAST} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ADREAMCAST} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TDREAMCAST} sort -o ${TDREAMCAST} ${TDREAMCAST} diff --git a/sys/arch/evbarm/Makefile b/sys/arch/evbarm/Makefile index 37aacf760612..2bf99b861f48 100644 --- a/sys/arch/evbarm/Makefile +++ b/sys/arch/evbarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/01/10 07:34:02 dyoung Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:37 apb Exp $ # Makefile for evbarm tags file and boot blocks @@ -23,7 +23,8 @@ tags: -echo ${SEVBARM} | xargs ctags -wadtf ${TEVBARM} -${FINDCOMM} | xargs ctags -wadtf ${TEVBARM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TEVBARM} sort -o ${TEVBARM} ${TEVBARM} diff --git a/sys/arch/evbarm/conf/Makefile.evbarm.inc b/sys/arch/evbarm/conf/Makefile.evbarm.inc index 325d12b59822..72d3ad16cd73 100644 --- a/sys/arch/evbarm/conf/Makefile.evbarm.inc +++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.evbarm.inc,v 1.18 2008/04/27 18:58:46 matt Exp $ +# $NetBSD: Makefile.evbarm.inc,v 1.19 2008/10/25 22:27:37 apb Exp $ .if defined(BOARDMKFRAG) # Must be a full pathname. .include "${BOARDMKFRAG}" @@ -14,7 +14,7 @@ EXTRA_CLEAN+= ldscript tmp # generate ldscript from common template ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG} echo ${KERNELS} - sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \ + ${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \ -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \ ${THISARM}/conf/ldscript.evbarm > tmp && mv tmp $@ diff --git a/sys/arch/evbmips/Makefile b/sys/arch/evbmips/Makefile index 86e959c53477..53b388fc7c48 100644 --- a/sys/arch/evbmips/Makefile +++ b/sys/arch/evbmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/10/17 19:54:14 garbled Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:37 apb Exp $ # Makefile for evbmips tags file and boot blocks @@ -22,7 +22,8 @@ tags: -echo ${SEVBMIPS} ${SMIPS} | xargs ctags -wadtf ${TEVBMIPS} -${FINDCOMM} | xargs ctags -wadtf ${TEVBMIPS} egrep "^LEAF(.*)|^[AN]LEAF(.*)|^NON_LEAF(.*)" ${AEVBMIPS} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TEVBMIPS} sort -o ${TEVBMIPS} ${TEVBMIPS} diff --git a/sys/arch/evbsh3/Makefile b/sys/arch/evbsh3/Makefile index 769499daef17..f679aaed9fb3 100644 --- a/sys/arch/evbsh3/Makefile +++ b/sys/arch/evbsh3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:29 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for evbsh3 tags file and boot blocks @@ -16,7 +16,8 @@ DEVBSH3= evbsh3 include tags: -ctags -wdtf ${TEVBSH3} ${SEVBSH3} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBSH3} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TEVBSH3} sort -o ${TEVBSH3} ${TEVBSH3} diff --git a/sys/arch/hp300/Makefile b/sys/arch/hp300/Makefile index 4e5f66507487..042a102f254a 100644 --- a/sys/arch/hp300/Makefile +++ b/sys/arch/hp300/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/01/06 17:40:31 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:37 apb Exp $ # Makefile for hp300 tags file and boot blocks @@ -18,7 +18,8 @@ DHP300= dev hp300 include tags: -ctags -wdtf ${THP300} ${SHP300} ${SM68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AHP300} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${THP300} sort -o ${THP300} ${THP300} diff --git a/sys/arch/hp700/stand/xxboot/Makefile b/sys/arch/hp700/stand/xxboot/Makefile index 11f822bf15a6..1005d921df2f 100644 --- a/sys/arch/hp700/stand/xxboot/Makefile +++ b/sys/arch/hp700/stand/xxboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2008/08/29 00:02:23 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:37 apb Exp $ PROG= xxboot NOMAN= # defined @@ -61,7 +61,7 @@ CLEANFILES+= ${SRCS:M*.c:S/.c$/.o.S/} # Place code to data section. .S.o: ${_MKTARGET_COMPILE} - sed -e 's/\.code/.data/' \ + ${TOOL_SED} -e 's/\.code/.data/' \ -e 's/\.bss/.section .bss,"aw",@nobits/' \ -e 's/\.allow$$/.level 1.0/' -e 's/\.allow/.level/' \ ${.IMPSRC} | ${AS} -o ${.TARGET} @@ -75,4 +75,4 @@ CLEANFILES+= ${SRCS:M*.c:S/.c$/.o.S/} if [ $$? = 0 ]; then \ echo 'found non-relocatable code' >&2 && exit 1; \ fi - sed -e 's/\.text/.data/' $@.S | ${AS} -o ${.TARGET} + ${TOOL_SED} -e 's/\.text/.data/' $@.S | ${AS} -o ${.TARGET} diff --git a/sys/arch/hpcarm/Makefile b/sys/arch/hpcarm/Makefile index 4cf7109d73b0..de8b71ede5fc 100644 --- a/sys/arch/hpcarm/Makefile +++ b/sys/arch/hpcarm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:33 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for hpcarm tags file and boot blocks @@ -16,7 +16,8 @@ DHPCARM= dev mainbus include sa tags: -ctags -wdtf ${THPCARM} ${SHPCARM} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AHPCARM} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${THPCARM} sort -o ${THPCARM} ${THPCARM} diff --git a/sys/arch/hpcsh/Makefile b/sys/arch/hpcsh/Makefile index 91f2ee153c6e..827cf6e8bb57 100644 --- a/sys/arch/hpcsh/Makefile +++ b/sys/arch/hpcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:34 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for hpcsh tags file and boot blocks @@ -16,7 +16,8 @@ DEVBSH3= hpcsh include tags: -ctags -wdtf ${TEVBSH3} ${SEVBSH3} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBSH3} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TEVBSH3} sort -o ${TEVBSH3} ${TEVBSH3} diff --git a/sys/arch/i386/Makefile b/sys/arch/i386/Makefile index b63bad8d76d9..ddd9d6371f16 100644 --- a/sys/arch/i386/Makefile +++ b/sys/arch/i386/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/06/11 08:14:14 dyoung Exp $ +# $NetBSD: Makefile,v 1.35 2008/10/25 22:27:37 apb Exp $ # Makefile for i386 tags file and boot blocks @@ -31,7 +31,8 @@ tags: -echo ${SI386} | xargs ctags -wadtf ${TI386} -${FINDCOMM} | xargs ctags -wadtf ${TI386} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TI386} sort -o ${TI386} ${TI386} diff --git a/sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile b/sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile index 66f6ce1c82e6..1c38c8b7bf74 100644 --- a/sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile +++ b/sys/arch/i386/stand/bootxx/bootxx_cd9660/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/09 11:25:03 dsl Exp $ +# $NetBSD: Makefile,v 1.11 2008/10/25 22:27:37 apb Exp $ S= ${.CURDIR}/../../../../.. @@ -46,7 +46,7 @@ ${PROG}: ${OBJS} ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} \ ${OBJS} @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\' \ - | sed 's/^0*//' ); \ + | ${TOOL_SED} 's/^0*//' ); \ echo "#### There are $$1 free bytes in ${PROG}" ${OBJCOPY} -O binary ${PROG}.tmp ${PROG} rm -f ${PROG}.tmp diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile index 85df1944bdd0..461a0bc8ff2f 100644 --- a/sys/arch/i386/stand/cdboot/Makefile +++ b/sys/arch/i386/stand/cdboot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/10/20 03:02:07 christos Exp $ +# $NetBSD: Makefile,v 1.8 2008/10/25 22:27:37 apb Exp $ S= ${.CURDIR}/../../../.. @@ -61,7 +61,8 @@ CLEANFILES+= ${PROG}.tmp ${PROG}: ${OBJS} ${_MKTARGET_LINK} ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${PRIMARY_LOAD_ADDRESS} ${OBJS} - @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\' | sed 's/^0*//' ); \ + @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\' \ + | ${TOOL_SED} 's/^0*//' ); \ echo "#### There are $$1 free bytes in ${PROG}" ${OBJCOPY} -O binary ${PROG}.tmp ${PROG} rm -f ${PROG}.tmp diff --git a/sys/arch/i386/stand/fatboot/Makefile.fat b/sys/arch/i386/stand/fatboot/Makefile.fat index 5a0e06a71f23..ff65fc981fd2 100644 --- a/sys/arch/i386/stand/fatboot/Makefile.fat +++ b/sys/arch/i386/stand/fatboot/Makefile.fat @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.fat,v 1.2 2008/10/20 03:02:07 christos Exp $ +# $NetBSD: Makefile.fat,v 1.3 2008/10/25 22:27:37 apb Exp $ S= ${.CURDIR}/../../../../../ @@ -45,7 +45,7 @@ ${PROG}: ${OBJS} ${_MKTARGET_LINK} ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,0x7c00 ${OBJS} @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\' \ - | sed 's/^0*//' ); \ + | ${TOOL_SED} 's/^0*//' ); \ echo "#### There are $$1 free bytes in ${PROG}" ${OBJCOPY} -O binary ${PROG}.tmp ${PROG} rm -f ${PROG}.tmp diff --git a/sys/arch/i386/stand/mbr/Makefile.mbr b/sys/arch/i386/stand/mbr/Makefile.mbr index 9a7512d65558..564b96b27926 100644 --- a/sys/arch/i386/stand/mbr/Makefile.mbr +++ b/sys/arch/i386/stand/mbr/Makefile.mbr @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.mbr,v 1.13 2008/10/20 03:02:07 christos Exp $ +# $NetBSD: Makefile.mbr,v 1.14 2008/10/25 22:27:37 apb Exp $ S= ${.CURDIR}/../../../../../ @@ -43,7 +43,7 @@ ${PROG}: ${OBJS} ${_MKTARGET_LINK} ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,0x600 ${OBJS} @ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\' \ - | sed 's/^0*//' ); \ + | ${TOOL_SED} 's/^0*//' ); \ echo "#### There are $$1 free bytes in ${PROG}" ${OBJCOPY} -O binary ${PROG}.tmp ${PROG} rm -f ${PROG}.tmp diff --git a/sys/arch/iyonix/Makefile b/sys/arch/iyonix/Makefile index 8ab2e006fe87..9ff9459566d3 100644 --- a/sys/arch/iyonix/Makefile +++ b/sys/arch/iyonix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/12/11 12:17:51 christos Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for iyonix tags file and boot blocks @@ -15,7 +15,8 @@ DIYONIX= include tags: -ctags -wdtf ${TIYONIX} ${SIYONIX} ${COMM} # egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AIYONIX} | \ -# sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ +# ${TOOL_SED} -e \ +# "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ # >> ${TIYONIX} sort -o ${TIYONIX} ${TIYONIX} diff --git a/sys/arch/landisk/Makefile b/sys/arch/landisk/Makefile index 9110d9788975..17f58414cab2 100644 --- a/sys/arch/landisk/Makefile +++ b/sys/arch/landisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/09/01 21:26:18 uwe Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:37 apb Exp $ # Makefile for landisk tags file and boot blocks @@ -14,7 +14,8 @@ DLANDISK= landisk include tags: -ctags -wdtf ${TLANDISK} ${SLANDISK} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ALANDISK} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TLANDISK} sort -o ${TLANDISK} ${TLANDISK} diff --git a/sys/arch/luna68k/Makefile b/sys/arch/luna68k/Makefile index 91f979a2d427..ace825e85fd3 100644 --- a/sys/arch/luna68k/Makefile +++ b/sys/arch/luna68k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:35 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:37 apb Exp $ # Makefile for luna68k tags file @@ -18,7 +18,8 @@ DLUNA68K= dev include tags: -ctags -wdtf ${TLUNA68K} ${SLUNA68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ALUNA68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TLUNA68K} sort -o ${TLUNA68K} ${TLUNA68K} diff --git a/sys/arch/m68k/fpsp/Makefile b/sys/arch/m68k/fpsp/Makefile index ae8e813444b1..ba9d62e18488 100644 --- a/sys/arch/m68k/fpsp/Makefile +++ b/sys/arch/m68k/fpsp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: Makefile,v 1.17 2008/10/25 22:27:37 apb Exp $ # MOTOROLA MICROPROCESSOR & MEMORY TECHNOLOGY GROUP # M68000 Hi-Performance Microprocessor Division @@ -55,7 +55,7 @@ AFLAGS = -x assembler-with-cpp -m68040 # For the Library Version: # AR? = ar -LIB_FILTER = sed 's/fpsp.defs/l_fpsp.defs/' +LIB_FILTER = ${TOOL_SED} 's/fpsp.defs/l_fpsp.defs/' LIB_TARGET = lib$(TARGET).a # # SYS selects the template set to use diff --git a/sys/arch/mac68k/Makefile b/sys/arch/mac68k/Makefile index 69c152fb7568..154e23b846a4 100644 --- a/sys/arch/mac68k/Makefile +++ b/sys/arch/mac68k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/02/25 05:47:55 dyoung Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:37 apb Exp $ # Makefile for mac68k tags file and boot blocks @@ -20,7 +20,8 @@ tags: -rm -f ${TMAC68K} -echo ${SMAC68K} ${SM68K} ${COMM} | xargs ctags -wdtf ${TMAC68K} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMAC68K} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TMAC68K} sort -o ${TMAC68K} ${TMAC68K} diff --git a/sys/arch/macppc/Makefile b/sys/arch/macppc/Makefile index aab6ef5f9fd8..531bfcbb93f5 100644 --- a/sys/arch/macppc/Makefile +++ b/sys/arch/macppc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2007/12/31 10:45:22 dyoung Exp $ +# $NetBSD: Makefile,v 1.8 2008/10/25 22:27:37 apb Exp $ # Makefile for macppc tags file @@ -25,7 +25,8 @@ tags: -echo ${SIMACPPC} | xargs ctags -wadtf ${TIMACPPC} -${FINDCOMM} | xargs ctags -wadtf ${TIMACPPC} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AIMACPPC} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TIMACPPC} sort -o ${TIMACPPC} ${TIMACPPC} diff --git a/sys/arch/mipsco/Makefile b/sys/arch/mipsco/Makefile index 5b853c256f93..2a8f69d09286 100644 --- a/sys/arch/mipsco/Makefile +++ b/sys/arch/mipsco/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/01/06 17:40:38 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:38 apb Exp $ # Makefile for mipsco tags file @@ -18,7 +18,8 @@ DMIPSCO= obio include tags: -ctags -wdtf ${TMIPSCO} ${SMIPSCO} ${SMIPS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMIPSCO} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TMIPSCO} sort -o ${TMIPSCO} ${TMIPSCO} diff --git a/sys/arch/mmeye/Makefile b/sys/arch/mmeye/Makefile index 4a3f09d34572..d67484eb8d24 100644 --- a/sys/arch/mmeye/Makefile +++ b/sys/arch/mmeye/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:39 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $ # Makefile for mmeye tags file and boot blocks @@ -16,7 +16,8 @@ DMMEYE= mmeye include tags: -ctags -wdtf ${TMMEYE} ${SMMEYE} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AMMEYE} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TMMEYE} sort -o ${TMMEYE} ${TMMEYE} diff --git a/sys/arch/netwinder/Makefile b/sys/arch/netwinder/Makefile index 636363803b83..e0cbb856ee1c 100644 --- a/sys/arch/netwinder/Makefile +++ b/sys/arch/netwinder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:40 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $ # Makefile for netwinder tags file and boot blocks @@ -15,7 +15,8 @@ DNETWINDER= isa pci include tags: -ctags -wdtf ${TNETWINDER} ${SNETWINDER} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANETWINDER} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TNETWINDER} sort -o ${TNETWINDER} ${TNETWINDER} diff --git a/sys/arch/news68k/Makefile b/sys/arch/news68k/Makefile index db67ed51b3f1..7e1948537a3c 100644 --- a/sys/arch/news68k/Makefile +++ b/sys/arch/news68k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/01/06 17:40:41 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:38 apb Exp $ # Makefile for news68k tags file @@ -18,7 +18,8 @@ DNEWS68K= dev include tags: -ctags -wdtf ${TNEWS68K} ${SNEWS68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANEWS68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TNEWS68K} sort -o ${TNEWS68K} ${TNEWS68K} diff --git a/sys/arch/newsmips/Makefile b/sys/arch/newsmips/Makefile index faa2474f0d1d..ad380e4d9223 100644 --- a/sys/arch/newsmips/Makefile +++ b/sys/arch/newsmips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/01/06 17:40:42 lukem Exp $ +# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:38 apb Exp $ # Makefile for newsmips tags file @@ -18,7 +18,8 @@ DNEWSMIPS= dev include tags: -ctags -wdtf ${TNEWSMIPS} ${SNEWSMIPS} ${SMIPS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANEWSMIPS} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TNEWSMIPS} sort -o ${TNEWSMIPS} ${TNEWSMIPS} diff --git a/sys/arch/next68k/Makefile b/sys/arch/next68k/Makefile index 399b5f15a434..e9825405817a 100644 --- a/sys/arch/next68k/Makefile +++ b/sys/arch/next68k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/01/06 17:40:42 lukem Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:38 apb Exp $ # Makefile for next68k tags file and boot blocks @@ -19,7 +19,8 @@ DNEXT68K= dev next68k include tags: -ctags -wdtf ${TNEXT68K} ${SNEXT68K} ${SM68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ANEXT68K} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TNEXT68K} sort -o ${TNEXT68K} ${TNEXT68K} diff --git a/sys/arch/pmax/Makefile b/sys/arch/pmax/Makefile index 666067a4dcca..750a79eb07d3 100644 --- a/sys/arch/pmax/Makefile +++ b/sys/arch/pmax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/01/06 17:40:45 lukem Exp $ +# $NetBSD: Makefile,v 1.12 2008/10/25 22:27:38 apb Exp $ # Makefile for pmax tags file and boot blocks @@ -18,7 +18,8 @@ DPMAX= dev tc include tags: -ctags -wdtf ${TPMAX} ${SPMAX} ${SMIPS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APMAX} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TPMAX} sort -o ${TPMAX} ${TPMAX} diff --git a/sys/arch/prep/Makefile b/sys/arch/prep/Makefile index a40840935c84..7593e4bda533 100644 --- a/sys/arch/prep/Makefile +++ b/sys/arch/prep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:46 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $ # Makefile for tags file @@ -15,7 +15,8 @@ DPREP= include tags: -ctags -wdtf ${TPREP} ${SPREP} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${APREP} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TPREP} sort -o ${TPREP} ${TPREP} diff --git a/sys/arch/rs6000/Makefile b/sys/arch/rs6000/Makefile index 0b3cf98c4a21..38b52be7e2e6 100644 --- a/sys/arch/rs6000/Makefile +++ b/sys/arch/rs6000/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2007/12/17 19:09:01 garbled Exp $ +# $NetBSD: Makefile,v 1.2 2008/10/25 22:27:38 apb Exp $ # Makefile for tags file @@ -15,7 +15,8 @@ DRS6000= include tags: -ctags -wdtf ${TRS6000} ${SRS6000} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ARS6000} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TRS6000} sort -o ${TRS6000} ${TRS6000} diff --git a/sys/arch/sgimips/Makefile b/sys/arch/sgimips/Makefile index d5b4509c614f..7626af91f14c 100644 --- a/sys/arch/sgimips/Makefile +++ b/sys/arch/sgimips/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/10/17 19:57:03 garbled Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:38 apb Exp $ # Makefile for sgimips tags file @@ -27,7 +27,8 @@ tags: -echo ${SSGIMIPS} ${SMIPS} | xargs ctags -wadtf ${TSGIMIPS} -${FINDCOMM} | xargs ctags -wadtf ${TSGIMIPS} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASGIMIPS} ${AMIPS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TSGIMIPS} sort -o ${TSGIMIPS} ${TSGIMIPS} diff --git a/sys/arch/shark/Makefile b/sys/arch/shark/Makefile index fa9e1da314ef..11bbddfd618f 100644 --- a/sys/arch/shark/Makefile +++ b/sys/arch/shark/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/01/06 17:40:49 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2008/10/25 22:27:38 apb Exp $ # Makefile for shark tags file and boot blocks @@ -15,7 +15,8 @@ DSHARK= isa include ofw tags: -ctags -wdtf ${TSHARK} ${SSHARK} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASHARK} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TSHARK} sort -o ${TSHARK} ${TSHARK} diff --git a/sys/arch/sparc/Makefile b/sys/arch/sparc/Makefile index ea0c312648f2..b2dd6b8abc14 100644 --- a/sys/arch/sparc/Makefile +++ b/sys/arch/sparc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/01/06 17:40:50 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/25 22:27:38 apb Exp $ # Makefile for sparc tags file and boot blocks @@ -13,7 +13,8 @@ DSPARC= conf dev fpu include sparc tags: -ctags -wdtf ${TSPARC} ${SSPARC} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> tags sort -o ${TSPARC} ${TSPARC} diff --git a/sys/arch/sparc64/Makefile b/sys/arch/sparc64/Makefile index 9b40b86a2c91..fa4753642cf0 100644 --- a/sys/arch/sparc64/Makefile +++ b/sys/arch/sparc64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2007/10/17 19:57:27 garbled Exp $ +# $NetBSD: Makefile,v 1.17 2008/10/25 22:27:38 apb Exp $ # Makefile for sparc64 tags file and boot blocks @@ -19,7 +19,8 @@ tags: -rm ${TSPARC64} -echo ${SSPARC64} ${COMM} | xargs ctags -wadtf ${TSPARC64} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${ASPARC64} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> tags sort -o ${TSPARC64} ${TSPARC64} diff --git a/sys/arch/x68k/Makefile b/sys/arch/x68k/Makefile index 1bbaa811b83c..7914dc7a4f4e 100644 --- a/sys/arch/x68k/Makefile +++ b/sys/arch/x68k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/01/06 17:40:54 lukem Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/25 22:27:38 apb Exp $ # Makefile for x68k tags file and boot blocks @@ -18,7 +18,8 @@ DX68K= x68k dev include tags: -ctags -wdtf ${TX68K} ${SX68K} ${SM68K} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AX68K} ${AM68K} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TX68K} sort -o ${TX68K} ${TX68K} diff --git a/sys/arch/x68k/stand/boot_ufs/Makefile b/sys/arch/x68k/stand/boot_ufs/Makefile index c96cb61fe5d1..72aedc224f57 100644 --- a/sys/arch/x68k/stand/boot_ufs/Makefile +++ b/sys/arch/x68k/stand/boot_ufs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/10/19 22:05:22 apb Exp $ +# $NetBSD: Makefile,v 1.23 2008/10/25 22:27:38 apb Exp $ NOMAN= # defined @@ -70,7 +70,7 @@ $(PROG): $(OBJS) $(LD) $(LINKFLAGS) -o $(PROG).x $(OBJS) $(LDADD) >$(PROG).map @grep first_kbyte $(PROG).map @if [ `(echo ibase=16; \ - sed -n -e '/[ ]first_kbyte/{' \ + ${TOOL_SED} -n -e '/[ ]first_kbyte/{' \ -e 's/.*0x\([0-9a-fA-F]*\).*/\1-$(TEXT)-400/p' \ -e '}' $(PROG).map | \ tr a-f A-F) | bc` -gt 0 ]; \ diff --git a/sys/arch/x68k/stand/boot_ustar/Makefile b/sys/arch/x68k/stand/boot_ustar/Makefile index 16af562b16c7..0a92edd09d7f 100644 --- a/sys/arch/x68k/stand/boot_ustar/Makefile +++ b/sys/arch/x68k/stand/boot_ustar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/10/19 22:05:22 apb Exp $ +# $NetBSD: Makefile,v 1.15 2008/10/25 22:27:38 apb Exp $ NOMAN= # defined @@ -53,14 +53,16 @@ ${PROG}: $(OBJS) @grep first_kbyte $(PROG).map .if ${OBJECT_FMT} == "ELF" @if [ `(echo ibase=16; \ - sed -n 's/^.*0x\([0-9a-f]*\).* first_kbyte$$/\1-$(TEXT)-400/p' \ + ${TOOL_SED} -n \ + 's/^.*0x\([0-9a-f]*\).* first_kbyte$$/\1-$(TEXT)-400/p' \ $(PROG).map | \ tr a-f A-F) | bc` -gt 0 ]; \ then echo '$(BOOT): first_kbyte exceeds the first killobyte'; \ rm $(PROG) ; exit 1; \ fi @if [ `(echo ibase=16; \ - sed -n 's/^.*0x\([0-9a-f]*\).* _edata *= *\.$$/\1-$(TEXT)-2000/p' \ + ${TOOL_SED} -n \ + 's/^.*0x\([0-9a-f]*\).* _edata *= *\.$$/\1-$(TEXT)-2000/p' \ $(PROG).map | \ tr a-f A-F) | bc` -gt 0 ]; \ then echo '$(BOOT): text+data is too large'; \ @@ -71,14 +73,16 @@ ${PROG}: $(OBJS) $(OBJCOPY) -I a.out-m68k-netbsd -O binary $(PROG).x $(PROG) @rm -f $(PROG).x @if [ `(echo ibase=16; \ - sed -n 's/ first_kbyte:.*0x\(.*\),.*$$/\1-$(TEXT)-400/p' \ + ${TOOL_SED} -n \ + 's/ first_kbyte:.*0x\(.*\),.*$$/\1-$(TEXT)-400/p' \ $(PROG).map | \ tr a-f A-F) | bc` -gt 0 ]; \ then echo '$(BOOT): first_kbyte exceeds the first killobyte'; \ rm $(PROG) ; exit 1; \ fi @if [ `(echo ibase=16; \ - sed -n 's/ _edata:.*0x\(.*\),.*$$/\1-$(TEXT)-2000/p' \ + ${TOOL_SED} -n \ + 's/ _edata:.*0x\(.*\),.*$$/\1-$(TEXT)-2000/p' \ $(PROG).map | \ tr a-f A-F) | bc` -gt 0 ]; \ then echo '$(BOOT): text+data is too large'; \ diff --git a/sys/arch/xen/Makefile b/sys/arch/xen/Makefile index 826afc642658..17dee410d0fa 100644 --- a/sys/arch/xen/Makefile +++ b/sys/arch/xen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2008/10/19 22:05:22 apb Exp $ +# $NetBSD: Makefile,v 1.5 2008/10/25 22:27:38 apb Exp $ # Makefile for xen tags file @@ -23,7 +23,8 @@ tags: rm -f ${TXEN} -echo ${SXEN} ${COMM} | xargs ctags -wadtf ${TXEN} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AXEN} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TXEN} sort -o ${TXEN} ${TXEN} diff --git a/sys/arch/zaurus/Makefile b/sys/arch/zaurus/Makefile index 524f5cc49bbe..ca54c7d7e0b9 100644 --- a/sys/arch/zaurus/Makefile +++ b/sys/arch/zaurus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2007/10/17 19:58:34 garbled Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:38 apb Exp $ # Makefile for zaurus tags file and boot blocks @@ -15,7 +15,8 @@ DZAURUS= include tags: -ctags -wdtf ${TZAURUS} ${SZAURUS} ${COMM} egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AZAURUS} | \ - sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ + ${TOOL_SED} -e \ + "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \ >> ${TZAURUS} sort -o ${TZAURUS} ${TZAURUS} diff --git a/sys/compat/svr4_32/Makefile b/sys/compat/svr4_32/Makefile index 869085a40702..13b6a981bc31 100644 --- a/sys/compat/svr4_32/Makefile +++ b/sys/compat/svr4_32/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/11 12:20:26 christos Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:38 apb Exp $ .include # for HOST_SH @@ -6,7 +6,7 @@ DEP= syscalls.conf syscalls.master ../../kern/makesyscalls.sh OBJS= svr4_32_sysent.c svr4_32_syscalls.c svr4_32_syscall.h svr4_32_syscallargs.h #syscalls.master: ../svr4/syscalls.master sed.script -# sed -f sed.script < ../svr4/syscalls.master > syscalls.master +# ${TOOL_SED} -f sed.script < ../svr4/syscalls.master > syscalls.master ${OBJS}: ${DEP} ${HOST_SH} ../../kern/makesyscalls.sh syscalls.conf syscalls.master diff --git a/sys/conf/Makefile.kern.inc b/sys/conf/Makefile.kern.inc index e8c5091abfa9..ade0c08e5dbc 100644 --- a/sys/conf/Makefile.kern.inc +++ b/sys/conf/Makefile.kern.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.kern.inc,v 1.117 2008/10/19 22:05:22 apb Exp $ +# $NetBSD: Makefile.kern.inc,v 1.118 2008/10/25 22:27:38 apb Exp $ # # This file contains common `MI' targets and definitions and it is included # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}. @@ -203,7 +203,7 @@ SYSTEM_LD?= @${_MKSHMSG} " link ${.CURDIR:T}/${.TARGET}"; \ ${_MKSHECHO}\ ${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' '$${EXTRA_OBJ}' vers.o; \ ${LD} -Map $@.map --cref ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o -SYSTEM_LD_TAIL?=@sed '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \ +SYSTEM_LD_TAIL?=@${TOOL_SED} '/const char sccs/!d;s/.*@(.)//;s/\\.*//' vers.c; \ ${SIZE} $@; chmod 755 $@ TEXTADDR?= ${LOADADDRESS} # backwards compatibility @@ -346,7 +346,7 @@ assym.d: assym.h cat ${GENASSYM_CONF} ${GENASSYM_EXTRAS} | \ ${GENASSYM} -- ${MKDEP} -f assym.dep -- \ ${CFLAGS} ${CPPFLAGS} - sed -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} + ${TOOL_SED} -e 's/.*\.o:.*\.c/assym.h:/' < assym.dep >${.TARGET} rm -f assym.dep DEPS+= assym.d @@ -419,14 +419,16 @@ EXTRA_CLEAN+= cscope.out cscope.tmp .if !target(cscope.out) cscope.out: Makefile depend ${_MKTARGET_CREATE} - @sed 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/kern/.depend | \ - tr -s ' ' '\n' | sed 's|^\([^.\\]\)|lib/kern/\1|;s|^../../||;' > \ - cscope.tmp - @sed 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/compat/.depend | \ - tr -s ' ' '\n' | sed 's|^\([^.\\]\)|lib/compat/\1|;s|^../../||;' >> \ - cscope.tmp + @${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/kern/.depend \ + | tr -s ' ' '\n' \ + | ${TOOL_SED} 's|^\([^.\\]\)|lib/kern/\1|;s|^../../||;' \ + > cscope.tmp + @${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\ *$$//;' lib/compat/.depend \ + | tr -s ' ' '\n' \ + | ${TOOL_SED} 's|^\([^.\\]\)|lib/compat/\1|;s|^../../||;' \ + >> cscope.tmp @echo ${SRCS} | cat - cscope.tmp | tr -s ' ' '\n' | sort -u | \ - ${CSCOPE} -k -i - -b `echo ${INCLUDES} | sed s/-nostdinc//` + ${CSCOPE} -k -i - -b `echo ${INCLUDES} | ${TOOL_SED} s/-nostdinc//` # cscope doesn't write cscope.out if it's uptodate, so ensure # make doesn't keep calling cscope when not needed. @rm -f cscope.tmp; touch cscope.out @@ -444,10 +446,16 @@ mkid: ID ID: Makefile depend ${_MKTARGET_CREATE} - @${MKID} `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' lib/kern/.depend \ - lib/compat/.depend | tr ' ' '\n' | sed "s|^../../||" | sort -u` \ - `sed 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' .depend | tr ' ' '\n' \ - | sort -u` + @${MKID} \ + `${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \ + lib/kern/.depend lib/compat/.depend \ + | tr ' ' '\n' \ + | ${TOOL_SED} "s|^../../||" \ + | sort -u` \ + `${TOOL_SED} 's/[^:]*://;s/^ *//;s/ *\\\\ *$$//;' \ + .depend \ + | tr ' ' '\n' \ + | sort -u` .endif diff --git a/sys/lkm/arch/mac68k/iwm/Makefile b/sys/lkm/arch/mac68k/iwm/Makefile index 6c72f1917672..004b2b6195fb 100644 --- a/sys/lkm/arch/mac68k/iwm/Makefile +++ b/sys/lkm/arch/mac68k/iwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2002/02/05 15:28:03 fredb Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:38 apb Exp $ # # Makefile for loadable iwm device driver kernel module # @@ -26,7 +26,7 @@ CFLAGS= -g -O -m68020-40 AFLAGS= -x assembler-with-cpp -traditional-cpp -D_LOCORE -I$S/arch iwm.o: iwm.s - ${CPP} ${AFLAGS} ${CPPFLAGS} ${.IMPSRC} | sed -e 's/^#.*//' | \ + ${CPP} ${AFLAGS} ${CPPFLAGS} ${.IMPSRC} | ${TOOL_SED} -e 's/^#.*//' | \ ${AS} -o ${.TARGET} .include diff --git a/sys/lkm/dev/isa/Makefile.inc b/sys/lkm/dev/isa/Makefile.inc index 45a5d1739ce9..8a09e2b6eab3 100644 --- a/sys/lkm/dev/isa/Makefile.inc +++ b/sys/lkm/dev/isa/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.10 2008/07/27 07:57:40 veego Exp $ +# $NetBSD: Makefile.inc,v 1.11 2008/10/25 22:27:38 apb Exp $ .include "../Makefile.inc" @@ -21,7 +21,7 @@ CLEANFILES+= ${TEMPL_FILE:S/.tmpl//} *~ ${KMOD} DPSRCS+= ${TEMPL_FILE:S/.tmpl//} ${TEMPL_FILE:S/.tmpl//}: - sed -e "s|@LKM_ISA_IO_PORT@|${LKM_ISA_IO_PORT}|g" \ + ${TOOL_SED} -e "s|@LKM_ISA_IO_PORT@|${LKM_ISA_IO_PORT}|g" \ -e "s|@LKM_ISA_SIZE@|${LKM_ISA_SIZE}|g" \ -e "s|@LKM_ISA_IOMEM@|${LKM_ISA_IOMEM}|g" \ -e "s|@LKM_ISA_IOSIZE@|${LKM_ISA_IOSIZE}|g" \ diff --git a/sys/rump/librump/rumpkern/Makefile.rumpkern b/sys/rump/librump/rumpkern/Makefile.rumpkern index fa8dd9572806..08b2f46ca01e 100644 --- a/sys/rump/librump/rumpkern/Makefile.rumpkern +++ b/sys/rump/librump/rumpkern/Makefile.rumpkern @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rumpkern,v 1.16 2008/10/15 13:04:26 pooka Exp $ +# $NetBSD: Makefile.rumpkern,v 1.17 2008/10/25 22:27:38 apb Exp $ # .include "${RUMPTOP}/Makefile.rump" @@ -87,7 +87,7 @@ RVNH=\#include \ rumpvnode_if.h: ${RUMPTOP}/../sys/vnode_if.h \ ${RUMPTOP}/librump/rumpkern/Makefile.rumpkern echo Generating rumpvnode_if.h - sed ${VOPTORUMPVOP}";s/SYS_VNODE_IF_H/SYS_RUMPVNODE_IF_H/g" \ + ${TOOL_SED} ${VOPTORUMPVOP}";s/SYS_VNODE_IF_H/SYS_RUMPVNODE_IF_H/g" \ < ${RUMPTOP}/../sys/vnode_if.h > rumpvnode_if.h rumpvnode_if.c: ${RUMPTOP}/../kern/vnode_if.c \ @@ -95,7 +95,7 @@ rumpvnode_if.c: ${RUMPTOP}/../kern/vnode_if.c \ echo Generating rumpvnode_if.c # XXX: some creative kludging to simulate 'a\' (I have no # clue how to make it work in a Makefile - sed ${VOPTORUMPVOP}";/sys\/vnode.h/{x;s/.*/${RVNH}/;x;G;n;}" \ + ${TOOL_SED} ${VOPTORUMPVOP}";/sys\/vnode.h/{x;s/.*/${RVNH}/;x;G;n;}" \ < ${RUMPTOP}/../kern/vnode_if.c > rumpvnode_if.c rumpdefs.h: ${RUMPTOP}/../sys/namei.h \ @@ -104,17 +104,17 @@ rumpdefs.h: ${RUMPTOP}/../sys/namei.h \ ${RUMPTOP}/../sys/errno.h \ ${RUMPTOP}/librump/rumpkern/Makefile.rumpkern echo Generating rumpdefs.h - sed -n '/#define NAMEI_/s/NAMEI_/RUMP_NAMEI_/gp' \ + ${TOOL_SED} -n '/#define NAMEI_/s/NAMEI_/RUMP_NAMEI_/gp' \ < ${RUMPTOP}/../sys/namei.h > rumpdefs.h - sed -n '/#define O_[A-Z]* *0x/s/O_/RUMP_O_/gp' \ + ${TOOL_SED} -n '/#define O_[A-Z]* *0x/s/O_/RUMP_O_/gp' \ < ${RUMPTOP}/../sys/fcntl.h >> rumpdefs.h printf "#ifndef __VTYPE_DEFINED\n#define __VTYPE_DEFINED\n" \ >> rumpdefs.h - sed -n '/enum vtype.*{/p' \ + ${TOOL_SED} -n '/enum vtype.*{/p' \ < ${RUMPTOP}/../sys/vnode.h >> rumpdefs.h printf "#endif /* __VTYPE_DEFINED */\n" >> rumpdefs.h printf "#ifndef EJUSTRETURN\n" >> rumpdefs.h - sed -n '/EJUSTRETURN/p' \ + ${TOOL_SED} -n '/EJUSTRETURN/p' \ < ${RUMPTOP}/../sys/errno.h >> rumpdefs.h printf "#endif /* EJUSTRETURN */\n" >> rumpdefs.h diff --git a/usr.bin/krb5-config/Makefile b/usr.bin/krb5-config/Makefile index 6a9771e6746e..c80545722ba9 100644 --- a/usr.bin/krb5-config/Makefile +++ b/usr.bin/krb5-config/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/07/20 17:53:30 veego Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:38 apb Exp $ .include @@ -13,7 +13,7 @@ MAN= krb5-config.1 CLEANFILES+= krb5-config krb5-config: krb5-config.in - sed -e "s!@PACKAGE\@!heimdal!g" \ + ${TOOL_SED} -e "s!@PACKAGE\@!heimdal!g" \ -e "s!@VERSION\@!1.1!g" \ -e "s!@prefix\@!/!g" \ -e "s!@exec_prefix\@!/!g" \ diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index 1ea0d68b84af..cf75564ca452 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2008/03/31 00:12:21 sjg Exp $ +# $NetBSD: Makefile,v 1.23 2008/10/25 22:27:39 apb Exp $ # # Unit tests for make(1) # The main targets are: @@ -58,7 +58,7 @@ TEST_MAKE?= ${.MAKE} test: @echo "${TEST_MAKE} -f ${MAKEFILE} > ${.TARGET}.out 2>&1" @cd ${.OBJDIR} && ${TEST_MAKE} -f ${MAKEFILE} 2>&1 | \ - sed -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \ + ${TOOL_SED} -e 's,^${TEST_MAKE:T:C/\./\\\./g}:,make:,' \ -e '/stopped/s, /.*, unit-tests,' \ -e 's,${.CURDIR:C/\./\\\./g}/,,g' \ -e 's,${UNIT_TESTS:C/\./\\\./g}/,,g' > ${.TARGET}.out || { \ diff --git a/usr.bin/nvi/catalog/Makefile b/usr.bin/nvi/catalog/Makefile index 71f3a9a64014..6a3cbecb7842 100644 --- a/usr.bin/nvi/catalog/Makefile +++ b/usr.bin/nvi/catalog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/10/19 22:05:24 apb Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $ # # @(#)Makefile 8.29 (Berkeley) 10/19/96 @@ -43,7 +43,7 @@ ${CATALOG}: ${CATALOG:S/$/.base/} print ""; \ print $0; \ }' | \ - sed -e '1s/^/VI_MESSAGE_CATALOG/' \ + ${TOOL_SED} -e '1s/^/VI_MESSAGE_CATALOG/' \ -e '/"/s/^[^"]*"//' \ -e '1!s/"$$/X/' > $@; \ if grep DUPLICATE $@ > /dev/null; then \ @@ -75,24 +75,24 @@ ${CHK}: ${CATALOG} echo =========================; \ echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):"; \ for j in \ - `sed '/^$$/d' < $$f.base | sort -u | \ + `${TOOL_SED} '/^$$/d' < $$f.base | sort -u | \ ${TOOL_AWK} '{print $$1}' | uniq -d`; do \ egrep $$j $$f.base; \ done; \ echo =========================; \ echo "Duplicate messages, both id and message (this is okay):"; \ - sed '/^$$/d' < $$f.base | sort | uniq -c | \ + ${TOOL_SED} '/^$$/d' < $$f.base | sort | uniq -c | \ ${TOOL_AWK} '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================; \ echo "Duplicate messages, just message (this is okay):"; \ - sed '/^$$/d' < $$f | sort | uniq -c | \ + ${TOOL_SED} '/^$$/d' < $$f | sort | uniq -c | \ ${TOOL_AWK} '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================) > $@ english.base: dump ${VI_FILES} #Makefile ${_MKTARGET_CREATE} ./dump ${VI_FILES} |\ - sed -e '/|/!d' \ + ${TOOL_SED} -e '/|/!d' \ -e 's/|/ "/' \ -e 's/^"//' \ -e 's/\\"/"/g' |\ diff --git a/usr.bin/vi/catalog/Makefile b/usr.bin/vi/catalog/Makefile index 8ed85c5f2964..0354a92adab5 100644 --- a/usr.bin/vi/catalog/Makefile +++ b/usr.bin/vi/catalog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2008/10/19 22:05:24 apb Exp $ +# $NetBSD: Makefile,v 1.15 2008/10/25 22:27:39 apb Exp $ # # @(#)Makefile 8.29 (Berkeley) 10/19/96 @@ -39,7 +39,7 @@ ${CATALOG}: english.base ${HOSTPROG} print ""; \ print $0; \ }' | \ - sed -e '1s/^/VI_MESSAGE_CATALOG/' \ + ${TOOL_SED} -e '1s/^/VI_MESSAGE_CATALOG/' \ -e '/"/s/^[^"]*"//' \ -e '1!s/"$$/X/' > $@; \ chmod 444 $@; \ @@ -72,24 +72,24 @@ ${CHK}: ${CATALOG} echo =========================; \ echo "MESSAGES WITH THE SAME MESSAGE ID's (FIX!):"; \ for j in \ - `sed '/^$$/d' < $$f.base | sort -u | \ + `${TOOL_SED} '/^$$/d' < $$f.base | sort -u | \ ${TOOL_AWK} '{print $$1}' | uniq -d`; do \ egrep $$j $$f.base; \ done; \ echo =========================; \ echo "Duplicate messages, both id and message (this is okay):"; \ - sed '/^$$/d' < $$f.base | sort | uniq -c | \ + ${TOOL_SED} '/^$$/d' < $$f.base | sort | uniq -c | \ ${TOOL_AWK} '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================; \ echo "Duplicate messages, just message (this is okay):"; \ - sed '/^$$/d' < $$f | sort | uniq -c | \ + ${TOOL_SED} '/^$$/d' < $$f | sort | uniq -c | \ ${TOOL_AWK} '$$1 != 1 { print $$0 }' | sort -n; \ echo =========================) > $@ english.base: dump ${VI_FILES} #Makefile ${_MKTARGET_CREATE} ./dump ${VI_FILES} |\ - sed -e '/|/!d' \ + ${TOOL_SED} -e '/|/!d' \ -e 's/|/ "/' \ -e 's/^"//' \ -e 's/\\"/"/g' |\ diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/Makefile b/usr.bin/vi/docs/USD.doc/vi.ref/Makefile index d818f08cf190..f8e75f059f5c 100644 --- a/usr.bin/vi/docs/USD.doc/vi.ref/Makefile +++ b/usr.bin/vi/docs/USD.doc/vi.ref/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2008/10/19 22:05:24 apb Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $ # # @(#)Makefile 8.20 (Berkeley) 8/18/96 @@ -23,12 +23,12 @@ index.so: vi.ref # Build index.so, side-effect of building the paper. ${TOOL_SOELIM} vi.ref | ${TOOL_TBL} | \ ${TOOL_ROFF_PS} ${MACROS} > /dev/null - sed -e 's/MINUSSIGN/\\-/' \ + ${TOOL_SED} -e 's/MINUSSIGN/\\-/' \ -e 's/DOUBLEQUOTE/""/' \ -e "s/SQUOTE/'/" \ -e 's/ /__SPACE/g' < index | \ sort -u '-t ' +0 -1 +1n | ${TOOL_AWK} -f merge.awk | \ - sed -e 's/__SPACE/ /g' > $@ + ${TOOL_SED} -e 's/__SPACE/ /g' > $@ rm -f index chmod 444 $@ diff --git a/usr.sbin/ipf/ipf/Makefile b/usr.sbin/ipf/ipf/Makefile index 4edd9174bc5d..0350b658bd15 100644 --- a/usr.sbin/ipf/ipf/Makefile +++ b/usr.sbin/ipf/ipf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/31 00:34:32 lukem Exp $ +# $NetBSD: Makefile,v 1.21 2008/10/25 22:27:39 apb Exp $ .include # for MKDYNAMICROOT definition @@ -16,24 +16,24 @@ CLEANFILES+= ipf_l.c ipf_l.h ipf_y.c: ipf_y.y ${_MKTARGET_CREATE} ${YACC} -d ${.ALLSRC} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ y.tab.c > ${.TARGET} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ y.tab.h > ${.TARGET:.c=.h} ipf_y.h: ipf_y.c ipf_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ -e 's/y.tab.h/ipf_y.h/' \ -e 's/lexer.h/ipf_l.h/' \ ${.ALLSRC} > ${.TARGET} ipf_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ ${.ALLSRC} > ${.TARGET} BINDIR= /sbin diff --git a/usr.sbin/ipf/ipftest/Makefile b/usr.sbin/ipf/ipftest/Makefile index 35d35678cd0c..6072f3837a36 100644 --- a/usr.sbin/ipf/ipftest/Makefile +++ b/usr.sbin/ipf/ipftest/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2006/05/11 07:07:08 mrg Exp $ +# $NetBSD: Makefile,v 1.33 2008/10/25 22:27:39 apb Exp $ .include @@ -34,11 +34,11 @@ CLEANFILES+= ippool.tab.c ippool.tab.h ipnat_y.c: ipnat_y.y ${_MKTARGET_CREATE} ${YACC} -b ipnat -d ${.ALLSRC} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ ipnat.tab.c > ${.TARGET} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ ipnat.tab.h > ${.TARGET:.c=.h} @@ -46,60 +46,60 @@ ipnat_y.h: ipnat_y.c ipnat_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ -e 's/lexer.h/ipnat_l.h/' \ ${.ALLSRC} > ${.TARGET} ipnat_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ ${.ALLSRC} > ${.TARGET} ippool_y.c: ippool_y.y ${_MKTARGET_CREATE} ${YACC} -b ippool -d ${.ALLSRC} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ ippool.tab.c > ${.TARGET} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ ippool.tab.h > ${.TARGET:.c=.h} ippool_y.h: ippool_y.c ippool_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ -e 's/y.tab.h/ippool_y.h/' \ -e 's/lexer.h/ippool_l.h/' \ ${.ALLSRC} > ${.TARGET} ippool_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ ${.ALLSRC} > ${.TARGET} ipf_y.c: ipf_y.y ${_MKTARGET_CREATE} ${YACC} -b ipf -d ${.ALLSRC} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ -e 's/"ipf_y.y"/"..\/tools\/ipf_y.y"/' \ ipf.tab.c > ${.TARGET} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ ipf.tab.h > ${.TARGET:.c=.h} ipf_y.h: ipf_y.c ipf_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ -e 's/y.tab.h/ipf_y.h/' \ -e 's/lexer.h/ipf_l.h/' \ ${.ALLSRC} > ${.TARGET} ipf_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ipf_yy/g' \ + ${TOOL_SED} -e 's/yy/ipf_yy/g' \ ${.ALLSRC} > ${.TARGET} .include diff --git a/usr.sbin/ipf/ipmon/Makefile b/usr.sbin/ipf/ipmon/Makefile index 591460575378..b5e43f30f699 100644 --- a/usr.sbin/ipf/ipmon/Makefile +++ b/usr.sbin/ipf/ipmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/01/05 10:00:29 martti Exp $ +# $NetBSD: Makefile,v 1.22 2008/10/25 22:27:39 apb Exp $ PROG= ipmon SRCS= ipmon.c ipmon_y.c ipmon_l.c @@ -14,24 +14,24 @@ CLEANFILES+= ipmon_l.c ipmon_l.h ipmon_y.c: ipmon_y.y ${_MKTARGET_CREATE} ${YACC} -d ${.ALLSRC} - sed -e 's/yy/ipmon_yy/g' \ + ${TOOL_SED} -e 's/yy/ipmon_yy/g' \ -e 's/"ipmon_y.y"/"..\/tools\/ipmon_y.y"/' \ y.tab.c > ${.TARGET} - sed -e 's/yy/ipmon_yy/g' \ + ${TOOL_SED} -e 's/yy/ipmon_yy/g' \ y.tab.h > ${.TARGET:.c=.h} ipmon_y.h: ipmon_y.c ipmon_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ipmon_yy/g' \ + ${TOOL_SED} -e 's/yy/ipmon_yy/g' \ -e 's/y.tab.h/ipmon_y.h/' \ -e 's/lexer.h/ipmon_l.h/' \ ${.ALLSRC} > ${.TARGET} ipmon_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ipmon_yy/g' \ + ${TOOL_SED} -e 's/yy/ipmon_yy/g' \ ${.ALLSRC} > ${.TARGET} .include diff --git a/usr.sbin/ipf/ipnat/Makefile b/usr.sbin/ipf/ipnat/Makefile index 68c6b8ca6781..f1e2c694bc93 100644 --- a/usr.sbin/ipf/ipnat/Makefile +++ b/usr.sbin/ipf/ipnat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/04/03 22:16:27 he Exp $ +# $NetBSD: Makefile,v 1.24 2008/10/25 22:27:39 apb Exp $ PROG= ipnat SRCS= ipnat.c ipnat_y.c ipnat_l.c @@ -14,11 +14,11 @@ CLEANFILES+= ipnat_l.c ipnat_l.h ipnat_y.c: ipnat_y.y ${_MKTARGET_CREATE} ${YACC} -d ${.ALLSRC} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.c/ipnat_y.c/' \ -e s/\"ipnat_y.y\"/\"..\\/tools\\/ipnat_y.y\"/ \ y.tab.c > ${.TARGET} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ y.tab.h > ${.TARGET:.c=.h} @@ -26,14 +26,14 @@ ipnat_y.h: ipnat_y.c ipnat_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ -e 's/y.tab.h/ipnat_y.h/' \ -e 's/lexer.h/ipnat_l.h/' \ ${.ALLSRC} > ${.TARGET} ipnat_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ipnat_yy/g' \ + ${TOOL_SED} -e 's/yy/ipnat_yy/g' \ ${.ALLSRC} > ${.TARGET} .include diff --git a/usr.sbin/ipf/ippool/Makefile b/usr.sbin/ipf/ippool/Makefile index c6ed1931eabb..9de1046038ef 100644 --- a/usr.sbin/ipf/ippool/Makefile +++ b/usr.sbin/ipf/ippool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/04/04 15:59:44 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/25 22:27:39 apb Exp $ PROG= ippool SRCS= ippool_y.c ippool_l.c kmem.c ippool.c @@ -13,24 +13,24 @@ CLEANFILES+= ippool_l.c ippool_l.h ippool_y.c: ippool_y.y ${_MKTARGET_CREATE} ${YACC} -d ${.ALLSRC} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ -e 's/"ippool_y.y"/"..\/tools\/ippool_y.y"/' \ y.tab.c > ${.TARGET} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ y.tab.h > ${.TARGET:.c=.h} ippool_y.h: ippool_y.c ippool_l.c: lexer.c ${_MKTARGET_CREATE} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ -e 's/y.tab.h/ippool_y.h/' \ -e 's/lexer.h/ippool_l.h/' \ ${.ALLSRC} > ${.TARGET} ippool_l.h: lexer.h ${_MKTARGET_CREATE} - sed -e 's/yy/ippool_yy/g' \ + ${TOOL_SED} -e 's/yy/ippool_yy/g' \ ${.ALLSRC} > ${.TARGET} .include diff --git a/usr.sbin/mopd/common/Makefile b/usr.sbin/mopd/common/Makefile index 241a0a4d5132..1d1b9650bf31 100644 --- a/usr.sbin/mopd/common/Makefile +++ b/usr.sbin/mopd/common/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/08/29 00:02:25 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.13 2008/10/25 22:27:39 apb Exp $ LIBISPRIVATE= yes @@ -10,7 +10,7 @@ CLEANFILES= version.c version.c: VERSION ${_MKTARGET_CREATE} rm -f version.c; \ - sed 's/.*/char version[] = "&";/' ${.ALLSRC} > version.c + ${TOOL_SED} 's/.*/char version[] = "&";/' ${.ALLSRC} > version.c .include diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index 39a2e8721e6e..2ba25b0b218b 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2008/08/29 00:02:26 gmcgarry Exp $ +# $NetBSD: Makefile,v 1.48 2008/10/25 22:27:39 apb Exp $ .include @@ -43,7 +43,7 @@ SRCS+= version.c version.c: VERSION ${_MKTARGET_CREATE} - sed -e 's/.*/char version[] = "&";/' ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -e 's/.*/char version[] = "&";/' ${.ALLSRC} > ${.TARGET} LDADD+= -lpcap -ll DPADD+= ${LIBPCAP} ${LIBL} diff --git a/x11/bin/rstart/Makefile.rstart b/x11/bin/rstart/Makefile.rstart index 63f2080e0880..96cd2486ced2 100644 --- a/x11/bin/rstart/Makefile.rstart +++ b/x11/bin/rstart/Makefile.rstart @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.rstart,v 1.3 2004/05/16 10:25:14 lukem Exp $ +# $NetBSD: Makefile.rstart,v 1.4 2008/10/25 22:27:39 apb Exp $ .include @@ -9,7 +9,7 @@ FILESDIR= ${X11ETCDIR}/rstart/${CFDIR} ${_F}.sed: ${_F} ${_MKTARGET_CREATE} rm -f ${.TARGET} - sed ${CFSED} < ${.ALLSRC} > ${.TARGET} + ${TOOL_SED} ${CFSED} < ${.ALLSRC} > ${.TARGET} CONFIGFILES+= ${_F}.sed CLEANFILES+= ${_F}.sed diff --git a/x11/bin/ssh-askpass/Makefile b/x11/bin/ssh-askpass/Makefile index 950fc2baf0ec..d5cc52a20e79 100644 --- a/x11/bin/ssh-askpass/Makefile +++ b/x11/bin/ssh-askpass/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2007/09/17 04:51:04 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $ NOMAN= yes @@ -22,7 +22,7 @@ CLEANFILES+= SshAskpass_ad.h SshAskpass_ad.h: SshAskpass.ad ${_MKTARGET_CREATE} rm -f ${.TARGET} - sed -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET} + ${TOOL_SED} -n '/^[^!]/s/.*/"&",/p' <${.ALLSRC} > ${.TARGET} LDADD+= -lXt -lSM -lICE -lXext -lX11 DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} diff --git a/x11/bin/twm/Makefile b/x11/bin/twm/Makefile index 1cb0aebe1aa2..43adc8411b39 100644 --- a/x11/bin/twm/Makefile +++ b/x11/bin/twm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/03/19 21:41:58 christos Exp $ +# $NetBSD: Makefile,v 1.7 2008/10/25 22:27:39 apb Exp $ .include @@ -29,7 +29,7 @@ deftwmrc.c: system.twmrc deftwmrc.sed echo ' * twm bindings file system.twmrc by the twm Makefile.' >>$@ echo ' */' >>$@ echo 'char *defTwmrc[] = {' >>$@ - sed -f ${X11SRCDIR.xc}/programs/${PROG}/deftwmrc.sed \ + ${TOOL_SED} -f ${X11SRCDIR.xc}/programs/${PROG}/deftwmrc.sed \ < ${X11SRCDIR.xc}/programs/${PROG}/system.twmrc >>$@ echo ' (char *) 0 };' >>$@ diff --git a/x11/lib/dps/Makefile b/x11/lib/dps/Makefile index 981492c8b4d7..83cf21526219 100644 --- a/x11/lib/dps/Makefile +++ b/x11/lib/dps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2008/10/19 22:05:24 apb Exp $ +# $NetBSD: Makefile,v 1.10 2008/10/25 22:27:39 apb Exp $ .include @@ -44,7 +44,7 @@ psops.h: ${PSOPSHEADERFILES} psname.txt header.txt psifdef.txt psendif.txt ( \ (cd ${DIST} && cat psname.txt header.txt psifdef.txt ); \ cat ${PSOPSHEADERFILES} \ - | sed -e '/^$$/D' -e '/#/D' -e '/^\//D' \ + | ${TOOL_SED} -e '/^$$/D' -e '/#/D' -e '/^\//D' \ -e '/^ gener/D' -e '/^.\//D' \ | sort \ | ${TOOL_AWK} '/;/ {print; printf("\n");}' ; \ @@ -59,7 +59,7 @@ dpsops.h: ${DPSOPSHEADERFILES} dpsname.txt header.txt dpsifdef.txt dpsendif.txt ( \ (cd ${DIST} && cat dpsname.txt header.txt dpsifdef.txt ); \ cat ${DPSOPSHEADERFILES} \ - | sed -e '/^$$/D' -e '/#/D' -e '/^\//D' \ + | ${TOOL_SED} -e '/^$$/D' -e '/#/D' -e '/^\//D' \ -e '/^ gener/D' -e '/^.\//D' \ | sort \ | ${TOOL_AWK} '/;/ {print; printf("\n");}' ; \ diff --git a/x11/lib/freetype2/freetype/Makefile b/x11/lib/freetype2/freetype/Makefile index 085548875e95..150534021ca6 100644 --- a/x11/lib/freetype2/freetype/Makefile +++ b/x11/lib/freetype2/freetype/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/03/21 00:55:04 rtr Exp $ +# $NetBSD: Makefile,v 1.9 2008/10/25 22:27:39 apb Exp $ .include @@ -20,7 +20,7 @@ SCRIPTS= freetype-config CLEANFILES+= ${SCRIPTS} # XXX hijack config-subst from Xft -CONFIG_SUBST= sed -e 's%@prefix@%${X11ROOTDIR}%' \ +CONFIG_SUBST= ${TOOL_SED} -e 's%@prefix@%${X11ROOTDIR}%' \ -e 's%@exec_prefix@%${X11BINDIR}%' \ -e 's%@libdir@%${X11USRLIBDIR}%g' \ -e 's%@includedir@%${X11INCDIR}%' \ diff --git a/x11/share/fonts/Makefile b/x11/share/fonts/Makefile index 6562fe9781a0..36f3991fc57e 100644 --- a/x11/share/fonts/Makefile +++ b/x11/share/fonts/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2004/02/09 06:52:34 lukem Exp $ +# $NetBSD: Makefile,v 1.6 2008/10/25 22:27:39 apb Exp $ .include @@ -13,7 +13,8 @@ afterinstall: .if ${MKUNPRIVED} != "no" cd ${DESTDIR} \ && find ./${X11FONTDIR} -name fonts.cache-1 \ - | sed -e 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ + | ${TOOL_SED} -e \ + 's/$$/ type=file mode=0444 uname=${BINOWN} gname=${BINGRP}/' \ | ${METALOG.add} .endif diff --git a/x11/share/nls/Makefile b/x11/share/nls/Makefile index d19a47f95b5d..57fbbc8394e4 100644 --- a/x11/share/nls/Makefile +++ b/x11/share/nls/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/11/08 13:57:30 lukem Exp $ +# $NetBSD: Makefile,v 1.4 2008/10/25 22:27:39 apb Exp $ .include @@ -16,7 +16,8 @@ ${_F}.lt: ${_F} ( \ ${CPP} -undef -traditional \ < ${.ALLSRC} | ${X11TOOL_UNXCOMM} \ - | sed -e '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d'; \ + | ${TOOL_SED} -e \ + '/^[^#][^ ]*:/s/://' -e '/^[^#].*[ ].*:/d'; \ ${CPP} -undef -traditional \ < ${.ALLSRC} | ${X11TOOL_UNXCOMM} ; \ ) > ${.TARGET}