update mail/sqwebmail to 3.6.2

PR:		ports/59763
Submitted By:	Alex Dupre <sysadmin@alexdupre.com>

4 files changed, 78 insertions, 34 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 4c218dffb41b..ec79c7a0b388 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	3.6.1
+PORTVERSION=	3.6.2
 PORTREVISION=	0
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -47,6 +47,7 @@ IMAGEURL?=	${WEBDATASUBDIR}
 # 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 VCHKPW to the home of the vpopmail user, if necessary
 #
 # The following settings are in bytes:
@@ -127,6 +128,10 @@ CONFIGURE_ARGS+=	--enable-https
 CONFIGURE_ARGS+=	--disable-autorenamesent
 .endif
 
+.if defined(WITHOUT_IMAP)
+CONFIGURE_ARGS+=	--disable-utf7-folder-encoding
+.endif
+
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-authmysql
 PLIST_SUB+=		MYSQLFLAG=""
@@ -202,8 +207,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^case x$$lockmethod in|${TEST} \&\& &|g' \
 		${WRKSRC}/liblock/configure
 
-.if !defined(WITHOUT_AUTHDAEMON)
 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/
 .endif
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 66e7b038d4d9..634197902798 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1 +1 @@
-MD5 (sqwebmail-3.6.1.tar.bz2) = e0bd529a28798dcc9783377ddabdac6e
+MD5 (sqwebmail-3.6.2.tar.bz2) = 7e5c19c4c1ba86e0c96408d5674c7f90
diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
new file mode 100644
index 000000000000..b9d4070e6731
--- /dev/null
+++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.sh
@@ -0,0 +1,21 @@
+#!/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)
+	${PREFIX}/libexec/sqwebmail/sqwebmail/sqwebmaild start > /dev/null && echo -n ' sqwebmaild'
+	;;
+stop)
+	${PREFIX}/libexec/sqwebmail/sqwebmail/sqwebmaild stop > /dev/null && echo -n ' sqwebmaild'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
+
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index e26dbb55b30e..a87af79738bc 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,4 +1,5 @@
 %%AUTHDFLAG%%etc/rc.d/sqwebmail-authdaemond.sh
+etc/rc.d/sqwebmail-sqwebmaild.sh
 libexec/sqwebmail/authlib/authcram
 libexec/sqwebmail/authlib/authcustom
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon
@@ -17,6 +18,7 @@ libexec/sqwebmail/sqwebmail/makedatprog
 libexec/sqwebmail/sqwebmail/makemime
 libexec/sqwebmail/sqwebmail/pcpd
 libexec/sqwebmail/sqwebmail/reformime
+libexec/sqwebmail/sqwebmail/sqwebmaild
 %%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist
 share/sqwebmail/authmodulelist
 %%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist
@@ -69,6 +71,7 @@ share/sqwebmail/html/en-us/printredirect.html
 share/sqwebmail/html/en-us/quickadd.html
 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
@@ -99,37 +102,50 @@ share/sqwebmail/webgpg
 %%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail
 @unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
 @unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventadd.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/eventedit.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/first.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/last.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-frowney2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-notsmiley2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-ohno.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-smiley2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sm-wink2.png
 %%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.gif
-%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.png
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.png
 @unexec /bin/rmdir %D/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
 @unexec /bin/rmdir %D/%%WEBDATADIR%% 2> /dev/null || true