- 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

13 files changed, 95 insertions, 62 deletions

diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index 48dd288a04b8..d01475be0beb 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-vchkpw
 
 COMMENT=	Vpopmail/vchkpw support for the Courier authentication library
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 90c5f6f2695b..53908f79338d 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.15
-PORTREVISION=	2
+PORTVERSION=	4.16.1
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -12,7 +11,9 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
+		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool
+LIB_DEPENDS=	libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 USES=		gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
@@ -24,6 +25,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
+ALL_TARGET=	all makeimapaccess makedat
 
 #
 # options available:
@@ -122,6 +124,8 @@ post-patch:
 		${WRKSRC}/libs/imap/imapd-ssl.dist.in
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
@@ -130,9 +134,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-	cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
-		install-configure ; cd - )
-
 	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
 	@${ECHO_MSG} "in your /etc/pam.d/imap"
 	@${ECHO_MSG} "auth    required    pam_unix.so         try_first_pass"
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a368c99189e0..bc8c29e77857 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.15.tar.bz2) = 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109
-SIZE (courier-imap-4.15.tar.bz2) = 3266353
+SHA256 (courier-imap-4.16.1.tar.bz2) = 51241784f78b7ce8342adf9d4741a2f8ae8ee0641fe7ead4751af8d4019d4204
+SIZE (courier-imap-4.16.1.tar.bz2) = 3026062
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index d5e6c2cf6650..0415259661c8 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/mail/courier-imap/files/patch-Makefile.in
@@ -1,15 +1,25 @@
---- Makefile.in.orig	2009-06-27 19:26:28.000000000 +0200
-+++ Makefile.in	2009-07-27 19:19:27.000000000 +0200
-@@ -307,7 +307,7 @@
- EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin COPYING.GPL \
- 	NEWS.html $(TEMPLFILES) pgpkeys.txt sysconftool
+--- Makefile.in.orig	2015-04-25 13:49:07 UTC
++++ Makefile.in
+@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared
+ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
+ databindir = $(datadir)
+ databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
+-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-	makeimapaccess makedat
++binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
+ 
+ sbinPROGRAMS = imaplogin pop3login
+ libexecPROGRAMS = makedatprog couriertcpd
+@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 
+ EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \
+ 	pgpkeys.txt sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -659,8 +659,8 @@
+@@ -793,8 +792,8 @@ install-man1: $(man_MANS)
  	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
  	while read files; do \
  	  test -z "$$files" || { \
@@ -20,7 +30,7 @@
  	done; }
  
  uninstall-man1:
-@@ -690,15 +690,15 @@
+@@ -829,15 +828,15 @@ install-man8: $(man_MANS)
  	sed 'N;N;s,\n, ,g' | { \
  	list=; while read file base inst; do \
  	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index c0a69db0a985..1354fc0dc183 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -4,6 +4,8 @@ bin/imapd
 bin/maildiracl
 bin/maildirkw
 bin/maildirmake
+bin/makedat
+bin/makeimapaccess
 bin/pop3d
 @unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
 %%CONFDIR%%/imapd-ssl.dist
@@ -36,6 +38,7 @@ man/man8/deliverquota.8.gz
 man/man8/imapd.8.gz
 man/man8/mkdhparams.8.gz
 man/man8/mkimapdcert.8.gz
+man/man8/makeimapaccess.8.gz
 man/man8/mkpop3dcert.8.gz
 sbin/imaplogin
 sbin/mkdhparams
@@ -58,12 +61,7 @@ share/courier-imap/mkpop3dcert
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.couriertls
-@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared
-@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared.tmp
-@dirrmtry var
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/courier-imap
-@dirrm %%LIBEXECDIR%%
-@dirrm %%CONFDIR%%/shared
-@dirrm %%CONFDIR%%/shared.tmp
-@dirrmtry %%CONFDIR%%
+@dir %%ETCDIR%%/imapaccess
+@dir var
+@dir %%CONFDIR%%/shared
+@dir %%CONFDIR%%/shared.tmp
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 6d53f41c0ef3..252a6f9c7157 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -15,7 +15,7 @@
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
 
 PORTNAME=	maildrop
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -38,7 +38,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS=	courier-0.65* libunicode-[0-9]*
 
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libunicode.so:${PORTSDIR}/devel/courier-unicode
+		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
@@ -48,7 +48,7 @@ FIXDOCPATH=	libs/liblock/lockmail.1 libs/maildir/deliverquota.8.in \
 		libs/maildir/maildirquota.7 libs/maildrop/mailbot.1 \
 		libs/maildrop/maildrop.1.in libs/maildrop/maildropex.7 \
 		libs/maildrop/maildropfilter.7.in libs/maildrop/maildropgdbm.7 \
-		libs/maildrop/makedat.1 libs/maildrop/reformail.1 \
+		libs/maildrop/reformail.1 \
 		libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \
 		libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 1542d2cbbb4e..3b07d2a4f756 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.8.1.tar.bz2) = e1dbdc83ca92c614b05feea837dbae6d275e11b9a35728f68c2d4b8042153b64
