sqwebmail-5.4.1:

* gpglib/list.c: Handle GnuPG 2 --with-colons output format changes.
* gpglib/mimegpgfork.c: GnuPG 2 wants --batch when specifying
  passphrase-fd.
* rfc2045/rfc2045reply.c (mkreply): Fix sender's name in the
  reply salutation.
* html/en-us/newmsg.html: Ditto.
* Big quota patch (with some changes).

(See the Changelog for the previous releases)

Based on patch(es) from PR pkg/42989 by Brian Candler

8 files changed, 32 insertions, 34 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index e0f22e0c606..64011aa9739 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2010/03/21 16:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2010/06/15 23:18:13 pettai Exp $
 
-DISTNAME=	sqwebmail-5.2.0
-PKGREVISION=	2
+DISTNAME=	sqwebmail-5.4.1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Webmail CGI for access to maildir-style mailboxes
 HOMEPAGE=	http://www.courier-mta.org/sqwebmail/
 
-DEPENDS+=	courier-maildir>=0.58.0:../../mail/courier-maildir
-DEPENDS+=	maildrop>=2.0.4nb3:../../mail/maildrop
+DEPENDS+=	courier-maildir>=${COURIER_VERSION}:../../mail/courier-maildir
+DEPENDS+=	maildrop>=2.5.0:../../mail/maildrop
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST
index ccbdb0fff0d..bcefeed97ef 100644
--- a/mail/sqwebmail/PLIST
+++ b/mail/sqwebmail/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:04:44 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/06/15 23:18:13 pettai Exp $
 bin/mimegpg
 libexec/courier/pcpd
 libexec/courier/sqwebmaild
 libexec/courier/sqwebpasswd
 libexec/courier/webmail/webmail
 man/man1/mimegpg.1
-sbin/webmaild
+sbin/webmaild.rc
 sbin/webgpg
 share/courier/sqwebmail/cleancache.pl
 share/courier/sqwebmail/html/en
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index 50e6588f3ad..1c19a60b918 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.20 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: distinfo,v 1.21 2010/06/15 23:18:13 pettai Exp $
 
-SHA1 (sqwebmail-5.2.0.tar.bz2) = 3032f673e9033c7d26a30bc50e24f2897e7ea22d
-RMD160 (sqwebmail-5.2.0.tar.bz2) = b0ba837df30605e6f337c3f0b04200d14bd618cc
-Size (sqwebmail-5.2.0.tar.bz2) = 3926342 bytes
-SHA1 (patch-aa) = 1f25c41ecdf0378f8ee57a9531f787c58ed7d37a
-SHA1 (patch-ad) = ae222755e2291636c3d8b9f5328b3001cf713ddc
-SHA1 (patch-ah) = 762491372570553cc00af0e0d5198b728707eccb
+SHA1 (sqwebmail-5.4.1.tar.bz2) = d0d89af201d78814e252c311ebdd33e3329878af
+RMD160 (sqwebmail-5.4.1.tar.bz2) = 1ae425c0d1dba76cff8b1458faa87c2202af21a1
+Size (sqwebmail-5.4.1.tar.bz2) = 3921443 bytes
+SHA1 (patch-aa) = 4b0e0aec5c8b63d09309f137dc2c49a401d57483
+SHA1 (patch-ad) = 486883ae1924d2184f3ac8862decbabfc11334f3
+SHA1 (patch-ah) = 988c5825294ce78e8f4305d131a34c8eddd710f7
 SHA1 (patch-ai) = def2f4d30bf5f15ea78f401f3c4ca2f2ec8c0ad2
-SHA1 (patch-aj) = fe79e0bdec04d29514c77a7110369f1ded76af77
-SHA1 (patch-am) = d5e654e23473fc3ff613020b0ec99f6eba7b99ea
+SHA1 (patch-aj) = 195ff33119c1991bac32282f2d9a5d15dc00b0d8
+SHA1 (patch-am) = 5b8b5da12c66034c48f7324d959e5ee66d492f22
diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa
index 822cc3d34d5..d699633121e 100644
--- a/mail/sqwebmail/patches/patch-aa
+++ b/mail/sqwebmail/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-aa,v 1.10 2010/06/15 23:18:13 pettai Exp $
 
 --- Makefile.in.orig	Sat Sep 29 14:52:57 2007
 +++ Makefile.in
-@@ -244,19 +244,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
+@@ -283,18 +283,19 @@ EXTRA_DIST = INSTALL.html README NEWS RE
  
  scriptbindir = $(sbindir)
  scriptbin_SCRIPTS = \
@@ -10,7 +10,6 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
 +	webmaild.rc
  
 -pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd
--pkglibexecdir = $(libexecdir)/sqwebmail
 +pkglibPROGRAMS = pcpd
 +pkglibexecdir = $(libexecdir)/courier
  pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@
@@ -28,7 +27,7 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
  @HAVE_HTMLPAGES_TRUE@NEWS_SOURCE = html/index2.html
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -836,6 +836,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
+@@ -975,6 +976,9 @@ uninstall-am: uninstall-libexecSCRIPTS u
  sqwebmaild.dist: sqwebmail/sqwebmaild.dist
  	cp sqwebmail/sqwebmaild.dist .
  
