Updated postfix to 2.2.2

- A more usable REPLACE action in header/body_checks. The old
  version produced unexpected results.

- Portability to HP-UX.

- Two harmless defects in the SMTP and LMTP clients that go back
  to before the first Postfix release, and that were found while
  doing code maintenance on the experimental release.

4 files changed, 17 insertions, 17 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 58d2873adc7..6a4c173dfd4 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.159 2005/03/28 08:53:07 jlam Exp $
+# $NetBSD: Makefile,v 1.160 2005/04/04 18:13:32 martti Exp $
 
-DISTNAME=	postfix-2.2.1
+DISTNAME=	postfix-2.2.2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index deeddc16a3c..7d60e5b914a 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.84 2005/03/22 18:09:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.85 2005/04/04 18:13:32 martti Exp $
 
-SHA1 (postfix/postfix-2.2.1.tar.gz) = 06d5f1b4cbf16dec4189589ae744bc1a58943871
-RMD160 (postfix/postfix-2.2.1.tar.gz) = 8547ea001d8db07ff8f0cabf30589cd711c48644
-Size (postfix/postfix-2.2.1.tar.gz) = 2407157 bytes
-SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
+SHA1 (postfix/postfix-2.2.2.tar.gz) = 453a171389083995ee992abad49052729bcdc942
+RMD160 (postfix/postfix-2.2.2.tar.gz) = 3ae2c579e9cd7d937755121502290b9307188750
+Size (postfix/postfix-2.2.2.tar.gz) = 2408375 bytes
+SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
 SHA1 (patch-ac) = ffcd4f8b00c1cf01f050a0c943bfe61a1ec2361a
-SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
+SHA1 (patch-ag) = dd7851aa16b7458e0cb1975742cf8da4118866b3
 SHA1 (patch-ai) = d24b434fcd8964d1d27e6c0eac93e2d742de98ab
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa
index 6d24824eebe..0e40d270009 100644
--- a/mail/postfix/patches/patch-aa
+++ b/mail/postfix/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2004/07/19 22:04:40 jlam Exp $
+$NetBSD: patch-aa,v 1.16 2005/04/04 18:13:32 martti Exp $
 
---- postfix-install.orig	Wed Apr 14 11:45:23 2004
-+++ postfix-install
-@@ -354,26 +354,6 @@ HTML files. Specify \"no\" if you do not
+--- postfix-install.orig	2005-02-02 23:39:36.000000000 +0200
++++ postfix-install	2005-04-04 21:05:58.000000000 +0300
+@@ -356,26 +356,6 @@
  : ${tempdir=`pwd`}
  : ${config_directory=`bin/postconf -h -d config_directory`}
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.15 2004/07/19 22:04:40 jlam Exp $
  # In case some systems special-case pathnames beginning with //.
  
  case $install_root in
-@@ -715,10 +695,3 @@ bin/postconf -c $CONFIG_DIRECTORY -e \
+@@ -722,10 +702,3 @@
      "sample_directory = $sample_directory" \
      "readme_directory = $readme_directory" \
  || exit 1
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 4fb54c0a785..dcc44d46366 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.14 2004/09/23 16:10:07 martti Exp $
+$NetBSD: patch-ag,v 1.15 2005/04/04 18:13:32 martti Exp $
 
---- src/util/sys_defs.h.orig	2004-08-02 00:05:23.000000000 +0300
-+++ src/util/sys_defs.h	2004-09-23 19:01:03.000000000 +0300
-@@ -128,5 +128,11 @@
+--- src/util/sys_defs.h.orig	2005-02-04 02:07:44.000000000 +0200
++++ src/util/sys_defs.h	2005-04-04 20:55:05.000000000 +0300
+@@ -157,5 +157,11 @@
  #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
 +#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"