Make NetBSD support version agnostic.

Checks are against __NetBSD__Version__ anyway.

Fixes NetBSD 8.99.1 build

3 files changed, 44 insertions, 29 deletions

diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 091dc28a997..3fa546bb926 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.171 2017/06/17 08:02:22 taca Exp $
+$NetBSD: distinfo,v 1.172 2017/06/23 19:18:07 maya Exp $
 
 SHA1 (postfix-3.2.2.tar.gz) = 1a0d01e79ced46b38e8bd5b7a726a1622cf1bc07
 RMD160 (postfix-3.2.2.tar.gz) = 9509e48da474d214771d96c2aa8563ea5ccd13a1
 SHA512 (postfix-3.2.2.tar.gz) = 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418
 Size (postfix-3.2.2.tar.gz) = 4390318 bytes
 SHA1 (patch-aa) = c8216f133e202a7bb37682b0dbc1448f021e7c1c
-SHA1 (patch-ag) = 88a1534b56dd51edcd7a5bde2172beaf0d6a0e70
-SHA1 (patch-ai) = b909daf44016b8ee4e258791b5e0193879871aaa
+SHA1 (patch-ag) = 10e7c6ec4ca9e05ba8a37eeb4910b784fb9a5e34
+SHA1 (patch-ai) = 464da0a53bc9cac1f4e932e9735b75f4a33c7aa7
 SHA1 (patch-src_dns_dns__lookup.c) = b04d35b1df1b60409c903d2fb5bafb16b848523d
diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag
index da9fffab3b8..2351c421553 100644
--- a/mail/postfix/patches/patch-ag
+++ b/mail/postfix/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.38 2017/06/17 08:02:22 taca Exp $
+$NetBSD: patch-ag,v 1.39 2017/06/23 19:18:07 maya Exp $
 
 * Add support for NetBSD 8.
 * Only define HAS_DB if it hasn't been defined.
@@ -6,7 +6,7 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:02:22 taca Exp $
 
 --- src/util/sys_defs.h.orig	2017-02-02 01:31:15.000000000 +0000
 +++ src/util/sys_defs.h
-@@ -30,12 +30,13 @@
+@@ -30,13 +30,11 @@
  #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
      || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
      || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
@@ -14,14 +14,15 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:02:22 taca Exp $
      || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
      || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
      || defined(OPENBSD5) || defined(OPENBSD6) \
-     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
-     || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
+-    || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
+-    || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
 -    || defined(NETBSD7) \
-+    || defined(NETBSD7) || defined(NETBSD8) \
-     || defined(EKKOBSD1) || defined(DRAGONFLY)
+-    || defined(EKKOBSD1) || defined(DRAGONFLY)
++    || defined(NETBSD) || defined(EKKOBSD1) || defined(DRAGONFLY)
  #define SUPPORTED
  #include <sys/param.h>
-@@ -48,7 +49,9 @@
+ #define UINT32_TYPE	unsigned int
+@@ -48,7 +46,9 @@
  #define DEF_MAILBOX_LOCK "flock, dotlock"
  #define HAS_SUN_LEN
  #define HAS_FSYNC
@@ -31,7 +32,7 @@ $NetBSD: patch-ag,v 1.38 2017/06/17 08:02:22 taca Exp $
  #define HAS_SA_LEN
  #define NATIVE_DB_TYPE	"hash"
  #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
-@@ -1250,6 +1253,8 @@ extern int h_errno;
+@@ -1250,6 +1250,8 @@ extern int h_errno;
  #define DEF_SMTP_CACHE_DEMAND	0
  #endif
  
diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai
index d574284aa2c..1c11c53c803 100644
--- a/mail/postfix/patches/patch-ai
+++ b/mail/postfix/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.39 2017/04/24 20:11:40 fhajny Exp $
+$NetBSD: patch-ai,v 1.40 2017/06/23 19:18:07 maya Exp $
 
 1) Add shlib definitions for NetBSD 5; the build system must be
 hard-coded per OS per version.  Not yet reported upstream.
@@ -34,20 +34,34 @@ hard-coded per OS per version.  Not yet reported upstream.
   DragonFly.*)	SYSTYPE=DRAGONFLY
  		;;
    OpenBSD.2*)	SYSTYPE=OPENBSD2
