10 files changed, 57 insertions, 46 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index cf9af28c82c2..f78f309c5740 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,22 +1,20 @@
+# New ports collection makefile for:    elm
+# Version required:     2.4
+# Date created:         14 October 1994
+# Whom:                 piero
 #
-#	Makefile for ports/mail/elm (FreeBSD)
-#	$Id: Makefile,v 1.2 1994/11/25 19:12:24 gpalmer Exp $
+# $Id$
 #
 
-# Distribution stuff
 DISTNAME=	elm2.4
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://dsinc.myxa.com/pub/elm/
+PKGNAME=	elm-2.4
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://dsinc.myxa.com/pub/elm/
+EXTRACT_SUFX=	.tar.Z
 
-# working directory
 WRKDIR=		work
-NO_WRKSUBDIR=	is_set
-
-# Interactive
-IS_INTERACTIVE=	is_set
-
-# Packaging
-NO_PACKAGE=	is_set
+NO_WRKSUBDIR=	yes
+IS_INTERACTIVE=	yes
+NO_PACKAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index cf9af28c82c2..f78f309c5740 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,22 +1,20 @@
+# New ports collection makefile for:    elm
+# Version required:     2.4
+# Date created:         14 October 1994
+# Whom:                 piero
 #
-#	Makefile for ports/mail/elm (FreeBSD)
-#	$Id: Makefile,v 1.2 1994/11/25 19:12:24 gpalmer Exp $
+# $Id$
 #
 
-# Distribution stuff
 DISTNAME=	elm2.4
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://dsinc.myxa.com/pub/elm/
+PKGNAME=	elm-2.4
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://dsinc.myxa.com/pub/elm/
+EXTRACT_SUFX=	.tar.Z
 
-# working directory
 WRKDIR=		work
-NO_WRKSUBDIR=	is_set
-
-# Interactive
-IS_INTERACTIVE=	is_set
-
-# Packaging
-NO_PACKAGE=	is_set
+NO_WRKSUBDIR=	yes
+IS_INTERACTIVE=	yes
+NO_PACKAGE=	yes
 
 .include <bsd.port.mk>
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 2be5afbcd56e..cf56e801ac86 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -3,15 +3,17 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.1.1.1 1994/10/23 01:19:50 torstenb Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:47:20 jkh Exp $
 #
 
 DISTNAME=	mm2.7
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
+PKGNAME=	mm-2.7
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://thumper.bellcore.com/pub/nsb/
 EXTRACT_SUFX=	.tar.Z
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
+
 pre-install:
 	   mkdir -p ${PREFIX}/bin
 	   mkdir -p ${PREFIX}/etc
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index 9d7b40fb22b4..451ee09dfebe 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -3,9 +3,12 @@
 # Date created:		Oct 4, 1994
 # Whom:			pst
 #
-MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
-CATEGORIES+=	mail
+# $Id$
+#
+
 DISTNAME=	mh-6.8.3
+CATEGORIES+=	mail
+MASTER_SITES=	ftp://ftp.ics.uci.edu/pub/mh/tar/
 EXTRACT_SUFX=	.tar.Z
 
 .include <bsd.port.mk>
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index e950f7595f45..4ccc0637b8b6 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -3,12 +3,14 @@
 # Date created:         20 Jan 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/21 00:39:25 ache Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:47:28 jkh Exp $
 #
 
 DISTNAME=       PGPsendmail-v1.4
-MASTER_SITES=   ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
+PKGNAME=	pgpsendmail-1.4
 CATEGORIES+=	mail
+MASTER_SITES=   ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
+
 WRKSRC=         ${WRKDIR}/pgpsendmail
 INSTALL_TARGET= all_install
 
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 3e39ac2c1bb5..7b4a1d72545c 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,14 +1,15 @@
 # New ports collection makefile for:	pine
-# Version required:	3.90
+# Version required:	3.91
 # Date created:		03 September 1994
 # Whom:			mr
 #
-# $Id: Makefile,v 1.6 1994/11/11 10:46:45 jkh Exp $
+# $Id: Makefile,v 1.7 1995/04/01 12:47:31 jkh Exp $
 #
 
 DISTNAME=	pine3.91
-MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
+PKGNAME=	pine-3.91
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/
 EXTRACT_SUFX=.tar.Z
 
 .include <bsd.port.mk>
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 307b5ff521a9..ac2040e6d513 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,15 +3,17 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.4 1994/12/25 12:30:32 ats Exp $
+# $Id: Makefile,v 1.6 1995/04/02 01:13:42 pst Exp $
 #
 
 DISTNAME=	qpop2.1.4-R1
+PKGNAME=	qpop-2.1.4
+CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/quest/unix/servers/popper/
 EXTRACT_SUFX=	.tar.Z
-WRKSRC=		${WRKDIR}/qpopper2.1.4
 
-CATEGORIES+=	mail
 MAINTAINER=	pst@freebsd.org
 
+WRKSRC=		${WRKDIR}/qpopper2.1.4
+
 .include <bsd.port.mk>
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 6b5ace3e5739..04cb1a77eed8 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -3,12 +3,13 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.10 1995/03/05 04:18:05 jkh Exp $
+# $Id: Makefile,v 1.11 1995/04/01 12:47:36 jkh Exp $
 #
 
 DISTNAME=	procmail-3.10
-MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
+
 IS_INTERACTIVE=	yes
 
 install:
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 307b5ff521a9..ac2040e6d513 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,15 +3,17 @@
 # Date created:		1 April 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.4 1994/12/25 12:30:32 ats Exp $
+# $Id: Makefile,v 1.6 1995/04/02 01:13:42 pst Exp $
 #
 
 DISTNAME=	qpop2.1.4-R1
+PKGNAME=	qpop-2.1.4
+CATEGORIES+=	mail
 MASTER_SITES=	ftp://ftp.qualcomm.com/quest/unix/servers/popper/
 EXTRACT_SUFX=	.tar.Z
-WRKSRC=		${WRKDIR}/qpopper2.1.4
 
-CATEGORIES+=	mail
 MAINTAINER=	pst@freebsd.org
 
+WRKSRC=		${WRKDIR}/qpopper2.1.4
+
 .include <bsd.port.mk>
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 43365a51b879..690898f771d0 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,15 +3,17 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1995/01/15 05:32:30 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:47:37 jkh Exp $
 #
 
 DISTNAME=	smail-3.1.29.1
-MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/
 CATEGORIES+=	mail
+MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/
+
 .if !exists(/usr/local/bin/bash)
 DEPENDS=	${PORTSDIR}/shells/bash
 .endif
+
 MAKE_FLAGS=	"SHELL=/usr/local/bin/bash"
 
 pre-install: