- Updated to 7.1.1

- Added UPDATING entry with pointers to upgrade documentation and note about
  new SQLite3 database plugin
- Added LICENSE

Requested by:	Brent B. Powers <portsbug@b2pi.info> (via email)

5 files changed, 59 insertions, 45 deletions

diff --git a/UPDATING b/UPDATING
index 77399c1cfe6f..6b7c87214a17 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110427
+  AFFECTS: users of mail/ezmlm-idx
+  AUTHOR: glarkin@FreeBSD.org
+
+  1) Please consult the instructions for upgrading to version 7.1.1 from
+     the earlier 0.444 version in the ports tree:
+
+     Online: https://github.com/bruceg/ezmlm-idx/blob/master/UPGRADE
+     Local:  /usr/local/share/doc/ezmlm-idx/UPGRADE
+
+  2) SQLite3 has been added as a supported database plugin. Note that the
+     MySQL, PgSQL and SQLite options are mutually exclusive, and the first
+     selected option takes precedence if multiple options are selected.
+
 20110421:
   AFFECTS: users of multimedia/webcamd
   AUTHOR: kwm@FreeBSD.org
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index c986325d1d12..24362a82a14d 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -6,72 +6,69 @@
 #
 
 PORTNAME=	ezmlm-idx
-PORTVERSION=	0.444
+PORTVERSION=	7.1.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.ezmlm.org/archive/${PORTVERSION}/ \
-		http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/ \
-		http://cr.yp.to/software/ \
-		http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		ezmlm-${EZMLM_VERSION}${EXTRACT_SUFX}
+		http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	Improved version of the ezmlm mailing list manager
 
 MAKE_JOBS_UNSAFE=	yes
 
+LICENSE=	GPLv2
+
 USE_QMAIL_RUN=	yes
 
 CONFLICTS=	ezmlm-0.*
 
-# LANGUAGE is the ISO code for the language to use in ezmlmrc
-LANGUAGE?=	en_US
-
 SUB_FILES=	pkg-message
 
 OPTIONS=	MYSQL "Build MySQL extensions" off \
-		PGSQL "Build PostgreSQL extensions" off
+		PGSQL "Build PostgreSQL extensions" off \
+		SQLITE "Build SQLite3 extensions" off
 
 .include <bsd.port.pre.mk>
 
+ALL_TARGET=	it
+
 # If WITH_MYSQL is defined, build with MySQL extensions
 .if defined(WITH_MYSQL)
 USE_MYSQL=	yes
 EXTRACT_INCLUDE+=	-I${LOCALBASE}/include/mysql
 EXTRACT_LIB+=	-L${LOCALBASE}/lib/mysql -lmysqlclient -lm
+ALL_TARGET+=	mysql
 .elif defined(WITH_PGSQL)
 USE_PGSQL=	yes
 EXTRACT_INCLUDE+=	-I${LOCALBASE}/include
 EXTRACT_LIB+=	-L${LOCALBASE}/lib -lpq -lcrypt
+ALL_TARGET+=	pgsql
+.elif defined(WITH_SQLITE)
+USE_SQLITE=	yes
+EXTRACT_INCLUDE+=	-I${LOCALBASE}/include
+EXTRACT_LIB+=	-L${LOCALBASE}/lib -lsqlite3
+ALL_TARGET+=	sqlite3
 .endif
 
-ALL_TARGET=	it ${LANGUAGE}
-
-WRKSRC=		${WRKDIR}/ezmlm-${EZMLM_VERSION}
-EZMLM_VERSION=	0.53
-
 PROGRAMS=	ezmlm-archive ezmlm-cgi ezmlm-clean ezmlm-cron ezmlm-gate \
 		ezmlm-get ezmlm-idx ezmlm-issubn ezmlm-limit ezmlm-list \
 		ezmlm-make ezmlm-manage ezmlm-moderate ezmlm-request \
 		ezmlm-reject ezmlm-return ezmlm-send ezmlm-split ezmlm-store \
 		ezmlm-sub ezmlm-tstdig ezmlm-unsub ezmlm-warn ezmlm-weed
-SCRIPTS=	ezmlm-accept ezmlm-check ezmlm-glconf ezmlm-mktab ezmlm-test
+SCRIPTS=	ezmlm-accept ezmlm-check ezmlm-glconf
 CONFIG=		ezmlmglrc ezmlmrc ezmlmsubrc
 
 MAN1=	ezmlm-accept.1 ezmlm-archive.1 ezmlm-cgi.1 ezmlm-check.1 \
 	ezmlm-clean.1 ezmlm-cron.1 ezmlm-gate.1 ezmlm-get.1 \
 	ezmlm-glconf.1 ezmlm-idx.1 ezmlm-issubn.1 ezmlm-limit.1 \
-	ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 ezmlm-mktab.1 \
+	ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 \
 	ezmlm-moderate.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-sub.1 ezmlm-tstdig.1 ezmlm-unsub.1 \
 	ezmlm-warn.1 ezmlm-weed.1
 MAN5=	ezmlm.5 ezmlmglrc.5 ezmlmrc.5 ezmlmsubrc.5
