7 files changed, 140 insertions, 224 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index ad5523d5fe2a..5489b38c9bc6 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	4.0.7
-PORTREVISION=	1
+PORTVERSION=	5.0.0
+PORTREVISION=	0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -15,6 +15,11 @@ MASTER_SITE_SUBDIR=	courier
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 
+BUILD_DEPENDS=	${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib
+RUN_DEPENDS=	${LOCALBASE}/bin/courierauthconfig:${PORTSDIR}/mail/courier-authlib
+
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
+
 #
 # User-serviceable variables
 #
@@ -25,6 +30,8 @@ COMMENT=	CGI Webmail client for Maildirs
 # set WEBDATADIR to where you'd like web pages to be placed
 # set WEBDATASUBDIR to where you'd like web pages to be placed
 # set IMAGEURL to where on the web server URL the images are found
+# set CACHEOWNER to who you'd like to own the cache files
+# set CACHEDIR to where you'd like your cache directory to be
 #
 
 CGIBINDIR?=	www/cgi-bin-dist
@@ -32,23 +39,21 @@ CGIBINSUBDIR?=	sqwebmail
 WEBDATADIR?=	www/data-dist
 WEBDATASUBDIR?=	sqwebmail
 IMAGEURL?=	${WEBDATASUBDIR}
+RCDIR?=		${PREFIX}/etc/rc.d
+CACHEDIR?=	${PREFIX}/var/sqwebmail/cache
+CACHEOWNER?=	bin
 
 #
-# set WITHOUT_CACHEDIR to disable the cache dir (can't set it with WITH_LDAP)
-# set WITHOUT_AUTHDAEMON to disable the usage of authdaemond
-# set CACHEOWNER to who you'd like to own the cache files
-# set CACHEDIR to where you'd like your cache directory to be
-# set WITH_LDAP for LDAP authentication and addressbook support
+# set WITHOUT_CACHEDIR to disable the cache dir
 # set WITH_HTTPS to generate https:// URLs for all accesses
 # set WITH_HTTPS=login to generate https:// URLs for only password access
-# set WITH_VCHKPW for vpopmail authentication
 # set WITH_ISPELL to provide spell-checking
 # set WITH_MIMETYPES to enable the search for a mime.types file
 # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr)
 # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m)
 # set WITHOUT_SENTRENAME to turn off periodic renaming of the Sent folder
 # set WITHOUT_IMAP if you don't use the Courier IMAP server
-# set VCHKPWLOC to the home of the vpopmail user, if necessary
+# set WITHOUT_GZIP for not using gzip to compress messages
 #
 # The following settings are in bytes:
 # set WITH_MAXMSGSIZE to max size of messages (including attachments)
@@ -57,11 +62,11 @@ IMAGEURL?=	${WEBDATASUBDIR}
 # 
 # set WITH_CHARSET=chset,chset,... to enable charsets.
 # Set it to "all" will enable all unicode charset mappings.
-# For available charsets just type "iconv -l"
-
-CACHEDIR?=	/var/sqwebmail/cache
-CACHEOWNER?=	bin
-VCHKPWLOC?=	${LOCALBASE}/vpopmail
+# "iconv -l" may give you an idea of some usable character sets, although
+# this is not exactly the same as the set which sqwebmail provides.
+# Do not forget the template character set and UTF-8. For example, to be
+# able to read ISO-8859-15 correctly, you need at least
+# WITH_CHARSET=ISO-8859-15,ISO-8859-1,UTF-8
 
 # End of user variables
 
@@ -71,19 +76,24 @@ HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
 USE_REINPLACE=	YES
 USE_GETTEXT=	YES
-USE_LIBTOOL_VER=13
-
-CONFIGURE_ARGS=	\
-	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
-	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
-	--libexecdir=${PREFIX}/libexec/sqwebmail \
-	--mandir=${PREFIX}/man \
-	--enable-imageurl=/${IMAGEURL} \
-	--with-locking-method=fcntl \
-	--with-libintl-prefix=${LOCALBASE} \
-	--with-libiconv-prefix=${LOCALBASE}
-
-PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} CGIBINSUBDIR=${CGIBINSUBDIR} WEBDATADIR=${WEBDATADIR} WEBDATASUBDIR=${WEBDATASUBDIR}
+USE_GMAKE=	YES
+USE_RC_SUBR=	YES
+USE_LIBTOOL_VER=15
+
+CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
+		--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
+		--localstatedir=${PREFIX}/var/sqwebmail \
+		--sysconfdir=${PREFIX}/etc/sqwebmail \
+		--mandir=${PREFIX}/man \
+		--enable-imageurl=/${IMAGEURL} \
+		--with-locking-method=fcntl \
+		--with-libintl-prefix=${LOCALBASE} \
+		--with-libiconv-prefix=${LOCALBASE}
+
+PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
+		CGIBINSUBDIR=${CGIBINSUBDIR} \
+		WEBDATADIR=${WEBDATADIR} \
+		WEBDATASUBDIR=${WEBDATASUBDIR}
 
 .if defined(WITHOUT_CACHEDIR)
 PLIST_SUB+=		CACHE="@comment "
@@ -92,36 +102,6 @@ CONFIGURE_ARGS+=	--without-cachedir
 PLIST_SUB+=		CACHE=""
 CONFIGURE_ARGS+=	--with-cachedir=${CACHEDIR} \
 			--with-cacheowner=${CACHEOWNER}
-
-.endif
-.if !defined(WITHOUT_AUTHDAEMON)
-CONFIGURE_ARGS+=	--with-authdaemon
-PLIST_SUB+=		AUTHDFLAG=""
-.else
-CONFIGURE_ARGS+=	--without-authdaemon
-PLIST_SUB+=		AUTHDFLAG="@comment "
-.endif
-
-.if defined(WITH_LDAP)
-USE_OPENLDAP=		YES
-CONFIGURE_ARGS+=	--with-authldap
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-PLIST_SUB+=		LDAPFLAG=""
-.else
-CONFIGURE_ARGS+=	--without-authldap
-PLIST_SUB+=		LDAPFLAG="@comment "
-.endif
-
-.if defined(WITH_VCHKPW)
-BUILD_DEPENDS+=	${VCHKPWLOC}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS+=	${VCHKPWLOC}/bin/vchkpw:${PORTSDIR}/mail/vpopmail
-
-CONFIGURE_ARGS+=	--with-authvchkpw
-PLIST_SUB+=		VPOPMAILFLAG=""
-.else
-CONFIGURE_ARGS+=	--without-authvchkpw
-PLIST_SUB+=		VPOPMAILFLAG="@comment "
 .endif
 
 .if defined(WITH_HTTPS)
@@ -140,26 +120,13 @@ CONFIGURE_ARGS+=	--disable-autorenamesent
 CONFIGURE_ARGS+=	--disable-utf7-folder-encoding
 .endif
 
-.if defined(WITH_MYSQL)
-CONFIGURE_ARGS+=	--with-authmysql
-PLIST_SUB+=		MYSQLFLAG=""
-.else
-CONFIGURE_ARGS+=	--without-authmysql
-PLIST_SUB+=		MYSQLFLAG="@comment "
-.endif
-
-.if defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+=	--with-authpgsql
-PLIST_SUB+=		PGSQLFLAG=""
-.else
-CONFIGURE_ARGS+=	--without-authpgsql
-PLIST_SUB+=		PGSQLFLAG="@comment "
+.if defined(WITHOUT_GZIP)
+CONFIGURE_ARGS+=	--without-gzip
 .endif
 
 .if defined(WITH_ISPELL)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS+=	${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell
-
 CONFIGURE_ARGS+=	--with-ispell=${LOCALBASE}/bin/ispell
 .else
 CONFIGURE_ARGS+=	--without-ispell
@@ -197,34 +164,20 @@ CONFIGURE_ARGS+=	--enable-unicode=${WITH_CHARSET}
 .endif
 .endif
 
+RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
+
 MAN1=		maildirmake.1
-MAN7=		authlib.7
-MAN8=		deliverquota.8 makeuserdb.8 userdb.8 userdbpw.8
-
-MLINKS=		authlib.7 authcram.7 \
-		authlib.7 authdaemon.7 \
-		authlib.7 authdaemond.7 \
-		authlib.7 authldap.7 \
-		authlib.7 authpam.7 \
-		authlib.7 authpwd.7 \
-		authlib.7 authshadow.7 \
-		authlib.7 authuserdb.7 \
-		authlib.7 authvchkpw.7 \
-		authlib.7 authmysql.7 \
-		makeuserdb.8 pw2userdb.8 \
-		makeuserdb.8 vchkpw2userdb.8
-
-CONFIGURE_ARGS+=	${CONFIGURE_TARGET}
+MAN8=		deliverquota.8
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
-		${WRKSRC}/authlib/installlist.in
+EXTRA_DOCS=	README README.logindomainlist.html README.pam sqwebmail/ChangeLog \
+		maildir/README.maildirquota.txt maildir/README.sharedfolders.txt
 
+post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/liblock/configure
 
-	@${FIND} ${WRKSRC} -name configure | ${XARGS} ${REINPLACE_CMD} \
-		-e 's|prefix=\$$ac_optarg|&/share/sqwebmail|g'
+	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -rpath=:${LOCALBASE}/lib/courier-authlib|' \
+		${WRKSRC}/sqwebmail/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|mkdir -p|${MKDIR}|g' ${WRKSRC}/pcp/configure
 
@@ -233,19 +186,22 @@ post-patch:
 		${WRKSRC}/pcp/intl/Makefile.in
 
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-sqwebmaild.sh \
-		${PREFIX}/etc/rc.d/
-.if !defined(WITHOUT_AUTHDAEMON)
-	${INSTALL_SCRIPT} ${FILESDIR}/sqwebmail-authdaemond.sh \
-		${PREFIX}/etc/rc.d/
+	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
+		${FILESDIR}/sqwebmail-sqwebmaild.sh > ${WRKDIR}/sqwebmail-sqwebmaild.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/sqwebmail-sqwebmaild.sh ${RCDIR}/sqwebmail-sqwebmaild.sh
+
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for a in ${EXTRA_DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${a} ${DOCSDIR}
+.endfor
 .endif
+	cd ${WRKSRC} && ( ${MAKE} install-configure ; cd - )
+
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "*************************************************************************"
-	@${ECHO_MSG} "*******      Make shure to run 'make install-configure' now!      *******"
-	@${ECHO_MSG} "*************************************************************************"
+	@${ECHO_MSG} "Add the following line to your /etc/crontab to make shure the"
+	@${ECHO_MSG} "sqwebmail cache directory gets cleaned up."
+	@${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl"
 	@${ECHO_MSG} ""
 
-install-configure:
-	cd ${WRKSRC} && ${GMAKE} install-configure
-
 .include <bsd.port.mk>
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index cf18233c1dba..f37da547d719 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,2 +1,2 @@
-MD5 (sqwebmail-4.0.7.tar.bz2) = 656e5d22cecab535f57a24407d39cd55
-SIZE(sqwebmail-4.0.7.tar.bz2) = 1972370
+MD5 (sqwebmail-5.0.0.tar.bz2) = f6d57fd7b1cbf7044d5d20e89d147b22
+SIZE(sqwebmail-5.0.0.tar.bz2) = 3146311
diff --git a/mail/sqwebmail/files/patch-ldap b/mail/sqwebmail/files/patch-ldap
deleted file mode 100644
index df479a4cbbfe..000000000000
--- a/mail/sqwebmail/files/patch-ldap
+++ /dev/null
@@ -1,13 +0,0 @@
---- authlib/configure.orig	Wed Mar  3 05:54:13 2004
-+++ authlib/configure	Tue Mar 16 19:36:40 2004
-@@ -1268,6 +1268,10 @@
-    { (exit 1); exit 1; }; }
- fi
- 
-+CFLAGS="$CFLAGS -I%%LOCALBASE%%/include"
-+CPPFLAGS="$CPPFLAGS -I%%LOCALBASE%%/include"
-+LDFLAGS="-L%%LOCALBASE%%/lib $LDFLAGS"
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/mail/sqwebmail/files/patch-sqwebmail::maildir.c b/mail/sqwebmail/files/patch-sqwebmail::maildir.c
deleted file mode 100644
index 43363edd05e1..000000000000
--- a/mail/sqwebmail/files/patch-sqwebmail::maildir.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- sqwebmail/maildir.c.orig	Fri May 28 21:22:37 2004
-+++ sqwebmail/maildir.c	Fri May 28 21:23:00 2004
-@@ -1488,8 +1488,8 @@
- 	as=rfc2047_decode_unicode(a, &unicode_UTF8, 0);
- 	bs=rfc2047_decode_unicode(b, &unicode_UTF8, 0);
- #else
--	as=rfc2047_decode_simple(a, &unicode_UTF8);
--	bs=rfc2047_decode_simple(b, &unicode_UTF8);
-+	as=rfc2047_decode_simple(a);
-+	bs=rfc2047_decode_simple(b);
- #endif
- 
- 	if (as)
diff --git a/mail/sqwebmail/files/sqwebmail-authdaemond.sh b/mail/sqwebmail/files/sqwebmail-authdaemond.sh
deleted file mode 100644
index cd05b44900b1..000000000000
--- a/mail/sqwebmail/files/sqwebmail-authdaemond.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	[ -r ${PREFIX}/share/sqwebmail/authdaemonrc ] && ${PREFIX}/libexec/sqwebmail/authlib/authdaemond start > /dev/null && echo -n ' authdaemond'
-	;;
-stop)
-	${PREFIX}/libexec/sqwebmail/authlib/authdaemond stop > /dev/null && echo -n ' authdaemond'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
-
diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
index 8ca408ee3096..a8b3a2eb325a 100644
--- a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
+++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
@@ -1,21 +1,52 @@
 #!/bin/sh
+#
+# An rc.subr-style startup script for courier-authdaemond service.
 
-if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
-    echo "$0: Cannot determine the PREFIX" >&2
-    exit 1
-fi
-
-case "$1" in
-start)
-	${PREFIX}/libexec/sqwebmail/sqwebmaild.rc start && echo -n ' sqwebmaild'
-	;;
-stop)
-	${PREFIX}/libexec/sqwebmail/sqwebmaild.rc stop && echo -n ' sqwebmaild'
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	;;
-esac
-
-exit 0
+# PROVIDE: sqwebmaild
+# REQUIRE: LOGIN sqwebmaild
+# KEYWORD: FreeBSD shutdown
+
+# Define these sqwebmaild_* variables in one of these files:
+# 	/etc/rc.conf
+# 	/etc/rc.conf.local
+# 	/etc/rc.conf.d/sqwebmaild
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+sqwebmaild_enable=${sqwebmaild_enable-"NO"}
+
+. %%RC_SUBR%%
+
+name="sqwebmaild"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/libexec/sqwebmaild.rc"
+
+start_cmd="sqwebmaild_cmd start"
+stop_cmd="sqwebmaild_cmd stop"
+restart_cmd="sqwebmaild_cmd stop && sqwebmaild_cmd start"
+pidfile="%%PREFIX%%/var/sqwebmail/run/sqwebmaild.pid"
+procname="%%PREFIX%%/sbin/courierlogger"
+
+load_rc_config $name
+
+sqwebmaild_cmd () {
+	case $1 in
+	start)
+		echo "Starting ${name}."
+		${command} start
+		;;
+	stop)
+		echo "Stopping ${name}."
+		${command} stop
+		if [ $? -eq 0 ] ; then
+			for file in "$pidfile" "$pidfile".lock "$pidfile".pcp.lock %%PREFIX%%/var/sqwebmail/sqwebmail.sock ; do
+				[ -f "$file" -o -S "$file" ] && rm -f "$file"
+			done
+			return 0
+		fi
+		;;
+	esac
+}
+
+run_rc_command "$1"
 
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index 513d8d606048..f8f3bee6c002 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,34 +1,18 @@
-%%AUTHDFLAG%%etc/rc.d/sqwebmail-authdaemond.sh
+etc/sqwebmail/ldapaddressbook.dist
+etc/sqwebmail/sqwebmaild.dist
+etc/sqwebmail/nodsn
 etc/rc.d/sqwebmail-sqwebmaild.sh
