[pkgsrc/trunk]: pkgsrc/mail Accept NetBSD 4.* as NETBSD4 to compile on NetBSD...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6c038966e0d5
branches:  trunk
changeset: 517451:6c038966e0d5
user:      taca <taca%pkgsrc.org@localhost>
date:      Fri Aug 11 12:34:24 2006 +0000

description:
Accept NetBSD 4.* as NETBSD4 to compile on NetBSD current.

Bump PKGREVISION.

diffstat:

 mail/postfix-current/Makefile         |   4 ++--
 mail/postfix-current/distinfo         |   5 +++--
 mail/postfix-current/patches/patch-ag |  22 ++++++++++++++++++++++
 mail/postfix-current/patches/patch-ai |  25 +++++++++++++++++--------
 mail/postfix/Makefile                 |   4 ++--
 mail/postfix/distinfo                 |   5 +++--
 mail/postfix/patches/patch-ag         |  22 ++++++++++++++++++++++
 mail/postfix/patches/patch-ai         |  25 +++++++++++++++++--------
 8 files changed, 88 insertions(+), 24 deletions(-)

diffs (228 lines):

diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix-current/Makefile
--- a/mail/postfix-current/Makefile     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix-current/Makefile     Fri Aug 11 12:34:24 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2006/07/13 09:57:53 martti Exp $
+# $NetBSD: Makefile,v 1.65 2006/08/11 12:34:54 taca Exp $
 
 DISTNAME=      postfix-2.4-20060711
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
                http://public.planetmirror.com.au/pub/postfix/experimental/
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix-current/distinfo
--- a/mail/postfix-current/distinfo     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix-current/distinfo     Fri Aug 11 12:34:24 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2006/07/13 09:57:53 martti Exp $
+$NetBSD: distinfo,v 1.26 2006/08/11 12:34:54 taca Exp $
 
 SHA1 (postfix/postfix-2.4-20060711.tar.gz) = f9b3de59414f1740a7c1d7ac54b18f100051ceb8
 RMD160 (postfix/postfix-2.4-20060711.tar.gz) = 0665e8d0da2fbdc3d0bc2af80db6744237dc60e9
 Size (postfix/postfix-2.4-20060711.tar.gz) = 2774624 bytes
 SHA1 (patch-aa) = 3f45ca9b05bf080bd0f9ef3c9f8c24a1ef992edd
-SHA1 (patch-ai) = 422028e9ef7821a0a1d8eaa94593c48bd08e86ae
+SHA1 (patch-ag) = 5b27be7d72f6c5e09d78ea13abc0f5eb244d6c38
+SHA1 (patch-ai) = 76d5986bdae4fe735e7e8e35abb95f65d108f6a8
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix-current/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix-current/patches/patch-ag     Fri Aug 11 12:34:24 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.13 2006/08/11 12:34:54 taca Exp $
+
+--- src/util/sys_defs.h.orig   2006-07-03 21:37:32.000000000 +0900
++++ src/util/sys_defs.h
+@@ -28,6 +28,7 @@
+     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
+     || defined(OPENBSD2) || defined(OPENBSD3) \
+     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
++    || defined(NETBSD4) \
+     || defined(EKKOBSD1)
+ #define SUPPORTED
+ #include <sys/types.h>
+@@ -41,7 +42,9 @@
+ #define DEF_MAILBOX_LOCK "flock"
+ #define HAS_SUN_LEN
+ #define HAS_FSYNC
++#ifndef HAS_DB
+ #define HAS_DB
++#endif
+ #define HAS_SA_LEN
+ #define DEF_DB_TYPE   "hash"
+ #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix-current/patches/patch-ai
--- a/mail/postfix-current/patches/patch-ai     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix-current/patches/patch-ai     Fri Aug 11 12:34:24 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.13 2006/07/13 09:57:53 martti Exp $
+$NetBSD: patch-ai,v 1.14 2006/08/11 12:34:54 taca Exp $
 
