Pullup ticket #3094 - requested by taca

mail/postfix: build fix
mail/postfix-current: build fix

Revisions pulled up:
- mail/postfix-current/distinfo			1.58
- mail/postfix-current/patches/patch-ag		1.22
- mail/postfix/distinfo				1.130
- mail/postfix/patches/patch-ag			1.30
---
Module Name:	pkgsrc
Committed By:	taca
Date:		Fri Apr 16 15:32:59 UTC 2010

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

Log Message:
Add patch to fix closefrom() problem on FreeBSD.

4 files changed, 36 insertions, 14 deletions

diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 85ac80e5729..0d1fc31f63e 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.57 2010/02/25 13:02:02 martti Exp $
+$NetBSD: distinfo,v 1.57.2.1 2010/04/25 18:16:59 tron Exp $
 
 SHA1 (postfix/postfix-2.8-20100213.tar.gz) = 2da9e142cce1494c7527be1ec50b278b5f7cc9bf
 RMD160 (postfix/postfix-2.8-20100213.tar.gz) = 2662de13a43e87b572ea549977eab26cf4b8d146
 Size (postfix/postfix-2.8-20100213.tar.gz) = 3442437 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = 24f57981d99f6515329b313bff627655abe0342e
+SHA1 (patch-ag) = 53f42aec86af576e1ffc420f1b9a19c988c3fe6c
 SHA1 (patch-ai) = f681187d6cf1f1793ecbf946a4aecee278d11f3d
 SHA1 (patch-as) = 8f16d7eda96c1fdbe76fb0a5294148dbf6148171
 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index b00a17bfb15..5772e29c536 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,10 +1,11 @@
-$NetBSD: patch-ag,v 1.21 2009/12/13 08:55:57 martti Exp $
+$NetBSD: patch-ag,v 1.21.4.1 2010/04/25 18:16:59 tron Exp $
 
 Only define HAS_DB if it hasn't been defined.
 Add support for NetBSD 5.x and DragonFly BSD.
+Handle closefrom() on FreeBSD.
 
---- src/util/sys_defs.h.orig	2009-11-15 01:32:37.000000000 +0200
-+++ src/util/sys_defs.h	2009-12-13 10:46:54.000000000 +0200
+--- src/util/sys_defs.h.orig	2009-11-14 23:32:37.000000000 +0000
++++ src/util/sys_defs.h
 @@ -29,8 +29,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
@@ -26,7 +27,17 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -163,9 +165,19 @@
+@@ -111,7 +113,8 @@
+ #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
+ #endif
+ 
+-#if __FreeBSD_version >= 800107		/* safe; don't believe the experts */
++#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \
++    || __FreeBSD_version >= 800100
+ #define HAS_CLOSEFROM
+ #endif
+ 
+@@ -163,9 +166,19 @@
  #define HAS_FUTIMES
  #endif
  
@@ -46,7 +57,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -174,14 +186,16 @@
+@@ -174,14 +187,16 @@
  
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 96b3c0598f1..a277824aec4 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.129 2010/02/25 13:01:22 martti Exp $
+$NetBSD: distinfo,v 1.129.2.1 2010/04/25 18:16:59 tron Exp $
 
 SHA1 (postfix/postfix-2.7.0.tar.gz) = 1ef2633c2e531d9d60db53ca0e26d4b1d95bc949
 RMD160 (postfix/postfix-2.7.0.tar.gz) = 8878c0b5b253a20bd7c64e066ee1ee72ab52073d
 Size (postfix/postfix-2.7.0.tar.gz) = 3418064 bytes
 SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
-SHA1 (patch-ag) = af3f5dc5f0de77562927b3e9407289a58b7ebbc7
+SHA1 (patch-ag) = 53f42aec86af576e1ffc420f1b9a19c988c3fe6c
 SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1
 SHA1 (patch-as) = 621b92e56606794f28ab267c6c5d723734471389
 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index 39694904f62..0127074b82f 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,11 @@
-$NetBSD: patch-ag,v 1.29 2010/02/25 13:01:23 martti Exp $
+$NetBSD: patch-ag,v 1.29.2.1 2010/04/25 18:16:59 tron Exp $
 
 Only define HAS_DB if it hasn't been defined.
 Add support for NetBSD 5.x and DragonFly BSD.
+Handle closefrom() on FreeBSD.
 
---- src/util/sys_defs.h.orig	2009-11-15 01:32:37.000000000 +0200
-+++ src/util/sys_defs.h	2010-02-25 14:47:46.000000000 +0200
+--- src/util/sys_defs.h.orig	2009-11-14 23:32:37.000000000 +0000
++++ src/util/sys_defs.h
 @@ -29,8 +29,8 @@
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
@@ -26,7 +27,17 @@ Add support for NetBSD 5.x and DragonFly BSD.
  #define HAS_SA_LEN
  #define DEF_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -163,9 +165,19 @@
+@@ -111,7 +113,8 @@
+ #define HAS_DUPLEX_PIPE			/* 4.1 breaks with kqueue(2) */
+ #endif
+ 
+-#if __FreeBSD_version >= 800107		/* safe; don't believe the experts */
++#if (__FreeBSD_version >= 702104 && __FreeBSD_version <= 800000) \
++    || __FreeBSD_version >= 800100
+ #define HAS_CLOSEFROM
+ #endif
+ 
+@@ -163,9 +166,19 @@
  #define HAS_FUTIMES
  #endif
  
@@ -46,7 +57,7 @@ Add support for NetBSD 5.x and DragonFly BSD.
      || defined(USAGI_LIBINET6)
  #ifndef NO_IPV6
  # define HAS_IPV6
-@@ -174,14 +186,16 @@
+@@ -174,14 +187,16 @@
  
  #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
      || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \