Call /usr/sbin/sendmail instead of /usr/lib/sendmail. It's wrong to

assume that we want /usr/sbin/sendmail, but we don't currently have a
good solution to that problem, and this is consistent with an existing
change that was made to this package.

Closes PR pkg/24678.

6 files changed, 91 insertions, 6 deletions

diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 0f2e2e8fdcc..6825c8122e5 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.26 2004/02/28 20:04:40 snj Exp $
+# $NetBSD: Makefile,v 1.27 2004/03/29 02:17:24 snj Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo
index c1e2662ca51..646a54bd22b 100644
--- a/mail/metamail/distinfo
+++ b/mail/metamail/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.8 2004/02/28 20:04:40 snj Exp $
+$NetBSD: distinfo,v 1.9 2004/03/29 02:17:24 snj Exp $
 
 SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6
 Size (mm2.7.tar.Z) = 262881 bytes
 SHA1 (patch-aa) = 5b03f920e11554af5f776ff352c85c06e2f8f8de
 SHA1 (patch-ab) = 7cd0a70de63ba86172b5628bb082fb46100262b9
+SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e
 SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94
 SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8
 SHA1 (patch-af) = 9ba42f1eef27d452debb9c1e0abc800f19deccac
 SHA1 (patch-ag) = 674ceb59955de76e9a673ee4969d359a30fba5f8
-SHA1 (patch-ah) = 0be03011df91c66f12836ce64eb37983f129e4c5
+SHA1 (patch-ah) = 69f286fbb45420921cfe57e16c6ec220e409b784
 SHA1 (patch-ai) = 4e85922573dc0ae2017c112198f1f23c2b08f729
 SHA1 (patch-aj) = 7384564119a360189c68bdc5ce0ba3648a44769c
 SHA1 (patch-ak) = fcf331b9d28243cb403fd0dc34a365eb147f3da4
@@ -16,3 +17,5 @@ SHA1 (patch-al) = c63427174a5d80c62b207212e0d855457939d0bc
 SHA1 (patch-am) = d5d2cc002173da827fb452a91ccd906452420bfc
 SHA1 (patch-an) = 56c228106dc663623cb31ecf4eeba1fc5c27d045
 SHA1 (patch-ao) = 90566d47642fe8ee71295ea47f3cf7420d0b2880
+SHA1 (patch-ap) = ade6fba2254e7db3f9cf52acf453bb512c0a3d32
+SHA1 (patch-aq) = 90f84381aaf91db03cecef84d9433c3ffd1152db
diff --git a/mail/metamail/patches/patch-ac b/mail/metamail/patches/patch-ac
new file mode 100644
index 00000000000..87c3eac41d1
--- /dev/null
+++ b/mail/metamail/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.4 2004/03/29 02:17:24 snj Exp $
+
+--- bin/audiosend.orig	2004-03-28 18:04:21.000000000 -0800
++++ bin/audiosend	2004-03-28 18:04:30.000000000 -0800
+@@ -86,7 +86,7 @@ set which = $<
+     switch ("$which")
+         case 1:
+           echo -n "Sending mail, please wait...  "
+-          /usr/lib/sendmail $to  $cc < $fname
++          /usr/sbin/sendmail $to  $cc < $fname
+           if (! $status) then
+             echo "Done."
+             rm $fname
diff --git a/mail/metamail/patches/patch-ah b/mail/metamail/patches/patch-ah
index 62e252446a3..67ac73f7e3c 100644
--- a/mail/metamail/patches/patch-ah
+++ b/mail/metamail/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2004/02/25 03:58:43 snj Exp $
+$NetBSD: patch-ah,v 1.3 2004/03/29 02:17:24 snj Exp $
 
 --- man/mailto.1.orig	1994-02-09 12:29:12.000000000 -0800
-+++ man/mailto.1	2004-02-24 10:18:53.000000000 -0800
++++ man/mailto.1	2004-03-28 18:08:59.000000000 -0800
 @@ -1,6 +1,6 @@
  .TH MAILTO 1 "Release 1" "Bellcore Prototype"
  .SH NAME