---- makedefs.orig      2006-07-11 21:25:31.000000000 +0000
-+++ makedefs   2006-07-13 11:22:55.000000000 +0000
-@@ -118,6 +118,8 @@
+--- makedefs.orig      2006-07-12 06:25:31.000000000 +0900
++++ makedefs
+@@ -118,6 +118,8 @@ case "$SYSTEM.$RELEASE" in
                ;;
    FreeBSD.6*) SYSTYPE=FREEBSD6
                ;;
@@ -11,7 +11,16 @@
    OpenBSD.2*) SYSTYPE=OPENBSD2
                ;;
    OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -180,13 +182,6 @@
+@@ -130,6 +132,8 @@ case "$SYSTEM.$RELEASE" in
+               ;;
+    NetBSD.3*) SYSTYPE=NETBSD3
+               ;;
++   NetBSD.4*) SYSTYPE=NETBSD4
++              ;;
+    BSD/OS.2*) SYSTYPE=BSDI2
+               ;;
+    BSD/OS.3*) SYSTYPE=BSDI3
+@@ -180,13 +184,6 @@ case "$SYSTEM.$RELEASE" in
                esac
                ;;
     ULTRIX.4*) SYSTYPE=ULTRIX4
@@ -25,7 +34,7 @@
                for l in syslog resolv; do
                    if [ -f /usr/local/lib/lib$l.a ]; then
                        SYSLIBS="$SYSLIBS -l$l"
-@@ -218,25 +213,8 @@
+@@ -218,25 +215,8 @@ case "$SYSTEM.$RELEASE" in
                esac;;
                # Tested with RedHat 3.03 on 20020729.
      Linux.1*) SYSTYPE=LINUX1
@@ -51,7 +60,7 @@
                # GDBM locks the DBM .pag file after open. This breaks postmap.
                # if [ -f /usr/include/gdbm-ndbm.h ]
                # then
-@@ -247,7 +225,6 @@
+@@ -247,7 +227,6 @@ case "$SYSTEM.$RELEASE" in
                #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
                #     GDBM_LIBS=gdbm
                # fi
@@ -59,7 +68,7 @@
                for name in nsl resolv $GDBM_LIBS
                do
                    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -275,25 +252,13 @@
+@@ -275,25 +254,13 @@ case "$SYSTEM.$RELEASE" in
  HP-UX.A.09.*) SYSTYPE=HPUX9
                SYSLIBS=-ldbm
                CCARGS="$CCARGS -DMISSING_USLEEP"
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix/Makefile
--- a/mail/postfix/Makefile     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix/Makefile     Fri Aug 11 12:34:24 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.185 2006/07/31 04:57:45 martti Exp $
+# $NetBSD: Makefile,v 1.186 2006/08/11 12:34:24 taca Exp $
 
 DISTNAME=      postfix-2.3.2
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix/distinfo
--- a/mail/postfix/distinfo     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix/distinfo     Fri Aug 11 12:34:24 2006 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.101 2006/07/31 04:57:45 martti Exp $
+$NetBSD: distinfo,v 1.102 2006/08/11 12:34:25 taca Exp $
 
 SHA1 (postfix/postfix-2.3.2.tar.gz) = cb56e7f8f0d4335cc8beb572ab7aa0423aab2dcf
 RMD160 (postfix/postfix-2.3.2.tar.gz) = ce561dcc03e7f6bc1bb3bdd9426175b18571c625
 Size (postfix/postfix-2.3.2.tar.gz) = 2774600 bytes
 SHA1 (patch-aa) = e53bc6644c2b7898b73f4604489021cb85514610
