- Update courier-unicode to 1.2

- Update courier-imap to 4.16.1
- Update maildrop to 2.8.2
- Update sqwebmail to 5.8.2
- Update courier-authlib to 0.66.2
- Some plist and Makefile modernization

Approved by:		oliver@ (as maintainer of various of these ports)
Differential Revision:	https://reviews.freebsd.org/D2391

3 files changed, 22 insertions, 16 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 3119c3277298..93caaff42bcf 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.8.1
+PORTVERSION=	5.8.2
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
@@ -12,7 +12,7 @@ COMMENT=	CGI Webmail client for Maildirs
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libunicode.so:${PORTSDIR}/devel/courier-unicode
+		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
@@ -40,6 +40,8 @@ IMAGEURL?=	${WEBDATASUBDIR}
 RCDIR?=		${PREFIX}/etc/rc.d
 CACHEDIR?=	/var/sqwebmail/cache
 CACHEOWNER?=	bin
+MAILOWN?=	courier
+MAILGRP?=	courier
 
 # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr)
 # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m)
@@ -65,20 +67,24 @@ CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		--with-locking-method=fcntl \
 		--with-libintl-prefix=${LOCALBASE} \
 		${ICONV_CONFIGURE_ARG} \
-		--cache-file=${WRKDIR}/sqwebmail.cache
+		--cache-file=${WRKDIR}/sqwebmail.cache \
+		--with-mailuser=${MAILOWN} \
+		--with-mailgroup=${MAILGRP}
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		CGIBINSUBDIR=${CGIBINSUBDIR} \
 		WEBDATADIR=${WEBDATADIR} \
-		WEBDATASUBDIR=${WEBDATASUBDIR}
+		WEBDATASUBDIR=${WEBDATASUBDIR} \
+		MAILOWN=${MAILOWN} \
+		MAILGRP=${MAILGRP} \
+		CACHEDIR=${CACHEDIR} \
+		CACHEOWN=${CACHEOWNER}
 
 EXTRA_DOCS=	README README.logindomainlist.html README.pam \
 		libs/sqwebmail/ChangeLog \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt
 
-INSTALL_TARGET=	install-strip install-configure
-
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
@@ -196,4 +202,8 @@ post-patch:
 	@${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl"
 	@${ECHO_MSG} ""
 
+post-install:
+	@${MV} ${STAGEDIR}/${ETCDIR}/ldapaddressbook.dist ${STAGEDIR}/${ETCDIR}/ldapaddressbook.sample
+	@${MV} ${STAGEDIR}/${ETCDIR}/sqwebmaild.dist ${STAGEDIR}/${ETCDIR}/sqwebmaild.sample
+
 .include <bsd.port.post.mk>
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 6533217896ea..bc8cdff8dcae 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqwebmail-5.8.1.tar.bz2) = 490bd1f3aac5c99965c8d0e7f35814304eedd10db5a42976ad3ecc9dde15dd76
-SIZE (sqwebmail-5.8.1.tar.bz2) = 3512211
+SHA256 (sqwebmail-5.8.2.tar.bz2) = 5a0a722a8e09b2ab318c91e3a09888564826616d26635799c52b4c545dfde7d9
+SIZE (sqwebmail-5.8.2.tar.bz2) = 3514846
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index e432339b1872..07e2dad1562c 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,9 +1,5 @@
-@unexec if cmp %D/%%ETCDIR%%/ldapaddressbook %D/%%ETCDIR%%/ldapaddressbook.dist ; then rm -vf %D/%%ETCDIR%%/ldapaddressbook ; fi
-%%ETCDIR%%/ldapaddressbook.dist
-@exec [ -f %D/%%ETCDIR%%/ldapaddressbook ] || cp -v %D/%%ETCDIR%%/ldapaddressbook.dist %D/%%ETCDIR%%/ldapaddressbook
-@unexec if cmp %D/%%ETCDIR%%/sqwebmaild %D/%%ETCDIR%%/sqwebmaild.dist ; then rm -vf %D/%%ETCDIR%%/sqwebmaild ; fi
-%%ETCDIR%%/sqwebmaild.dist
-@exec [ -f %D/%%ETCDIR%%/sqwebmaild ] || cp -v %D/%%ETCDIR%%/sqwebmaild.dist %D/%%ETCDIR%%/sqwebmaild
+@sample %%ETCDIR%%/ldapaddressbook.sample
+@sample %%ETCDIR%%/sqwebmaild.sample
 @unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true
 libexec/sqwebmail/deliverquota
 libexec/sqwebmail/maildirmake
@@ -11,7 +7,7 @@ libexec/sqwebmail/makemime
 libexec/sqwebmail/pcpd
 libexec/sqwebmail/reformime
 libexec/sqwebmail/sqwebmaild
-libexec/sqwebmail/sqwebpasswd
+@(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd
 libexec/sqwebmaild.rc
 man/man1/maildirmake.1.gz
 man/man8/deliverquota.8.gz
@@ -81,7 +77,7 @@ share/sqwebmail/webgpg
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%@dir %%DOCSDIR%%
 @dir etc/sqwebmail
-%%CACHE%%@dir /var/sqwebmail/cache
+%%CACHE%%@dir(%%CACHEOWN%%,,) %%CACHEDIR%%
 @dir /var/sqwebmail/calendar/public
 @dir /var/sqwebmail/calendar/private
 @dir /var/sqwebmail/calendar/localcache