Pullup ticket 905 - requested by Martti Kuparinen

portability fixes for postfix

Revisions pulled up:
- pkgsrc/mail/postfix/distinfo				1.90, 1.91, 1.92
- pkgsrc/mail/postfix/patches/patch-ag			1.17, 1.18
- pkgsrc/mail/postfix/patches/patch-ai			1.14
- pkgsrc/mail/postfix-current/distinfo			1.15, 1.16, 1.17
- pkgsrc/mail/postfix-current/patches/patch-ag		1.10, 1.11
- pkgsrc/mail/postfix-current/patches/patch-ai		1.11

   Module Name:		pkgsrc
   Committed By:	joerg
   Date:		Thu Oct 13 13:06:38 UTC 2005

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

   Log Message:
   Treat DragonFly as FreeBSD 4 to let Postfix build.
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Sat Nov 12 05:19:25 UTC 2005

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

   Log Message:
   Make this compile on NetBSD 2.1. Does not affect other versions so no
   version bump. Fixes pkg/31952.
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Sat Nov 12 05:23:18 UTC 2005

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

   Log Message:
   Make this compile on NetBSD 2.1. Does not affect other versions so no
   version bump. Fixes same problem as pkg/31952.
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Sun Nov 13 10:37:10 UTC 2005

   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:
   Regenerate the patches not to add NetBSD stuff inside Mac OS X section.
---
   Module Name:		pkgsrc
   Committed By:	martti
   Date:		Tue Nov 15 10:43:20 UTC 2005

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

   Log Message:
   Treat DragonFly as FreeBSD 4 to let Postfix build.

6 files changed, 65 insertions, 47 deletions

diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index 69aed78cb90..2264720699d 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13.2.1 2005/10/05 13:45:39 salo Exp $
+$NetBSD: distinfo,v 1.13.2.2 2005/11/15 11:42:44 salo Exp $
 
 SHA1 (postfix/postfix-2.3-20050922.tar.gz) = 392548fef18c860bc6d75155f0e6b259fd4489a5
 RMD160 (postfix/postfix-2.3-20050922.tar.gz) = 848bcfcc5e044fdae3f42ed384bbc7bea98a1ae5
@@ -6,5 +6,5 @@ Size (postfix/postfix-2.3-20050922.tar.gz) = 2508873 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
 SHA1 (patch-ab) = aa08339399411b8c1e12856f6b5f8406b7775840
 SHA1 (patch-ac) = 1b0fb6da368b65ccd6e47c94ff867f0169aaa839
-SHA1 (patch-ag) = 9285c62239419876ee3351250dcc29984c39d958
-SHA1 (patch-ai) = adc9996118adc6162efbec21d6aa491e6962706b
+SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
+SHA1 (patch-ai) = 562b29dcc4998b787b947727e0f88f134e1e7dff
diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag
index 7975a117467..b0f11bc3565 100644
--- a/mail/postfix-current/patches/patch-ag
+++ b/mail/postfix-current/patches/patch-ag
@@ -1,20 +1,18 @@
-$NetBSD: patch-ag,v 1.8.2.1 2005/10/05 13:45:39 salo Exp $
+$NetBSD: patch-ag,v 1.8.2.2 2005/11/15 11:42:44 salo Exp $
 
 --- src/util/sys_defs.h.orig	2005-07-15 00:28:33.000000000 +0300
-+++ src/util/sys_defs.h	2005-09-30 05:52:00.000000000 +0300
-@@ -155,9 +155,15 @@
- #define DEF_DB_TYPE	"hash"
- #define ALIAS_DB_MAP	"hash:/etc/aliases"
++++ src/util/sys_defs.h	2005-11-13 09:22:07.000000000 +0200
+@@ -52,3 +52,3 @@
+ #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
+-#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
++#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 299000900)
+ # define USE_STATVFS
+@@ -124,3 +124,3 @@
+ 
+-#if __NetBSD_Version__ >= 200060000	/* 2.0F */
++#if __NetBSD_Version__ >= 299000900	/* 2.99.9 */
+ #define HAS_CLOSEFROM
+@@ -157,2 +157,3 @@
  #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__ >= 299000900) /* NetBSD 2.99.9 */
