6 files changed, 6 insertions, 60 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index e3d291a9c82..d32d2d6e8bf 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.45 2005/09/30 06:04:32 martti Exp $
+# $NetBSD: Makefile,v 1.46 2005/11/16 06:53:14 martti Exp $
 
 DISTNAME=	postfix-2.3-20050922
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
 		http://public.planetmirror.com.au/pub/postfix/experimental/
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index daeec02f2f2..c79929a5b54 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.17 2005/11/15 10:43:20 martti Exp $
+$NetBSD: distinfo,v 1.18 2005/11/16 06:53:14 martti Exp $
 
 SHA1 (postfix/postfix-2.3-20050922.tar.gz) = 392548fef18c860bc6d75155f0e6b259fd4489a5
 RMD160 (postfix/postfix-2.3-20050922.tar.gz) = 848bcfcc5e044fdae3f42ed384bbc7bea98a1ae5
 Size (postfix/postfix-2.3-20050922.tar.gz) = 2508873 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
 SHA1 (patch-ab) = aa08339399411b8c1e12856f6b5f8406b7775840
-SHA1 (patch-ac) = 1b0fb6da368b65ccd6e47c94ff867f0169aaa839
 SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
 SHA1 (patch-ai) = 562b29dcc4998b787b947727e0f88f134e1e7dff
diff --git a/mail/postfix-current/patches/patch-ac b/mail/postfix-current/patches/patch-ac
deleted file mode 100644
index 0f2b3047cfd..00000000000
--- a/mail/postfix-current/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.6 2005/09/30 06:04:32 martti Exp $
-
-See http://archives.neohapsis.com/archives/postfix/2004-08/1114.html
-and the preceding thread.  Fixes "smtp killed by signal 11" problems.
-
---- src/util/vstream.c.orig	2005-08-29 21:24:44.000000000 +0300
-+++ src/util/vstream.c	2005-09-30 05:50:46.000000000 +0300
-@@ -983,6 +983,10 @@
-      * policies. Either this, or the vstream*open() routines would have to
-      * have a really ugly interface with lots of mostly-unused arguments (can
-      * you say VMS?).
-+     * 
-+     * Initialize the I/O time (as documented) so that a time sensitive, "write
-+     * before read" application does not force flush the first data written
-+     * to a stream, potentially triggering NAGLE delays or other trouble.
-      */
-     stream = (VSTREAM *) mymalloc(sizeof(*stream));
-     stream->fd = fd;
-@@ -996,7 +1000,7 @@
-     stream->timeout = 0;
-     stream->context = 0;
-     stream->jbuf = 0;
--    stream->iotime = 0;
-+    stream->iotime = time((time_t *) 0); /* as documented */;
-     return (stream);
- }
- 
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 4497ca28dc7..76c2fd60f06 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.167 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.168 2005/11/16 06:53:13 martti Exp $
 
 DISTNAME=	postfix-2.2.5
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 371bf98ba21..1fb0a601cdf 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.92 2005/11/13 10:37:09 martti Exp $
+$NetBSD: distinfo,v 1.93 2005/11/16 06:53:13 martti Exp $
 
 SHA1 (postfix/postfix-2.2.5.tar.gz) = 5e86340e6ccff5a9141c259a6b65f72b7396483d
 RMD160 (postfix/postfix-2.2.5.tar.gz) = 5508f9662319e655daf8ec8b70fb508f0bb15bb0
 Size (postfix/postfix-2.2.5.tar.gz) = 2428594 bytes
 SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
-SHA1 (patch-ac) = ffcd4f8b00c1cf01f050a0c943bfe61a1ec2361a
 SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
 SHA1 (patch-ai) = d3ea006bafb5e9df869fbb2dec8c7f53b160c8e0
diff --git a/mail/postfix/patches/patch-ac b/mail/postfix/patches/patch-ac
deleted file mode 100644
index af6fd559fb3..00000000000
--- a/mail/postfix/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2005/03/22 10:43:50 cjs Exp $
-
-See http://archives.neohapsis.com/archives/postfix/2004-08/1114.html
-and the preceding thread.  Fixes "smtp killed by signal 11" problems.
-
---- src/util/vstream.c.old	2005-03-22 19:04:49.000000000 +0900
-+++ src/util/vstream.c	2005-03-22 19:05:26.000000000 +0900
-@@ -926,6 +926,10 @@
-      * policies. Either this, or the vstream*open() routines would have to
-      * have a really ugly interface with lots of mostly-unused arguments (can
-      * you say VMS?).
-+     * 
-+     * Initialize the I/O time (as documented) so that a time sensitive, "write
-+     * before read" application does not force flush the first data written
-+     * to a stream, potentially triggering NAGLE delays or other trouble.
-      */
-     stream = (VSTREAM *) mymalloc(sizeof(*stream));
-     stream->fd = fd;
-@@ -939,7 +943,7 @@
-     stream->timeout = 0;
-     stream->context = 0;
-     stream->jbuf = 0;
--    stream->iotime = 0;
-+    stream->iotime = time((time_t *) 0); /* as documented */;
-     return (stream);
- }
-