Sat Jun 11 00:37:24 2016 UTC ()
since 4.87 redis lookup is no longer experimental


(wiedi)
diff -r1.146 -r1.147 pkgsrc/mail/exim/Makefile
diff -r1.21 -r1.22 pkgsrc/mail/exim/options.mk
cvs diff -r1.146 -r1.147 pkgsrc/mail/exim/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/exim/Makefile 2016/04/11 19:01:56 1.146
+++ pkgsrc/mail/exim/Makefile 2016/06/11 00:37:24 1.147
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.146 2016/04/11 19:01:56 ryoon Exp $ 1# $NetBSD: Makefile,v 1.147 2016/06/11 00:37:24 wiedi Exp $
2 2
3DISTNAME= exim-4.87 3DISTNAME= exim-4.87
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= mail net 5CATEGORIES= mail net
6MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ 6MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \
7 http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ 7 http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= abs@NetBSD.org 10MAINTAINER= abs@NetBSD.org
11HOMEPAGE= http://www.exim.org/ 11HOMEPAGE= http://www.exim.org/
12COMMENT= The Exim mail transfer agent, a replacement for sendmail 12COMMENT= The Exim mail transfer agent, a replacement for sendmail
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15CONFLICTS+= exim-exiscan-[0-9]* 15CONFLICTS+= exim-exiscan-[0-9]*
16 16
17USE_TOOLS+= perl:run 17USE_TOOLS+= perl:run
cvs diff -r1.21 -r1.22 pkgsrc/mail/exim/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/exim/options.mk 2014/04/02 17:36:00 1.21
+++ pkgsrc/mail/exim/options.mk 2016/06/11 00:37:24 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.21 2014/04/02 17:36:00 wiedi Exp $ 1# $NetBSD: options.mk,v 1.22 2016/06/11 00:37:24 wiedi Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.exim 3PKG_OPTIONS_VAR= PKG_OPTIONS.exim
4PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore 4PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
5PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-auth-dovecot exim-build-eximon 5PKG_SUPPORTED_OPTIONS+= exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
6PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb 6PKG_SUPPORTED_OPTIONS+= exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
7PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql 7PKG_SUPPORTED_OPTIONS+= exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
8PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite 8PKG_SUPPORTED_OPTIONS+= exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite
9PKG_SUPPORTED_OPTIONS+= exim-lookup-whoson exim-old-demime exim-router-iplookup 9PKG_SUPPORTED_OPTIONS+= exim-lookup-whoson exim-old-demime exim-router-iplookup
10PKG_SUPPORTED_OPTIONS+= exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm 10PKG_SUPPORTED_OPTIONS+= exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm
11PKG_SUPPORTED_OPTIONS+= inet6 opendmarc saslauthd spf readline 11PKG_SUPPORTED_OPTIONS+= inet6 opendmarc saslauthd spf readline
12 12
13PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore 13PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
14PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan 14PKG_SUGGESTED_OPTIONS+= exim-appendfile-mbx exim-content-scan
@@ -67,27 +67,27 @@ LOOKUP_LIBS+=-lldap -llber @@ -67,27 +67,27 @@ LOOKUP_LIBS+=-lldap -llber
67.if !empty(PKG_OPTIONS:Mexim-lookup-mysql) 67.if !empty(PKG_OPTIONS:Mexim-lookup-mysql)
68LOCAL_MAKEFILE_OPTIONS+=LOOKUP_MYSQL=YES 68LOCAL_MAKEFILE_OPTIONS+=LOOKUP_MYSQL=YES
69LOOKUP_LIBS+=-lmysqlclient 69LOOKUP_LIBS+=-lmysqlclient
70. include "../../mk/mysql.buildlink3.mk" 70. include "../../mk/mysql.buildlink3.mk"
71.endif 71.endif
72 72
73.if !empty(PKG_OPTIONS:Mexim-lookup-pgsql) 73.if !empty(PKG_OPTIONS:Mexim-lookup-pgsql)
74LOCAL_MAKEFILE_OPTIONS+=LOOKUP_PGSQL=YES 74LOCAL_MAKEFILE_OPTIONS+=LOOKUP_PGSQL=YES
75LOOKUP_LIBS+=-lpq 75LOOKUP_LIBS+=-lpq
76. include "../../mk/pgsql.buildlink3.mk" 76. include "../../mk/pgsql.buildlink3.mk"
77.endif 77.endif
78 78
79.if !empty(PKG_OPTIONS:Mexim-lookup-redis) 79.if !empty(PKG_OPTIONS:Mexim-lookup-redis)
80LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_REDIS=YES 80LOCAL_MAKEFILE_OPTIONS+=LOOKUP_REDIS=YES
81LOOKUP_LIBS+=-lhiredis 81LOOKUP_LIBS+=-lhiredis
82. include "../../databases/hiredis/buildlink3.mk" 82. include "../../databases/hiredis/buildlink3.mk"
83.endif 83.endif
84 84
85.if !empty(PKG_OPTIONS:Mexim-lookup-sqlite) 85.if !empty(PKG_OPTIONS:Mexim-lookup-sqlite)
86LOCAL_MAKEFILE_OPTIONS+=LOOKUP_SQLITE=YES 86LOCAL_MAKEFILE_OPTIONS+=LOOKUP_SQLITE=YES
87LOOKUP_LIBS+=-lsqlite3 87LOOKUP_LIBS+=-lsqlite3
88. include "../../databases/sqlite3/buildlink3.mk" 88. include "../../databases/sqlite3/buildlink3.mk"
89.endif 89.endif
90 90
91.if !empty(PKG_OPTIONS:Mexim-lookup-whoson) 91.if !empty(PKG_OPTIONS:Mexim-lookup-whoson)
92LOCAL_MAKEFILE_OPTIONS+=LOOKUP_WHOSON=YES 92LOCAL_MAKEFILE_OPTIONS+=LOOKUP_WHOSON=YES
93LOOKUP_LIBS+=-lwhoson 93LOOKUP_LIBS+=-lwhoson