cyrus-imapd30: fixed options, cleaned up provided configuration example

[Matthias Petermann <mp%petermann-it.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Wed Mar 11 09:38:07 2020 +0100
Changeset:	2ae5ba7376d6898b2fab3783b8626a1a6b719696

Modified Files:
	cyrus-imapd30/files/imapd.conf
	cyrus-imapd30/options.mk

Log Message:
cyrus-imapd30: fixed options, cleaned up provided configuration example

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2ae5ba7376d6898b2fab3783b8626a1a6b719696

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cyrus-imapd30/files/imapd.conf | 42 +++++++++++++++++++-----------------------
 cyrus-imapd30/options.mk       |  2 +-
 2 files changed, 20 insertions(+), 24 deletions(-)

diffs:
diff --git a/cyrus-imapd30/files/imapd.conf b/cyrus-imapd30/files/imapd.conf
index 4be2358fad..5227441f84 100644
--- a/cyrus-imapd30/files/imapd.conf
+++ b/cyrus-imapd30/files/imapd.conf
@@ -12,39 +12,23 @@ admins: cyrus
 ###################################################################
 
 # Configuration directory
-# DEFAULT configdirectory: /var/lib/cyrus
 configdirectory: /var/imap
 
-# Directories for proc and lock files
-#proc_path: /run/cyrus/proc
-#mboxname_lockpath: /run/cyrus/lock
-
-# Locations for DB files
-# The following DB are recreated upon initialization, so should live in
-# ephemeral storage for best performance.
-#duplicate_db_path: /run/cyrus/deliver.db
-#ptscache_db_path:  /run/cyrus/ptscache.db
-#statuscache_db_path: /run/cyrus/statuscache.db
-#tls_sessions_db_path: /run/cyrus/tls_sessions.db
-
 # Which partition to use for default mailboxes
 defaultpartition: default
-# DEFAULT partition-default: /var/spool/cyrus/mail
 partition-default: /var/spool/imap
 
 # If sieveusehomedir is false (the default), this directory is searched
 # for Sieve scripts.
-# DEFAULT sievedir: /var/spool/sieve
 sievedir:/var/sieve
-# OLD pkgsrc: hashimapspool: false
 
 ###################################################################
 ## Important: KEEP THESE IN SYNC WITH cyrus.conf
 ###################################################################
 
-lmtpsocket: /run/cyrus/socket/lmtp
-idlesocket: /run/cyrus/socket/idle
-notifysocket: /run/cyrus/socket/notify
+lmtpsocket: /var/imap/socket/lmtp
+idlesocket: /var/imap/socket/idle
+notifysocket: /var/imap/socket/notify
 
 # Syslog prefix. Defaults to cyrus (so logging is done as cyrus/imap
 # etc.)
@@ -59,18 +43,27 @@ syslog_prefix: cyrus
 # compile time due to missing dependencies (e.g. libical).
 #
 # Allowed values: caldav, carddav, domainkey, ischedule, rss
-httpmodules: caldav carddav
+httpmodules: caldav carddav freebusy
 
 # If enabled, the partitions will also be hashed, in addition to the
 # hashing done on configuration directories. This is recommended if one
 # partition has a very bushy mailbox tree.
-hashimapspool: true
+hashimapspool: false
 
 # Enable virtual domains
 # and set default domain to localhost
 virtdomains: yes
 defaultdomain: localhost
 
+# Enable web based calendar admin GUI
+caldav_allowcalendaradmin: 1
+
+# Convert usernames to lo
+username_tolower: 1
+
+# Path to sendmail binary
+sendmail: /usr/sbin/sendmail
+
 ###################################################################
 ## User experience settings
 ###################################################################
@@ -96,7 +89,6 @@ allowplaintext: yes
 # "alwaystrue".  They are tried in order, you can specify more than one,
 # separated by spaces.
 sasl_pwcheck_method: saslauthd
-# OLD pkgsrc: sasl_pwcheck_method: auxprop
 
 # If enabled, the SASL library will automatically create authentication
 # secrets when given a plaintext password. Refer to SASL documentation
@@ -114,7 +106,6 @@ sasl_auto_transition: no
 # certificate.
 #tls_server_key: /etc/ssl/private/ssl-cert-snakeoil.key
 
-
 # File containing one or more Certificate Authority (CA) certificates.
 #tls_client_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem
 
@@ -125,3 +116,8 @@ tls_client_ca_dir: /etc/ssl/certs
 # later reuse.  The maximum value is 1440 (24 hours), the default.  A
 # value of 0 will disable session caching.
 tls_session_timeout: 1440
+
+###################################################################
+## Debug settings
+###################################################################
+debug: 1
diff --git a/cyrus-imapd30/options.mk b/cyrus-imapd30/options.mk
index 50f0cb4cf2..2b752d3b76 100644
--- a/cyrus-imapd30/options.mk
+++ b/cyrus-imapd30/options.mk
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=	--with-com-err=yes
 post-configure:		generate-compile-et
 .endif
 
-generate-compile-et:
+.PHONY: generate-compile-et
 	${RUN}cd ${WRKSRC}/com_err/et;				\
 	if ${TEST} ! -f Makefile -a  ! -f compile_et; then	\
 		${SED} 	-e 's,@SED@,${SED},g'			\