-SIZE (maildrop-2.8.1.tar.bz2) = 1989926
+SHA256 (maildrop-2.8.2.tar.bz2) = ab505c4c75ec5566f0626ae477c21ca3069ac37f8f31c41b318025d4ee549654
+SIZE (maildrop-2.8.2.tar.bz2) = 1989913
diff --git a/mail/maildrop/files/patch-Makefile.in b/mail/maildrop/files/patch-Makefile.in
index 708853cfb655..61e8f2c95723 100644
--- a/mail/maildrop/files/patch-Makefile.in
+++ b/mail/maildrop/files/patch-Makefile.in
@@ -1,6 +1,21 @@
---- Makefile.in.orig	2014-09-01 14:50:09.000000000 +0200
-+++ Makefile.in	2014-09-02 00:46:38.638094906 +0200
-@@ -376,7 +376,7 @@
+--- Makefile.in.orig	2015-04-25 13:56:37 UTC
++++ Makefile.in
+@@ -83,10 +83,10 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_DBLIBRARY_TRUE@am__append_1 = makedat.html
+-@HAVE_DBLIBRARY_TRUE@am__append_2 = makedat.1
+-@HAVE_DBLIBRARY_FALSE@am__append_3 = makedat.html
+-@HAVE_DBLIBRARY_FALSE@am__append_4 = makedat.1
++@HAVE_DBLIBRARY_TRUE@am__append_1 = 
++@HAVE_DBLIBRARY_TRUE@am__append_2 = 
++@HAVE_DBLIBRARY_FALSE@am__append_3 = 
++@HAVE_DBLIBRARY_FALSE@am__append_4 = 
+ subdir = .
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/configure $(am__configure_deps) \
+@@ -376,7 +376,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -9,7 +24,7 @@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
-@@ -411,15 +411,15 @@
+@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP
  	maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
  
  scriptdir = $(pkgdatadir)/scripts
@@ -29,7 +44,7 @@
  	maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
  	makemime.1 reformail.1 reformime.1 $(am__append_2)
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
-@@ -1257,21 +1257,21 @@
+@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall-
  
  install-deliverquota:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -57,7 +72,7 @@
  
  #  In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake
  #  and a soft link was created from maildirmake to maildrop.maildirmake
-@@ -1289,7 +1289,7 @@
+@@ -1297,18 +1297,18 @@ install-maildrop:
  		$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
@@ -65,8 +80,15 @@
 +	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake
  	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
- 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1300,7 +1300,7 @@
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
++#	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
++#		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
++#	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
++#		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
+ 	. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
  	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
@@ -75,7 +97,7 @@
  		rm -f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1354,11 +1354,11 @@
+@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl
  maildirkw.html: libs/maildir/maildirkw.html
  	cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
  
diff --git a/mail/maildrop/files/patch-filelock.C b/mail/maildrop/files/patch-libs_maildrop_filelock.C
index b5b1fee87813..8356f0f9f1fe 100644
--- a/mail/maildrop/files/patch-filelock.C
+++ b/mail/maildrop/files/patch-libs_maildrop_filelock.C
@@ -1,6 +1,6 @@
---- libs/maildrop/filelock.C.orig	2013-08-25 20:54:20.000000000 +0200
-+++ libs/maildrop/filelock.C	2013-10-01 17:26:36.724456433 +0200
-@@ -63,7 +63,7 @@
+--- libs/maildrop/filelock.C.orig	2013-08-25 18:54:20 UTC
++++ libs/maildrop/filelock.C
+@@ -63,7 +63,7 @@ int	flockrc;
  		// you're writing to a device file, you know what you're doing.
  
  		if (fstat(fd, &stat_buf) >= 0 && (
diff --git a/mail/maildrop/pkg-plist b/mail/maildrop/pkg-plist
index 93a98de08fec..4ecc11cc3178 100644
--- a/mail/maildrop/pkg-plist
+++ b/mail/maildrop/pkg-plist
@@ -9,8 +9,6 @@ bin/maildrop
 bin/maildrop-deliverquota
 bin/mailbot
 bin/maildrop-maildirmake
-bin/makedat
-bin/makedatprog
 bin/makemime
 bin/reformail
 bin/reformime
@@ -19,7 +17,6 @@ man/man1/lockmail.1.gz
 man/man1/mailbot.1.gz
 man/man1/maildrop-maildirmake.1.gz
 man/man1/maildrop.1.gz
-man/man1/makedat.1.gz
 man/man1/makemime.1.gz
 man/man1/reformail.1.gz
 man/man1/reformime.1.gz
@@ -56,7 +53,6 @@ man/man8/maildrop-deliverquota.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/maildropfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/maildropgdbm.html
 %%PORTDOCS%%%%DOCSDIR%%/maildroptips.txt
-%%PORTDOCS%%%%DOCSDIR%%/makedat.html
 %%PORTDOCS%%%%DOCSDIR%%/makemime.html
 %%PORTDOCS%%%%DOCSDIR%%/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/reformail.html
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