Sun Dec 13 08:55:57 2009 UTC ()
Updated to the latest development release.


(martti)
diff -r1.109 -r1.110 pkgsrc/mail/postfix-current/Makefile
diff -r1.20 -r1.21 pkgsrc/mail/postfix-current/PLIST
diff -r1.55 -r1.56 pkgsrc/mail/postfix-current/distinfo
diff -r1.20 -r1.21 pkgsrc/mail/postfix-current/patches/patch-ag
diff -r1.23 -r1.24 pkgsrc/mail/postfix-current/patches/patch-ai
diff -r1.5 -r1.6 pkgsrc/mail/postfix-current/patches/patch-as
cvs diff -r1.109 -r1.110 pkgsrc/mail/postfix-current/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/Attic/Makefile 2009/08/31 09:37:49 1.109
+++ pkgsrc/mail/postfix-current/Attic/Makefile 2009/12/13 08:55:57 1.110
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.109 2009/08/31 09:37:49 martti Exp $ 1# $NetBSD: Makefile,v 1.110 2009/12/13 08:55:57 martti Exp $
2 2
3DISTNAME= postfix-2.7-20090828 3DISTNAME= postfix-2.7-20091209
4PKGNAME= postfix-2.7.20090828 4PKGNAME= postfix-2.7.20091209
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
7MASTER_SITES+= http://postfix.it-austria.net/releases/experimental/ 7MASTER_SITES+= http://postfix.it-austria.net/releases/experimental/
8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/experimental/ 8MASTER_SITES+= http://mirrors.isc.org/pub/postfix/experimental/
9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/experimental/ 9MASTER_SITES+= http://mirror.postfix.jp/postfix-release/experimental/
10DIST_SUBDIR= postfix 10DIST_SUBDIR= postfix
11 11
12MAINTAINER= martti@NetBSD.org 12MAINTAINER= martti@NetBSD.org
13HOMEPAGE= http://www.postfix.org/ 13HOMEPAGE= http://www.postfix.org/
14COMMENT= Postfix SMTP server and tools 14COMMENT= Postfix SMTP server and tools
15LICENSE= postfix-license 15LICENSE= postfix-license
16 16
17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 17CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
cvs diff -r1.20 -r1.21 pkgsrc/mail/postfix-current/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/Attic/PLIST 2009/06/14 18:04:40 1.20
+++ pkgsrc/mail/postfix-current/Attic/PLIST 2009/12/13 08:55:57 1.21
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1@comment $NetBSD: PLIST,v 1.20 2009/06/14 18:04:40 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.21 2009/12/13 08:55:57 martti Exp $
2bin/mailq 2bin/mailq
3bin/newaliases 3bin/newaliases
4libexec/postfix/anvil 4libexec/postfix/anvil
5libexec/postfix/bounce 5libexec/postfix/bounce
6libexec/postfix/cleanup 6libexec/postfix/cleanup
7libexec/postfix/discard 7libexec/postfix/discard
 8libexec/postfix/dnsblog
8libexec/postfix/error 9libexec/postfix/error
9libexec/postfix/flush 10libexec/postfix/flush
10libexec/postfix/lmtp 11libexec/postfix/lmtp
11libexec/postfix/local 12libexec/postfix/local
12libexec/postfix/main.cf 13libexec/postfix/main.cf
13libexec/postfix/master 14libexec/postfix/master
14libexec/postfix/master.cf 15libexec/postfix/master.cf
15libexec/postfix/nqmgr 16libexec/postfix/nqmgr
16libexec/postfix/oqmgr 17libexec/postfix/oqmgr
17libexec/postfix/pickup 18libexec/postfix/pickup
18libexec/postfix/pipe 19libexec/postfix/pipe
19libexec/postfix/post-install 20libexec/postfix/post-install
20libexec/postfix/postfix-files 21libexec/postfix/postfix-files
21libexec/postfix/postfix-script 22libexec/postfix/postfix-script
22libexec/postfix/postfix-wrapper 23libexec/postfix/postfix-wrapper
23libexec/postfix/postmulti-script 24libexec/postfix/postmulti-script
 25libexec/postfix/postscreen
