Update to 0.441. From the changelog:

-Fixed critical one-off bug in both *SQL configuration parsers.
 Thanks Jim Winstead.
-Fixed lack of quoting in PgSQL subscribe code.  Thanks Dan O'Neill.
-Updated ezmlm-cgi to generate valid XHTML/CSS output.
 Thanks Brian Ghidinelli
-Fixed readwrite.h to work on LP64 systems.  Thanks Amitai Schlair
-Don't clobber msgsize file on re-make.  Thanks Stephen Quinney.
-ezmlm-test can now be run by any user, in any writeable directory.
-Put a valid recipient into the To: header in moderation messages.

pkgsrc changes: declare "mysql" and "pgsql" options as part of a
"database" option group.

5 files changed, 15 insertions, 38 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 55dc5cc11ac..65148de2519 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.20 2005/04/15 20:41:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/05 06:04:17 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
-DISTNAME=		ezmlm-idx-0.440
+DISTNAME=		ezmlm-idx-0.441
 SITES_${DISTNAME}.tar.gz=	http://www.ezmlm.org/archive/${PKGVERSION}/
 
 MAINTAINER=		schmonz@NetBSD.org
@@ -17,7 +17,6 @@ PLIST_SRC+=		PLIST.idx
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-
 # ezmlm-idx is a modification of the ezmlm source.
 DJB_RESTRICTED=		YES
 
diff --git a/mail/ezmlm-idx/PLIST.idx b/mail/ezmlm-idx/PLIST.idx
index bfa088a618f..cda42670735 100644
--- a/mail/ezmlm-idx/PLIST.idx
+++ b/mail/ezmlm-idx/PLIST.idx
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.idx,v 1.4 2005/04/15 20:41:20 schmonz Exp $
+@comment $NetBSD: PLIST.idx,v 1.5 2005/07/05 06:04:17 schmonz Exp $
 bin/ezmlm-accept
 bin/ezmlm-archive
 bin/ezmlm-check
@@ -45,6 +45,7 @@ man/man1/ezmlm-check.1
 man/man1/ezmlm-clean.1
 man/man1/ezmlm-confirm.1
 man/man1/ezmlm-cron.1
+man/man1/ezmlm-dispatch.1
 man/man1/ezmlm-gate.1
 man/man1/ezmlm-get.1
 man/man1/ezmlm-glconf.1
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index f51458e3af5..e8b0315765e 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.13 2005/04/30 04:56:10 schmonz Exp $
+$NetBSD: distinfo,v 1.14 2005/07/05 06:04:17 schmonz Exp $
 
-SHA1 (ezmlm-idx-0.440.tar.gz) = 1995071e8b54a97ba1e2ae823949eaa3f37ebfeb
-RMD160 (ezmlm-idx-0.440.tar.gz) = 944f203450feec5b011a0b5d00ccabf70783a360
-Size (ezmlm-idx-0.440.tar.gz) = 580590 bytes
+SHA1 (ezmlm-idx-0.441.tar.gz) = d69b2fe78948eb27c89ef71c4adb5c04cd088a23
+RMD160 (ezmlm-idx-0.441.tar.gz) = 02f3c958d4ea63083fd71890bfc5d0b799980d88
+Size (ezmlm-idx-0.441.tar.gz) = 580363 bytes
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 RMD160 (ezmlm-0.53.tar.gz) = 6d366de2d7028a984ba454f1bec9d2d9f495c88b
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
 SHA1 (patch-aa) = ab64608eb858732f6e27c6aa876574f1293d294e
 SHA1 (patch-ab) = 7b4626114a2676e9a3526066fc97628b06300bc7
-SHA1 (patch-ac) = d8fa7fa6ed9122904e43fe2861f37aab7bb95041
diff --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk
index 86cd065cf98..58638548cc0 100644
--- a/mail/ezmlm-idx/options.mk
+++ b/mail/ezmlm-idx/options.mk
@@ -1,17 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2005/03/23 00:51:09 schmonz Exp $
+# $NetBSD: options.mk,v 1.7 2005/07/05 06:04:17 schmonz Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.ezmlm-idx
-PKG_SUPPORTED_OPTIONS=	mysql pgsql
-.include "../../mk/bsd.options.mk"
-
-###
-### We can't compile support for both MySQL and PostgreSQL.
-###
-.if !empty(PKG_OPTIONS:Mmysql) && !empty(PKG_OPTIONS:Mpgsql)
-PKG_FAIL_REASON+=       "MySQL and PostgreSQL cannot both be compiled in." \
-			"Please change ${PKG_OPTIONS_VAR} to one or the other."
-.endif
+PKG_OPTIONS_VAR=		PKG_OPTIONS.ezmlm-idx
+PKG_OPTIONS_OPTIONAL_GROUPS=	database
+PKG_OPTIONS_GROUP.database=	mysql pgsql
 
+.include "../../mk/bsd.options.mk"
 
 ###
 ### MySQL support
@@ -29,7 +22,7 @@ post-configure:
 		> sub_mysql/conf-sqlld;					\
 	${ECHO} mysql > conf-sub
 .  else
-PKG_FAIL_REASON+=	"mysql: can't define post-configure target"
+PKG_FAIL_REASON+=	"ezmlm-idx: can't define post-configure mysql target"
 .  endif
 .endif
 
@@ -49,6 +42,6 @@ post-configure:
 		> sub_pgsql/conf-sqlld;					\
 	${ECHO} pgsql > conf-sub
 .  else
-PKG_FAIL_REASON+=	"pgsql: can't define post-configure target"
+PKG_FAIL_REASON+=	"ezmlm-idx: can't define post-configure pgsql target"
 .  endif
 .endif
diff --git a/mail/ezmlm-idx/patches/patch-ac b/mail/ezmlm-idx/patches/patch-ac
deleted file mode 100644
index b04bd7a0c60..00000000000
--- a/mail/ezmlm-idx/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2005/04/30 04:56:10 schmonz Exp $
-
---- readwrite.h.orig	1997-06-29 23:11:54.000000000 -0400
-+++ readwrite.h
-@@ -1,7 +1,8 @@
- #ifndef READWRITE_H
- #define READWRITE_H
- 
--extern int read();
--extern int write();
-+#include <sys/types.h>
-+extern ssize_t read();
-+extern ssize_t write();
- 
- #endif