Update sqwebmail to 3.5.1

Take maintainership

PR:		50910
Approved by:	nbm, alex (mentor)

3 files changed, 62 insertions, 42 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 0f8083cff6c..faa617481b6 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	sqwebmail
-PORTVERSION=	3.3.7
+PORTVERSION=	3.5.1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
 
-MAINTAINER=	nbm@FreeBSD.org
+MAINTAINER=	oliver@freebsd.org
 COMMENT=	CGI Webmail client for Maildirs
 
 #
@@ -37,11 +37,14 @@ IMAGEURL?=	${WEBDATASUBDIR}
 # set CACHEOWNER to who you'd like to own the cache files
 # set CACHEDIR to where you'd like your cache directory to be
 # set WITH_LDAP for LDAP authentication and addressbook support
+# set WITH_HTTPS to generate https:// URLs for all accesses
+# set WITH_HTTPS=login to generate https:// URLs for only password access
 # set WITH_VCHKPW for vpopmail authentication
 # set WITH_ISPELL to provide spell-checking
 # set WITH_MIMETYPES to enable the search for a mime.types file
 # 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 VCHKPW to the home of the vpopmail user, if necessary
 #
 # The following settings are in bytes:
@@ -49,7 +52,6 @@ IMAGEURL?=	${WEBDATASUBDIR}
 # set WITH_MAXARGSIZE to max size of a text message (excluding attachments)
 # set WITH_MAXFORMARGSIZE to max size of attachments
 
-
 CACHEDIR?=	/var/sqwebmail/cache
 CACHEOWNER?=	bin
 VCHKPWLOC?=	${LOCALBASE}/vpopmail
@@ -58,6 +60,7 @@ VCHKPWLOC?=	${LOCALBASE}/vpopmail
 
 USE_PERL5=	yes
 HAS_CONFIGURE=	YES
+USE_BZIP2=	YES
 
 CONFIGURE_ARGS= \
 	--enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \
@@ -68,6 +71,8 @@ CONFIGURE_ARGS= \
 	--prefix=${PREFIX}/share/sqwebmail \
 	--enable-imageurl=/${IMAGEURL}/
 
+PLIST_SUB+=	CGIDIR=${CGIBINDIR} HTDOCSDIR=${WEBDATADIR}
+
 .if defined(WITHOUT_CACHEDIR)
 PLIST_SUB+=		CACHE="@comment "
 CONFIGURE_ARGS+=	--without-cachedir
@@ -97,6 +102,18 @@ CONFIGURE_ARGS+=	--without-authvchkpw
 PLIST_SUB+=		VPOPMAILFLAG="@comment "
 .endif
 
+.if defined(WITH_HTTPS)
+.if ${WITH_HTTPS} == "login"
+CONFIGURE_ARGS+=	--enable-https=login
+.else
+CONFIGURE_ARGS+=	--enable-https
+.endif
+.endif
+
+.if defined(WITHOUT_SENTRENAME)
+CONFIGURE_ARGS+=	--disable-autorenamesent
+.endif
+
 .if defined(WITH_MYSQL)
 CONFIGURE_ARGS+=	--with-authmysql
 PLIST_SUB+=		MYSQLFLAG=""
@@ -160,6 +177,7 @@ MLINKS=		authlib.7 authcram.7 \
 		authlib.7 authshadow.7 \
 		authlib.7 authuserdb.7 \
 		authlib.7 authvchkpw.7 \
+		authlib.7 authmysql.7 \
 		makeuserdb.8 pw2userdb.8 \
 		makeuserdb.8 vchkpw2userdb.8
 
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 3e1e4e5c58d..5d5d5b0dff3 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1 +1 @@
-MD5 (sqwebmail-3.3.7.tar.gz) = 07b7c5aabda5cc25ced3bcdb4f681225
+MD5 (sqwebmail-3.5.1.tar.bz2) = 83adbd0076b1d16ac094562521b2a803
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index c50bbc65d28..fb838863a5c 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -68,6 +68,7 @@ share/sqwebmail/html/en-us/spellchk.html
 share/sqwebmail/ldapaddressbook.dist
 share/sqwebmail/ldapsearch
 share/sqwebmail/lib/charset.alias
