Define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H for Mac OS X, and include

<nameser8_compat.h> before <resolv.h> if it's defined.

Along with Johnny's recent buildlink3 fixes, this fixes the build
for me on Mac OS X Server 10.3.4. Should address pkg/26584.

4 files changed, 38 insertions, 6 deletions

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 3fa89363414..5d5ad1525c0 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.73 2004/08/07 16:56:53 jlam Exp $
+$NetBSD: distinfo,v 1.74 2004/08/10 16:49:47 schmonz Exp $
 
 SHA1 (postfix/postfix-2.1.4.tar.gz) = 64dbd7b053df4ccf2191d4200b272be06e1592a8
 Size (postfix/postfix-2.1.4.tar.gz) = 1970068 bytes
@@ -9,5 +9,7 @@ Size (postfix/tls+ipv6-1.25-pf-2.1.4.patch.gz) = 256600 bytes
 SHA1 (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 313d572bcd960e3cafd78ac9ee4b87bdc1f02fc8
 Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
-SHA1 (patch-ag) = 292b3b5d87f4688930fd654edfc5cb83ca8a2652
+SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
+SHA1 (patch-ac) = 0067efd3ec26d5f1ecdef3b9c04b2df731f6acce
+SHA1 (patch-ag) = 1c6ba5e7b8dc923172add8b0f8af0f9a81226edc
 SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff --git a/mail/postfix/patches/patch-ab b/mail/postfix/patches/patch-ab
new file mode 100644
index 00000000000..40d6d1591a0
--- /dev/null
+++ b/mail/postfix/patches/patch-ab
@@ -0,0 +1,14 @@
+$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-ac b/mail/postfix/patches/patch-ac
new file mode 100644
index 00000000000..29c4c036c3f
--- /dev/null
+++ b/mail/postfix/patches/patch-ac
@@ -0,0 +1,14 @@
+$NetBSD: patch-ac,v 1.8 2004/08/10 16:49:47 schmonz Exp $
+
+--- src/util/match_ops.c.orig	Tue Aug 10 02:29:26 2004
++++ src/util/match_ops.c
+@@ -117,6 +117,9 @@
+ #include <string.h>
+ #include <netdb.h>
+ #include <arpa/inet.h>
++#ifdef RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
++#include <nameser8_compat.h>
++#endif
+ #include <resolv.h>
+ 
+ /* prototypes */
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index e2c6243ff45..6c4cd63b372 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,12 @@
-$NetBSD: patch-ag,v 1.12 2004/06/21 16:13:24 martti Exp $
+$NetBSD: patch-ag,v 1.13 2004/08/10 16:49:47 schmonz Exp $
 
---- src/util/sys_defs.h.orig	2004-06-14 21:13:40.000000000 +0300
-+++ src/util/sys_defs.h	2004-06-20 11:40:54.000000000 +0300
-@@ -127,8 +127,13 @@
+--- src/util/sys_defs.h.orig	Tue Aug 10 02:27:04 2004
++++ src/util/sys_defs.h
+@@ -134,9 +134,15 @@
+ #define DEF_DB_TYPE	"hash"
  #define ALIAS_DB_MAP	"hash:/etc/aliases"
  #define GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *) 0)
++#define RESOLVE_H_NEEDS_NAMESER8_COMPAT_H
  #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
 +#if (defined(__NetBSD__) && __NetBSD_Version__ >= 200040000) /* NetBSD 2.0D */
 +#define USE_STATVFS