Update ezmlm-idx to 0.421. From the changelog:

ezmlm-idx-0.421, 20040602
=========================
-Updated ezmlmrc.fr.  Thanks Jean-Marc Lasgouttes.
-Fixed bug in ezmlm-request when dealing with continuation lines.
 Thanks Sami Farin.
-Replaced many library with public-domain sources.
-Fixed "log" function conflicting with built-in math function.
-Fixed problem with "test -e" in makelang.sh for Solaris.
-Fixed typo bug in ezmlm-cron.
-Fixed uses of "head -#" and "tail -#" to "head -n #" and "tail -n #".

ezmlm-idx-0.42, 20040114 (New maintainer: Bruce Guenter <bruceg@em.ca>)
=======================================================================
-The ezmlmrc.* files were broken into two parts, to make them easier to
 write and maintain.  The language specific parts are stored in the
 "lang" subdirectory.
-Updated ezmlm-cgi to version 1.18, which includes the no banner
 security fix.
-Added ezmlmrc.hu.  Thanks Julian Severn-nek http://js.hu/
-Added ezmlmrc.nl.  Thanks Willem
-Fixed problem in ezmlm-send munging MIME attachments using implicit
 content types.  Thanks Ed
-Fixed typo in ezmlm-unsub -- manual unsubscriptions would be
 erroneously logged as "+manual"
-Fixed ezmlm-gate to handle the -Q option.  Thanks Bjoern Hansen.
-Fixed internal bug calling decodeHDR.
-Fix ezmlm-manage to properly send subscription confirmation to
moderators.  Thanks Mate Wierdl.
-Portability and bug fixes to ezmlm-test.
-Added a "dry-run" option to ezmlm-gate.
-Fixed ezmlm-send to fully handle QMQP relaying.  Thanks Bernhard Graf.
-Fixed ezmlm-gate to use "/bin/sh" consistently.  Thanks Bernhard Graf.
-Fixed ezmlm-cgi's output of non-standard port numbers.
-Fixed message archiving in subscribe-only moderated lists.

pkgsrc changes:

Set RESTRICTED directly in this package, rather than in
../ezmlm/Makefile.common, and clarify: in addition to the reasons
we cannot redistribute binary packages of ezmlm, ezmlm-idx is a
modification of the ezmlm source.

Set USE_BUILDLINK3=yes.

Introduce EZMLM_IDX_USE_{MY,PG}SQL. Each builds and runs, but I
haven't tested the database functions.

3 files changed, 41 insertions, 14 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index fc8ec474faa..87cd9fd7a72 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:46:01 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/07/19 23:50:22 schmonz Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
 
-DISTNAME=	ezmlm-idx-0.40
-PKGREVISION=	1
-MASTER_SITES+=	http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
-		ftp://ftp.ezmlm.org/pub/patches/
+DISTNAME=	ezmlm-idx-0.421
+SITES_${DISTNAME}.tar.gz=	http://www.ezmlm.org/archive/0.421/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.ezmlm.org/
@@ -17,6 +15,13 @@ CONFLICTS=	ezmlm-[0-9]*
 DISTFILES+=	${EZMLM_VERS}.tar.gz
 PLIST_SRC+=	PLIST.idx
 
+USE_BUILDLINK3=	yes
+
+# ezmlm-idx is a modification of the ezmlm source.
+RESTRICTED=	"modified source and binaries may not be distributed"
+NO_BIN_ON_CDROM=${RESTRICTED}
+NO_BIN_ON_FTP=	${RESTRICTED}
+
 USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR=	ezmlm
@@ -26,10 +31,32 @@ EGDIR=		${PREFIX}/share/examples/ezmlm-idx
 CONF_FILES=	${EGDIR}/ezcgirc ${PKG_SYSCONFDIR}/ezcgirc
 CONF_FILES+=	${EGDIR}/ezmlmrc ${PKG_SYSCONFDIR}/ezmlmrc
 
