Update to version 0.321.

PR:		10867
Submitted by:	maintainer

7 files changed, 88 insertions, 58 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 0e543b8d2b26..4351b27a4348 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	ezmlm
-# Version required:     0.313
+# Version required:     0.321
 # Date created:		28 November 1998
 # Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 #
-# $Id: Makefile,v 1.1.1.1 1999/01/18 03:51:18 steve Exp $
+# $Id: Makefile,v 1.2 1999/02/22 04:17:39 steve Exp $
 
 DISTNAME=	ezmlm-idx-${IDX_VERSION}
 CATEGORIES=	mail
@@ -15,46 +15,50 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	tom@eborcom.com
 
-.if defined(NOPORTDOCS)
-PLIST=		${PKGDIR}/PLIST.nodocs
-.endif
-
 # QMAIL_DIR is the directory where qmail is installed
-.if !defined(QMAIL_DIR)
-QMAIL_DIR=	/var/qmail
-.endif
+QMAIL_DIR?=	/var/qmail
+
+# LANGUAGE is the ISO code for the language to use in ezmlmrc
+LANGUAGE?=	en_US
 
 RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 
+# If USE_MYSQL is defined, build with MySQL extensions
+.if defined(USE_MYSQL)
+ALL_TARGET=	it ${LANGUAGE} mysql
+LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322
+.else
+ALL_TARGET=	it ${LANGUAGE}
+.endif
+
 NO_PACKAGE=	Unsure of djb's license
 
 WRKSRC=		${WRKDIR}/ezmlm-${EZMLM_VERSION}
 
-ALL_TARGET=	it
-
-MAN1=		ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 ezmlm-reject.1 \
-		ezmlm-return.1 ezmlm-send.1 ezmlm-sub.1 ezmlm-unsub.1 \
-		ezmlm-warn.1 ezmlm-weed.1 ezmlm-accept.1 ezmlm-both.1 \
-		ezmlm-issubn.1 ezmlm-glconf.1 ezmlm-glmake.1 ezmlm-moderate.1 \
-		ezmlm-request.1 ezmlm-store.1 ezmlm-idx.1 ezmlm-gate.1 \
-		ezmlm-tstdig.1 ezmlm-get.1 ezmlm-check.1 ezmlm-clean.1 \
-		ezmlm-cron.1
-MAN5=		ezmlm.5 ezmlmrc.5
+MAN1=	ezmlm-accept.1 ezmlm-check.1 ezmlm-clean.1 ezmlm-cron.1 \
+	ezmlm-gate.1 ezmlm-get.1 ezmlm-glconf.1 ezmlm-grant.1 \
+	ezmlm-idx.1 ezmlm-issubn.1 ezmlm-limit.1 ezmlm-list.1 \
+	ezmlm-make.1 ezmlm-manage.1 ezmlm-mktab.1 ezmlm-moderate.1 \
+	ezmlm-receipt.1 ezmlm-reject.1 ezmlm-request.1 \
+	ezmlm-return.1 ezmlm-send.1 ezmlm-split.1 ezmlm-store.1 \
+	ezmlm-sub.1 ezmlm-test.1 ezmlm-tstdig.1 ezmlm-unsub.1 \
+	ezmlm-warn.1 ezmlm-weed.1
+MAN5=	ezmlm.5 ezmlmglrc.5 ezmlmrc.5 ezmlmsubrc.5
 
 DIFF_MSG=	Cannot Make and Install with different PREFIX or QMAIL_DIR
 
-MY_PROGRAMS=	ezmlm-clean ezmlm-cron ezmlm-gate ezmlm-get ezmlm-idx \
-		ezmlm-issubn ezmlm-list ezmlm-make ezmlm-manage \
-		ezmlm-moderate ezmlm-request ezmlm-reject ezmlm-return \
-		ezmlm-send ezmlm-store ezmlm-sub ezmlm-tstdig ezmlm-unsub \
-		ezmlm-warn ezmlm-weed
+MY_PROGRAMS=	clean cron gate get idx issubn list make manage \
+		moderate receipt request reject return send split \
+		store sub tstdig unsub warn weed
 
-MY_SCRIPTS=	ezmlm-accept ezmlm-both ezmlm-check ezmlm-glconf ezmlm-glmake
+MY_SCRIPTS=	accept check glconf grant mktab test
 