24libexec/postfix/proxymap 26libexec/postfix/proxymap
25libexec/postfix/qmgr 27libexec/postfix/qmgr
26libexec/postfix/qmqpd 28libexec/postfix/qmqpd
27libexec/postfix/scache 29libexec/postfix/scache
28libexec/postfix/showq 30libexec/postfix/showq
29libexec/postfix/smtp 31libexec/postfix/smtp
30libexec/postfix/smtpd 32libexec/postfix/smtpd
31libexec/postfix/spawn 33libexec/postfix/spawn
32libexec/postfix/tlsmgr 34libexec/postfix/tlsmgr
33libexec/postfix/trivial-rewrite 35libexec/postfix/trivial-rewrite
34libexec/postfix/verify 36libexec/postfix/verify
35libexec/postfix/virtual 37libexec/postfix/virtual
36man/man1/mailq.1 38man/man1/mailq.1
@@ -65,34 +67,36 @@ man/man5/pcre_table.5 @@ -65,34 +67,36 @@ man/man5/pcre_table.5
65man/man5/pgsql_table.5 67man/man5/pgsql_table.5
66man/man5/postconf.5 68man/man5/postconf.5
67man/man5/postfix-wrapper.5 69man/man5/postfix-wrapper.5
68man/man5/regexp_table.5 70man/man5/regexp_table.5
69man/man5/relocated.5 71man/man5/relocated.5
70man/man5/tcp_table.5 72man/man5/tcp_table.5
71man/man5/transport.5 73man/man5/transport.5
72man/man5/virtual.5 74man/man5/virtual.5
73man/man8/anvil.8 75man/man8/anvil.8
74man/man8/bounce.8 76man/man8/bounce.8
75man/man8/cleanup.8 77man/man8/cleanup.8
76man/man8/defer.8 78man/man8/defer.8
77man/man8/discard.8 79man/man8/discard.8
 80man/man8/dnsblog.8
78man/man8/error.8 81man/man8/error.8
79man/man8/flush.8 82man/man8/flush.8
80man/man8/lmtp.8 83man/man8/lmtp.8
81man/man8/local.8 84man/man8/local.8
82man/man8/master.8 85man/man8/master.8
83man/man8/oqmgr.8 86man/man8/oqmgr.8
84man/man8/pickup.8 87man/man8/pickup.8
85man/man8/pipe.8 88man/man8/pipe.8
 89man/man8/postscreen.8