-libexec/sqwebmail/authlib/authcram
-libexec/sqwebmail/authlib/authcustom
-%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon
-%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon.passwd
-%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond
-%%LDAPFLAG%%libexec/sqwebmail/authlib/authdaemond.ldap
-%%LDAPFLAG%%libexec/sqwebmail/authlib/authldap
-%%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql
-%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond.plain
-%%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
-%%MYSQLFLAG%%libexec/sqwebmail/authlib/authmysql
-%%VPOPMAILFLAG%%libexec/sqwebmail/authlib/authvchkpw
-libexec/sqwebmail/authlib/authpam
-libexec/sqwebmail/authlib/authsystem.passwd
-libexec/sqwebmail/authlib/authuserdb
-libexec/sqwebmail/sqwebmail/authenumerate
-libexec/sqwebmail/sqwebmail/deliverquota
-libexec/sqwebmail/sqwebmail/maildirmake
-libexec/sqwebmail/sqwebmail/makedatprog
-libexec/sqwebmail/sqwebmail/makemime
-libexec/sqwebmail/sqwebmail/pcpd
-libexec/sqwebmail/sqwebmail/reformime
-libexec/sqwebmail/sqwebmail/sqwebmaild
-libexec/sqwebmail/sqwebmaild.rc
-%%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist
-%%LDAPFLAG%%share/sqwebmail/authldaprc.dist
-%%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist
-%%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist
+libexec/sqwebmail/deliverquota
+libexec/sqwebmail/maildirmake
+libexec/sqwebmail/makemime
+libexec/sqwebmail/pcpd
+libexec/sqwebmail/reformime
+libexec/sqwebmail/sqwebmaild
+libexec/sqwebmail/sqwebpasswd
+libexec/sqwebmaild.rc
 %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl
