Fix a possible security issue with ezmlm-cgi mentioned in ports/47091.

While I'm here, merge pkg-plist and pkg-plist.docs and remove some dead
MASTER_SITES.

PR:		ports/47091
Submitted by:	Matthias Andree <matthias.andree@web.de>

4 files changed, 13 insertions, 23 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 2232a42c8034..abef80c6f074 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -7,23 +7,18 @@
 
 PORTNAME=	ezmlm-idx
 PORTVERSION=	0.40
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
-		ftp://ftp.rivertown.net/pub/ezmlm/ \
-		ftp://ftp.crc.ca/ftp/packages/mail/ezmlm-patches-fred/ \
-		http://ftp.crc.ca/ftp/ftp/packages/mail/ezmlm-patches-fred/ \
-		ftp://ftp.win.or.jp/pub/network/mail/qmail/ezmlm-idx/ \
-		ftp://jp.ezmlm.org/ezmlm/ \
-		ftp://de.ezmlm.org/pub/ \
 		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
 		http://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
-		ftp://pl.ezmlm.org/ \
-		ftp://uk.ezmlm.org/pub/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/mail/qmail/ezmlm-idx/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		ezmlm-${EZMLM_VERSION}${EXTRACT_SUFX}
 
+PATCHFILES=	ezmlm-cgi.patch
+PATCH_SITES=	${MASTER_SITES}
+
 MAINTAINER=	tom@FreeBSD.org
 
 # QMAIL_DIR is the directory where qmail is installed
@@ -76,11 +71,9 @@ MY_CONFIG=	ezmlmglrc ezmlmrc ezmlmsubrc
 
 EZMLM_VERSION=	0.53
 
-PLIST=		${WRKDIR}/pkg-plist
-
 pre-patch:
 	@${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
-	@cd ${WRKSRC} && ${PATCH} < idx.patch
+	@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < idx.patch
 
 post-patch:
 	@${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin
@@ -101,10 +94,6 @@ post-patch:
 	@${MV} ${WRKSRC}/idx.h ${WRKSRC}/idx.h.orig
 	@${SED} -e 's#/etc/ezmlm/#'${PREFIX}'/etc/ezmlm/#' \
 		< ${WRKSRC}/idx.h.orig > ${WRKSRC}/idx.h
-	@${CP} ${PKGDIR}/pkg-plist ${WRKDIR}
-.if !defined(NOPORTDOCS)
-	@${CAT} ${PKGDIR}/pkg-plist.docs >> ${WRKDIR}/pkg-plist
-.endif
 
 pre-install:
 	@${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.IPREFIX
diff --git a/mail/ezmlm-idx/distinfo b/mail/ezmlm-idx/distinfo
index 56bf5e9e1f71..43234e3e974f 100644
--- a/mail/ezmlm-idx/distinfo
+++ b/mail/ezmlm-idx/distinfo
@@ -1,2 +1,3 @@
 MD5 (ezmlm-idx-0.40.tar.gz) = c6137114060cff19301a956e73d46fc0
 MD5 (ezmlm-0.53.tar.gz) = 108c632caaa8cdbfd3041e6c449191b2
+MD5 (ezmlm-cgi.patch) = 6795309488af3499ebbbd71c0f4197e7
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index 509969dc4810..3c2b68c48e7b 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -30,4 +30,11 @@ bin/ezmlm-weed
 etc/ezmlm/ezmlmglrc.sample
 etc/ezmlm/ezmlmrc.sample
 etc/ezmlm/ezmlmsubrc.sample
+%%PORTDOCS%%share/doc/ezmlm-idx/CHANGES.idx
+%%PORTDOCS%%share/doc/ezmlm-idx/DOWNGRADE.idx
+%%PORTDOCS%%share/doc/ezmlm-idx/FAQ.idx
+%%PORTDOCS%%share/doc/ezmlm-idx/INSTALL.idx
+%%PORTDOCS%%share/doc/ezmlm-idx/README.idx
+%%PORTDOCS%%share/doc/ezmlm-idx/UPGRADE.idx
+%%PORTDOCS%%@dirrm share/doc/ezmlm-idx
 @dirrm etc/ezmlm
diff --git a/mail/ezmlm-idx/pkg-plist.docs b/mail/ezmlm-idx/pkg-plist.docs
deleted file mode 100644
index fa315135f310..000000000000
--- a/mail/ezmlm-idx/pkg-plist.docs
+++ /dev/null
@@ -1,7 +0,0 @@
-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