[pkgsrc/trunk]: pkgsrc/mail/dovecot Import some improvements from the pkgsrc-...

[ghen <ghen%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d5681b744365
branches:  trunk
changeset: 507676:d5681b744365
user:      ghen <ghen%pkgsrc.org@localhost>
date:      Mon Feb 06 17:28:09 2006 +0000

description:
Import some improvements from the pkgsrc-wip/dovecot package (by tv@) and
correct a mistake in my previous commit:

- add dependency on zlib
- add option for GNU TLS as an alternative to OpenSSL
- drop SASL option, it's no longer supported
- explicitly disable some options with --disable-*
- "s,/usr/pkg,@PREFIX@," in patch-ab -- I accidentally diffed it after the SUBST stage
- change SUBST_STAGE from post-patch to pre-configure to avoid this in the future
- bump PKGREVISION for all this

Thanks to tv@.

diffstat:

 mail/dovecot/Makefile         |   6 ++++--
 mail/dovecot/distinfo         |   4 ++--
 mail/dovecot/options.mk       |  24 +++++++++++-------------
 mail/dovecot/patches/patch-ab |  20 ++++++++++----------
 4 files changed, 27 insertions(+), 27 deletions(-)

diffs (175 lines):

diff -r d30146d5ffbe -r d5681b744365 mail/dovecot/Makefile
--- a/mail/dovecot/Makefile     Mon Feb 06 16:10:14 2006 +0000
+++ b/mail/dovecot/Makefile     Mon Feb 06 17:28:09 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2006/02/06 15:54:37 ghen Exp $
+# $NetBSD: Makefile,v 1.44 2006/02/06 17:28:09 ghen Exp $
 
 DISTNAME=              dovecot-1.0.beta2
 PKGNAME=               ${DISTNAME:S/.beta/b/}
+PKGREVISION=           1
 CATEGORIES=            mail
 MASTER_SITES=          http://www.dovecot.org/releases/
 
@@ -37,7 +38,7 @@
 SUBST_CLASSES+=                paths
 SUBST_FILES.paths=     dovecot-example.conf
 SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=     post-patch
+SUBST_STAGE.paths=     pre-configure
 
 post-install:
        ${INSTALL_DATA_DIR} ${EGDIR}
@@ -46,4 +47,5 @@
        ${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${EGDIR}
        ${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${EGDIR}
 
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r d30146d5ffbe -r d5681b744365 mail/dovecot/distinfo
--- a/mail/dovecot/distinfo     Mon Feb 06 16:10:14 2006 +0000
+++ b/mail/dovecot/distinfo     Mon Feb 06 17:28:09 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2006/02/06 15:54:37 ghen Exp $
+$NetBSD: distinfo,v 1.20 2006/02/06 17:28:09 ghen Exp $
 
 SHA1 (dovecot-1.0.beta2.tar.gz) = cf25468db5eb171cdf020c39296ae4a688417873
 RMD160 (dovecot-1.0.beta2.tar.gz) = 446072d3aef6288b18392b7002bbe3eaf124fa99
 Size (dovecot-1.0.beta2.tar.gz) = 1340629 bytes
 SHA1 (patch-aa) = be37d7ed741930e683028e6ea626aa1d312a328e
-SHA1 (patch-ab) = 0e1f60ac3bd3dfeb4439da7bba1f7c0a73643150
+SHA1 (patch-ab) = 4fc3888eb96692e82364295e3aae75f48a042982
diff -r d30146d5ffbe -r d5681b744365 mail/dovecot/options.mk
--- a/mail/dovecot/options.mk   Mon Feb 06 16:10:14 2006 +0000
+++ b/mail/dovecot/options.mk   Mon Feb 06 17:28:09 2006 +0000
@@ -1,20 +1,24 @@
-# $NetBSD: options.mk,v 1.11 2006/02/06 15:54:37 ghen Exp $
+# $NetBSD: options.mk,v 1.12 2006/02/06 17:28:09 ghen Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS= inet6 ldap mysql pam pgsql sasl ssl sqlite
+PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl= gnutls ssl
 PKG_SUGGESTED_OPTIONS= ssl
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Build with OpenSSL as the underlying crypto library.
+### Build with OpenSSL or GNU TLS as the underlying crypto library.
 ###
-# (gnutls is broken in dovecot 0.99.x)
 .if !empty(PKG_OPTIONS:Mssl)
-CONFIGURE_ARGS+=        --enable-ssl=openssl
+CONFIGURE_ARGS+=        --with-ssl=openssl
 .  include "../../security/openssl/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=       --with-ssl=gnutls
+.  include "../../security/gnutls/buildlink3.mk"
 .else
-CONFIGURE_ARGS+=       --disable-ssl
+CONFIGURE_ARGS+=       --without-ssl
 .endif
 
 ###
@@ -39,6 +43,8 @@
 ###
 .if !empty(PKG_OPTIONS:Minet6)
 CONFIGURE_ARGS+=       --enable-ipv6
+.else
+CONFIGURE_ARGS+=       --disable-ipv6
 .endif
 
 ###
@@ -50,14 +56,6 @@
 .endif
 
 ###
-### IMAP-AUTH via SASL.
-###
-.if !empty(PKG_OPTIONS:Msasl)
-CONFIGURE_ARGS+=       --with-cyrus-sasl2
-.  include "../../security/cyrus-sasl2/buildlink3.mk"
-.endif
-
-###
 ### PAM support.
 ###
 .if !empty(PKG_OPTIONS:Mpam)
diff -r d30146d5ffbe -r d5681b744365 mail/dovecot/patches/patch-ab
--- a/mail/dovecot/patches/patch-ab     Mon Feb 06 16:10:14 2006 +0000
+++ b/mail/dovecot/patches/patch-ab     Mon Feb 06 17:28:09 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.8 2006/02/06 15:54:37 ghen Exp $
+$NetBSD: patch-ab,v 1.9 2006/02/06 17:28:09 ghen Exp $
 
 --- dovecot-example.conf.orig  2006-02-06 16:39:00.000000000 +0100
 +++ dovecot-example.conf
@@ -36,22 +36,22 @@
  protocol imap {
    # Login executable location.
 -  #login_executable = /usr/libexec/dovecot/imap-login
-+  #login_executable = /usr/pkg/libexec/dovecot/imap-login
++  #login_executable = @PREFIX@/libexec/dovecot/imap-login
  
    # IMAP executable location. Changing this allows you to execute other
    # binaries before the imap process is executed.
    #
    # This would write rawlogs into ~/dovecot.rawlog/ directory:
 -  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = /usr/pkg/libexec/dovecot/rawlog /usr/pkg/libexec/dovecot/imap
++  #   mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap
    #
    # This would attach gdb into the imap process and write backtraces into
    # /tmp/gdbhelper.* files:
 -  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+  #   mail_executable = /usr/pkg/libexec/dovecot/gdbhelper /usr/pkg/libexec/dovecot/imap
++  #   mail_executable = @PREFIX@/libexec/dovecot/gdbhelper @PREFIX@/libexec/dovecot/imap
    #
 -  #mail_executable = /usr/libexec/dovecot/imap
-+  #mail_executable = /usr/pkg/libexec/dovecot/imap
++  #mail_executable = @PREFIX@/libexec/dovecot/imap
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
@@ -60,7 +60,7 @@
    # Support for dynamically loadable modules.
    #mail_use_modules = no
 -  #mail_modules = /usr/lib/dovecot/imap
-+  #mail_modules = /usr/pkg/lib/dovecot/imap
++  #mail_modules = @PREFIX@/lib/dovecot/imap
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
@@ -69,11 +69,11 @@
  protocol pop3 {
    # Login executable location.
 -  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = /usr/pkg/libexec/dovecot/pop3-login
++  #login_executable = @PREFIX@/libexec/dovecot/pop3-login
  
    # POP3 executable location
 -  #mail_executable = /usr/libexec/dovecot/pop3
-+  #mail_executable = /usr/pkg/libexec/dovecot/pop3
++  #mail_executable = @PREFIX@/libexec/dovecot/pop3
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
@@ -82,7 +82,7 @@
    # Support for dynamically loadable modules.
    #mail_use_modules = no
 -  #mail_modules = /usr/lib/dovecot/pop3
-+  #mail_modules = /usr/pkg/lib/dovecot/pop3
++  #mail_modules = @PREFIX@/lib/dovecot/pop3
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
@@ -91,7 +91,7 @@
  
  # Executable location
 -#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = /usr/pkg/libexec/dovecot/dovecot-auth
++#auth_executable = @PREFIX@/libexec/dovecot/dovecot-auth
  
  # Set max. process size in megabytes.
  #auth_process_size = 256