[pkgsrc/trunk]: pkgsrc/mk Replace all occurrences of the "MAIL" definition wi...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/mk Replace all occurrences of the "MAIL" definition wi...
From: agc <agc%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:26:45 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/d715c35d0367
branches:  trunk
changeset: 467242:d715c35d0367
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Jan 27 16:11:47 2004 +0000

description:
Replace all occurrences of the "MAIL" definition with MAIL_CMD, since
some shells can set MAIL to be the mailbox of the user, and
environment variables will override assignments in make when using
conditional assignments.

diffstat:

 mk/bsd.pkg.mk      |  4 ++--
 mk/bulk/build      |  8 ++++----
 mk/defs.AIX.mk     |  4 ++--
 mk/defs.BSDOS.mk   |  4 ++--
 mk/defs.Darwin.mk  |  4 ++--
 mk/defs.FreeBSD.mk |  4 ++--
 mk/defs.IRIX.mk    |  4 ++--
 mk/defs.Linux.mk   |  6 +++---
 mk/defs.NetBSD.mk  |  4 ++--
 mk/defs.OpenBSD.mk |  4 ++--
 mk/defs.SunOS.mk   |  4 ++--
 11 files changed, 25 insertions(+), 25 deletions(-)

diffs (220 lines):

diff -r 8db29b2762ce -r d715c35d0367 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/bsd.pkg.mk     Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
        ${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 -r 8db29b2762ce -r d715c35d0367 mk/bulk/build
--- a/mk/bulk/build     Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/bulk/build     Tue Jan 27 16:11:47 2004 +0000
@@ -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@localhost>
@@ -114,7 +114,7 @@
        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 @@
        -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 @@
 
 # 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.AIX.mk
--- a/mk/defs.AIX.mk    Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.AIX.mk    Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.BSDOS.mk
--- a/mk/defs.BSDOS.mk  Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.BSDOS.mk  Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.Darwin.mk
--- a/mk/defs.Darwin.mk Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.Darwin.mk Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.FreeBSD.mk
--- a/mk/defs.FreeBSD.mk        Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.FreeBSD.mk        Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.IRIX.mk
--- a/mk/defs.IRIX.mk   Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.IRIX.mk   Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.Linux.mk
--- a/mk/defs.Linux.mk  Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.Linux.mk  Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.NetBSD.mk
--- a/mk/defs.NetBSD.mk Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.NetBSD.mk Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.OpenBSD.mk
--- a/mk/defs.OpenBSD.mk        Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.OpenBSD.mk        Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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 -r 8db29b2762ce -r d715c35d0367 mk/defs.SunOS.mk
--- a/mk/defs.SunOS.mk  Tue Jan 27 14:18:20 2004 +0000
+++ b/mk/defs.SunOS.mk  Tue Jan 27 16:11:47 2004 +0000
@@ -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 @@
 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
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/chmlib Replace -lpthread with ${PTHREAD_LDFLAGS}...
Next by Date: [pkgsrc/trunk]: pkgsrc/x11/xscreensaver Add build dependency on perl.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/chmlib Replace -lpthread with ${PTHREAD_LDFLAGS}...
Next by Thread: [pkgsrc/trunk]: pkgsrc/x11/xscreensaver Add build dependency on perl.
Indexes:
Home | Main Index | Thread Index | Old Index