-+#define USE_STATVFS
-+#define STATVFS_IN_SYS_STATVFS_H
-+#else
- #define USE_STATFS
- #define STATFS_IN_SYS_MOUNT_H
-+#endif
- #define HAS_POSIX_REGEXP
- #define NORETURN	void
- #define PRINTFLIKE(x,y)
diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai
index 5506e787ad5..fa655fc4239 100644
--- a/mail/postfix-current/patches/patch-ai
+++ b/mail/postfix-current/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.9.2.1 2005/10/05 13:45:39 salo Exp $
+$NetBSD: patch-ai,v 1.9.2.2 2005/11/15 11:42:44 salo Exp $
 
 --- makedefs.orig	2005-07-17 02:51:31.000000000 +0300
-+++ makedefs	2005-09-30 05:52:25.000000000 +0300
-@@ -124,7 +124,7 @@
++++ makedefs	2005-11-15 10:39:33.000000000 +0200
+@@ -116,6 +116,8 @@
+ 		;;
+   FreeBSD.5*)	SYSTYPE=FREEBSD5
+ 		;;
++  DragonFly.1*)	SYSTYPE=FREEBSD4
++		;;
+   OpenBSD.2*)	SYSTYPE=OPENBSD2
+ 		;;
+   OpenBSD.3*)	SYSTYPE=OPENBSD3
+@@ -124,7 +126,7 @@
  		;;
     NetBSD.1*)	SYSTYPE=NETBSD1
  		;;
@@ -11,7 +20,7 @@ $NetBSD: patch-ai,v 1.9.2.1 2005/10/05 13:45:39 salo Exp $
  		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
-@@ -176,13 +176,6 @@
+@@ -176,13 +178,6 @@
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -25,7 +34,7 @@ $NetBSD: patch-ai,v 1.9.2.1 2005/10/05 13:45:39 salo Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -214,25 +207,8 @@
+@@ -214,25 +209,8 @@
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -51,7 +60,7 @@ $NetBSD: patch-ai,v 1.9.2.1 2005/10/05 13:45:39 salo Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -243,7 +219,6 @@
+@@ -243,7 +221,6 @@
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -59,7 +68,7 @@ $NetBSD: patch-ai,v 1.9.2.1 2005/10/05 13:45:39 salo Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -271,25 +246,13 @@
+@@ -271,25 +248,13 @@
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index fd7e33660d9..7b0383bf0ee 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.89 2005/09/06 08:10:58 abs Exp $
+$NetBSD: distinfo,v 1.89.2.1 2005/11/15 11:42:44 salo Exp $
 
 SHA1 (postfix/postfix-2.2.5.tar.gz) = 5e86340e6ccff5a9141c259a6b65f72b7396483d
 RMD160 (postfix/postfix-2.2.5.tar.gz) = 5508f9662319e655daf8ec8b70fb508f0bb15bb0
@@ -6,5 +6,5 @@ Size (postfix/postfix-2.2.5.tar.gz) = 2428594 bytes
 SHA1 (patch-aa) = 49d2bf6c7e5bbe5aac4d950ac69c7b6b32a98ef3
 SHA1 (patch-ab) = c506a08b694f94ef4884fa97eec51e44c92812dd
 SHA1 (patch-ac) = ffcd4f8b00c1cf01f050a0c943bfe61a1ec2361a
-SHA1 (patch-ag) = 7e992130da8b450c72d40c20c50d87840261d59d
-SHA1 (patch-ai) = d24b434fcd8964d1d27e6c0eac93e2d742de98ab
+SHA1 (patch-ag) = 550d1acab1c8bcd903a689207bd2c92444f42351
+SHA1 (patch-ai) = d3ea006bafb5e9df869fbb2dec8c7f53b160c8e0
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index ab6b2378019..1f162703960 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,16 +1,18 @@
-$NetBSD: patch-ag,v 1.16 2005/09/06 08:10:58 abs Exp $
+$NetBSD: patch-ag,v 1.16.2.1 2005/11/15 11:42:44 salo Exp $
 
