Cleanups from new maintainer.

PR:		9930
Submitted by:	Tom Hukins <tom@eborcom.com>

2 files changed, 84 insertions, 40 deletions

diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 58a6e011d729..0e543b8d2b26 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,24 +1,36 @@
 # New ports collection makefile for:	ezmlm
-# Version required:     0.53
+# Version required:     0.313
 # Date created:		28 November 1998
 # Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1999/01/18 03:51:18 steve Exp $
 
-DISTNAME=       ezmlm-idx-${IDX_VERSION}
+DISTNAME=	ezmlm-idx-${IDX_VERSION}
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.id.wustl.edu/pub/patches/
+MASTER_SITES=	ftp://ftp.ezmlm.org/pub/patches/ \
+		ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \
+		ftp://ftp.win.or.jp/pub/network/mail/qmail/ezmlm-idx/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		ezmlm-${EZMLM_VERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@freebsd.org
+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
 
 RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 
+NO_PACKAGE=	Unsure of djb's license
+
 WRKSRC=		${WRKDIR}/ezmlm-${EZMLM_VERSION}
 
 ALL_TARGET=	it
-INSTALL_TARGET=	setup
 
 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 \
@@ -27,38 +39,63 @@ MAN1=		ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 ezmlm-reject.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
+MAN5=		ezmlm.5 ezmlmrc.5
 
 DIFF_MSG=	Cannot Make and Install with different PREFIX or QMAIL_DIR
 
-.if exists(${PREFIX}/bin/qmail-send)
-QMAIL_DIR?=	${PREFIX}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
+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_SCRIPTS=	ezmlm-accept ezmlm-both ezmlm-check ezmlm-glconf ezmlm-glmake
+
+MY_CONFIG=	ezmlmrc
 
 EZMLM_VERSION=	0.53
 IDX_VERSION=	0.313
 
 pre-patch:
 	@${MV} -f ${WRKDIR}/ezmlm-idx-${IDX_VERSION}/* ${WRKSRC}
-	@cd ${WRKSRC} \
-	&& ${PATCH} < idx.patch
+	@cd ${WRKSRC} && ${PATCH} < idx.patch
 
 post-patch:
-	@perl -pi.bak -e "s|.usr.local.bin.ezmlm|${PREFIX}/bin|" ${WRKSRC}/conf-bin
-	@perl -pi.bak -e "s|.usr.local|${PREFIX}|" ${WRKSRC}/conf-man
-	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
-	@perl -pi.bak -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKSRC}/conf-qmail
-
-	@perl -pi.bak -e '$$_ = "" if /cat/' ${WRKSRC}/MAN
-	@echo ${PREFIX} > ${WRKDIR}/.PPREFIX
-	@echo ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
+	@${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
+	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@${ECHO} ${CC} -s > ${WRKSRC}/conf-ld
+	@${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
+	@${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
+	@${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX
+	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
 
 pre-install:
-	@echo ${PREFIX} > ${WRKDIR}/.IPREFIX
-	@echo ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX
-	@diff ${WRKDIR}/.[PI]PREFIX > /dev/null \
-	|| (echo ${DIFF_MSG} && exit 1)
+	@${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX
+	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX
+	@diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1)
+
+do-install:
+.for file in ${MY_PROGRAMS}
+	@${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+.for file in ${MY_SCRIPTS}
+	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+.for file in ${MY_CONFIG}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/bin
+.endfor
+.for file in ${MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
+.endfor
+.for file in ${MAN5}
+	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man5
+.endfor
+.if !defined(NOPORTDOCS)
+	@${ECHO} "===>  Copying documents to ${PREFIX}/share/doc/ezmlm-idx"
+	@${MKDIR} ${PREFIX}/share/doc/ezmlm-idx
+.for file in CHANGES.idx DOWNGRADE.idx FAQ.idx INSTALL.idx README.idx UPGRADE.idx
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/ezmlm-idx
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/ezmlm-idx/pkg-plist b/mail/ezmlm-idx/pkg-plist
index dadc4a9242b5..705b52111d84 100644
--- a/mail/ezmlm-idx/pkg-plist
+++ b/mail/ezmlm-idx/pkg-plist
@@ -1,26 +1,33 @@
 bin/ezmlm-accept
 bin/ezmlm-both
-bin/ezmlm-issubn
+bin/ezmlm-check
+bin/ezmlm-clean
+bin/ezmlm-cron
+bin/ezmlm-gate
+bin/ezmlm-get
 bin/ezmlm-glconf
 bin/ezmlm-glmake
+bin/ezmlm-idx
+bin/ezmlm-issubn
+bin/ezmlm-list
 bin/ezmlm-make
 bin/ezmlm-manage
-bin/ezmlm-send
-bin/ezmlm-request
+bin/ezmlm-moderate
 bin/ezmlm-reject
+bin/ezmlm-request
 bin/ezmlm-return
-bin/ezmlm-warn
-bin/ezmlm-weed
-bin/ezmlm-list
-bin/ezmlm-clean
-bin/ezmlm-cron
+bin/ezmlm-send
 bin/ezmlm-store
-bin/ezmlm-moderate
 bin/ezmlm-sub
+bin/ezmlm-tstdig
 bin/ezmlm-unsub
+bin/ezmlm-warn
+bin/ezmlm-weed
 bin/ezmlmrc
-bin/ezmlm-idx
-bin/ezmlm-check
-bin/ezmlm-gate
-bin/ezmlm-tstdig
-bin/ezmlm-get
+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