Update mail/sqwebmail to 5.0.7. Changes from version 5.0.6 include:

	* Update attribute count, after purging invalid html syntax/
	* Fix some HTML display bugs
	* When using GPG, sign the entire message in its entirety, instead
	  of signing each MIME part separately.  Some E-mail clients cannot
	  handle individually-signed multipart/alternative content.
	* Fix HTML templates (remove 8bit content inserted by Amaya).
	* Wiki-style composition of HTML messages.

Also, the "fam" option is noted to be supported here now, although
the logic to handle it is still in mail/courier-maildir/Makefile.common.

5 files changed, 19 insertions, 16 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 33b07a81679..58aa4ae8535 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2005/12/17 05:20:22 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2006/01/03 05:59:12 jlam Exp $
 
-DISTNAME=	sqwebmail-5.0.6
+DISTNAME=	sqwebmail-5.0.7
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -16,8 +16,10 @@ USE_TOOLS+=		env gmake perl:run
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 
+PKG_SUPPORTED_OPTIONS+=	fam
+
 # PKGNAME is a parameter to the following file.
-PKGNAME=	${DISTNAME}
+PKGNAME=		${DISTNAME}
 .include "../../mail/courier-maildir/Makefile.common"
 
 .include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST
index 4fd3d2013a8..9a34bf4dd4b 100644
--- a/mail/sqwebmail/PLIST
+++ b/mail/sqwebmail/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:01 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/01/03 05:59:12 jlam Exp $
 bin/mimegpg
 libexec/cgi-bin/sqwebmail
 libexec/courier/pcpd
@@ -103,6 +103,7 @@ share/courier/sqwebmail/images/sm-wink2.png
 share/courier/sqwebmail/images/sqwebmail.css
 share/courier/sqwebmail/images/trash2.png
 share/courier/sqwebmail/images/uncancel.png
+share/courier/sqwebmail/images/wikifmt.html
 share/courier/sqwebmail/ldapsearch
 share/courier/sqwebmail/sendit.sh
 share/doc/courier/sqwebmail/BUGS.html
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 667948e2a9d..08c9a087d70 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/10/20 20:26:32 jlam Exp $
+$NetBSD: distinfo,v 1.13 2006/01/03 05:59:12 jlam Exp $
 
-SHA1 (sqwebmail-5.0.6.tar.bz2) = 7d95d8a39da47b038cd101ac6cb8e33e116400bc
-RMD160 (sqwebmail-5.0.6.tar.bz2) = fdfd26f1bb3ef5f859e4a2ddcb5a40a0bf517def
-Size (sqwebmail-5.0.6.tar.bz2) = 3558357 bytes
-SHA1 (patch-aa) = 88cc780caf78aa86a17962a7ca93709c8254bf8c
+SHA1 (sqwebmail-5.0.7.tar.bz2) = 32c5a8b36e2a329ba28263491a165bab946c7c48
+RMD160 (sqwebmail-5.0.7.tar.bz2) = 81bfd353f52803436009962a07a571f6fc973b9a
+Size (sqwebmail-5.0.7.tar.bz2) = 3559891 bytes
+SHA1 (patch-aa) = 5f263487244e8127845050a19d3b68356f846aa2
 SHA1 (patch-ad) = 5207b327b2e88bc75a820fcd7467a8ddf207bfb3
 SHA1 (patch-ah) = 8624f6bc7453ee2544a18e0bd1d7d2e0044c083f
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = 6bc3feccfb1c4fc91b7944383b6e9813b474e7ac
+SHA1 (patch-aj) = 9341a88e5b3894bbb9121083d2edcc14193308e7
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index 70a099abb4e..dbbb7cb20c2 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2005/08/11 00:03:51 jlam Exp $
+$NetBSD: patch-aa,v 1.7 2006/01/03 05:59:12 jlam Exp $
 
---- Makefile.in.orig	2005-07-23 10:00:11.000000000 -0400
+--- Makefile.in.orig	2005-12-25 17:02:47.000000000 -0500
 +++ Makefile.in
-@@ -236,19 +236,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
+@@ -237,19 +237,18 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  	pgpkeys.txt
  
  scriptbindir = $(sbindir)
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
index b28df0ddf69..732a9cf59ca 100644
--- a/mail/sqwebmail/patches/patch-aj
+++ b/mail/sqwebmail/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.3 2005/10/20 20:26:32 jlam Exp $
+$NetBSD: patch-aj,v 1.4 2006/01/03 05:59:12 jlam Exp $
 
---- INSTALL.html.orig	2005-08-31 21:37:02.000000000 -0400
+--- INSTALL.html.orig	2005-11-17 22:38:11.000000000 -0500
 +++ INSTALL.html
-@@ -701,7 +701,7 @@ Qmail, and it implements DSNs.</p>
+@@ -700,7 +700,7 @@ Qmail box.</p>
  installation. The following presumes that SqWebMail's configuration files are
  installed in <code>/usr/lib/sqwebmail</code> (the default).</p>