+sbin/sharedindexinstall
+sbin/sharedindexsplit
 share/sqwebmail/cleancache.pl
 share/sqwebmail/html/en
 share/sqwebmail/html/en-us/CHARSET
@@ -79,36 +63,28 @@ share/sqwebmail/html/en-us/readmsg.html
 share/sqwebmail/html/en-us/redirect.html
 share/sqwebmail/html/en-us/smileys.txt
 share/sqwebmail/html/en-us/spellchk.html
-share/sqwebmail/ldapaddressbook.dist
 share/sqwebmail/ldapsearch
-share/sqwebmail/nodsn
-share/sqwebmail/sbin/courierlogger
-share/sqwebmail/sbin/makeuserdb
-share/sqwebmail/sbin/pw2userdb
-share/sqwebmail/sbin/sharedindexinstall
-share/sqwebmail/sbin/sharedindexsplit
-share/sqwebmail/sbin/userdb
-share/sqwebmail/sbin/userdbpw
-share/sqwebmail/sbin/vchkpw2userdb
 share/sqwebmail/sendit.sh
-share/sqwebmail/sqwebmaild.dist
 share/sqwebmail/webgpg
-@dirrm share/sqwebmail/var/calendar/public
-@dirrm share/sqwebmail/var/calendar/private
-@dirrm share/sqwebmail/var/calendar/localcache
-@dirrm share/sqwebmail/var/calendar
-%%AUTHDFLAG%%@dirrm share/sqwebmail/var/authdaemon
-@dirrm share/sqwebmail/var
-@dirrm share/sqwebmail/share
-@dirrm share/sqwebmail/sbin
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.logindomainlist.html
+%%PORTDOCS%%%%DOCSDIR%%/README.pam
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/sqwebmail
+%%CACHE%%@dirrm var/sqwebmail/cache
+@dirrm var/sqwebmail/calendar/public
+@dirrm var/sqwebmail/calendar/private
+@dirrm var/sqwebmail/calendar/localcache
+@dirrm var/sqwebmail/calendar
+@dirrm var/sqwebmail/run
+@dirrm var/sqwebmail
 @dirrm share/sqwebmail/html/en-us
 @dirrm share/sqwebmail/html
 @dirrm share/sqwebmail
-@dirrm libexec/sqwebmail/sqwebmail
-@dirrm libexec/sqwebmail/authlib
 @dirrm libexec/sqwebmail
-%%CACHE%%@unexec rmdir /var/sqwebmail/cache 2> /dev/null || true
-%%CACHE%%@unexec rmdir /var/sqwebmail 2> /dev/null || true
 %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail
 @unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
 @unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true