update to 5.8.1

4 files changed, 32 insertions, 30 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 397ee6ac2178..3119c3277298 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.7.2
+PORTVERSION=	5.8.1
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
@@ -11,7 +11,8 @@ 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
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libunicode.so:${PORTSDIR}/devel/courier-unicode
 
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
@@ -71,9 +72,6 @@ PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		WEBDATADIR=${WEBDATADIR} \
 		WEBDATASUBDIR=${WEBDATASUBDIR}
 
-MAN1=		maildirmake.1
-MAN8=		deliverquota.8
-
 EXTRA_DOCS=	README README.logindomainlist.html README.pam \
 		libs/sqwebmail/ChangeLog \
 		libs/maildir/README.maildirquota.txt \
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index ea7c033b8acd..6533217896ea 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqwebmail-5.7.2.tar.bz2) = 50f36d62a9da7eb8ef6e7b4fffcca3021f2d9b1f4362c19d3263d2d7f40398c3
-SIZE (sqwebmail-5.7.2.tar.bz2) = 3680795
+SHA256 (sqwebmail-5.8.1.tar.bz2) = 490bd1f3aac5c99965c8d0e7f35814304eedd10db5a42976ad3ecc9dde15dd76
+SIZE (sqwebmail-5.8.1.tar.bz2) = 3512211
diff --git a/mail/sqwebmail/pkg-descr b/mail/sqwebmail/pkg-descr
index 0075a31189e4..cefaaf60c45a 100644
--- a/mail/sqwebmail/pkg-descr
+++ b/mail/sqwebmail/pkg-descr
@@ -9,4 +9,4 @@ Features:
 . Virtual accounts
 . vpopmail authentication
 
-WWW:	http://inter7.com/sqwebmail/
+WWW: http://inter7.com/sqwebmail/
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index aca2d52ab2a0..e432339b1872 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,8 +1,10 @@
-@unexec [ ! -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true
-@unexec if cmp -s %D/etc/sqwebmail/ldapaddressbook.dist %D/etc/sqwebmail/ldapaddressbook; then rm -f %D/etc/sqwebmail/ldapaddressbook; fi
-etc/sqwebmail/ldapaddressbook.dist
-@unexec if cmp -s %D/etc/sqwebmail/sqwebmaild.dist %D/etc/sqwebmail/sqwebmaild; then rm -f %D/etc/sqwebmail/sqwebmaild; fi
-etc/sqwebmail/sqwebmaild.dist
+@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
+@unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true
 libexec/sqwebmail/deliverquota
 libexec/sqwebmail/maildirmake
 libexec/sqwebmail/makemime
@@ -11,6 +13,8 @@ libexec/sqwebmail/reformime
 libexec/sqwebmail/sqwebmaild
 libexec/sqwebmail/sqwebpasswd
 libexec/sqwebmaild.rc
+man/man1/maildirmake.1.gz
+man/man8/deliverquota.8.gz
 %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl
 sbin/sharedindexinstall.sqwebmail
 sbin/sharedindexsplit.sqwebmail
@@ -75,22 +79,22 @@ share/sqwebmail/webgpg
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/sqwebmail
-%%CACHE%%@unexec rmdir /var/sqwebmail/cache
-@unexec rmdir /var/sqwebmail/calendar/public
-@unexec rmdir /var/sqwebmail/calendar/private
-@unexec rmdir /var/sqwebmail/calendar/localcache
-@unexec rmdir /var/sqwebmail/calendar
-@unexec rmdir /var/sqwebmail/run
-@unexec rmdir /var/sqwebmail
-@dirrm share/sqwebmail/html/en-us
-@dirrm share/sqwebmail/html
-@dirrm share/sqwebmail
-@dirrm libexec/sqwebmail
+%%PORTDOCS%%@dir %%DOCSDIR%%
+@dir etc/sqwebmail
+%%CACHE%%@dir /var/sqwebmail/cache
+@dir /var/sqwebmail/calendar/public
+@dir /var/sqwebmail/calendar/private
+@dir /var/sqwebmail/calendar/localcache
+@dir /var/sqwebmail/calendar
+@dir /var/sqwebmail/run
+@dir /var/sqwebmail
+@dir share/sqwebmail/html/en-us
+@dir share/sqwebmail/html
+@dir share/sqwebmail
+@dir libexec/sqwebmail
 %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail
-@unexec rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
-@unexec rmdir %D/%%CGIBINDIR%% 2> /dev/null || true
+@dir %%CGIBINDIR%%/%%CGIBINSUBDIR%%
+@dir %%CGIBINDIR%%
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.png
@@ -138,5 +142,5 @@ share/sqwebmail/webgpg
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/wikifmt.html
-@unexec rmdir %D/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
-@unexec rmdir %D/%%WEBDATADIR%% 2> /dev/null || true
+@dir %%WEBDATADIR%%/%%WEBDATASUBDIR%%
+@dir %%WEBDATADIR%%