Let mini_sendmail recognize the `-oi' option, as it does for `-i', so it

can work with send-pr.  Bump PKGREVISION to 3.

5 files changed, 25 insertions, 17 deletions

diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index de201d6604c..4883bf76444 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/04/24 19:49:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/05/07 11:20:07 jmmv Exp $
 #
 
 PKGNAME=	mini_sendmail-1.3.2
-PKGREVISION=	2
+PKGREVISION=	3
 
 BUILD_DEFS+=	USE_INET6
 
diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
index 4865d60dcb9..cfe3311dc35 100644
--- a/mail/mini_sendmail/distinfo
+++ b/mail/mini_sendmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/02/15 22:39:50 is Exp $
+$NetBSD: distinfo,v 1.3 2003/05/07 11:20:08 jmmv Exp $
 
 SHA1 (mini_sendmail-1.3.2.tar.gz) = 1e297ae27135f0f83f09c7be8a911ebfd9e2f966
 Size (mini_sendmail-1.3.2.tar.gz) = 7329 bytes
-SHA1 (patch-aa) = e10ba2e62295e598e6f6c38d622bc3bb6388969d
+SHA1 (patch-aa) = ff7be50e6126d2f7a515617efc4b3cb28e08e6d1
 SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
-SHA1 (patch-ac) = d2dbafded5c05328d7f67ada0aadfeb6305efd25
-SHA1 (patch-ad) = c4f2218e0531bc9cd480a04a92477220afddd836
+SHA1 (patch-ac) = d8fcaf56fd2399c5e3ab084400d5675e3f50a7c7
+SHA1 (patch-ad) = 6ed8307145443fb1cdffe8738bce6edad2a49708
diff --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa
index b1bc5e1f4c9..77d4aeb348b 100644
--- a/mail/mini_sendmail/patches/patch-aa
+++ b/mail/mini_sendmail/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2003/02/15 22:39:50 is Exp $
+$NetBSD: patch-aa,v 1.3 2003/05/07 11:20:08 jmmv Exp $
 
 --- mini_sendmail.c.orig	Thu Nov 21 21:27:55 2002
 +++ mini_sendmail.c
@@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.2 2003/02/15 22:39:50 is Exp $
  	    timeout = atoi( &(argv[argn][2]) );
  	else if ( strcmp( argv[argn], "-v" ) == 0 )
  	    verbose = 1;
-+	else if ( strcmp( argv[argn], "-i" ) == 0 )
++	else if ( strcmp( argv[argn], "-i" ) == 0 || strcmp ( argv[argn], "-oi" ) == 0 )
 +	    /* do nothing */ ;
  	else
  	    usage();
diff --git a/mail/mini_sendmail/patches/patch-ac b/mail/mini_sendmail/patches/patch-ac
index 18a82950154..a0315fae3c9 100644
--- a/mail/mini_sendmail/patches/patch-ac
+++ b/mail/mini_sendmail/patches/patch-ac
@@ -1,24 +1,32 @@
-$NetBSD: patch-ac,v 1.1 2003/02/15 22:39:50 is Exp $
+$NetBSD: patch-ac,v 1.2 2003/05/07 11:20:08 jmmv Exp $
 
---- mini_sendmail.8.orig        Sat Feb 15 23:16:19 2003
+--- mini_sendmail.8.orig	2001-07-13 23:08:43.000000000 +0200
 +++ mini_sendmail.8
-@@ -4,6 +4,7 @@
+@@ -1,9 +1,11 @@
+-.TH mini_sendmail 8 "12 July 2001"
++.TH mini_sendmail 8 "7 May 2003"
+ .SH NAME
+ mini_sendmail - accept email on behalf of real sendmail
  .SH SYNOPSIS
  .B mini_sendmail
  .RB [ -f<name> ]
 +.RB [ -i ]
++.RB [ -oi ]
  .RB [ -t ]
  .RB [ -s<server> ]
  .RB [ -T<timeout> ]
-@@ -24,6 +25,11 @@
- .TP
+@@ -25,6 +27,14 @@ can be used to send email from inside a 
  .B -f
  Set the name of the "from" person (i.e. the sender of the mail).
-+.TP
+ .TP
 +.B -i
 +Don't parse for a dot-line, but read input up to an end-of-file.
 +Currently, this is always the case, but this option is needed for
 +compatibility with sendmail.
- .TP
++.TP
++.B -oi
++Same as -i, needed for compatibility with sendmail.
++.TP
  .B -t
  Read message for recipients.
+ To:, Cc:, and Bcc: lines will be scanned for recipient addresses.
diff --git a/mail/mini_sendmail/patches/patch-ad b/mail/mini_sendmail/patches/patch-ad
index 7f996b70846..eab9cec3c5e 100644
--- a/mail/mini_sendmail/patches/patch-ad
+++ b/mail/mini_sendmail/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1 2003/02/15 22:39:50 is Exp $
+$NetBSD: patch-ad,v 1.2 2003/05/07 11:20:08 jmmv Exp $
 
 --- version.h.orig	Thu Nov 21 21:19:50 2002
 +++ version.h
@@ -7,6 +7,6 @@ $NetBSD: patch-ad,v 1.1 2003/02/15 22:39:50 is Exp $
  #define _VERSION_H_
  
 -#define VERSION "mini_sendmail/1.3.2 21nov2002"
-+#define VERSION "mini_sendmail/1.3.2 21nov2002 nb1 15Feb2003"
++#define VERSION "mini_sendmail/1.3.2 21nov2002 nb3 7May2003"
  
  #endif /* _VERSION_H_ */