Mon Feb 27 03:01:30 2012 UTC ()
Build fix for NetBSD 6.0_BETA.


(taca)
diff -r1.140 -r1.141 pkgsrc/mail/postfix/distinfo
diff -r1.32 -r1.33 pkgsrc/mail/postfix/patches/patch-ag
diff -r1.26 -r1.27 pkgsrc/mail/postfix/patches/patch-ai
cvs diff -r1.140 -r1.141 pkgsrc/mail/postfix/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2012/02/19 18:19:23 1.140
+++ pkgsrc/mail/postfix/distinfo 2012/02/27 03:01:30 1.141
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.140 2012/02/19 18:19:23 tron Exp $ 1$NetBSD: distinfo,v 1.141 2012/02/27 03:01:30 taca Exp $
2 2
3SHA1 (postfix-2.8.8.tar.gz) = b712b25a105c132b40b63aef49268ea117b86f03 3SHA1 (postfix-2.8.8.tar.gz) = b712b25a105c132b40b63aef49268ea117b86f03
4RMD160 (postfix-2.8.8.tar.gz) = eb71b542af2a00da5f12220946731560ff20377d 4RMD160 (postfix-2.8.8.tar.gz) = eb71b542af2a00da5f12220946731560ff20377d
5Size (postfix-2.8.8.tar.gz) = 3648317 bytes 5Size (postfix-2.8.8.tar.gz) = 3648317 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = 3d8083260763adb97ab3d7a270c25c2d95ce6bd6 7SHA1 (patch-ag) = 60d752b6c8db971d92ca0017c63329ad446209c5
8SHA1 (patch-ai) = ef3feef8a4fe7781a89f7e087fc5780760b461b1 8SHA1 (patch-ai) = 8f81c48321ce0875bffe28fd94c0b3965d927560
cvs diff -r1.32 -r1.33 pkgsrc/mail/postfix/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-ag 2011/11/07 15:36:07 1.32
+++ pkgsrc/mail/postfix/patches/patch-ag 2012/02/27 03:01:30 1.33
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1$NetBSD: patch-ag,v 1.32 2011/11/07 15:36:07 taca Exp $ 1$NetBSD: patch-ag,v 1.33 2012/02/27 03:01:30 taca Exp $
2 2
3Only define HAS_DB if it hasn't been defined. 3Only define HAS_DB if it hasn't been defined.
4Add support for NetBSD 5.x and DragonFly BSD. 4Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
5Handle closefrom() on FreeBSD. 5Handle closefrom() on FreeBSD.
6 6
7--- src/util/sys_defs.h.orig 2011-11-02 23:46:22.000000000 +0000 7--- src/util/sys_defs.h.orig 2011-11-02 23:46:22.000000000 +0000
8+++ src/util/sys_defs.h 8+++ src/util/sys_defs.h
9@@ -30,8 +30,8 @@ 9@@ -30,8 +30,8 @@
10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ 10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
11 || defined(OPENBSD5) \ 11 || defined(OPENBSD5) \
12 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ 12 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
13- || defined(NETBSD4) \ 13- || defined(NETBSD4) \
14- || defined(EKKOBSD1) 14- || defined(EKKOBSD1)
15+ || defined(NETBSD4) || defined(NETBSD5) \ 15+ || defined(NETBSD4) || defined(NETBSD5) || defined(NETBSD6) \
16+ || defined(EKKOBSD1) || defined(DRAGONFLY) 16+ || defined(EKKOBSD1) || defined(DRAGONFLY)
17 #define SUPPORTED 17 #define SUPPORTED
18 #include <sys/types.h> 18 #include <sys/types.h>
19 #include <sys/param.h> 19 #include <sys/param.h>
20@@ -44,7 +44,9 @@ 20@@ -44,7 +44,9 @@
21 #define DEF_MAILBOX_LOCK "flock, dotlock" 21 #define DEF_MAILBOX_LOCK "flock, dotlock"
22 #define HAS_SUN_LEN 22 #define HAS_SUN_LEN
23 #define HAS_FSYNC 23 #define HAS_FSYNC
24+#ifndef HAS_DB 24+#ifndef HAS_DB
25 #define HAS_DB 25 #define HAS_DB
26+#endif 26+#endif
27 #define HAS_SA_LEN 27 #define HAS_SA_LEN
28 #define DEF_DB_TYPE "hash" 28 #define DEF_DB_TYPE "hash"
cvs diff -r1.26 -r1.27 pkgsrc/mail/postfix/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-ai 2010/02/25 13:01:23 1.26
+++ pkgsrc/mail/postfix/patches/patch-ai 2012/02/27 03:01:30 1.27
@@ -1,87 +1,89 @@ @@ -1,87 +1,89 @@
1$NetBSD: patch-ai,v 1.26 2010/02/25 13:01:23 martti Exp $ 1$NetBSD: patch-ai,v 1.27 2012/02/27 03:01:30 taca Exp $
2 2
3Make this pkgsrc friendly. 3Make this pkgsrc friendly.
4Add support for NetBSD 5.x and DragonFly BSD. 4Add support for NetBSD 5.x, NetBSD 6.x and DragonFly BSD.
5 5
6--- makedefs.orig 2010-02-03 22:58:58.000000000 +0200 6--- makedefs.orig 2011-11-02 23:46:22.000000000 +0000
7+++ makedefs 2010-02-25 14:48:50.000000000 +0200 7+++ makedefs
8@@ -146,6 +146,8 @@ 8@@ -146,6 +146,8 @@ case "$SYSTEM.$RELEASE" in
9 ;; 9 ;;
10 FreeBSD.8*) SYSTYPE=FREEBSD8 10 FreeBSD.8*) SYSTYPE=FREEBSD8
11 ;; 11 ;;
12+ DragonFly.*) SYSTYPE=DRAGONFLY 12+ DragonFly.*) SYSTYPE=DRAGONFLY
13+ ;; 13+ ;;
14 OpenBSD.2*) SYSTYPE=OPENBSD2 14 OpenBSD.2*) SYSTYPE=OPENBSD2
15 ;; 15 ;;
16 OpenBSD.3*) SYSTYPE=OPENBSD3 16 OpenBSD.3*) SYSTYPE=OPENBSD3
17@@ -162,6 +164,8 @@ 17@@ -164,6 +166,10 @@ case "$SYSTEM.$RELEASE" in
18 ;; 18 ;;
19 NetBSD.4*) SYSTYPE=NETBSD4 19 NetBSD.4*) SYSTYPE=NETBSD4
20 ;; 20 ;;
21+ NetBSD.5*) SYSTYPE=NETBSD5 21+ NetBSD.5*) SYSTYPE=NETBSD5
22+ ;; 22+ ;;
 23+ NetBSD.6*) SYSTYPE=NETBSD6
 24+ ;;
