From a8051eb2915d6b548703ae31fcbd44b675cf8d8c Mon Sep 17 00:00:00 2001 From: taca Date: Mon, 3 Nov 2008 00:47:17 +0000 Subject: [PATCH] Make it build on NetBSD current (and NetBSD 5.x). --- mail/postfix-current/distinfo | 6 +++--- mail/postfix-current/patches/patch-ag | 13 ++++++++----- mail/postfix-current/patches/patch-ai | 26 ++++++++++++++++++-------- mail/postfix/distinfo | 6 +++--- mail/postfix/patches/patch-ag | 13 ++++++++----- mail/postfix/patches/patch-ai | 26 ++++++++++++++++++-------- 6 files changed, 58 insertions(+), 32 deletions(-) diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index bb1d90ab2008..090a5d0a8e8d 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.49 2008/10/16 09:56:58 martti Exp $ +$NetBSD: distinfo,v 1.50 2008/11/03 00:47:36 taca Exp $ SHA1 (postfix/postfix-2.6-20081012.tar.gz) = 7136abfd30557b3faf8bfa1ec754e304100fca91 RMD160 (postfix/postfix-2.6-20081012.tar.gz) = c7249bac4c21f29a11a7e9f46016e4ff7007f393 Size (postfix/postfix-2.6-20081012.tar.gz) = 3183572 bytes SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb -SHA1 (patch-ag) = b77081a61bc2b95a40963fb1d3ac5818d55a778b -SHA1 (patch-ai) = aedee357d43321d2c3557679d796814455ae0ea6 +SHA1 (patch-ag) = 643d6aea9574bbe05d252638b34ce132cd9bc4ac +SHA1 (patch-ai) = a9a1e0ebcf38c570c51283006419f7a4fdac2225 SHA1 (patch-as) = b70ce22b253a011f4917ed170db29da2c92f675b SHA1 (patch-at) = cb8a292f56c985a68e112e7fad8b05b482886251 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf diff --git a/mail/postfix-current/patches/patch-ag b/mail/postfix-current/patches/patch-ag index 54514e886841..7fb1d725e9bc 100644 --- a/mail/postfix-current/patches/patch-ag +++ b/mail/postfix-current/patches/patch-ag @@ -1,14 +1,17 @@ -$NetBSD: patch-ag,v 1.18 2008/09/17 13:44:16 joerg Exp $ +$NetBSD: patch-ag,v 1.19 2008/11/03 00:47:36 taca Exp $ Only define HAS_DB if it hasn't been defined. +Add support for NetBSD 5.x and DragonFly BSD. ---- src/util/sys_defs.h.orig 2008-01-15 02:51:44 +0200 -+++ src/util/sys_defs.h 2008-07-18 22:24:22 +0300 -@@ -29,7 +29,7 @@ +--- src/util/sys_defs.h.orig 2008-08-23 05:47:16.000000000 +0900 ++++ src/util/sys_defs.h +@@ -28,8 +28,8 @@ + || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ - || defined(NETBSD4) \ +- || defined(NETBSD4) \ - || defined(EKKOBSD1) ++ || defined(NETBSD4) || defined(NETBSD5) \ + || defined(EKKOBSD1) || defined(DRAGONFLY) #define SUPPORTED #include diff --git a/mail/postfix-current/patches/patch-ai b/mail/postfix-current/patches/patch-ai index 56e88ef38834..6a8a6b3ea8a2 100644 --- a/mail/postfix-current/patches/patch-ai +++ b/mail/postfix-current/patches/patch-ai @@ -1,10 +1,11 @@ -$NetBSD: patch-ai,v 1.21 2008/09/17 13:44:16 joerg Exp $ +$NetBSD: patch-ai,v 1.22 2008/11/03 00:47:36 taca Exp $ Make this pkgsrc friendly. +Add support for NetBSD 5.x and DragonFly BSD. ---- makedefs.orig 2007-08-19 14:28:11.000000000 +0000 -+++ makedefs 2007-10-22 05:50:31.000000000 +0000 -@@ -132,6 +132,8 @@ +--- makedefs.orig 2008-09-04 08:46:54.000000000 +0900 ++++ makedefs +@@ -144,6 +144,8 @@ case "$SYSTEM.$RELEASE" in ;; FreeBSD.7*) SYSTYPE=FREEBSD7 ;; @@ -13,7 +14,16 @@ Make this pkgsrc friendly. OpenBSD.2*) SYSTYPE=OPENBSD2 ;; OpenBSD.3*) SYSTYPE=OPENBSD3 -@@ -198,13 +200,6 @@ +@@ -160,6 +162,8 @@ case "$SYSTEM.$RELEASE" in + ;; + NetBSD.4*) SYSTYPE=NETBSD4 + ;; ++ NetBSD.5*) SYSTYPE=NETBSD5 ++ ;; + BSD/OS.2*) SYSTYPE=BSDI2 + ;; + BSD/OS.3*) SYSTYPE=BSDI3 +@@ -210,13 +214,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -27,7 +37,7 @@ Make this pkgsrc friendly. for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -236,25 +231,8 @@ +@@ -248,25 +245,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -53,7 +63,7 @@ Make this pkgsrc friendly. # GDBM locks the DBM .pag file after open. This breaks postmap. # if [ -f /usr/include/gdbm-ndbm.h ] # then -@@ -265,7 +243,6 @@ +@@ -277,7 +257,6 @@ case "$SYSTEM.$RELEASE" in # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H=''" # GDBM_LIBS=gdbm # fi @@ -61,7 +71,7 @@ Make this pkgsrc friendly. for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -360,25 +337,13 @@ +@@ -370,25 +349,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP" diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 249b5617b3cf..da0704ebba6c 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.121 2008/10/16 09:40:20 martti Exp $ +$NetBSD: distinfo,v 1.122 2008/11/03 00:47:17 taca Exp $ SHA1 (postfix/postfix-2.5.5.tar.gz) = 7240be9e362b991bacfcf7e3771ab611e872ac12 RMD160 (postfix/postfix-2.5.5.tar.gz) = 2118fa61710bdb266d4fb8b7a0f60cf0f633c801 Size (postfix/postfix-2.5.5.tar.gz) = 3157877 bytes SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb -SHA1 (patch-ag) = b77081a61bc2b95a40963fb1d3ac5818d55a778b -SHA1 (patch-ai) = aedee357d43321d2c3557679d796814455ae0ea6 +SHA1 (patch-ag) = b572e51dd5053e655667f4c9f583191ae5c7fb1c +SHA1 (patch-ai) = 6884934b519eea945555b3556350e303f83221fb SHA1 (patch-as) = 531d372fd2e51781616202b9c704b621b96770c4 SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf diff --git a/mail/postfix/patches/patch-ag b/mail/postfix/patches/patch-ag index 7ea3419bebd8..62796447e7fa 100644 --- a/mail/postfix/patches/patch-ag +++ b/mail/postfix/patches/patch-ag @@ -1,14 +1,17 @@ -$NetBSD: patch-ag,v 1.26 2008/09/17 13:21:19 joerg Exp $ +$NetBSD: patch-ag,v 1.27 2008/11/03 00:47:17 taca Exp $ Only define HAS_DB if it hasn't been defined. +Add support for NetBSD 5.x and DragonFly BSD. ---- src/util/sys_defs.h.orig 2008-01-15 02:51:44 +0200 -+++ src/util/sys_defs.h 2008-07-18 22:24:22 +0300 -@@ -29,7 +29,7 @@ +--- src/util/sys_defs.h.orig 2008-01-15 09:51:44.000000000 +0900 ++++ src/util/sys_defs.h +@@ -28,8 +28,8 @@ + || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ - || defined(NETBSD4) \ +- || defined(NETBSD4) \ - || defined(EKKOBSD1) ++ || defined(NETBSD4) || defined(NETBSD5) \ + || defined(EKKOBSD1) || defined(DRAGONFLY) #define SUPPORTED #include diff --git a/mail/postfix/patches/patch-ai b/mail/postfix/patches/patch-ai index 6c30a71c3cd2..b92c0e84d6f5 100644 --- a/mail/postfix/patches/patch-ai +++ b/mail/postfix/patches/patch-ai @@ -1,10 +1,11 @@ -$NetBSD: patch-ai,v 1.23 2008/09/17 13:21:19 joerg Exp $ +$NetBSD: patch-ai,v 1.24 2008/11/03 00:47:17 taca Exp $ Make this pkgsrc friendly. +Add support for NetBSD 5.x and DragonFly BSD. ---- makedefs.orig 2007-08-19 14:28:11.000000000 +0000 -+++ makedefs 2007-10-22 05:50:31.000000000 +0000 -@@ -132,6 +132,8 @@ +--- makedefs.orig 2008-01-16 05:20:24.000000000 +0900 ++++ makedefs +@@ -132,6 +132,8 @@ case "$SYSTEM.$RELEASE" in ;; FreeBSD.7*) SYSTYPE=FREEBSD7 ;; @@ -13,7 +14,16 @@ Make this pkgsrc friendly. OpenBSD.2*) SYSTYPE=OPENBSD2 ;; OpenBSD.3*) SYSTYPE=OPENBSD3 -@@ -198,13 +200,6 @@ +@@ -148,6 +150,8 @@ case "$SYSTEM.$RELEASE" in + ;; + NetBSD.4*) SYSTYPE=NETBSD4 + ;; ++ NetBSD.5*) SYSTYPE=NETBSD5 ++ ;; + BSD/OS.2*) SYSTYPE=BSDI2 + ;; + BSD/OS.3*) SYSTYPE=BSDI3 +@@ -198,13 +202,6 @@ case "$SYSTEM.$RELEASE" in esac ;; ULTRIX.4*) SYSTYPE=ULTRIX4 @@ -27,7 +37,7 @@ Make this pkgsrc friendly. for l in syslog resolv; do if [ -f /usr/local/lib/lib$l.a ]; then SYSLIBS="$SYSLIBS -l$l" -@@ -236,25 +231,8 @@ +@@ -236,25 +233,8 @@ case "$SYSTEM.$RELEASE" in esac;; # Tested with RedHat 3.03 on 20020729. Linux.1*) SYSTYPE=LINUX1 @@ -53,7 +63,7 @@ Make this pkgsrc friendly. # GDBM locks the DBM .pag file after open. This breaks postmap. # if [ -f /usr/include/gdbm-ndbm.h ] # then -@@ -265,7 +243,6 @@ +@@ -265,7 +245,6 @@ case "$SYSTEM.$RELEASE" in # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H=''" # GDBM_LIBS=gdbm # fi @@ -61,7 +71,7 @@ Make this pkgsrc friendly. for name in nsl resolv $GDBM_LIBS do for lib in /usr/lib64 /lib64 /usr/lib /lib -@@ -360,25 +337,13 @@ +@@ -360,25 +339,13 @@ EOF HP-UX.A.09.*) SYSTYPE=HPUX9 SYSLIBS=-ldbm CCARGS="$CCARGS -DMISSING_USLEEP"