86man/man8/proxymap.8 90man/man8/proxymap.8
87man/man8/qmgr.8 91man/man8/qmgr.8
88man/man8/qmqpd.8 92man/man8/qmqpd.8
89man/man8/scache.8 93man/man8/scache.8
90man/man8/showq.8 94man/man8/showq.8
91man/man8/smtp.8 95man/man8/smtp.8
92man/man8/smtpd.8 96man/man8/smtpd.8
93man/man8/spawn.8 97man/man8/spawn.8
94man/man8/tlsmgr.8 98man/man8/tlsmgr.8
95man/man8/trace.8 99man/man8/trace.8
96man/man8/trivial-rewrite.8 100man/man8/trivial-rewrite.8
97man/man8/verify.8 101man/man8/verify.8
98man/man8/virtual.8 102man/man8/virtual.8
cvs diff -r1.55 -r1.56 pkgsrc/mail/postfix-current/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/Attic/distinfo 2009/08/31 09:37:49 1.55
+++ pkgsrc/mail/postfix-current/Attic/distinfo 2009/12/13 08:55:57 1.56
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.55 2009/08/31 09:37:49 martti Exp $ 1$NetBSD: distinfo,v 1.56 2009/12/13 08:55:57 martti Exp $
2 2
3SHA1 (postfix/postfix-2.7-20090828.tar.gz) = fb311bea397d5ba92fb5bef04bf9153edeee80c9 3SHA1 (postfix/postfix-2.7-20091209.tar.gz) = 0c033f4015825147273a4e7206643873ae305902
4RMD160 (postfix/postfix-2.7-20090828.tar.gz) = 163f33c7936960027bee50f9eec400d8e31d874f 4RMD160 (postfix/postfix-2.7-20091209.tar.gz) = be0a008172b49739f03e5efda5af875cf4ceba08
5Size (postfix/postfix-2.7-20090828.tar.gz) = 3335807 bytes 5Size (postfix/postfix-2.7-20091209.tar.gz) = 3385941 bytes
6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb 6SHA1 (patch-aa) = 5b4923402c80957e47b8a4e16c897287b88544bb
7SHA1 (patch-ag) = 85dee76cc7dafcdb57d2dfa7af8e9e0e96f747fa 7SHA1 (patch-ag) = 24f57981d99f6515329b313bff627655abe0342e
8SHA1 (patch-ai) = 809f63e6e4e61b3c2cecc49ee0a4c7cabc97844e 8SHA1 (patch-ai) = f681187d6cf1f1793ecbf946a4aecee278d11f3d
9SHA1 (patch-as) = eb57a7bbfad7bd7f2a13eed9d0429f63e93af622 9SHA1 (patch-as) = 8f16d7eda96c1fdbe76fb0a5294148dbf6148171
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.20 -r1.21 pkgsrc/mail/postfix-current/patches/Attic/patch-ag (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/patches/Attic/patch-ag 2009/05/13 10:34:06 1.20
+++ pkgsrc/mail/postfix-current/patches/Attic/patch-ag 2009/12/13 08:55:57 1.21
@@ -1,62 +1,62 @@ @@ -1,62 +1,62 @@
1$NetBSD: patch-ag,v 1.20 2009/05/13 10:34:06 martti Exp $ 1$NetBSD: patch-ag,v 1.21 2009/12/13 08:55:57 martti 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 and DragonFly BSD.
5 5
6--- src/util/sys_defs.h.orig 2009-05-11 03:45:27.000000000 +0300 6--- src/util/sys_defs.h.orig 2009-11-15 01:32:37.000000000 +0200
7+++ src/util/sys_defs.h 2009-05-13 12:25:40.000000000 +0300 7+++ src/util/sys_defs.h 2009-12-13 10:46:54.000000000 +0200
8@@ -28,8 +28,8 @@ 8@@ -29,8 +29,8 @@
9 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ 9 || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ 10 || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \
11 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ 11 || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \
12- || defined(NETBSD4) \ 12- || defined(NETBSD4) \
13- || defined(EKKOBSD1) 13- || defined(EKKOBSD1)
14+ || defined(NETBSD4) || defined(NETBSD5) \ 14+ || defined(NETBSD4) || defined(NETBSD5) \
15+ || defined(EKKOBSD1) || defined(DRAGONFLY) 15+ || defined(EKKOBSD1) || defined(DRAGONFLY)
16 #define SUPPORTED 16 #define SUPPORTED
17 #include <sys/types.h> 17 #include <sys/types.h>
18 #include <sys/param.h> 18 #include <sys/param.h>
19@@ -42,7 +42,9 @@ 19@@ -43,7 +43,9 @@
20 #define DEF_MAILBOX_LOCK "flock, dotlock" 20 #define DEF_MAILBOX_LOCK "flock, dotlock"
21 #define HAS_SUN_LEN 21 #define HAS_SUN_LEN
22 #define HAS_FSYNC 22 #define HAS_FSYNC
23+#ifndef HAS_DB 23+#ifndef HAS_DB
24 #define HAS_DB 24 #define HAS_DB
25+#endif 25+#endif
26 #define HAS_SA_LEN 26 #define HAS_SA_LEN
27 #define DEF_DB_TYPE "hash" 27 #define DEF_DB_TYPE "hash"
28 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000) 28 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 104250000)
29@@ -158,9 +160,19 @@ 29@@ -163,9 +165,19 @@
30 #define HAS_FUTIMES 30 #define HAS_FUTIMES
31 #endif 31 #endif
32  32
33+#if defined(__DragonFly__) 33+#if defined(__DragonFly__)
34+#define HAS_DEV_URANDOM 34+#define HAS_DEV_URANDOM
35+#define HAS_ISSETUGID 35+#define HAS_ISSETUGID
36+#define HAS_FUTIMES 36+#define HAS_FUTIMES
37+#define SOCKADDR_SIZE socklen_t 37+#define SOCKADDR_SIZE socklen_t
38+#define SOCKOPT_SIZE socklen_t 38+#define SOCKOPT_SIZE socklen_t
39+#define HAS_DUPLEX_PIPE 39+#define HAS_DUPLEX_PIPE
40+#endif 40+#endif
41+ 41+
42 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \ 42 #if (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 105000000) \
43 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \ 43 || (defined(__FreeBSD__) && __FreeBSD__ >= 4) \
44 || (defined(OpenBSD) && OpenBSD >= 200003) \ 44 || (defined(OpenBSD) && OpenBSD >= 200003) \
45+ || defined(__DragonFly__) \ 45+ || defined(__DragonFly__) \
46 || defined(USAGI_LIBINET6) 46 || defined(USAGI_LIBINET6)
47 #ifndef NO_IPV6 47 #ifndef NO_IPV6
48 # define HAS_IPV6 48 # define HAS_IPV6
49@@ -169,14 +181,16 @@ 49@@ -174,14 +186,16 @@
50  50
51 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \ 51 #if (defined(__FreeBSD_version) && __FreeBSD_version >= 300000) \
52 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \ 52 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 103000000) \
53- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ 53- || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */
54+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \ 54+ || (defined(OpenBSD) && OpenBSD >= 199700) /* OpenBSD 2.0?? */ \
55+ || defined(__DragonFly__) 55+ || defined(__DragonFly__)
56 # define USE_SYSV_POLL 56 # define USE_SYSV_POLL
57 #endif 57 #endif
58  58
59 #ifndef NO_KQUEUE 59 #ifndef NO_KQUEUE
60 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \ 60 # if (defined(__FreeBSD_version) && __FreeBSD_version >= 410000) \
61 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \ 61 || (defined(__NetBSD_Version__) && __NetBSD_Version__ >= 200000000) \
62- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */ 62- || (defined(OpenBSD) && OpenBSD >= 200105) /* OpenBSD 2.9 */
cvs diff -r1.23 -r1.24 pkgsrc/mail/postfix-current/patches/Attic/patch-ai (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/patches/Attic/patch-ai 2009/05/13 10:34:06 1.23
+++ pkgsrc/mail/postfix-current/patches/Attic/patch-ai 2009/12/13 08:55:57 1.24
@@ -1,87 +1,87 @@ @@ -1,87 +1,87 @@
1$NetBSD: patch-ai,v 1.23 2009/05/13 10:34:06 martti Exp $ 1$NetBSD: patch-ai,v 1.24 2009/12/13 08:55:57 martti 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 and DragonFly BSD.
5 5
6--- makedefs.orig 2009-05-12 00:26:46.000000000 +0300 6--- makedefs.orig 2009-11-10 02:44:41.000000000 +0200
7+++ makedefs 2009-05-13 12:26:34.000000000 +0300 7+++ makedefs 2009-12-13 10:47:16.000000000 +0200
8@@ -144,6 +144,8 @@ 8@@ -146,6 +146,8 @@
9 ;; 9 ;;
10 FreeBSD.7*) SYSTYPE=FREEBSD7 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@@ -160,6 +162,8 @@ 17@@ -162,6 +164,8 @@
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 BSD/OS.2*) SYSTYPE=BSDI2 23 BSD/OS.2*) SYSTYPE=BSDI2
24 ;; 24 ;;
25 BSD/OS.3*) SYSTYPE=BSDI3 25 BSD/OS.3*) SYSTYPE=BSDI3
26@@ -212,13 +216,6 @@ 26@@ -214,13 +218,6 @@
27 esac 27 esac
28 ;; 28 ;;
29 ULTRIX.4*) SYSTYPE=ULTRIX4 29 ULTRIX.4*) SYSTYPE=ULTRIX4
30- if [ -f /usr/local/lib/libdb.a ]; then 30- if [ -f /usr/local/lib/libdb.a ]; then
31- SYSLIBS="$SYSLIBS -ldb" 31- SYSLIBS="$SYSLIBS -ldb"
32- CCARGS="$CCARGS -DHAS_DB" 32- CCARGS="$CCARGS -DHAS_DB"
33- if [ -d /usr/local/include/db ]; then 33- if [ -d /usr/local/include/db ]; then
34- CCARGS="$CCARGS -I/usr/local/include/db" 34- CCARGS="$CCARGS -I/usr/local/include/db"
35- fi 35- fi
36- fi 36- fi
37 for l in syslog resolv; do 37 for l in syslog resolv; do
38 if [ -f /usr/local/lib/lib$l.a ]; then 38 if [ -f /usr/local/lib/lib$l.a ]; then
39 SYSLIBS="$SYSLIBS -l$l" 39 SYSLIBS="$SYSLIBS -l$l"
40@@ -250,25 +247,8 @@ 40@@ -252,25 +249,8 @@
41 esac;; 41 esac;;
42 # Tested with RedHat 3.03 on 20020729. 42 # Tested with RedHat 3.03 on 20020729.
43 Linux.1*) SYSTYPE=LINUX1 43 Linux.1*) SYSTYPE=LINUX1
44- SYSLIBS="-ldb" 44- SYSLIBS="-ldb"
45 ;; 45 ;;
46 Linux.2*) SYSTYPE=LINUX2 46 Linux.2*) SYSTYPE=LINUX2
47- # Postfix no longer needs DB 1.85 compatibility 47- # Postfix no longer needs DB 1.85 compatibility
48- if [ -f /usr/include/db.h ] 48- if [ -f /usr/include/db.h ]
49- then 49- then
50- : we are all set 50- : we are all set
51- elif [ -f /usr/include/db/db.h ] 51- elif [ -f /usr/include/db/db.h ]
52- then 52- then
53- CCARGS="$CCARGS -I/usr/include/db" 53- CCARGS="$CCARGS -I/usr/include/db"
54- else 54- else
55- # No, we're not going to try db1 db2 db3 etc. 55- # No, we're not going to try db1 db2 db3 etc.
56- # On a properly installed system, Postfix builds 56- # On a properly installed system, Postfix builds
57- # by including <db.h> and by linking with -ldb 57- # by including <db.h> and by linking with -ldb
58- echo "No <db.h> include file found." 1>&2 58- echo "No <db.h> include file found." 1>&2
59- echo "Install the appropriate db*-devel package first." 1>&2 59- echo "Install the appropriate db*-devel package first." 1>&2
60- echo "See the RELEASE_NOTES file for more information." 1>&2 60- echo "See the RELEASE_NOTES file for more information." 1>&2
61- exit 1 61- exit 1
62- fi 62- fi
63 # GDBM locks the DBM .pag file after open. This breaks postmap. 63 # GDBM locks the DBM .pag file after open. This breaks postmap.
64 # if [ -f /usr/include/gdbm-ndbm.h ] 64 # if [ -f /usr/include/gdbm-ndbm.h ]
65 # then 65 # then
66@@ -279,7 +259,6 @@ 66@@ -281,7 +261,6 @@
67 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'" 67 # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
68 # GDBM_LIBS=gdbm 68 # GDBM_LIBS=gdbm
69 # fi 69 # fi
70- SYSLIBS="-ldb" 70- SYSLIBS="-ldb"
71 for name in nsl resolv $GDBM_LIBS 71 for name in nsl resolv $GDBM_LIBS
72 do 72 do
73 for lib in /usr/lib64 /lib64 /usr/lib /lib 73 for lib in /usr/lib64 /lib64 /usr/lib /lib
74@@ -372,25 +351,13 @@ 74@@ -383,25 +362,13 @@
75 HP-UX.A.09.*) SYSTYPE=HPUX9 75 HP-UX.A.09.*) SYSTYPE=HPUX9
76 SYSLIBS=-ldbm 76 SYSLIBS=-ldbm
77 CCARGS="$CCARGS -DMISSING_USLEEP" 77 CCARGS="$CCARGS -DMISSING_USLEEP"
78- if [ -f /usr/lib/libdb.a ]; then 78- if [ -f /usr/lib/libdb.a ]; then
79- CCARGS="$CCARGS -DHAS_DB" 79- CCARGS="$CCARGS -DHAS_DB"
80- SYSLIBS="$SYSLIBS -ldb" 80- SYSLIBS="$SYSLIBS -ldb"
81- fi 81- fi
82 ;; 82 ;;
83 HP-UX.B.10.*) SYSTYPE=HPUX10 83 HP-UX.B.10.*) SYSTYPE=HPUX10
84 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null | 84 CCARGS="$CCARGS `nm /usr/lib/libc.a 2>/dev/null |
85 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`" 85 (grep usleep >/dev/null || echo '-DMISSING_USLEEP')`"
86- if [ -f /usr/lib/libdb.a ]; then 86- if [ -f /usr/lib/libdb.a ]; then
87- CCARGS="$CCARGS -DHAS_DB" 87- CCARGS="$CCARGS -DHAS_DB"
cvs diff -r1.5 -r1.6 pkgsrc/mail/postfix-current/patches/Attic/patch-as (expand / switch to unified diff)