+share/sqwebmail/nodsn
 share/sqwebmail/sbin/makeuserdb
 share/sqwebmail/sbin/pw2userdb
 share/sqwebmail/sbin/userdb
@@ -76,44 +77,6 @@ share/sqwebmail/sbin/vchkpw2userdb
 share/sqwebmail/sendit.sh
 share/sqwebmail/share/locale/locale.alias
 share/sqwebmail/webgpg
-www/cgi-bin.default/sqwebmail/sqwebmail
-www/data.default/sqwebmail/bg.gif
-www/data.default/sqwebmail/bluebottomleft.gif
-www/data.default/sqwebmail/bluebottomright.gif
-www/data.default/sqwebmail/bluetopleft.gif
-www/data.default/sqwebmail/bluetopright.gif
-www/data.default/sqwebmail/calendar.gif
-www/data.default/sqwebmail/cancel.gif
-www/data.default/sqwebmail/folder.gif
-www/data.default/sqwebmail/folder2.gif
-www/data.default/sqwebmail/folders.gif
-www/data.default/sqwebmail/forward.gif
-www/data.default/sqwebmail/forwardatt.gif
-www/data.default/sqwebmail/fullheaders.gif
-www/data.default/sqwebmail/graybottomleft.gif
-www/data.default/sqwebmail/graybottomright.gif
-www/data.default/sqwebmail/graytopleft.gif
-www/data.default/sqwebmail/graytopright.gif
-www/data.default/sqwebmail/left.gif
-www/data.default/sqwebmail/left2.gif
-www/data.default/sqwebmail/logo.gif
-www/data.default/sqwebmail/print.gif
-www/data.default/sqwebmail/reply.gif
-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
-www/data.default/sqwebmail/trash2.gif
-www/data.default/sqwebmail/uncancel.gif
-@dirrm www/data.default/sqwebmail
-@unexec /bin/rmdir %D/www/data.default 2> /dev/null || true
-@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/calendar/public
 @dirrm share/sqwebmail/var/calendar/private
 @dirrm share/sqwebmail/var/calendar/localcache
@@ -136,3 +99,42 @@ www/data.default/sqwebmail/uncancel.gif
 @dirrm libexec/sqwebmail
 %%CACHE%%@unexec rmdir /var/sqwebmail/cache 2> /dev/null || true
 %%CACHE%%@unexec rmdir /var/sqwebmail 2> /dev/null || true
+@cwd %%CGIDIR%%
+sqwebmail/sqwebmail
+@dirrm sqwebmail
+@unexec cd .. && /bin/rmdir %%CGIDIR%% 2> /dev/null || true
+@cwd %%HTDOCSDIR%%
+sqwebmail/bg.gif
+sqwebmail/bluebottomleft.gif
+sqwebmail/bluebottomright.gif
+sqwebmail/bluetopleft.gif
+sqwebmail/bluetopright.gif
+sqwebmail/calendar.gif
+sqwebmail/cancel.gif
+sqwebmail/folder.gif
+sqwebmail/folder2.gif
+sqwebmail/folders.gif
+sqwebmail/forward.gif
+sqwebmail/forwardatt.gif
+sqwebmail/fullheaders.gif
+sqwebmail/graybottomleft.gif
+sqwebmail/graybottomright.gif
+sqwebmail/graytopleft.gif
+sqwebmail/graytopright.gif
+sqwebmail/left.gif
+sqwebmail/left2.gif
+sqwebmail/logo.gif
+sqwebmail/print.gif
+sqwebmail/reply.gif
+sqwebmail/replyall.gif
+sqwebmail/replylist.gif
+sqwebmail/right.gif
+sqwebmail/right2.gif
+sqwebmail/save.gif
+sqwebmail/sep.gif
+sqwebmail/signin.gif
+sqwebmail/sqwebmail.css
+sqwebmail/trash2.gif
+sqwebmail/uncancel.gif
+@dirrm sqwebmail
+@unexec cd .. && /bin/rmdir %%HTDOCSDIR%% 2> /dev/null || true