[pkgsrc/trunk]: pkgsrc/mail/postfix Apply NI_WITHSCOPEID patch only if the in...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4327e202da7a
branches:  trunk
changeset: 486453:4327e202da7a
user:      kim <kim%pkgsrc.org@localhost>
date:      Tue Dec 28 16:13:28 2004 +0000

description:
Apply NI_WITHSCOPEID patch only if the inet6 option is enabled.

Closes PR pkg/28756

diffstat:

 mail/postfix/distinfo                         |   3 +--
 mail/postfix/files/patch-inet6-ni_withscopeid |  13 +++++++++++++
 mail/postfix/options.mk                       |   7 +++++--
 mail/postfix/patches/patch-aj                 |  13 -------------
 4 files changed, 19 insertions(+), 17 deletions(-)

diffs (72 lines):

diff -r 5a18ef2bea0f -r 4327e202da7a mail/postfix/distinfo
--- a/mail/postfix/distinfo     Tue Dec 28 16:09:47 2004 +0000
+++ b/mail/postfix/distinfo     Tue Dec 28 16:13:28 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.79 2004/12/23 13:51:27 kim Exp $
+$NetBSD: distinfo,v 1.80 2004/12/28 16:13:28 kim Exp $
 
 SHA1 (postfix/postfix-2.1.5.tar.gz) = bbc65c9fdc1cbd8e553816a5549b2685255cf69d
 Size (postfix/postfix-2.1.5.tar.gz) = 1971931 bytes
@@ -13,4 +13,3 @@
 SHA1 (patch-ac) = f26b493c648c84af6ff70c54da82876eae8c2637
 SHA1 (patch-ag) = d5e9aab43b5d3be6df9ad8e3f03572b9a228f784
 SHA1 (patch-ai) = f166c2d52bfb8a441db22a9090312c0a2de56a6f
-SHA1 (patch-aj) = c2e79b1954dae272e22bb38bf3c0586f1b7c9543
diff -r 5a18ef2bea0f -r 4327e202da7a mail/postfix/files/patch-inet6-ni_withscopeid
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix/files/patch-inet6-ni_withscopeid     Tue Dec 28 16:13:28 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-inet6-ni_withscopeid,v 1.1 2004/12/28 16:13:28 kim Exp $
+
+--- src/util/inet_addr_list.h.orig     2004-12-17 04:30:07.000000000 -0500
++++ src/util/inet_addr_list.h  2004-12-17 04:36:47.000000000 -0500
+@@ -58,7 +58,7 @@
+  * Only on KAME? Use without implementation will result in EAI_BADFLAGS.
+  */
+ #ifdef INET6
+-# ifndef INET6_KAME
++# if !defined(INET6_KAME) || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 299001100))
+ #  ifdef NI_WITHSCOPEID
+ #   undef NI_WITHSCOPEID
+ #  endif
diff -r 5a18ef2bea0f -r 4327e202da7a mail/postfix/options.mk
--- a/mail/postfix/options.mk   Tue Dec 28 16:09:47 2004 +0000
+++ b/mail/postfix/options.mk   Tue Dec 28 16:13:28 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.13 2004/12/02 14:39:56 jlam Exp $
+# $NetBSD: options.mk,v 1.14 2004/12/28 16:13:28 kim Exp $
 
 # Global and legacy options
 
@@ -31,10 +31,13 @@
 PATCH_DIST_STRIP.${IPV6TLS_PATCH}=     -p1
 PLIST_SRC+=            ${PKGDIR}/PLIST.inet6
 
-post-patch: darwin-inet6-fix
+post-patch: darwin-inet6-fix inet6-ni_withscopeid-fix
 darwin-inet6-fix:
        @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} \
                < ${FILESDIR}/patch-darwin-inet6
+inet6-ni_withscopeid-fix:
+       @cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} \
+               < ${FILESDIR}/patch-inet6-ni_withscopeid
 .endif
 
 ###
diff -r 5a18ef2bea0f -r 4327e202da7a mail/postfix/patches/patch-aj
--- a/mail/postfix/patches/patch-aj     Tue Dec 28 16:09:47 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.6 2004/12/17 19:36:01 kim Exp $
-
---- src/util/inet_addr_list.h.orig     2004-12-17 04:30:07.000000000 -0500
-+++ src/util/inet_addr_list.h  2004-12-17 04:36:47.000000000 -0500
-@@ -58,7 +58,7 @@
-  * Only on KAME? Use without implementation will result in EAI_BADFLAGS.
-  */
- #ifdef INET6
--# ifndef INET6_KAME
-+# if !defined(INET6_KAME) || (defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 299001100))
- #  ifdef NI_WITHSCOPEID
- #   undef NI_WITHSCOPEID
- #  endif