summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/bsd.pkg.mk4
-rw-r--r--mk/bulk/build8
-rw-r--r--mk/defs.AIX.mk4
-rw-r--r--mk/defs.BSDOS.mk4
-rw-r--r--mk/defs.Darwin.mk4
-rw-r--r--mk/defs.FreeBSD.mk4
-rw-r--r--mk/defs.IRIX.mk4
-rw-r--r--mk/defs.Linux.mk6
-rw-r--r--mk/defs.NetBSD.mk4
-rw-r--r--mk/defs.OpenBSD.mk4
-rw-r--r--mk/defs.SunOS.mk4
11 files changed, 25 insertions, 25 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index e250eed8a0a..6b61eeed01e 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1361 2004/01/27 02:36:59 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1362 2004/01/27 16:11:47 agc Exp $
#
# This file is in the public domain.
#
@@ -2678,7 +2678,7 @@ real-su-install: ${MESSAGE}
${ECHO} ""; \
${CAT} ${MESSAGE}; \
${ECHO} "") | \
- ${MAIL} -s"Package ${PKGNAME} installed" ${PKGSRC_MESSAGE_RECIPIENTS}
+ ${MAIL_CMD} -s"Package ${PKGNAME} installed" ${PKGSRC_MESSAGE_RECIPIENTS}
. endif
.endif
.if !defined(NO_PKG_REGISTER)
diff --git a/mk/bulk/build b/mk/bulk/build
index 17b9a447b03..3ffd859e457 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: build,v 1.33 2004/01/22 09:08:34 grant Exp $
+# $NetBSD: build,v 1.34 2004/01/27 16:11:47 agc Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@netbsd.org>
@@ -114,7 +114,7 @@ if [ -d pkgtools/pkglint ]; then
AWK=`${BMAKE} show-var VARNAME=AWK` || fail=yes
GREP=`${BMAKE} show-var VARNAME=GREP` || fail=yes
SED=`${BMAKE} show-var VARNAME=SED` || fail=yes
- MAIL=`${BMAKE} show-var VARNAME=MAIL` || fail=yes
+ MAIL_CMD=`${BMAKE} show-var VARNAME=MAIL_CMD` || fail=yes
MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes
else
echo "The pkgtools/pkglint directory does not exist. Please update"
@@ -149,7 +149,7 @@ if [ $fail = "yes" -o \
-z "$AWK" -o \
-z "$GREP" -o \
-z "$SED" -o \
- -z "$MAIL" \
+ -z "$MAIL_CMD" \
]; then
echo "ERROR: build failed to extract certain key variables."
echo " please examine the above list and correct the"
@@ -242,7 +242,7 @@ echo "Post processing bulk build results..."
# Perl was wiped, reinstall it!
( cd lang/perl5 && ${BMAKE} bulk-install )
-perl mk/bulk/post-build | ${MAIL} -s "pkgsrc/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
+perl mk/bulk/post-build | ${MAIL_CMD} -s "pkgsrc/${MACHINE_ARCH} bulk build results `date +%Y-%m-%d`" $ADMIN
# Done!
echo ""
diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index 4e3d4b6d8c7..707c848a9f7 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.3 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.AIX.mk,v 1.4 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the AIX operating system.
@@ -56,7 +56,7 @@ LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mailx
+MAIL_CMD?= /usr/bin/mailx
MKDIR?= /bin/mkdir -p
MTREE?= ${LOCALBASE}/sbin/mtree
MV?= /bin/mv
diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk
index 28a39a42ffa..06adaf318d5 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/defs.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.4 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.5 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the BSD/OS operating system.
@@ -48,7 +48,7 @@ LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mail
+MAIL_CMD?= /usr/bin/mail
MKDIR?= /bin/mkdir -p
.if exists(${LOCALBASE}/sbin/mtree)
MTREE?= ${LOCALBASE}/sbin/mtree
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index bb5e8a91f51..3e4a9ca20d7 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.64 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.Darwin.mk,v 1.65 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the Darwin operating system.
@@ -38,7 +38,7 @@ LDD?= /usr/bin/otool -L
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mail
+MAIL_CMD?= /usr/bin/mail
MKDIR?= /bin/mkdir -p
MTREE?= /usr/sbin/mtree
MV?= /bin/mv
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 6f54c54c1b8..deb66901016 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.28 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.29 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the FreeBSD operating system.
@@ -41,7 +41,7 @@ LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mail
+MAIL_CMD?= /usr/bin/mail
MKDIR?= /bin/mkdir -p
.if exists(${LOCALBASE}/sbin/mtree)
MTREE?= ${LOCALBASE}/sbin/mtree
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index f697773ef56..58004679e0b 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.39 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.IRIX.mk,v 1.40 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the IRIX operating system.
@@ -46,7 +46,7 @@ LDCONFIG?= /usr/bin/true
LN?= /sbin/ln
LS?= /sbin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/sbin/mailx
+MAIL_CMD?= /usr/sbin/mailx
MKDIR?= /sbin/mkdir -p
.if exists(${LOCALBASE}/sbin/mtree)
MTREE?= ${LOCALBASE}/sbin/mtree
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 0ac62b9be06..d9409fd974f 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.63 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.Linux.mk,v 1.64 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the Linux operating system.
@@ -75,9 +75,9 @@ LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
.if exists(/bin/mail)
-MAIL?= /bin/mail # RH, Mandrake
+MAIL_CMD?= /bin/mail # RH, Mandrake
.else
-MAIL?= /usr/bin/mail # Debian, Slackware, SuSE
+MAIL_CMD?= /usr/bin/mail # Debian, Slackware, SuSE
.endif
MKDIR?= /bin/mkdir -p
MTREE?= ${LOCALBASE}/sbin/mtree
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index b4595b6c4f9..78359cf83bb 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.58 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.59 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the NetBSD operating system.
@@ -43,7 +43,7 @@ LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mail
+MAIL_CMD?= /usr/bin/mail
MKDIR?= /bin/mkdir -p
MTREE?= /usr/sbin/mtree
MV?= /bin/mv
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 1fe803e931a..c45cde072c7 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.27 2003/12/16 23:07:42 heinz Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.28 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the OpenBSD operating system.
@@ -39,7 +39,7 @@ LDCONFIG?= /sbin/ldconfig
LN?= /bin/ln
LS?= /bin/ls
M4?= /usr/bin/m4
-MAIL?= /usr/bin/mail
+MAIL_CMD?= /usr/bin/mail
MKDIR?= /bin/mkdir -p
MTREE?= /usr/sbin/mtree
MV?= /bin/mv
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 370eb805e84..f0b523d4ebc 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.77 2004/01/15 19:00:22 gavan Exp $
+# $NetBSD: defs.SunOS.mk,v 1.78 2004/01/27 16:11:47 agc Exp $
#
# Variable definitions for the SunOS/Solaris operating system.
@@ -47,7 +47,7 @@ LDCONFIG?= /usr/bin/true
LN?= /usr/bin/ln
LS?= /usr/bin/ls
M4?= /usr/ccs/bin/m4
-MAIL?= /usr/bin/mailx
+MAIL_CMD?= /usr/bin/mailx
MKDIR?= /usr/bin/mkdir -p
.if exists(${LOCALBASE}/sbin/mtree)
MTREE?= ${LOCALBASE}/sbin/mtree