[pkgsrc/trunk]: pkgsrc/mail/postfix This patch can only apply cleanly if "ine...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fa72ceb3331
branches:  trunk
changeset: 479297:4fa72ceb3331
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Aug 11 06:51:31 2004 +0000

description:
This patch can only apply cleanly if "inet6" is a build option.  Move it
to a file that's applied at post-patch time only if "inet6" is specified.
This fixes building postfix on systems that don't support IPv6.

diffstat:

 mail/postfix/distinfo                 |   3 +--
 mail/postfix/files/patch-darwin-inet6 |  14 ++++++++++++++
 mail/postfix/options.mk               |   7 ++++++-
 mail/postfix/patches/patch-ac         |  14 --------------
 4 files changed, 21 insertions(+), 17 deletions(-)

diffs (73 lines):

diff -r 5204ebcc6d8d -r 4fa72ceb3331 mail/postfix/distinfo
--- a/mail/postfix/distinfo     Tue Aug 10 21:49:04 2004 +0000
+++ b/mail/postfix/distinfo     Wed Aug 11 06:51:31 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.74 2004/08/10 16:49:47 schmonz Exp $
+$NetBSD: distinfo,v 1.75 2004/08/11 06:51:31 jlam Exp $
 
 SHA1 (postfix/postfix-2.1.4.tar.gz) = 64dbd7b053df4ccf2191d4200b272be06e1592a8
 Size (postfix/postfix-2.1.4.tar.gz) = 1970068 bytes
@@ -10,6 +10,5 @@
 Size (postfix/pfixtls-0.8.18-2.1.3-0.9.7d.tar.gz) = 239141 bytes
 SHA1 (patch-aa) = 279b54f19289b56a423214716386c5aab79a57d5
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
-SHA1 (patch-ac) = 0067efd3ec26d5f1ecdef3b9c04b2df731f6acce
 SHA1 (patch-ag) = 1c6ba5e7b8dc923172add8b0f8af0f9a81226edc
 SHA1 (patch-ai) = e7284d9b3d7b83def7994269867e443fc0394d40
diff -r 5204ebcc6d8d -r 4fa72ceb3331 mail/postfix/files/patch-darwin-inet6
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix/files/patch-darwin-inet6     Wed Aug 11 06:51:31 2004 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-darwin-inet6,v 1.1 2004/08/11 06:51:31 jlam 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 -r 5204ebcc6d8d -r 4fa72ceb3331 mail/postfix/options.mk
--- a/mail/postfix/options.mk   Tue Aug 10 21:49:04 2004 +0000
+++ b/mail/postfix/options.mk   Wed Aug 11 06:51:31 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2004/08/07 17:05:00 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2004/08/11 06:51:31 jlam Exp $
 
 # Global and legacy options
 #
@@ -65,6 +65,11 @@
 SITES_${IPV6TLS_PATCH}=        ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.25/
 PATCH_DIST_STRIP.${IPV6TLS_PATCH}=     -p1
 PLIST_SRC+=            ${PKGDIR}/PLIST.inet6
+
+post-patch: darwin-inet6-fix
+darwin-inet6-fix:
+       @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} \
+               < ${FILESDIR}/patch-darwin-inet6
 .endif
 
 ###
diff -r 5204ebcc6d8d -r 4fa72ceb3331 mail/postfix/patches/patch-ac
--- a/mail/postfix/patches/patch-ac     Tue Aug 10 21:49:04 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$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 */