---- src/util/sys_defs.h.orig	2005-02-04 02:07:44.000000000 +0200
-+++ src/util/sys_defs.h	2005-04-04 20:55:05.000000000 +0300
-@@ -157,5 +157,11 @@
+--- src/util/sys_defs.h.orig	2005-07-15 00:28:33.000000000 +0300
++++ src/util/sys_defs.h	2005-11-13 09:22:07.000000000 +0200
+@@ -52,3 +52,3 @@
+ #define ROOT_PATH	"/bin:/usr/bin:/sbin:/usr/sbin"
+-#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 200040000)
++#if (defined(__NetBSD_Version__) && __NetBSD_Version__ > 299000900)
+ # define USE_STATVFS
+@@ -124,3 +124,3 @@
+ 
+-#if __NetBSD_Version__ >= 200060000	/* 2.0F */
++#if __NetBSD_Version__ >= 299000900	/* 2.99.9 */
+ #define HAS_CLOSEFROM
+@@ -157,2 +157,3 @@
  #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__ >= 299000900) /* NetBSD 2.99.9 */
-+#define USE_STATVFS
-+#define STATVFS_IN_SYS_STATVFS_H
-+#else
- #define USE_STATFS
- #define STATFS_IN_SYS_MOUNT_H
-+#endif
- #define HAS_POSIX_REGEXP
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 2478ef2e7de..4d51e99ef4c 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,8 +1,17 @@
-$NetBSD: patch-ai,v 1.13 2005/03/22 18:09:33 xtraeme Exp $
+$NetBSD: patch-ai,v 1.13.4.1 2005/11/15 11:42:44 salo Exp $
 
 --- makedefs.orig	2005-02-22 13:35:52.000000000 +0100
-+++ makedefs	2005-03-21 22:45:02.000000000 +0100
-@@ -124,7 +124,7 @@
++++ makedefs
+@@ -116,6 +116,8 @@ case "$SYSTEM.$RELEASE" in
+ 		;;
+   FreeBSD.5*)	SYSTYPE=FREEBSD5
+ 		;;
++  DragonFly.1*) SYSTYPE=FREEBSD4
++		;;
+   OpenBSD.2*)	SYSTYPE=OPENBSD2
+ 		;;
+   OpenBSD.3*)	SYSTYPE=OPENBSD3
+@@ -124,7 +126,7 @@ case "$SYSTEM.$RELEASE" in
  		;;
     NetBSD.1*)	SYSTYPE=NETBSD1
  		;;
@@ -11,7 +20,7 @@ $NetBSD: patch-ai,v 1.13 2005/03/22 18:09:33 xtraeme Exp $
  		;;
     BSD/OS.2*)	SYSTYPE=BSDI2
  		;;
-@@ -175,13 +175,6 @@
+@@ -175,13 +177,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -25,7 +34,7 @@ $NetBSD: patch-ai,v 1.13 2005/03/22 18:09:33 xtraeme Exp $
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -213,25 +206,8 @@
+@@ -213,25 +208,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -51,7 +60,7 @@ $NetBSD: patch-ai,v 1.13 2005/03/22 18:09:33 xtraeme Exp $
  		# GDBM locks the DBM .pag file after open. This breaks postmap.
  		# if [ -f /usr/include/gdbm-ndbm.h ]
  		# then
-@@ -242,7 +218,6 @@
+@@ -242,7 +220,6 @@ case "$SYSTEM.$RELEASE" in
  		#     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
  		#     GDBM_LIBS=gdbm
  		# fi
@@ -59,7 +68,7 @@ $NetBSD: patch-ai,v 1.13 2005/03/22 18:09:33 xtraeme Exp $
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -270,25 +245,13 @@
+@@ -270,25 +247,13 @@ case "$SYSTEM.$RELEASE" in
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"