3 files changed, 33 insertions, 21 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 196bd6efa587..b70efb78fab5 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	3.2.0
+PORTVERSION=	3.3.7
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
@@ -55,7 +55,7 @@ CONFIGURE_ARGS= \
 	--enable-imagedir=${WEBDATADIR}/${WEBDATASUBDIR} \
 	--without-authmysql \
 	--libexecdir=${PREFIX}/libexec/sqwebmail \
-	--mandir=${PREFIX}/share/sqwebmail \
+	--mandir=${PREFIX}/share/sqwebmail/man \
 	--prefix=${PREFIX}/share/sqwebmail \
 	--enable-imageurl=/${IMAGEURL}/
 
@@ -119,16 +119,18 @@ CONFIGURE_ARGS+=	--disable-mimetypes
 
 MANPREFIX=	${PREFIX}/share/sqwebmail
 MAN1=		maildirmake.1
-MAN8=		makeuserdb.8 userdb.8 userdbpw.8 authlib.8
-MLINKS=		authlib.8 authcram.8 \
-		authlib.8 authdaemon.8 \
-		authlib.8 authdaemond.8 \
-		authlib.8 authldap.8 \
-		authlib.8 authpam.8 \
-		authlib.8 authpwd.8 \
-		authlib.8 authshadow.8 \
-		authlib.8 authuserdb.8 \
-		authlib.8 authvchkpw.8 \
+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 \
 		makeuserdb.8 pw2userdb.8 \
 		makeuserdb.8 vchkpw2userdb.8
 
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 533b80c800c8..3e1e4e5c58d6 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1 +1 @@
-MD5 (sqwebmail-3.2.0.tar.gz) = 7200ae094a33e8573e687d98c899f234
+MD5 (sqwebmail-3.3.7.tar.gz) = 07b7c5aabda5cc25ced3bcdb4f681225
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index 498f83176dab..c50bbc65d28a 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -2,18 +2,20 @@ libexec/sqwebmail/authlib/authdaemon
 libexec/sqwebmail/authlib/authdaemon.passwd
 libexec/sqwebmail/authlib/authdaemond
 %%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql
-%%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
 libexec/sqwebmail/authlib/authdaemond.plain
+%%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
 libexec/sqwebmail/authlib/authsystem.passwd
+libexec/sqwebmail/sqwebmail/deliverquota
 libexec/sqwebmail/sqwebmail/maildirmake
 libexec/sqwebmail/sqwebmail/makedatprog
 libexec/sqwebmail/sqwebmail/makemime
 libexec/sqwebmail/sqwebmail/mimegpg
+libexec/sqwebmail/sqwebmail/pcpd
 libexec/sqwebmail/sqwebmail/reformime
 share/sqwebmail/authdaemonrc.dist
 share/sqwebmail/authmodulelist
-%%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist
 %%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist
+%%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist
 %%CACHE%%@unexec %D/share/sqwebmail/cleancache.pl
 share/sqwebmail/cleancache.pl
 share/sqwebmail/html/en
@@ -26,10 +28,15 @@ share/sqwebmail/html/en-us/TIMEZONELIST
 share/sqwebmail/html/en-us/abooklist.html
 share/sqwebmail/html/en-us/attachments.html
 share/sqwebmail/html/en-us/autoresponder.html
+share/sqwebmail/html/en-us/calendarlogin.inc.html
 share/sqwebmail/html/en-us/empty.html
+share/sqwebmail/html/en-us/eventacl.html
 share/sqwebmail/html/en-us/eventdaily.html
 share/sqwebmail/html/en-us/eventdelete.html
 share/sqwebmail/html/en-us/eventmonthly.html
+share/sqwebmail/html/en-us/eventnotifydelete.txt
+share/sqwebmail/html/en-us/eventnotifynew.txt
+share/sqwebmail/html/en-us/eventnotifysubject.txt
 share/sqwebmail/html/en-us/eventshow.html
 share/sqwebmail/html/en-us/eventweekly.html
 share/sqwebmail/html/en-us/expired.html
@@ -45,6 +52,9 @@ share/sqwebmail/html/en-us/keyimport.html
 share/sqwebmail/html/en-us/ldaplist.html
 share/sqwebmail/html/en-us/ldapsearch.html
 share/sqwebmail/html/en-us/login.html
+share/sqwebmail/html/en-us/navbar.inc.html
+share/sqwebmail/html/en-us/navbar2.inc.html
+share/sqwebmail/html/en-us/navbar3.inc.html
 share/sqwebmail/html/en-us/newevent.html
 share/sqwebmail/html/en-us/newmsg.html
 share/sqwebmail/html/en-us/preferences.html
@@ -93,6 +103,7 @@ www/data.default/sqwebmail/replyall.gif
 www/data.default/sqwebmail/replylist.gif
 www/data.default/sqwebmail/right.gif
 www/data.default/sqwebmail/right2.gif
+www/data.default/sqwebmail/save.gif
 www/data.default/sqwebmail/sep.gif
 www/data.default/sqwebmail/signin.gif
 www/data.default/sqwebmail/sqwebmail.css
@@ -103,18 +114,17 @@ www/data.default/sqwebmail/uncancel.gif
 @dirrm www/cgi-bin.default/sqwebmail
 @unexec /bin/rmdir %D/www/cgi-bin.default 2> /dev/null || true
 @unexec /bin/rmdir %D/www 2> /dev/null || true
-@dirrm share/sqwebmail/var/spool/calendar/public
-@dirrm share/sqwebmail/var/spool/calendar/private
-@dirrm share/sqwebmail/var/spool/calendar/localcache
-@dirrm share/sqwebmail/var/spool/calendar/authdaemon
-@dirrm share/sqwebmail/var/spool/calendar
-@dirrm share/sqwebmail/var/spool
+@dirrm share/sqwebmail/var/calendar/public
+@dirrm share/sqwebmail/var/calendar/private
+@dirrm share/sqwebmail/var/calendar/localcache
+@dirrm share/sqwebmail/var/calendar
 @dirrm share/sqwebmail/var/authdaemon
 @dirrm share/sqwebmail/var
 @dirrm share/sqwebmail/share/locale
 @dirrm share/sqwebmail/share
 @dirrm share/sqwebmail/sbin
 @dirrm share/sqwebmail/man/man8
+@dirrm share/sqwebmail/man/man7
 @dirrm share/sqwebmail/man/man1
 @dirrm share/sqwebmail/man
 @dirrm share/sqwebmail/lib