-@@ -321,6 +339,12 @@ case "$SYSTEM.$RELEASE" in
-    NetBSD.4*)	SYSTYPE=NETBSD4
+@@ -312,25 +330,7 @@ case "$SYSTEM.$RELEASE" in
  		;;
-    NetBSD.5*)	SYSTYPE=NETBSD5
-+		: ${SHLIB_SUFFIX=.so}
-+		: ${SHLIB_CFLAGS=-fPIC}
-+		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
-+		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
-+		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
-+		: ${PLUGIN_LD="${CC-gcc} -shared"}
+   ekkoBSD.1*)	SYSTYPE=EKKOBSD1
  		;;
-    NetBSD.6*)	SYSTYPE=NETBSD6
+-   NetBSD.1*)	SYSTYPE=NETBSD1
+-		;;
+-   NetBSD.2*)	SYSTYPE=NETBSD2
+-		;;
+-   NetBSD.3*)	SYSTYPE=NETBSD3
+-		;;
+-   NetBSD.4*)	SYSTYPE=NETBSD4
+-		;;
+-   NetBSD.5*)	SYSTYPE=NETBSD5
+-		;;
+-   NetBSD.6*)	SYSTYPE=NETBSD6
+-		: ${SHLIB_SUFFIX=.so}
+-		: ${SHLIB_CFLAGS=-fPIC}
+-		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
+-		: ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'}
+-		: ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"}
+-		: ${PLUGIN_LD="${CC-gcc} -shared"}
+-               ;;
+-   NetBSD.7*)  SYSTYPE=NETBSD7
++   NetBSD*)	SYSTYPE=NETBSD
  		: ${SHLIB_SUFFIX=.so}
-@@ -409,13 +433,6 @@ case "$SYSTEM.$RELEASE" in
+ 		: ${SHLIB_CFLAGS=-fPIC}
+ 		: ${SHLIB_LD="${CC-gcc} -shared"' -Wl,-soname,${LIB}'}
+@@ -409,13 +409,6 @@ case "$SYSTEM.$RELEASE" in
  		esac
  		;;
     ULTRIX.4*)	SYSTYPE=ULTRIX4
@@ -61,7 +75,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for l in syslog resolv; do
  		    if [ -f /usr/local/lib/lib$l.a ]; then
  			SYSLIBS="$SYSLIBS -l$l"
-@@ -457,33 +474,8 @@ case "$SYSTEM.$RELEASE" in
+@@ -457,33 +450,8 @@ case "$SYSTEM.$RELEASE" in
  		esac;;
  		# Tested with RedHat 3.03 on 20020729.
      Linux.1*)	SYSTYPE=LINUX1
@@ -95,7 +109,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv $GDBM_LIBS
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -544,25 +536,6 @@ EOF
+@@ -544,25 +512,6 @@ EOF
  		: ${PLUGIN_LD="${CC-gcc} -shared"}
  		;;
    Linux.[34].*)	SYSTYPE=LINUX$RELEASE_MAJOR
@@ -121,7 +135,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /usr/lib/* /lib /lib/*
-@@ -583,24 +556,6 @@ EOF
+@@ -583,24 +532,6 @@ EOF
  		;;
       GNU.0*|GNU/kFreeBSD.[567]*)
  		SYSTYPE=GNU0
@@ -146,7 +160,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		for name in nsl resolv
  		do
  		    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -631,26 +586,14 @@ EOF
+@@ -631,26 +562,14 @@ EOF
  HP-UX.A.09.*)	SYSTYPE=HPUX9
  		SYSLIBS=-ldbm
  		CCARGS="$CCARGS -DMISSING_USLEEP -DNO_SNPRINTF"
@@ -173,7 +187,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
  ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix543
  		RANLIB=echo
-@@ -692,12 +635,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
+@@ -692,12 +611,12 @@ ReliantUNIX-?.5.43) SYSTYPE=ReliantUnix5
  		esac
  		: ${SHLIB_CFLAGS=-fPIC}
  		: ${SHLIB_SUFFIX=.dylib}
@@ -188,7 +202,7 @@ hard-coded per OS per version.  Not yet reported upstream.
  		;;
      dcosx.1*)	SYSTYPE=DCOSX1
  		RANLIB=echo
-@@ -778,8 +721,8 @@ esac
+@@ -778,8 +697,8 @@ esac
  #
  case "$CCARGS" in
  *-DNO_EAI*) CCARGS="$CCARGS "'-DDEF_SMTPUTF8_ENABLE=\"no\"';;