-DOCS=	CHANGES.idx DOWNGRADE.idx FAQ.idx INSTALL.idx README.idx UPGRADE.idx
-
-pre-patch:
-	@${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
-	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < idx.patch
+DOCS=	BLURB CHANGES ChangeLog DOWNGRADE FAQ HISTORY INSTALL README \
+	README.mysql README.pgsql README.std TODO UPGRADE
 
 post-patch:
 	@${ECHO_CMD} /usr/sbin > ${WRKSRC}/conf-cron
@@ -79,13 +76,14 @@ post-patch:
 	@${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	@${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld
 .if defined(WITH_MYSQL)
-	@${ECHO_CMD} mysql > ${WRKSRC}/conf-sub
-	@${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_mysql/conf-sqlcc
-	@${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_mysql/conf-sqlld
+	@${ECHO_CMD} ${CC} ${CFLAGS} ${EXTRACT_INCLUDE} > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} ${CC} -s ${EXTRACT_LIB} > ${WRKSRC}/conf-ld
 .elif defined(WITH_PGSQL)
-	@${ECHO_CMD} pgsql > ${WRKSRC}/conf-sub
-	@${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_pgsql/conf-sqlcc
-	@${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld
+	@${ECHO_CMD} ${CC} ${CFLAGS} ${EXTRACT_INCLUDE} > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} ${CC} -s ${EXTRACT_LIB} > ${WRKSRC}/conf-ld
+.elif defined(WITH_SQLITE)
+	@${ECHO_CMD} ${CC} ${CFLAGS} ${EXTRACT_INCLUDE} > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} ${CC} -s ${EXTRACT_LIB} > ${WRKSRC}/conf-ld
 .endif
 	@${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man
 	@${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index f88c44ecfcb1..f8a4807d2118 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,6 +1,2 @@
-MD5 (ezmlm-idx-0.444.tar.gz) = d413a3a85054f4cf5f836f513e7b523e
-SHA256 (ezmlm-idx-0.444.tar.gz) = d442ebf1fff0f6d254b0d9563b9ee7577746ad01392bf1655f77b7ff9e9380e1
-SIZE (ezmlm-idx-0.444.tar.gz) = 615519
-MD5 (ezmlm-0.53.tar.gz) = 108c632caaa8cdbfd3041e6c449191b2
-SHA256 (ezmlm-0.53.tar.gz) = 9639c3a5cc49d417f30e6cd7d8c5e2c6945262953c143134035889d8aa1004b9
-SIZE (ezmlm-0.53.tar.gz) = 62693
+SHA256 (ezmlm-idx-7.1.1.tar.gz) = 0d2a9d99fa410cc26c9d00c000ede4977b606ba9fd483c5a7a00b87bf8db2383
+SIZE (ezmlm-idx-7.1.1.tar.gz) = 718954
diff --git a/mail/ezmlm-idx/files/pkg-message.in b/mail/ezmlm-idx/files/pkg-message.in
index ba2f692cd6e1..32573ca034e7 100644
--- a/mail/ezmlm-idx/files/pkg-message.in
+++ b/mail/ezmlm-idx/files/pkg-message.in
@@ -9,6 +9,7 @@ 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.
+If you have enabled the database extensions, you need to create an
+ezmlm database. See section 5 in %%PREFIX%%/share/doc/ezmlm-idx/FAQ
+for further instructions.
 -----------------------------------------------------------------
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index ebc9cf7e902a..db2073c2f37b 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -13,7 +13,6 @@ bin/ezmlm-limit
 bin/ezmlm-list
 bin/ezmlm-make
 bin/ezmlm-manage
-bin/ezmlm-mktab
 bin/ezmlm-moderate
 bin/ezmlm-reject
 bin/ezmlm-request
@@ -22,7 +21,6 @@ bin/ezmlm-send
 bin/ezmlm-split
 bin/ezmlm-store
 bin/ezmlm-sub
-bin/ezmlm-test
 bin/ezmlm-tstdig
 bin/ezmlm-unsub
 bin/ezmlm-warn
@@ -31,10 +29,17 @@ etc/ezmlm/ezmlmglrc.sample
 etc/ezmlm/ezmlmrc.sample
 etc/ezmlm/ezmlmsubrc.sample
 @dirrmtry etc/ezmlm
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.idx
-%%PORTDOCS%%%%DOCSDIR%%/DOWNGRADE.idx
-%%PORTDOCS%%%%DOCSDIR%%/FAQ.idx
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.idx
-%%PORTDOCS%%%%DOCSDIR%%/README.idx
-%%PORTDOCS%%%%DOCSDIR%%/UPGRADE.idx
+%%PORTDOCS%%%%DOCSDIR%%/BLURB
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/DOWNGRADE
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/HISTORY
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.mysql
+%%PORTDOCS%%%%DOCSDIR%%/README.pgsql
+%%PORTDOCS%%%%DOCSDIR%%/README.std
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/UPGRADE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%