From a60441a3682ff15c356d9d6f6da227fb08b33984 Mon Sep 17 00:00:00 2001
From: is <is@pkgsrc.org>
Date: Tue, 7 Oct 2003 08:45:14 +0000
Subject: Add -oeq option, for sendmail compatibility. Bump pkgrevision to 4.

---
 mail/mini_sendmail/Makefile         |  4 ++--
 mail/mini_sendmail/distinfo         |  8 ++++----
 mail/mini_sendmail/patches/patch-aa |  8 +++++---
 mail/mini_sendmail/patches/patch-ac | 15 +++++++++------
 mail/mini_sendmail/patches/patch-ad |  4 ++--
 5 files changed, 22 insertions(+), 17 deletions(-)

(limited to 'mail')

diff --git a/mail/mini_sendmail/Makefile b/mail/mini_sendmail/Makefile
index 4883bf76444..dc89627d548 100644
--- a/mail/mini_sendmail/Makefile
+++ b/mail/mini_sendmail/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/05/07 11:20:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/10/07 08:45:14 is Exp $
 #
 
 PKGNAME=	mini_sendmail-1.3.2
-PKGREVISION=	3
+PKGREVISION=	4
 
 BUILD_DEFS+=	USE_INET6
 
diff --git a/mail/mini_sendmail/distinfo b/mail/mini_sendmail/distinfo
index cfe3311dc35..d86ae8889fd 100644
--- a/mail/mini_sendmail/distinfo
+++ b/mail/mini_sendmail/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/05/07 11:20:08 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2003/10/07 08:45:14 is Exp $
 
 SHA1 (mini_sendmail-1.3.2.tar.gz) = 1e297ae27135f0f83f09c7be8a911ebfd9e2f966
 Size (mini_sendmail-1.3.2.tar.gz) = 7329 bytes
-SHA1 (patch-aa) = ff7be50e6126d2f7a515617efc4b3cb28e08e6d1
+SHA1 (patch-aa) = 0a58aa3ca8b3afef3ae6a68386b99020829777c9
 SHA1 (patch-ab) = f96d22be2f94445a6f8b249cdd823dcfbd1528de
-SHA1 (patch-ac) = d8fcaf56fd2399c5e3ab084400d5675e3f50a7c7
-SHA1 (patch-ad) = 6ed8307145443fb1cdffe8738bce6edad2a49708
+SHA1 (patch-ac) = 3c10e603993c61f2a518ceb9f130460087c69081
+SHA1 (patch-ad) = d7c79697612745f7fa6abc163b610ccad232ff9c
diff --git a/mail/mini_sendmail/patches/patch-aa b/mail/mini_sendmail/patches/patch-aa
index 77d4aeb348b..2b8c4fe5919 100644
--- a/mail/mini_sendmail/patches/patch-aa
+++ b/mail/mini_sendmail/patches/patch-aa
@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.3 2003/05/07 11:20:08 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2003/10/07 08:45:14 is Exp $
 
 --- mini_sendmail.c.orig	Thu Nov 21 21:27:55 2002
 +++ mini_sendmail.c
-@@ -129,6 +129,8 @@
+@@ -129,6 +129,10 @@ main( int argc, char** argv )
  	    timeout = atoi( &(argv[argn][2]) );
  	else if ( strcmp( argv[argn], "-v" ) == 0 )
  	    verbose = 1;
++	else if ( strcmp( argv[argn], "-oeq" ) == 0 )
++	    verbose = 0;
 +	else if ( strcmp( argv[argn], "-i" ) == 0 || strcmp ( argv[argn], "-oi" ) == 0 )
 +	    /* do nothing */ ;
  	else
  	    usage();
  	++argn;
-@@ -575,14 +577,16 @@
+@@ -575,14 +579,16 @@ open_client_socket( void )
      sock_family = PF_INET6;
  
  #ifdef DO_MINUS_S
diff --git a/mail/mini_sendmail/patches/patch-ac b/mail/mini_sendmail/patches/patch-ac
index a0315fae3c9..a7cd03f4fa7 100644
--- a/mail/mini_sendmail/patches/patch-ac
+++ b/mail/mini_sendmail/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.2 2003/05/07 11:20:08 jmmv Exp $
+$NetBSD: patch-ac,v 1.3 2003/10/07 08:45:14 is Exp $
 
---- mini_sendmail.8.orig	2001-07-13 23:08:43.000000000 +0200
+--- mini_sendmail.8.orig	Fri Jul 13 23:08:43 2001
 +++ mini_sendmail.8
 @@ -1,9 +1,11 @@
 -.TH mini_sendmail 8 "12 July 2001"
@@ -15,18 +15,21 @@ $NetBSD: patch-ac,v 1.2 2003/05/07 11:20:08 jmmv Exp $
  .RB [ -t ]
  .RB [ -s<server> ]
  .RB [ -T<timeout> ]
-@@ -25,6 +27,14 @@ can be used to send email from inside a 
+@@ -24,6 +26,17 @@ can be used to send email from inside a 
+ .TP
  .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
++.B -oeq
++Quiet mode, needed for compatibility with sendmail.
++.TP
 +.B -oi
 +Same as -i, needed for compatibility with sendmail.
-+.TP
+ .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 eab9cec3c5e..672dc8fdeff 100644
--- a/mail/mini_sendmail/patches/patch-ad
+++ b/mail/mini_sendmail/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2003/05/07 11:20:08 jmmv Exp $
+$NetBSD: patch-ad,v 1.3 2003/10/07 08:45:14 is Exp $
 
 --- version.h.orig	Thu Nov 21 21:19:50 2002
 +++ version.h
@@ -7,6 +7,6 @@ $NetBSD: patch-ad,v 1.2 2003/05/07 11:20:08 jmmv Exp $
  #define _VERSION_H_
  
 -#define VERSION "mini_sendmail/1.3.2 21nov2002"
-+#define VERSION "mini_sendmail/1.3.2 21nov2002 nb3 7May2003"
++#define VERSION "mini_sendmail/1.3.2 21nov2002 nb4 7oct2003"
  
  #endif /* _VERSION_H_ */
-- 
cgit v1.2.3