-MY_CONFIG=	ezmlmrc
+MY_CONFIG=	ezmlmglrc ezmlmrc ezmlmsubrc
 
 EZMLM_VERSION=	0.53
-IDX_VERSION=	0.313
+IDX_VERSION=	0.321
+
+PLIST=		${WRKDIR}/PLIST
 
 pre-patch:
 	@${MV} -f ${WRKDIR}/ezmlm-idx-${IDX_VERSION}/* ${WRKSRC}
@@ -68,21 +72,30 @@ post-patch:
 	@${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
 	@${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX
 	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
+	@${ECHO} ${NOPORTDOCS} ${USE_MYSQL} >> ${WRKDIR}/.PPREFIX
+	@${MV} ${WRKSRC}/idx.h ${WRKSRC}/idx.h.orig
+	@${SED} -e 's#TXT_ETC_EZMLMRC "/etc/ezmlmrc"#TXT_ETC_EZMLMRC "${PREFIX}/etc/ezmlmrc"#' \
+		< ${WRKSRC}/idx.h.orig > ${WRKSRC}/idx.h
+	@${CP} ${PKGDIR}/PLIST ${WRKDIR}
+.if !defined(NOPORTDOCS)
+	@${CAT} ${PKGDIR}/PLIST.docs >> ${WRKDIR}/PLIST
+.endif
 
 pre-install:
 	@${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX
 	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX
+	@${ECHO} ${NOPORTDOCS} ${USE_MYSQL} >> ${WRKDIR}/.IPREFIX
 	@diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1)
 
 do-install:
 .for file in ${MY_PROGRAMS}
-	@${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/ezmlm-${file} ${PREFIX}/bin
 .endfor
 .for file in ${MY_SCRIPTS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
+	@${INSTALL_SCRIPT} ${WRKSRC}/ezmlm-${file} ${PREFIX}/bin
 .endfor
 .for file in ${MY_CONFIG}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/bin
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/etc/${file}.sample
 .endfor
 .for file in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
@@ -97,5 +110,6 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ezmlm-idx
 .endfor
 .endif
+	@${CAT} ${PKGDIR}/MESSAGE
 
 .include <bsd.port.mk>
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index dba8e3fcc11e..37e83ab3c7df 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,2 +1,2 @@
-MD5 (ezmlm-idx-0.313.tar.gz) = 34e3b177ae7ccf162a405a96213e85f2
+MD5 (ezmlm-idx-0.321.tar.gz) = e6ed4a3a613211e374d4e363b3d608c1
 MD5 (ezmlm-0.53.tar.gz) = 108c632caaa8cdbfd3041e6c449191b2
diff --git a/mail/ezmlm-idx/pkg-comment b/mail/ezmlm-idx/pkg-comment
index 877ff2e02f7a..c284c052265c 100644
--- a/mail/ezmlm-idx/pkg-comment
+++ b/mail/ezmlm-idx/pkg-comment
@@ -1 +1 @@
-This is an addition and patch to ezmlm-0.53 [(c) Dan J. Bernstein].
+Improved version of the ezmlm-0.53 mailing list management software.
diff --git a/mail/ezmlm-idx/pkg-descr b/mail/ezmlm-idx/pkg-descr
index 4094f37aa6df..0fafca645fa3 100644
--- a/mail/ezmlm-idx/pkg-descr
+++ b/mail/ezmlm-idx/pkg-descr
@@ -1,19 +1,18 @@
-ezmlm is an easy-to-use, high-speed mailing list manager for qmail.
+ezmlm-idx is an addition and patch to ezmlm-0.53.
 
-This is an addition and patch to ezmlm-0.53 [(c) Dan J. Bernstein].
-Ezmlm-idx uses only Dan's libraries and heavily relies on ezmlm-0.53 code.
-ezmlm-idx does not function without ezmlm-0.53.
+ezmlm-idx adds multi-message threaded archive retrieval, digests, remote
+administration, message and subscription moderation, subscriber-only
+restrictions, message trailer, subject prefix, subscriber name storage,
+customizable setup, multi-language and MIME support and more. In addition,
+improved bounce handling, case-insensitive subscriber address storage, and
+support for distributed lists (main + sublist transparent to the
+subscriber).
 
-ezmlm-idx-0.31 adds threaded archive retrieval, digest creation,
-subscription moderation, remote administration, message moderation,
-a fully configurable ezmlm-make list setup and editing commands and
-a large number of other options to ezmlm lists. See man pages and
-FAQ.idx for more information. It also adds support for user- or
-host-wide integration of lists with a ``majordomo@''-style interface
-(see ezmlm-request.1 and FAQ).
+ezmlm-idx can now be compiled with MySQL support for centrally administrated
+distributed lists with binaries that autosense use of SQL or standard ezmlm
+databases.
 
-To use ezmlm-idx with other languages, copy the correct ezmlmrc.XX file
-(where XX is the iso 639 language code) to /etc/ezmlmrc or ~/.ezmlmrc.
-If the appropriate one doesn't exist, feel free to make a translations
-(please leave comments English for the benefit of maintenance) and mail
-to lindberg@id.wustl.edu. See FAQ.idx for more info.
+http://www.ezmlm.org/
+
+- Tom
+tom@eborcom.com
diff --git a/mail/ezmlm-idx/pkg-message b/mail/ezmlm-idx/pkg-message
new file mode 100644
index 000000000000..272832fc65fb
--- /dev/null
+++ b/mail/ezmlm-idx/pkg-message
@@ -0,0 +1,12 @@
+ezmlm-idx has been installed successfully.
+
+However, before you can use the programs, you should copy the
+"ezmlmglrc.sample", "ezmlmrc.sample" and "ezmlmsubrc.sample" files
+in ${PREFIX}/etc to "ezmlmglrc", "ezmlmrc" and "ezmlmsubrc"
+respectively.
+
+Usually, you do not need to edit these files, but be sure to check
+carefully.
+
+If you have enabled the MySQL extensions, you need to create an
+ezmlm database. See INSTALL.idx in ${PREFIX}/share/doc/ezmlm-idx.
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index 705b52111d84..6f3c0390afbc 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -1,33 +1,31 @@
 bin/ezmlm-accept
-bin/ezmlm-both
 bin/ezmlm-check
 bin/ezmlm-clean
 bin/ezmlm-cron
 bin/ezmlm-gate
 bin/ezmlm-get
 bin/ezmlm-glconf
-bin/ezmlm-glmake
+bin/ezmlm-grant
 bin/ezmlm-idx
 bin/ezmlm-issubn
 bin/ezmlm-list
 bin/ezmlm-make
 bin/ezmlm-manage
+bin/ezmlm-mktab
 bin/ezmlm-moderate
+bin/ezmlm-receipt
 bin/ezmlm-reject
 bin/ezmlm-request
 bin/ezmlm-return
 bin/ezmlm-send
+bin/ezmlm-split
 bin/ezmlm-store
 bin/ezmlm-sub
+bin/ezmlm-test
 bin/ezmlm-tstdig
 bin/ezmlm-unsub
 bin/ezmlm-warn
 bin/ezmlm-weed
-bin/ezmlmrc
-share/doc/ezmlm-idx/CHANGES.idx
-share/doc/ezmlm-idx/DOWNGRADE.idx
-share/doc/ezmlm-idx/FAQ.idx
-share/doc/ezmlm-idx/INSTALL.idx
-share/doc/ezmlm-idx/README.idx
-share/doc/ezmlm-idx/UPGRADE.idx
-@dirrm share/doc/ezmlm-idx
+etc/ezmlmglrc.sample
+etc/ezmlmrc.sample
+etc/ezmlmsubrc.sample
diff --git a/mail/ezmlm-idx/pkg-plist.docs b/mail/ezmlm-idx/pkg-plist.docs
new file mode 100644
index 000000000000..fa315135f310
--- /dev/null
+++ b/mail/ezmlm-idx/pkg-plist.docs
@@ -0,0 +1,7 @@
+share/doc/ezmlm-idx/CHANGES.idx
+share/doc/ezmlm-idx/DOWNGRADE.idx
+share/doc/ezmlm-idx/FAQ.idx
+share/doc/ezmlm-idx/INSTALL.idx
+share/doc/ezmlm-idx/README.idx
+share/doc/ezmlm-idx/UPGRADE.idx
+@dirrm share/doc/ezmlm-idx