pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework about MAIL_CMD. We u...
details: https://anonhg.NetBSD.org/pkgsrc/rev/70ad91c7ddaa
branches: trunk
changeset: 493342:70ad91c7ddaa
user: jlam <jlam%pkgsrc.org@localhost>
date: Tue May 03 16:30:34 2005 +0000
description:
Teach the new tools framework about MAIL_CMD. We use mail/nail as a
"mail" replacement in case TOOLS_PLATFORM.mail is empty.
diffstat:
mk/bsd.pkg.mk | 7 ++++++-
mk/tools/defaults.mk | 3 ++-
mk/tools/replace.mk | 13 ++++++++++++-
mk/tools/tools.AIX.mk | 3 ++-
mk/tools/tools.BSDOS.mk | 3 ++-
mk/tools/tools.Darwin.mk | 3 ++-
mk/tools/tools.DragonFly.mk | 3 ++-
mk/tools/tools.FreeBSD.mk | 3 ++-
mk/tools/tools.IRIX.mk | 3 ++-
mk/tools/tools.Interix.mk | 3 ++-
mk/tools/tools.Linux.mk | 7 ++++++-
mk/tools/tools.NetBSD.mk | 3 ++-
mk/tools/tools.OSF1.mk | 3 ++-
mk/tools/tools.OpenBSD.mk | 3 ++-
mk/tools/tools.SunOS.mk | 3 ++-
mk/tools/tools.UnixWare.mk | 3 ++-
16 files changed, 50 insertions(+), 16 deletions(-)
diffs (290 lines):
diff -r 8767bcc5582a -r 70ad91c7ddaa mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/bsd.pkg.mk Tue May 03 16:30:34 2005 +0000
@@ -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 @@
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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/defaults.mk
--- a/mk/tools/defaults.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/defaults.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/replace.mk
--- a/mk/tools/replace.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/replace.mk Tue May 03 16:30:34 2005 +0000
@@ -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 @@
. 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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.AIX.mk
--- a/mk/tools/tools.AIX.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.AIX.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.BSDOS.mk
--- a/mk/tools/tools.BSDOS.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.BSDOS.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.Darwin.mk
--- a/mk/tools/tools.Darwin.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.Darwin.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.DragonFly.mk
--- a/mk/tools/tools.DragonFly.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.DragonFly.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.FreeBSD.mk
--- a/mk/tools/tools.FreeBSD.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.FreeBSD.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.IRIX.mk
--- a/mk/tools/tools.IRIX.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.IRIX.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.Interix.mk
--- a/mk/tools/tools.Interix.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.Interix.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.Linux.mk
--- a/mk/tools/tools.Linux.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.Linux.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.NetBSD.mk
--- a/mk/tools/tools.NetBSD.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.NetBSD.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.OSF1.mk
--- a/mk/tools/tools.OSF1.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.OSF1.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.OpenBSD.mk
--- a/mk/tools/tools.OpenBSD.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.OpenBSD.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.SunOS.mk
--- a/mk/tools/tools.SunOS.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.SunOS.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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 -r 8767bcc5582a -r 70ad91c7ddaa mk/tools/tools.UnixWare.mk
--- a/mk/tools/tools.UnixWare.mk Tue May 03 16:17:52 2005 +0000
+++ b/mk/tools/tools.UnixWare.mk Tue May 03 16:30:34 2005 +0000
@@ -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.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
Home |
Main Index |
Thread Index |
Old Index