@@ -38,7 +37,7 @@ $NetBSD: patch-aa,v 1.9 2007/10/15 15:38:52 jlam Exp $
  pcpd: pcp/pcpd
  	cp pcp/pcpd .
  
-@@ -871,7 +874,7 @@ install-exec-local:
+@@ -1010,7 +1014,7 @@ install-exec-local:
  	$(mkinstalldirs) $(DESTDIR)$(cgibindir)
  	test -w $(DESTDIR)$(cgibindir) || exit 0; \
  		$(INSTALL_PROGRAM) sqwebmail/sqwebmail \
diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad
index 1f0c1b2ab95..1e02bbac023 100644
--- a/mail/sqwebmail/patches/patch-ad
+++ b/mail/sqwebmail/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-ad,v 1.11 2010/06/15 23:18:13 pettai Exp $
 
 --- sqwebmail/Makefile.in.orig	Sat Sep 29 14:53:23 2007
 +++ sqwebmail/Makefile.in
-@@ -1012,7 +1012,7 @@ install-perms-local: install-perms-cache
+@@ -1143,7 +1143,7 @@ install-perms-local: install-perms-cache
  
  htmllibdir.h: config.status
  	echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h
@@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
  	echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h
  	echo '#define LOGINDOMAINLIST "$(sysconfdir)/logindomainlist"' >>htmllibdir.h
  	echo '#define MAXMSGSIZE @MAXMSGSIZE@' >>htmllibdir.h
-@@ -1020,7 +1020,7 @@ htmllibdir.h: config.status
+@@ -1151,7 +1151,7 @@ htmllibdir.h: config.status
  	echo '#define SOCKDIR "$(localstatedir)"' >>htmllibdir.h
  	echo '#define SHAREDINDEXFILE "$(sysconfdir)/shared/index"' >>htmllibdir.h
  	echo '#define SQWEBPASSWD "$(pkglibexecdir)/sqwebpasswd"' >>htmllibdir.h
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.10 2007/10/15 15:38:52 jlam Exp $
  		; then \
  		echo '#define HOSTNAMEFILE "$(sysconfdir)/defaultdomain"' >>htmllibdir.h \
  		; echo '#define MAKEMIME "$(bindir)/makemime"' >>htmllibdir.h \
-@@ -1057,9 +1057,6 @@ install-perms-cache:
+@@ -1188,9 +1188,6 @@ install-perms-cache:
  	@echo "@cachedir@ 700 @cacheowner@ bin" >>permissions.dat
  
  cache-reminder:
diff --git a/mail/sqwebmail/patches/patch-ah b/mail/sqwebmail/patches/patch-ah
index 8ea7cd53783..669c433f98f 100644
--- a/mail/sqwebmail/patches/patch-ah
+++ b/mail/sqwebmail/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.6 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-ah,v 1.7 2010/06/15 23:18:13 pettai Exp $
 
 --- sqwebmail/configure.orig	Sat Sep 29 14:53:22 2007
 +++ sqwebmail/configure
-@@ -19893,7 +19893,7 @@ fi
+@@ -12502,7 +12502,7 @@ fi
  
  
  
diff --git a/mail/sqwebmail/patches/patch-aj b/mail/sqwebmail/patches/patch-aj
index e4064bc3f83..e6c04028c62 100644
--- a/mail/sqwebmail/patches/patch-aj
+++ b/mail/sqwebmail/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.7 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-aj,v 1.8 2010/06/15 23:18:13 pettai Exp $
 
 --- INSTALL.html.orig	Mon Sep  3 16:05:20 2007
 +++ INSTALL.html
-@@ -809,7 +809,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
+@@ -820,7 +820,7 @@ BrowserMatch "MSIE" nokeepalive downgrad
    configuration files are installed in
    <code>/usr/lib/sqwebmail</code> (the default).</p>
  
diff --git a/mail/sqwebmail/patches/patch-am b/mail/sqwebmail/patches/patch-am
index f85bee8d774..95e16d23923 100644
--- a/mail/sqwebmail/patches/patch-am
+++ b/mail/sqwebmail/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2007/10/15 15:38:52 jlam Exp $
+$NetBSD: patch-am,v 1.3 2010/06/15 23:18:13 pettai Exp $
 
---- pcp/configure.orig	Sun Jul 22 01:27:29 2007
-+++ pcp/configure
-@@ -28669,14 +28669,15 @@ LIBS="$saveLIBS"
+--- pcp/configure.orig	2010-03-21 01:56:14.000000000 +0100
++++ pcp/configure	2010-06-11 00:59:42.000000000 +0200
+@@ -21456,14 +21456,15 @@ LIBS="$saveLIBS"
  echo $NETLIBS >pcp.libs
  
  
@@ -19,4 +19,4 @@ $NetBSD: patch-am,v 1.2 2007/10/15 15:38:52 jlam Exp $
 +SENDIT="$sysconfdir/sendit.sh"
  
  
- { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+ { $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5