Pullup ticket #3691 - requested by tron

mail/postfix: build fix

Revisions pulled up:
- mail/postfix/distinfo                                         1.141
- mail/postfix/patches/patch-ag                                 1.33
- mail/postfix/patches/patch-ai                                 1.27

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	taca
   Date:		Mon Feb 27 03:01:30 UTC 2012

   Modified Files:
   	pkgsrc/mail/postfix: distinfo
   	pkgsrc/mail/postfix/patches: patch-ag patch-ai

   Log Message:
   Build fix for NetBSD 6.0_BETA.


   To generate a diff of this commit:
   cvs rdiff -u -r1.140 -r1.141 pkgsrc/mail/postfix/distinfo
   cvs rdiff -u -r1.32 -r1.33 pkgsrc/mail/postfix/patches/patch-ag
   cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/postfix/patches/patch-ai

3 files changed, 18 insertions, 16 deletions

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index c414b97c9f0..94d898d2f3f 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.139 2011/11/07 15:36:07 taca Exp $
+$NetBSD: distinfo,v 1.139.2.1 2012/02/29 19:32:08 spz Exp $
 
 SHA1 (postfix-2.8.7.tar.gz) = 81c87aceff4d9af67a304354bab9c99ac98fc8a0
 RMD160 (postfix-2.8.7.tar.gz) = ab0700f8f340fad11bf2a294a36ff1d70a1a8783
 Size (postfix-2.8.7.tar.gz) = 3647643 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 3d8083260763adb97ab3d7a270c25c2d95ce6bd6
-SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1
+SHA1 (patch-ag) = 60d752b6c8db971d92ca0017c63329ad446209c5
+SHA1 (patch-ai) = 8f81c48321ce0875bffe28fd94c0b3965d927560
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 39bbce1fbf4..b35a1d14098 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.32 2011/11/07 15:36:07 taca Exp $
+$NetBSD: patch-ag,v 1.32.2.1 2012/02/29 19:32:08 spz Exp $
 
 Only define HAS_DB if it hasn't been defined.
-Add support for NetBSD 5.x and DragonFly BSD.
+Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
 Handle closefrom() on FreeBSD.
 
 --- src/util/sys_defs.h.orig	2011-11-02 23:46:22.000000000 +0000
@@ -12,7 +12,7 @@ Handle closefrom() on FreeBSD.
      || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
 -    || defined(NETBSD4) \
 -    || defined(EKKOBSD1)
-+    || defined(NETBSD4) || defined(NETBSD5) \
++    || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
 +    || defined(EKKOBSD1) || defined(DRAGONFLY)
  #define SUPPORTED
  #include <sys/types.h>
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 98b825757bc..0c6dbc04bd3 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,11 +1,11 @@
-$NetBSD: patch-ai,v 1.26 2010/02/25 13:01:23 martti Exp $
+$NetBSD: patch-ai,v 1.26.16.1 2012/02/29 19:32:08 spz Exp $
 
 Make this pkgsrc friendly.
-Add support for NetBSD 5.x and DragonFly BSD.
+Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
 
---- makedefs.orig	2010-02-03 22:58:58.000000000 +0200
-+++ makedefs	2010-02-25 14:48:50.000000000 +0200
-@@ -146,6 +146,8 @@
+--- makedefs.orig	2011-11-02 23:46:22.000000000 +0000
++++ makedefs
+@@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in
  		;;
    FreeBSD.8*)	SYSTYPE=FREEBSD8
  		;;
@@ -14,16 +14,18 @@ Add support for NetBSD 5.x and DragonFly BSD.
    OpenBSD.2*)	SYSTYPE=OPENBSD2
  		;;
    OpenBSD.3*)	SYSTYPE=OPENBSD3
-@@ -162,6 +164,8 @@
+@@ -164,6 +166,10 @@ case "$SYSTEM.$RELEASE" in
  		;;
     NetBSD.4*)	SYSTYPE=NETBSD4
  		;;
 +   NetBSD.5*)	SYSTYPE=NETBSD5
 +		;;
++   NetBSD.6*)	SYSTYPE=NETBSD6
++		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
     BSD/OS.3*)	SYSTYPE=BSDI3
-@@ -214,13 +218,6 @@
+@@ -216,13 +222,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -37,7 +39,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -252,25 +249,8 @@
+@@ -260,25 +259,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -63,7 +65,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -281,7 +261,6 @@
+@@ -289,7 +271,6 @@ case "$SYSTEM.$RELEASE" in
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -71,7 +73,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -383,25 +362,13 @@
+@@ -418,25 +399,13 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"