diff options
| -rw-r--r-- | mail/dovecot/distinfo | 4 | ||||
| -rw-r--r-- | mail/dovecot/options.mk | 14 | ||||
| -rw-r--r-- | mail/dovecot/patches/patch-ac | 41 | ||||
| -rw-r--r-- | mail/dovecot/patches/patch-ad | 23 |
4 files changed, 79 insertions, 3 deletions
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo index e553dc6e647..1cdaab6b530 100644 --- a/mail/dovecot/distinfo +++ b/mail/dovecot/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.22 2006/02/10 12:20:55 tv Exp $ +$NetBSD: distinfo,v 1.23 2006/02/12 02:47:31 grant Exp $ SHA1 (dovecot-1.0.beta3.tar.gz) = a5d1fc471c88b96e0ef9d7296b25450a1d7a1419 RMD160 (dovecot-1.0.beta3.tar.gz) = 180e694ee78b73e69995096e1598cca427f6c87d Size (dovecot-1.0.beta3.tar.gz) = 1360574 bytes SHA1 (patch-aa) = be37d7ed741930e683028e6ea626aa1d312a328e SHA1 (patch-ab) = a96efac8c8fbaf90f2706e5cb4a3288e405d946f +SHA1 (patch-ac) = 27de0de32111e351cd547cb5a9847a15e4c991a0 +SHA1 (patch-ad) = c390d007c60b80a6456c42f3512afdea76e5e03c diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index f1944140890..b1069af9223 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.13 2006/02/09 09:09:28 ghen Exp $ +# $NetBSD: options.mk,v 1.14 2006/02/12 02:47:32 grant Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot -PKG_SUPPORTED_OPTIONS= inet6 ldap mysql pam pgsql sasl sqlite +PKG_SUPPORTED_OPTIONS= inet6 kqueue ldap mysql pam pgsql sasl sqlite PKG_OPTIONS_OPTIONAL_GROUPS= ssl PKG_OPTIONS_GROUP.ssl= gnutls ssl PKG_SUGGESTED_OPTIONS= ssl @@ -13,6 +13,8 @@ PKG_SUGGESTED_OPTIONS= ssl ### .if !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --with-ssl=openssl +CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include" +CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto" . include "../../security/openssl/buildlink3.mk" .elif !empty(PKG_OPTIONS:Mgnutls) CONFIGURE_ARGS+= --with-ssl=gnutls @@ -72,3 +74,11 @@ CONFIGURE_ARGS+= --without-pam CONFIGURE_ARGS+= --with-sqlite . include "../../databases/sqlite3/buildlink3.mk" .endif + +### +### kqueue support. +### +.if !empty(PKG_OPTIONS:Mkqueue) +CONFIGURE_ARGS+= --with-ioloop=kqueue +CONFIGURE_ARGS+= --with-notify=kqueue +.endif diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac new file mode 100644 index 00000000000..154b1d57329 --- /dev/null +++ b/mail/dovecot/patches/patch-ac @@ -0,0 +1,41 @@ +$NetBSD: patch-ac,v 1.3 2006/02/12 02:47:32 grant Exp $ + +--- configure.orig 2006-02-08 21:13:57.000000000 +1100 ++++ configure +@@ -27710,7 +27710,7 @@ pkg_failed=no + echo "$as_me:$LINENO: checking for SSL" >&5 + echo $ECHO_N "checking for SSL... $ECHO_C" >&6 + +-if test -n "$PKG_CONFIG"; then ++#if test -n "$PKG_CONFIG"; then + if test -n "$SSL_CFLAGS"; then + pkg_cv_SSL_CFLAGS="$SSL_CFLAGS" + else +@@ -27725,10 +27725,10 @@ else + pkg_failed=yes + fi + fi +-else +- pkg_failed=untried +-fi +-if test -n "$PKG_CONFIG"; then ++#else ++# pkg_failed=untried ++#fi ++#if test -n "$PKG_CONFIG"; then + if test -n "$SSL_LIBS"; then + pkg_cv_SSL_LIBS="$SSL_LIBS" + else +@@ -27743,9 +27743,9 @@ else + pkg_failed=yes + fi + fi +-else +- pkg_failed=untried +-fi ++#else ++# pkg_failed=untried ++#fi + + + diff --git a/mail/dovecot/patches/patch-ad b/mail/dovecot/patches/patch-ad new file mode 100644 index 00000000000..91b4bf8d10a --- /dev/null +++ b/mail/dovecot/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.3 2006/02/12 02:47:32 grant Exp $ + +--- src/lib-sql/Makefile.in.orig 2006-02-08 21:13:53.000000000 +1100 ++++ src/lib-sql/Makefile.in +@@ -470,12 +470,16 @@ sql-drivers-register.c: Makefile + echo '/* this file automatically generated by Makefile */' >$@ + echo '#include "lib.h"' >>$@ + echo '#include "sql-api.h"' >>$@ +- for i in $(sql_drivers) ; do \ ++ for i in $(sql_drivers) null; do \ ++ if [ "$${i}" != "null" ]; then \ + echo "extern struct sql_db driver_$${i}_db;" >>$@ ; \ ++ fi \ + done + echo 'void sql_drivers_register_all(void) {' >>$@ +- for i in $(sql_drivers) ; do \ ++ for i in $(sql_drivers) null; do \ ++ if [ "$${i}" != "null" ]; then \ + echo "sql_driver_register(&driver_$${i}_db);" >>$@ ; \ ++ fi \ + done + echo '}' >>$@ + |