Mon Nov 3 00:47:17 2008 UTC ()
Make it build on NetBSD current (and NetBSD 5.x).


(taca)
diff -r1.121 -r1.122 pkgsrc/mail/postfix/distinfo
diff -r1.26 -r1.27 pkgsrc/mail/postfix/patches/patch-ag
diff -r1.23 -r1.24 pkgsrc/mail/postfix/patches/patch-ai
cvs diff -r1.121 -r1.122 pkgsrc/mail/postfix/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix/distinfo 2008/10/16 09:40:20 1.121
+++ pkgsrc/mail/postfix/distinfo 2008/11/03 00:47:17 1.122
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.121 2008/10/16 09:40:20 martti Exp $ 1$NetBSD: distinfo,v 1.122 2008/11/03 00:47:17 taca Exp $
2 2
3SHA1 (postfix/postfix-2.5.5.tar.gz) = 7240be9e362b991bacfcf7e3771ab611e872ac12 3SHA1 (postfix/postfix-2.5.5.tar.gz) = 7240be9e362b991bacfcf7e3771ab611e872ac12
4RMD160 (postfix/postfix-2.5.5.tar.gz) = 2118fa61710bdb266d4fb8b7a0f60cf0f633c801 4RMD160 (postfix/postfix-2.5.5.tar.gz) = 2118fa61710bdb266d4fb8b7a0f60cf0f633c801
5Size (postfix/postfix-2.5.5.tar.gz) = 3157877 bytes 5Size (postfix/postfix-2.5.5.tar.gz) = 3157877 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = b77081a61bc2b95a40963fb1d3ac5818d55a778b 7SHA1 (patch-ag) = b572e51dd5053e655667f4c9f583191ae5c7fb1c
8SHA1 (patch-ai) = aedee357d43321d2c3557679d796814455ae0ea6 8SHA1 (patch-ai) = 6884934b519eea945555b3556350e303f83221fb
9SHA1 (patch-as) = 531d372fd2e51781616202b9c704b621b96770c4 9SHA1 (patch-as) = 531d372fd2e51781616202b9c704b621b96770c4
10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03 10SHA1 (patch-at) = b0abf2c49bfe94153f7a3845b5709ff8e0027a03
11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf 11SHA1 (patch-au) = 60396f5f182e0f247b06974dc5cf912dbcf84bbf
12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73 12SHA1 (patch-av) = 98073186738e1a4fcd0f620096f4be83a9ff9e73
cvs diff -r1.26 -r1.27 pkgsrc/mail/postfix/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/postfix/patches/patch-ag 2008/09/17 13:21:19 1.26
+++ pkgsrc/mail/postfix/patches/patch-ag 2008/11/03 00:47:17 1.27
@@ -1,24 +1,27 @@ @@ -1,24 +1,27 @@
1$NetBSD: patch-ag,v 1.26 2008/09/17 13:21:19 joerg Exp $ 1$NetBSD: patch-ag,v 1.27 2008/11/03 00:47:17 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.
4 5
5--- src/util/sys_defs.h.orig 2008-01-15 02:51:44 +0200 6--- src/util/sys_defs.h.orig 2008-01-15 09:51:44.000000000 +0900
6+++ src/util/sys_defs.h 2008-07-18 22:24:22 +0300 7+++ src/util/sys_defs.h
7@@ -29,7 +29,7 @@ 8@@ -28,8 +28,8 @@
 9 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
8 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ 10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
9 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ 11 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
10 || defined(NETBSD4) \ 12- || defined(NETBSD4) \
11- || defined(EKKOBSD1) 13- || defined(EKKOBSD1)
 14+ || defined(NETBSD4) || defined(NETBSD5) \
12+ || defined(EKKOBSD1) || defined(DRAGONFLY) 15+ || defined(EKKOBSD1) || defined(DRAGONFLY)
13 #define SUPPORTED 16 #define SUPPORTED
14 #include <sys/types.h> 17 #include <sys/types.h>
15 #include <sys/param.h> 18 #include <sys/param.h>
16@@ -42,7 +42,9 @@ 19@@ -42,7 +42,9 @@
17 #define DEF_MAILBOX_LOCK "flock, dotlock" 20 #define DEF_MAILBOX_LOCK "flock, dotlock"
18 #define HAS_SUN_LEN 21 #define HAS_SUN_LEN
19 #define HAS_FSYNC 22 #define HAS_FSYNC
20+#ifndef HAS_DB 23+#ifndef HAS_DB
21 #define HAS_DB 24 #define HAS_DB
22+#endif 25+#endif
23 #define HAS_SA_LEN 26 #define HAS_SA_LEN
24 #define DEF_DB_TYPE "hash" 27 #define DEF_DB_TYPE "hash"
cvs diff -r1.23 -r1.24 pkgsrc/mail/postfix/patches/patch-ai (expand / switch to unified diff)

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