@@ -19,6 +19,15 @@ $NetBSD: patch-ah,v 1.2 2004/02/25 03:58:43 snj Exp $
  
  2.  Non-text data.  Metamail can include pictures, sounds, and other non-textual data in the middle of any mail message.  The mailcap configuration mechanism can even make this process reasonably user-friendly, but a knowledgable user can include non-textual data even in the absence of a proper mailcap entry.
  
+@@ -230,7 +230,7 @@ The .mailrc file in your home directory 
+    dot -- controls whether or not a period alone on a line 
+         should be interpreted as terminating your mail
+    ignore -- controls whether or not interrupts are ignored
+-   verbose -- controls the verbosity of output from /usr/lib/sendmail
++   verbose -- controls the verbosity of output from /usr/sbin/sendmail
+    quiet -- controls the verbosity of output from the mailto program.
+    keepblind -- controls whether or not a 'blind' copy of the mail is kept.
+   commasonly -- controls whether or not a space character
 @@ -275,7 +275,7 @@ The mailto program reads both the aliase
  
  .I 
diff --git a/mail/metamail/patches/patch-ap b/mail/metamail/patches/patch-ap
new file mode 100644
index 00000000000..34d74d65b17
--- /dev/null
+++ b/mail/metamail/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2004/03/29 02:17:24 snj Exp $
+
+--- bin/showexternal.orig	2004-03-28 18:05:20.000000000 -0800
++++ bin/showexternal	2004-03-28 18:05:27.000000000 -0800
+@@ -222,7 +222,7 @@ quit
+ 	echo "" >> $NEWNAME
+ 	sed -e 1,/^\$/d < $bodyfile >> $NEWNAME
+ 	echo "" >> $NEWNAME
+-	/usr/lib/sendmail -t  < $NEWNAME
++	/usr/sbin/sendmail -t  < $NEWNAME
+ 	if ($status) then
+ 	    echo sendmail failed
+ 	    cd ${METAMAIL_TMPDIR}
diff --git a/mail/metamail/patches/patch-aq b/mail/metamail/patches/patch-aq
new file mode 100644
index 00000000000..e3307c6fe70
--- /dev/null
+++ b/mail/metamail/patches/patch-aq
@@ -0,0 +1,47 @@
+$NetBSD: patch-aq,v 1.1 2004/03/29 02:17:24 snj Exp $
+
+--- bin/mailserver.orig	2004-03-28 18:11:22.000000000 -0800
++++ bin/mailserver	2004-03-28 18:11:34.000000000 -0800
+@@ -68,7 +68,7 @@ reproduced below.  If no message appears
+ probably run in some circumstance other than mail delivery.
+ --------------------
+ !
+-	cat $TmpFile - | /usr/lib/sendmail $MAINTAINER
++	cat $TmpFile - | /usr/sbin/sendmail $MAINTAINER
+ 	# Takes the rest of the message from standard input
+ 	rm $TmpFile
+ 	exit 0
+@@ -86,7 +86,7 @@ that contain ".." in the path name.
+ 
+ The file you requested, if it exists, will not be sent to you.
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -107,7 +107,7 @@ Here is a list of the currently availabl
+ --------------------------------
+ !
+ 	ls -R >> $TmpFile
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+@@ -135,13 +135,13 @@ Command failed: 
+   metasend -b -t "$FromName" -f "$Subject" -m "$ct" -s "Re: $Subject"
+ 
+ !
+-	/usr/lib/sendmail -t < $TmpFile
++	/usr/sbin/sendmail -t < $TmpFile
+ 	rm $TmpFile
+ 	exit 0
+ endif
+ 
+ if ("$LOGADDR" != "") then
+-	/usr/lib/sendmail -t <<!
++	/usr/sbin/sendmail -t <<!
+ From: ${LOCALADDR}@`hostname`
+ To: $LOGADDR
+ Subject: Autosend delivery report