-SHA1 (patch-ai) = 1781a172d8213706e4811386f42e486a520f0ab6
+SHA1 (patch-ag) = 5b27be7d72f6c5e09d78ea13abc0f5eb244d6c38
+SHA1 (patch-ai) = 6b76dd8b5566a2fb8d64b06ebe1969ebf19ff554
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/postfix/patches/patch-ag     Fri Aug 11 12:34:24 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.20 2006/08/11 12:34:25 taca Exp $
+
+--- src/util/sys_defs.h.orig   2006-07-03 21:37:32.000000000 +0900
++++ src/util/sys_defs.h
+@@ -28,6 +28,7 @@
+     || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
+     || defined(OPENBSD2) || defined(OPENBSD3) \
+     || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
++    || defined(NETBSD4) \
+     || defined(EKKOBSD1)
+ #define SUPPORTED
+ #include <sys/types.h>
+@@ -41,7 +42,9 @@
+ #define DEF_MAILBOX_LOCK "flock"
+ #define HAS_SUN_LEN
+ #define HAS_FSYNC
++#ifndef HAS_DB
+ #define HAS_DB
++#endif
+ #define HAS_SA_LEN
+ #define DEF_DB_TYPE   "hash"
+ #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
diff -r d7ffb212bd3b -r 6c038966e0d5 mail/postfix/patches/patch-ai
--- a/mail/postfix/patches/patch-ai     Fri Aug 11 12:09:33 2006 +0000
+++ b/mail/postfix/patches/patch-ai     Fri Aug 11 12:34:24 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.16 2006/07/13 09:57:51 martti Exp $
+$NetBSD: patch-ai,v 1.17 2006/08/11 12:34:25 taca Exp $
 
---- makedefs.orig      2006-07-03 20:30:00.000000000 +0000
-+++ makedefs   2006-07-13 12:40:49.000000000 +0000
-@@ -118,6 +118,8 @@
+--- makedefs.orig      2006-07-04 05:30:00.000000000 +0900
++++ makedefs
+@@ -118,6 +118,8 @@ case "$SYSTEM.$RELEASE" in
                ;;
    FreeBSD.6*) SYSTYPE=FREEBSD6
                ;;
@@ -11,7 +11,16 @@
    OpenBSD.2*) SYSTYPE=OPENBSD2
                ;;
    OpenBSD.3*) SYSTYPE=OPENBSD3
-@@ -180,13 +182,6 @@
+@@ -130,6 +132,8 @@ case "$SYSTEM.$RELEASE" in
+               ;;
+    NetBSD.3*) SYSTYPE=NETBSD3
+               ;;
++   NetBSD.4*) SYSTYPE=NETBSD4
++              ;;
+    BSD/OS.2*) SYSTYPE=BSDI2
+               ;;
+    BSD/OS.3*) SYSTYPE=BSDI3
+@@ -180,13 +184,6 @@ case "$SYSTEM.$RELEASE" in
                esac
                ;;
     ULTRIX.4*) SYSTYPE=ULTRIX4
@@ -25,7 +34,7 @@
                for l in syslog resolv; do
                    if [ -f /usr/local/lib/lib$l.a ]; then
                        SYSLIBS="$SYSLIBS -l$l"
-@@ -218,25 +213,8 @@
+@@ -218,25 +215,8 @@ case "$SYSTEM.$RELEASE" in
                esac;;
                # Tested with RedHat 3.03 on 20020729.
      Linux.1*) SYSTYPE=LINUX1
@@ -51,7 +60,7 @@
                # GDBM locks the DBM .pag file after open. This breaks postmap.
                # if [ -f /usr/include/gdbm-ndbm.h ]
                # then
-@@ -247,7 +225,6 @@
+@@ -247,7 +227,6 @@ case "$SYSTEM.$RELEASE" in
                #     CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
                #     GDBM_LIBS=gdbm
                # fi
@@ -59,7 +68,7 @@
                for name in nsl resolv $GDBM_LIBS
                do
                    for lib in /usr/lib64 /lib64 /usr/lib /lib
-@@ -275,25 +252,13 @@
+@@ -275,25 +254,13 @@ case "$SYSTEM.$RELEASE" in
  HP-UX.A.09.*) SYSTYPE=HPUX9
                SYSLIBS=-ldbm
                CCARGS="$CCARGS -DMISSING_USLEEP"