From tom@eborcom.com  Sat Feb  6 08:22:10 1999
Received: from mail1.svr.pol.co.uk (mail1.svr.pol.co.uk [195.92.193.18])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA24169
          for <FreeBSD-gnats-submit@freebsd.org>; Sat, 6 Feb 1999 08:22:08 -0800 (PST)
          (envelope-from tom@eborcom.com)
Received: from modem-67.thulium.dialup.pol.co.uk ([62.136.34.67])
	by mail1.svr.pol.co.uk with esmtp (Exim 2.10 #1)
	id 109AUe-0006I0-00
	for FreeBSD-gnats-submit@freebsd.org; Sat, 6 Feb 1999 16:22:05 +0000
Received: (qmail 29118 invoked by uid 5000); 6 Feb 1999 16:10:12 -0000
Message-Id: <19990206161012.29117.qmail@eborcom.com>
Date: 6 Feb 1999 16:10:12 -0000
From: Tom Hukins <tom@eborcom.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Tidied port: ezmlm
X-Send-Pr-Version: 3.2

>Number:         9929
>Category:       ports
>Synopsis:       ezmlm port tidied up
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb  6 08:30:00 PST 1999
>Closed-Date:    Sun Feb 21 20:19:09 PST 1999
>Last-Modified:  Sun Feb 21 20:19:24 PST 1999
>Originator:     Tom Hukins
>Release:        FreeBSD 2.2.8-STABLE i386
>Organization:
eBORcOM
>Environment:

	

>Description:

Minor changes to the ezmlm port:
- Fixed up the installation procedure to honour INSTALL_*
- Added some MASTER_SITES
- Maintainer ports@freebsd.org -> tom@eborcom.com
- Added NO_PACKAGE, as used in other djb ports (eg. ucspi-tcp,
  serialmail)
- Removed patch-aa and patches directory, not needed due to new
  "do-install" target

>How-To-Repeat:

	

>Fix:
	
diff -ruN ezmlm.old/Makefile ezmlm/Makefile
--- ezmlm.old/Makefile	Mon Jan 18 03:48:08 1999
+++ ezmlm/Makefile	Sat Feb  6 10:58:23 1999
@@ -8,41 +8,60 @@
 
 DISTNAME=       ezmlm-0.53
 CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.id.wustl.edu/pub/patches/
-
-MAINTAINER=	ports@freebsd.org
+MASTER_SITES=	ftp://koobera.math.uic.edu/pub/software/ \
+		ftp://ftp.ezmlm.org/pub/qmail/ \
+		ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
+		ftp://ftp.pipex.net/mirrors/qmail/ \
+		ftp://ftp.jp.qmail.org/qmail/ \
+		ftp://ftp.rifkin.technion.ac.il/pub/qmail/ \
+		ftp://ftp.mira.net.au/unix/mail/qmail/
+
+MAINTAINER=	tom@eborcom.com
+
+# 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
+
 ALL_TARGET=	it
-INSTALL_TARGET=	setup
 
-MAN1=		ezmlm-list.1 ezmlm-make.1 ezmlm-manage.1 ezmlm-reject.1
-MAN1+=		ezmlm-return.1 ezmlm-send.1 ezmlm-sub.1 ezmlm-unsub.1
-MAN1+=		ezmlm-warn.1 ezmlm-weed.1
+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
 MAN5=		ezmlm.5
 
 DIFF_MSG=       Cannot Make and Install with different PREFIX or QMAIL_DIR
 
-.if exists(${PREFIX}/qmail/bin/qmail-send)
-QMAIL_DIR?=	${PREFIX}/qmail
-.else
-QMAIL_DIR?=	/var/qmail
-.endif
+MY_PROGRAMS=	ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \
+		ezmlm-warn ezmlm-weed ezmlm-list ezmlm-sub ezmlm-unsub
 
 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|.var.qmail|${QMAIL_DIR}|" ${WRKSRC}/conf-qmail
-	@perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc
-	@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 ${MAN1}
+	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
+.endfor
+.for file in ${MAN5}
+	@${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man5
+.endfor
 
 .include <bsd.port.mk>
diff -ruN ezmlm.old/patches/patch-aa ezmlm/patches/patch-aa
--- ezmlm.old/patches/patch-aa	Mon Jan 18 03:48:08 1999
+++ ezmlm/patches/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- Makefile.orig	Sat Nov 28 22:34:51 1998
-+++ Makefile	Sat Nov 28 22:35:12 1998
-@@ -610,7 +610,7 @@
- 	./compile seek_set.c
- 
- setup: \
--it man install conf-bin conf-man
-+it install conf-bin conf-man
- 	./install "`head -1 conf-bin`" < BIN
- 	./install "`head -1 conf-man`" < MAN
- 
diff -ruN ezmlm.old/pkg/PLIST ezmlm/pkg/PLIST
--- ezmlm.old/pkg/PLIST	Mon Jan 18 03:48:08 1999
+++ ezmlm/pkg/PLIST	Sat Feb  6 11:01:46 1999
@@ -1,10 +1,10 @@
+bin/ezmlm-list
 bin/ezmlm-make
 bin/ezmlm-manage
-bin/ezmlm-send
 bin/ezmlm-reject
 bin/ezmlm-return
-bin/ezmlm-warn
-bin/ezmlm-weed
-bin/ezmlm-list
+bin/ezmlm-send
 bin/ezmlm-sub
 bin/ezmlm-unsub
+bin/ezmlm-warn
+bin/ezmlm-weed
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Feb 21 20:19:09 PST 1999 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