-pre-patch:
+.include "../../mk/bsd.prefs.mk"
+
+BUILD_DEFS+=	EZMLM_IDX_USE_MYSQL EZMLM_IDX_USE_PGSQL
+
+.if !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS])
+.include "../../databases/mysql-client/buildlink3.mk"
+post-configure:
+	${ECHO} -I${BUILDLINK_PREFIX.mysql-client}/include/mysql > ${WRKSRC}/sub_mysql/conf-sqlcc
+	${ECHO} -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql -Wl,-R${BUILDLINK_PREFIX.mysql-client}/lib/mysql -lmysqlclient > ${WRKSRC}/sub_mysql/conf-sqlld
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} mysql
+.endif
+
+.if !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS])
+.include "../../databases/postgresql-lib/buildlink3.mk"
+post-configure:
+	${ECHO} -I${BUILDLINK_PREFIX.postgresql-lib}/include > ${WRKSRC}/sub_pgsql/conf-sqlcc
+	${ECHO} -L${BUILDLINK_PREFIX.postgresql-lib}/lib -Wl,-R${BUILDLINK_PREFIX.postgresql-lib}/lib -lpq > ${WRKSRC}/sub_pgsql/conf-sqlld
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} pgsql
+.endif
+
+post-extract:
 	@${MV} ${WRKSRC}/* ${WRKDIR}/${EZMLM_VERS}
 	@${RMDIR} ${WRKSRC}
 	@${MV} ${WRKDIR}/${EZMLM_VERS} ${WRKSRC}
+
+pre-patch:
 	@cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < idx.patch
 
 post-install:
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index 61a7ea1003c..373ed65629d 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/03/21 17:31:37 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2004/07/19 23:50:22 schmonz Exp $
 
-SHA1 (ezmlm-idx-0.40.tar.gz) = 8a4db55624e6949e57ac8f243f0078b46516cf77
-Size (ezmlm-idx-0.40.tar.gz) = 553974 bytes
+SHA1 (ezmlm-idx-0.421.tar.gz) = d7c2c7c87d58ae1c3aeb26f6fa34101fdfa71ab6
+Size (ezmlm-idx-0.421.tar.gz) = 540727 bytes
 SHA1 (ezmlm-0.53.tar.gz) = 3a7b618737fed8b774bec69c272d70f4142c1e30
 Size (ezmlm-0.53.tar.gz) = 62693 bytes
-SHA1 (patch-aa) = 648a8123596b486832ea9cebf01dedf9b2a3edd5
+SHA1 (patch-aa) = e4b25f667ade7ffc853b1f116c5de44a015f9aeb
 SHA1 (patch-ab) = 3d51bc1ab750f5c9324815070f392f6f6aaa2da1
diff --git a/mail/ezmlm-idx/patches/patch-aa b/mail/ezmlm-idx/patches/patch-aa
index 59f2df2dd41..436b2a81671 100644
--- a/mail/ezmlm-idx/patches/patch-aa
+++ b/mail/ezmlm-idx/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2003/03/21 17:31:37 jmmv Exp $
+$NetBSD: patch-aa,v 1.2 2004/07/19 23:50:22 schmonz Exp $
 
---- idx.h.orig	1999-12-24 21:15:01.000000000 +0100
+--- idx.h.orig	2004-06-03 01:17:13.000000000 -0400
 +++ idx.h
-@@ -238,7 +238,7 @@
+@@ -237,7 +237,7 @@
  /* ezmlm-make looks first (unless the -c switch is specified) before  */
  /* falling back to the (usually unchanged) version in the ezmlm bin   */
  /* directory. */
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.1 2003/03/21 17:31:37 jmmv Exp $
  
  /* same name added to auto_bin. Note leading slash! */
  #define TXT_EZMLMRC "/ezmlmrc"
-@@ -253,7 +253,7 @@
+@@ -252,7 +252,7 @@
  #define TXT_LOOPNUM "loopnum"
  
  /* ezmlm-cgi config file for normal SUID root install */