--- pkgsrc/mail/postfix-current/patches/Attic/patch-as 2009/05/13 10:34:06 1.5
+++ pkgsrc/mail/postfix-current/patches/Attic/patch-as 2009/12/13 08:55:57 1.6
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-as,v 1.5 2009/05/13 10:34:06 martti Exp $ 1$NetBSD: patch-as,v 1.6 2009/12/13 08:55:57 martti Exp $
2 2
3Support for sqlite. 3Support for sqlite.
4 4
5--- src/global/Makefile.in.orig 2009-02-13 03:25:05.000000000 +0200 5--- src/global/Makefile.in.orig 2009-10-07 03:09:52.000000000 +0300
6+++ src/global/Makefile.in 2009-05-13 12:27:54.000000000 +0300 6+++ src/global/Makefile.in 2009-12-13 10:48:04.000000000 +0200
7@@ -4,7 +4,7 @@ 7@@ -4,7 +4,7 @@
8 clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \ 8 clnt_stream.c conv_time.c db_common.c debug_peer.c debug_process.c \
9 defer.c deliver_completed.c deliver_flock.c deliver_pass.c \ 9 defer.c deliver_completed.c deliver_flock.c deliver_pass.c \
10 deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \ 10 deliver_request.c dict_ldap.c dict_mysql.c dict_pgsql.c \
11- dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \ 11- dict_proxy.c domain_list.c dot_lockfile.c dot_lockfile_as.c \
12+ dict_proxy.c dict_sqlite.c domain_list.c dot_lockfile.c dot_lockfile_as.c \ 12+ dict_proxy.c dict_sqlite.c domain_list.c dot_lockfile.c dot_lockfile_as.c \
13 dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \ 13 dsb_scan.c dsn.c dsn_buf.c dsn_mask.c dsn_print.c dsn_util.c \
14 ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \ 14 ehlo_mask.c ext_prop.c file_id.c flush_clnt.c header_opts.c \
15 header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \ 15 header_token.c input_transp.c int_filt.c is_header.c log_adhoc.c \
16@@ -35,7 +35,7 @@ 16@@ -35,7 +35,7 @@
17 clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \ 17 clnt_stream.o conv_time.o db_common.o debug_peer.o debug_process.o \
18 defer.o deliver_completed.o deliver_flock.o deliver_pass.o \ 18 defer.o deliver_completed.o deliver_flock.o deliver_pass.o \
19 deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \ 19 deliver_request.o dict_ldap.o dict_mysql.o dict_pgsql.o \
@@ -21,35 +21,35 @@ Support for sqlite. @@ -21,35 +21,35 @@ Support for sqlite.
21+ dict_proxy.o dict_sqlite.o domain_list.o dot_lockfile.o dot_lockfile_as.o \ 21+ dict_proxy.o dict_sqlite.o domain_list.o dot_lockfile.o dot_lockfile_as.o \
22 dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \ 22 dsb_scan.o dsn.o dsn_buf.o dsn_mask.o dsn_print.o dsn_util.o \
23 ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \ 23 ehlo_mask.o ext_prop.o file_id.o flush_clnt.o header_opts.o \
24 header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \ 24 header_token.o input_transp.o int_filt.o is_header.o log_adhoc.o \
25@@ -65,7 +65,7 @@ 25@@ -65,7 +65,7 @@
26 canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \ 26 canon_addr.h cfg_parser.h cleanup_user.h clnt_stream.h config.h \
27 conv_time.h db_common.h debug_peer.h debug_process.h defer.h \ 27 conv_time.h db_common.h debug_peer.h debug_process.h defer.h \
28 deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \ 28 deliver_completed.h deliver_flock.h deliver_pass.h deliver_request.h \
29- dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \ 29- dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h domain_list.h \
30+ dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h dict_sqlite.h domain_list.h \ 30+ dict_ldap.h dict_mysql.h dict_pgsql.h dict_proxy.h dict_sqlite.h domain_list.h \
31 dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \ 31 dot_lockfile.h dot_lockfile_as.h dsb_scan.h dsn.h dsn_buf.h \
32 dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \ 32 dsn_mask.h dsn_print.h dsn_util.h ehlo_mask.h ext_prop.h \
33 file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \ 33 file_id.h flush_clnt.h header_opts.h header_token.h input_transp.h \
34@@ -862,6 +862,13 @@ 34@@ -868,6 +868,13 @@
35 dict_proxy.o: dict_proxy.h 35 dict_proxy.o: dict_proxy.h
36 dict_proxy.o: mail_params.h 36 dict_proxy.o: mail_params.h
37 dict_proxy.o: mail_proto.h 37 dict_proxy.o: mail_proto.h
38+dict_sqlite.o: ../../include/dict.h 38+dict_sqlite.o: ../../include/dict.h
39+dict_sqlite.o: ../../include/msg.h 39+dict_sqlite.o: ../../include/msg.h
40+dict_sqlite.o: ../../include/sys_defs.h 40+dict_sqlite.o: ../../include/sys_defs.h
41+dict_sqlite.o: cfg_parser.h 41+dict_sqlite.o: cfg_parser.h
42+dict_sqlite.o: db_common.h 42+dict_sqlite.o: db_common.h
43+dict_sqlite.o: dict_sqlite.c 43+dict_sqlite.o: dict_sqlite.c
44+dict_sqlite.o: dict_sqlite.h 44+dict_sqlite.o: dict_sqlite.h
45 domain_list.o: ../../include/match_list.h 45 domain_list.o: ../../include/match_list.h
46 domain_list.o: ../../include/match_ops.h 46 domain_list.o: ../../include/match_ops.h
47 domain_list.o: ../../include/sys_defs.h 47 domain_list.o: ../../include/sys_defs.h
48@@ -1233,6 +1240,7 @@ 48@@ -1239,6 +1246,7 @@
49 mail_dict.o: dict_mysql.h 49 mail_dict.o: dict_mysql.h
50 mail_dict.o: dict_pgsql.h 50 mail_dict.o: dict_pgsql.h
51 mail_dict.o: dict_proxy.h 51 mail_dict.o: dict_proxy.h
52+mail_dict.o: dict_sqlite.h 52+mail_dict.o: dict_sqlite.h
53 mail_dict.o: mail_dict.c 53 mail_dict.o: mail_dict.c
54 mail_dict.o: mail_dict.h 54 mail_dict.o: mail_dict.h
55 mail_error.o: ../../include/name_mask.h 55 mail_error.o: ../../include/name_mask.h