Fix build on NetBSD 7.*.

3 files changed, 40 insertions, 13 deletions

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 8a809a465df..7e720815adc 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.154 2014/05/11 09:54:54 taca Exp $
+$NetBSD: distinfo,v 1.155 2014/08/25 16:00:54 taca Exp $
 
 SHA1 (postfix-2.11.1.tar.gz) = 4034171013bde30600724f79c37f82d69a802ad0
 RMD160 (postfix-2.11.1.tar.gz) = 9b3d0478a5f4b74c159f3121f3353502d4e6f79f
 Size (postfix-2.11.1.tar.gz) = 4035026 bytes
 SHA1 (patch-aa) = 6f7dc14d53e914e9cb72752fb3941c569cd2e8f9
-SHA1 (patch-ag) = 150007e901ad3b470b0800bb3e073bff06eb8190
-SHA1 (patch-ai) = 5f56b77a716bec1fce5dcdbbb2d589f3301cabd3
+SHA1 (patch-ag) = 2f96a679e7f0c2e36615f5e7993ab96296303a10
+SHA1 (patch-ai) = 01fe261dccd3119a99703fbf2a0c5247efe476ba
 SHA1 (patch-src_dns_dns__lookup.c) = 9c26686e5abd9aee36f042440e5f6a6ffca3df4a
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index f8c98a32380..4042eca9534 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,10 +1,19 @@
-$NetBSD: patch-ag,v 1.34 2014/02/09 05:34:13 taca Exp $
+$NetBSD: patch-ag,v 1.35 2014/08/25 16:00:54 taca Exp $
 
-Only define HAS_DB if it hasn't been defined.
+* Add support for NetBSD 7.
+* Only define HAS_DB if it hasn't been defined.
 
 --- src/util/sys_defs.h.orig	2013-09-29 20:51:55.000000000 +0000
 +++ src/util/sys_defs.h
-@@ -44,7 +44,9 @@
+@@ -31,6 +31,7 @@
+     || defined(OPENBSD5) \
+     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+     || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
++    || defined(NETBSD7) \
+     || defined(EKKOBSD1) || defined(DRAGONFLY)
+ #define SUPPORTED
+ #include <sys/types.h>
+@@ -44,7 +45,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
@@ -14,3 +23,12 @@ Only define HAS_DB if it hasn't been defined.
  #define HAS_SA_LEN
  #define NATIVE_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
+@@ -1265,6 +1268,8 @@ extern int h_errno;
+ #define DEF_SMTP_CACHE_DEMAND	0
+ #endif
+ 
++#define RECEIVED_ENVELOPE_FROM
++
+  /*
+   * We're not going to try to guess like configure does.
+   */
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index 47bfcded891..3829f99d05e 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,10 +1,19 @@
-$NetBSD: patch-ai,v 1.31 2014/02/09 05:34:13 taca Exp $
+$NetBSD: patch-ai,v 1.32 2014/08/25 16:00:54 taca Exp $
 
 Make this pkgsrc friendly.
 
---- makedefs.orig	2014-01-05 17:18:56.000000000 +0000
+--- makedefs.orig	2014-01-16 19:49:11.000000000 +0000
 +++ makedefs
-@@ -239,13 +239,6 @@ case "$SYSTEM.$RELEASE" in
+@@ -182,6 +182,8 @@ case "$SYSTEM.$RELEASE" in
+ 		;;
+    NetBSD.6*)	SYSTYPE=NETBSD6
+ 		;;
++   NetBSD.7*)	SYSTYPE=NETBSD7
++		;;
+    BSD/OS.2*)	SYSTYPE=BSDI2
+ 		;;
+    BSD/OS.3*)	SYSTYPE=BSDI3
+@@ -239,13 +241,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -18,7 +27,7 @@ Make this pkgsrc friendly.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -283,33 +276,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -283,33 +278,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -52,7 +61,7 @@ Make this pkgsrc friendly.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -363,25 +331,6 @@ EOF
+@@ -363,25 +333,6 @@ EOF
  		esac
  		;;
      Linux.3*)	SYSTYPE=LINUX3
@@ -78,7 +87,7 @@ Make this pkgsrc friendly.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -395,24 +344,6 @@ EOF
+@@ -395,24 +346,6 @@ EOF
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
@@ -103,7 +112,7 @@ Make this pkgsrc friendly.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -443,25 +374,13 @@ EOF
+@@ -443,25 +376,13 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP"