Updated mail/postfix to 2.2.6

Postfix 2.2 patch 06 catches up with minor fixes that were fielded
earlier in the experimental Postfix 2.3 snapshots.

4 files changed, 7 insertions, 41 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 76c2fd60f06..8704b8c4050 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.168 2005/11/16 06:53:13 martti Exp $
+# $NetBSD: Makefile,v 1.169 2005/12/01 06:46:40 martti Exp $
 
-DISTNAME=	postfix-2.2.5
-PKGREVISION=	1
+DISTNAME=	postfix-2.2.6
+#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 1fb0a601cdf..397cd3158ef 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.93 2005/11/16 06:53:13 martti Exp $
+$NetBSD: distinfo,v 1.94 2005/12/01 06:46:40 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 (postfix/postfix-2.2.6.tar.gz) = 938ab8d2b1e02b18515ff6de57782e7e483b609d
+RMD160 (postfix/postfix-2.2.6.tar.gz) = d7af42d4e407a812ad99fbddcc2c30327c78f487
+Size (postfix/postfix-2.2.6.tar.gz) = 2433005 bytes
 SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
-SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
-SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
 SHA1 (patch-ai) = d3ea006bafb5e9df869fbb2dec8c7f53b160c8e0
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
deleted file mode 100644
index 40d6d1591a0..00000000000
--- a/mail/postfix/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.10 2004/08/10 16:49:47 schmonz Exp $
-
---- src/dns/dns.h.orig	Mon Apr 30 09:22:59 2001
-+++ src/dns/dns.h
-@@ -19,6 +19,9 @@
- #ifdef RESOLVE_H_NEEDS_STDIO_H
- #include <stdio.h>
- #endif
-+#ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
-+#include <nameser8_compat.h>
-+#endif
- #include <resolv.h>
- 
-  /*
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
deleted file mode 100644
index f988ad27ddd..00000000000
--- a/mail/postfix/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.18 2005/11/13 10:37:09 martti Exp $
-
---- src/util/sys_defs.h.orig	2005-07-15 00:28:33.000000000 +0300
-+++ src/util/sys_defs.h	2005-11-13 09:22:07.000000000 +0200
-@@ -52,3 +52,3 @@
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
--#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
-+#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 299000900)
- # define USE_STATVFS
-@@ -124,3 +124,3 @@
- 
--#if __NetBSD_Version__ >= 200060000	/* 2.0F */
-+#if __NetBSD_Version__ >= 299000900	/* 2.99.9 */
- #define HAS_CLOSEFROM
-@@ -157,2 +157,3 @@
- #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
-+#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
- #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"