Teach the new tools framework about MAIL_CMD. We use mail/nail as a

"mail" replacement in case TOOLS_PLATFORM.mail is empty.

16 files changed, 50 insertions, 16 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index aa48d8dbadd..51f810b7e22 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1622 2005/05/02 21:10:02 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1623 2005/05/03 16:30:34 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -945,6 +945,11 @@ USE_TOOLS+=	[ awk basename cat chgrp chmod chown cmp cp cut date	\
 		m4 mkdir mtree mv nice pax pwd rm rmdir sed sh shlock	\
 		sort tail tee test touch tr true tsort wc xargs
 
+# We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
+.if !empty(PKGSRC_MESSAGE_RECIPIENTS)
+USE_TOOLS+=	mail
+.endif
+
 .if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .include "../../mk/tools/bsd.tools.mk"
 .else
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index b2677546fb6..96fdd16a2aa 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.4 2005/05/02 21:10:03 jlam Exp $
+# $NetBSD: defaults.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=	defined
@@ -53,6 +53,7 @@ _TOOLS_VARNAME.lex=		LEX
 _TOOLS_VARNAME.ln=		LN
 _TOOLS_VARNAME.ls=		LS
 _TOOLS_VARNAME.m4=		M4
+_TOOLS_VARNAME.mail=		MAIL_CMD
 _TOOLS_VARNAME.mkdir=		MKDIR
 _TOOLS_VARNAME.mtree=		MTREE
 _TOOLS_VARNAME.mv=		MV
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index de1541e3dd4..5b9ef78ac03 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.58 2005/05/03 15:17:26 jlam Exp $
+# $NetBSD: replace.mk,v 1.59 2005/05/03 16:30:34 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -518,6 +518,17 @@ ${_TOOLS_VARNAME.m4}=		${TOOLS_REAL_CMD.m4}
 .  endif
 .endif
 
+.if !defined(TOOLS_IGNORE.mail) && !empty(_USE_TOOLS:Mmail)
+.  if !empty(PKGPATH:Mmail/nail)
+MAKEFLAGS+=			TOOLS_IGNORE.mail=
+.  elif !empty(_TOOLS_USE_PKGSRC.mail:M[yY][eE][sS])
+TOOLS_DEPENDS.mail?=		nail>=11.22:../../mail/nail
+TOOLS_SYMLINK+=			mail
+TOOLS_REAL_CMD.mail=		${LOCALBASE}/bin/nail
+${_TOOLS_VARNAME.mail}=		${TOOLS_REAL_CMD.mail}
+.  endif
+.endif
+
 .if !defined(TOOLS_IGNORE.mkdir) && !empty(_USE_TOOLS:Mmkdir)
 .  if !empty(PKGPATH:Msysutils/coreutils)
 MAKEFLAGS+=			TOOLS_IGNORE.mkdir=
diff --git a/mk/tools/tools.AIX.mk b/mk/tools/tools.AIX.mk
index 20dca57ad89..c32bdd778dd 100644
--- a/mk/tools/tools.AIX.mk
+++ b/mk/tools/tools.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.AIX.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.AIX.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the AIX operating system.
 
@@ -30,6 +30,7 @@ TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
diff --git a/mk/tools/tools.BSDOS.mk b/mk/tools/tools.BSDOS.mk
index 1d10e9c3915..53e811b5a8b 100644
--- a/mk/tools/tools.BSDOS.mk
+++ b/mk/tools/tools.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.BSDOS.mk,v 1.5 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.BSDOS.mk,v 1.6 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the BSD/OS operating system.
 
@@ -34,6 +34,7 @@ TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
diff --git a/mk/tools/tools.Darwin.mk b/mk/tools/tools.Darwin.mk
index 4da3f9eacdf..0736dd44e68 100644
--- a/mk/tools/tools.Darwin.mk
+++ b/mk/tools/tools.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Darwin.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.Darwin.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the Darwin (Mac OS X) operating system.
 
@@ -35,6 +35,7 @@ TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
diff --git a/mk/tools/tools.DragonFly.mk b/mk/tools/tools.DragonFly.mk
index a7b4be4b125..dc6d814b5df 100644
--- a/mk/tools/tools.DragonFly.mk
+++ b/mk/tools/tools.DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.DragonFly.mk,v 1.6 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.DragonFly.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the DragonFly operating system.
 
@@ -36,6 +36,7 @@ TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
diff --git a/mk/tools/tools.FreeBSD.mk b/mk/tools/tools.FreeBSD.mk
index 8a4d2ea4c05..f0a98b3be1e 100644
--- a/mk/tools/tools.FreeBSD.mk
+++ b/mk/tools/tools.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.FreeBSD.mk,v 1.6 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.FreeBSD.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the FreeBSD operating system.
 
@@ -38,6 +38,7 @@ TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
diff --git a/mk/tools/tools.IRIX.mk b/mk/tools/tools.IRIX.mk
index 44d2cc99559..72953a4763a 100644
--- a/mk/tools/tools.IRIX.mk
+++ b/mk/tools/tools.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.IRIX.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.IRIX.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the IRIX operating system.
 
@@ -37,6 +37,7 @@ TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/sbin/ln
 TOOLS_PLATFORM.ls?=		/sbin/ls
 TOOLS_PLATFORM.m4?=		/sbin/m4
+TOOLS_PLATFORM.mail?=		/usr/sbin/mailx
 TOOLS_PLATFORM.mkdir?=		/sbin/mkdir -p
 TOOLS_PLATFORM.mv?=		/sbin/mv
 TOOLS_PLATFORM.nice?=		/sbin/nice
diff --git a/mk/tools/tools.Interix.mk b/mk/tools/tools.Interix.mk
index 8241db6a4bb..028c20f0f1c 100644
--- a/mk/tools/tools.Interix.mk
+++ b/mk/tools/tools.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Interix.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.Interix.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the Interix operating system.
 
@@ -33,6 +33,7 @@ TOOLS_PLATFORM.ldconfig?=	/bin/true
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/bin/m4
+TOOLS_PLATFORM.mail?=		/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/bin/nice
diff --git a/mk/tools/tools.Linux.mk b/mk/tools/tools.Linux.mk
index a2f52c7d5c6..d85c9b62d6c 100644
--- a/mk/tools/tools.Linux.mk
+++ b/mk/tools/tools.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.Linux.mk,v 1.7 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.Linux.mk,v 1.8 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the Linux operating system.
 
@@ -87,6 +87,11 @@ TOOLS_PLATFORM.ldconfig?=	/sbin/ldconfig
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		${TOOLS_PLATFORM.gm4}
+.if exists(/bin/mail)
+TOOLS_PLATFORM.mail?=		/bin/mail	# RH, Mandrake
+.elif exists(/usr/bin/mail)
+TOOLS_PLATFORM.mail?=		/usr/bin/mail	# Debian, Slackware, SuSE
+.endif
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 .if exists(/bin/nice)
diff --git a/mk/tools/tools.NetBSD.mk b/mk/tools/tools.NetBSD.mk
index 2764cb918d9..e94ff9e3d09 100644
--- a/mk/tools/tools.NetBSD.mk
+++ b/mk/tools/tools.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.NetBSD.mk,v 1.6 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.NetBSD.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the NetBSD operating system.
 
@@ -50,6 +50,7 @@ TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
diff --git a/mk/tools/tools.OSF1.mk b/mk/tools/tools.OSF1.mk
index bb836f5db1c..6cceb9557da 100644
--- a/mk/tools/tools.OSF1.mk
+++ b/mk/tools/tools.OSF1.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OSF1.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.OSF1.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the OSF/1 operating system.
 
@@ -33,6 +33,7 @@ TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
diff --git a/mk/tools/tools.OpenBSD.mk b/mk/tools/tools.OpenBSD.mk
index b220819b707..95ad7c6fddc 100644
--- a/mk/tools/tools.OpenBSD.mk
+++ b/mk/tools/tools.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.OpenBSD.mk,v 1.5 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.OpenBSD.mk,v 1.6 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the OpenBSD operating system.
 
@@ -39,6 +39,7 @@ TOOLS_PLATFORM.lex?=		/usr/bin/lex
 TOOLS_PLATFORM.ln?=		/bin/ln
 TOOLS_PLATFORM.ls?=		/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mail
 TOOLS_PLATFORM.mkdir?=		/bin/mkdir -p
 TOOLS_PLATFORM.mtree?=		/usr/sbin/mtree
 TOOLS_PLATFORM.mv?=		/bin/mv
diff --git a/mk/tools/tools.SunOS.mk b/mk/tools/tools.SunOS.mk
index 75f20063a03..c4fdfd71baa 100644
--- a/mk/tools/tools.SunOS.mk
+++ b/mk/tools/tools.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.SunOS.mk,v 1.6 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.SunOS.mk,v 1.7 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the Solaris operating system.
 
@@ -42,6 +42,7 @@ TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/usr/bin/ln
 TOOLS_PLATFORM.ls?=		/usr/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mkdir?=		/usr/bin/mkdir -p
 TOOLS_PLATFORM.mv?=		/usr/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/xpg4/bin/nice
diff --git a/mk/tools/tools.UnixWare.mk b/mk/tools/tools.UnixWare.mk
index 4d7383dc0d0..8765b1d0de2 100644
--- a/mk/tools/tools.UnixWare.mk
+++ b/mk/tools/tools.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.UnixWare.mk,v 1.4 2005/05/02 04:42:08 jlam Exp $
+# $NetBSD: tools.UnixWare.mk,v 1.5 2005/05/03 16:30:34 jlam Exp $
 #
 # System-supplied tools for the UnixWare 7 operating system.
 
@@ -30,6 +30,7 @@ TOOLS_PLATFORM.ldconfig?=	${TOOLS_PLATFORM.true}
 TOOLS_PLATFORM.ln?=		/usr/bin/ln
 TOOLS_PLATFORM.ls?=		/usr/bin/ls
 TOOLS_PLATFORM.m4?=		/usr/ccs/bin/m4
+TOOLS_PLATFORM.mail?=		/usr/bin/mailx
 TOOLS_PLATFORM.mv?=		/usr/bin/mv
 TOOLS_PLATFORM.nice?=		/usr/bin/nice
 TOOLS_PLATFORM.pwd?=		/usr/bin/pwd