23 BSD/OS.2*) SYSTYPE=BSDI2 25 BSD/OS.2*) SYSTYPE=BSDI2
24 ;; 26 ;;
25 BSD/OS.3*) SYSTYPE=BSDI3 27 BSD/OS.3*) SYSTYPE=BSDI3
26@@ -214,13 +218,6 @@ 28@@ -216,13 +222,6 @@ case "$SYSTEM.$RELEASE" in
27 esac 29 esac
28 ;; 30 ;;
29 ULTRIX.4*) SYSTYPE=ULTRIX4 31 ULTRIX.4*) SYSTYPE=ULTRIX4
30- if [ -f /usr/local/lib/libdb.a ]; then 32- if [ -f /usr/local/lib/libdb.a ]; then
31- SYSLIBS="$SYSLIBS -ldb" 33- SYSLIBS="$SYSLIBS -ldb"
32- CCARGS="$CCARGS -DHAS_DB" 34- CCARGS="$CCARGS -DHAS_DB"
33- if [ -d /usr/local/include/db ]; then 35- if [ -d /usr/local/include/db ]; then
34- CCARGS="$CCARGS -I/usr/local/include/db" 36- CCARGS="$CCARGS -I/usr/local/include/db"
35- fi 37- fi
36- fi 38- fi
37 for l in syslog resolv; do 39 for l in syslog resolv; do
38 if [ -f /usr/local/lib/lib$l.a ]; then 40 if [ -f /usr/local/lib/lib$l.a ]; then
39 SYSLIBS="$SYSLIBS -l$l" 41 SYSLIBS="$SYSLIBS -l$l"
40@@ -252,25 +249,8 @@ 42@@ -260,25 +259,8 @@ case "$SYSTEM.$RELEASE" in
41 esac;; 43 esac;;
42 # Tested with RedHat 3.03 on 20020729. 44 # Tested with RedHat 3.03 on 20020729.
43 Linux.1*) SYSTYPE=LINUX1 45 Linux.1*) SYSTYPE=LINUX1
44- SYSLIBS="-ldb" 46- SYSLIBS="-ldb"
45 ;; 47 ;;
46 Linux.2*) SYSTYPE=LINUX2 48 Linux.2*) SYSTYPE=LINUX2
47- # Postfix no longer needs DB 1.85 compatibility 49- # Postfix no longer needs DB 1.85 compatibility
48- if [ -f /usr/include/db.h ] 50- if [ -f /usr/include/db.h ]
49- then 51- then
50- : we are all set 52- : we are all set
51- elif [ -f /usr/include/db/db.h ] 53- elif [ -f /usr/include/db/db.h ]
52- then 54- then
53- CCARGS="$CCARGS -I/usr/include/db" 55- CCARGS="$CCARGS -I/usr/include/db"
54- else 56- else
55- # No, we're not going to try db1 db2 db3 etc. 57- # No, we're not going to try db1 db2 db3 etc.
56- # On a properly installed system, Postfix builds 58- # On a properly installed system, Postfix builds
57- # by including <db.h> and by linking with -ldb 59- # by including <db.h> and by linking with -ldb
58- echo "No <db.h> include file found." 1>&2 60- echo "No <db.h> include file found." 1>&2
59- echo "Install the appropriate db*-devel package first." 1>&2 61- echo "Install the appropriate db*-devel package first." 1>&2
60- echo "See the RELEASE_NOTES file for more information." 1>&2 62- echo "See the RELEASE_NOTES file for more information." 1>&2
61- exit 1 63- exit 1
62- fi 64- fi
63 # GDBM locks the DBM .pag file after open. This breaks postmap. 65 # GDBM locks the DBM .pag file after open. This breaks postmap.
64 # if [ -f /usr/include/gdbm-ndbm.h ] 66 # if [ -f /usr/include/gdbm-ndbm.h ]
65 # then 67 # then
66@@ -281,7 +261,6 @@ 68@@ -289,7 +271,6 @@ case "$SYSTEM.$RELEASE" in
67 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'" 69 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
68 # GDBM_LIBS=gdbm 70 # GDBM_LIBS=gdbm
69 # fi 71 # fi
70- SYSLIBS="-ldb" 72- SYSLIBS="-ldb"
71 for name in nsl resolv $GDBM_LIBS 73 for name in nsl resolv $GDBM_LIBS
72 do 74 do
73 for lib in /usr/lib64 /lib64 /usr/lib /lib 75 for lib in /usr/lib64 /lib64 /usr/lib /lib
74@@ -383,25 +362,13 @@ 76@@ -418,25 +399,13 @@ EOF
75 HP-UX.A.09.*) SYSTYPE=HPUX9 77 HP-UX.A.09.*) SYSTYPE=HPUX9
76 SYSLIBS=-ldbm 78 SYSLIBS=-ldbm
77 CCARGS="$CCARGS -DMISSING_USLEEP" 79 CCARGS="$CCARGS -DMISSING_USLEEP"
78- if [ -f /usr/lib/libdb.a ]; then 80- if [ -f /usr/lib/libdb.a ]; then
79- CCARGS="$CCARGS -DHAS_DB" 81- CCARGS="$CCARGS -DHAS_DB"
80- SYSLIBS="$SYSLIBS -ldb" 82- SYSLIBS="$SYSLIBS -ldb"
81- fi 83- fi
82 ;; 84 ;;
83 HP-UX.B.10.*) SYSTYPE=HPUX10 85 HP-UX.B.10.*) SYSTYPE=HPUX10
84 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null | 86 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
85 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`" 87 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
86- if [ -f /usr/lib/libdb.a ]; then 88- if [ -f /usr/lib/libdb.a ]; then
87- CCARGS="$CCARGS -DHAS_DB" 89- CCARGS="$CCARGS -DHAS_DB"