aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Piazza <cpiazza@FreeBSD.org>2000-04-13 20:01:08 +0000
committerChris Piazza <cpiazza@FreeBSD.org>2000-04-13 20:01:08 +0000
commit28849e36e90815aed6c95e0187cc1b0bac0906f3 (patch)
tree618ad4af1b7aa492c70b0b12e4151ef6c5087bb4
parent6028b9f95256d11d28f23194f65f96cca1b9325c (diff)
downloadports-28849e36e90815aed6c95e0187cc1b0bac0906f3.tar.gz
ports-28849e36e90815aed6c95e0187cc1b0bac0906f3.zip
Notes
-rw-r--r--mail/adcomplain/Makefile7
-rw-r--r--mail/asmail/Makefile4
-rw-r--r--mail/autorespond/Makefile4
-rw-r--r--mail/balsa/Makefile4
-rw-r--r--mail/balsa2/Makefile4
-rw-r--r--mail/bbmail/Makefile4
-rw-r--r--mail/biffer/Makefile4
-rw-r--r--mail/bulk_mailer/Makefile4
-rw-r--r--mail/cmail/Makefile4
-rw-r--r--mail/coolmail/Makefile4
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/cucipop/Makefile4
-rw-r--r--mail/cyrus-imapd/Makefile6
-rw-r--r--mail/cyrus-imapd2/Makefile6
-rw-r--r--mail/cyrus-imapd22/Makefile6
-rw-r--r--mail/cyrus-imapd23/Makefile6
-rw-r--r--mail/cyrus-imapd24/Makefile6
-rw-r--r--mail/cyrus/Makefile6
-rw-r--r--mail/distribute/Makefile6
-rw-r--r--mail/elm+ME/Makefile7
-rw-r--r--mail/elm/Makefile7
-rw-r--r--mail/emil/Makefile6
-rw-r--r--mail/exim-devel/Makefile4
-rw-r--r--mail/exim-old/Makefile4
-rw-r--r--mail/exim/Makefile4
-rw-r--r--mail/ezmlm-idx/Makefile8
-rw-r--r--mail/ezmlm/Makefile4
-rw-r--r--mail/faces/Makefile4
-rw-r--r--mail/fetchmail/Makefile4
-rw-r--r--mail/gbuffy/Makefile4
-rw-r--r--mail/gensig/Makefile4
-rw-r--r--mail/glacier/Makefile4
-rw-r--r--mail/glbiff/Makefile4
-rw-r--r--mail/grepmail/Makefile4
-rw-r--r--mail/hbiff/Makefile4
-rw-r--r--mail/im/Makefile4
-rw-r--r--mail/imap-uw/Makefile6
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/knewmail/Makefile4
-rw-r--r--mail/lbdb/Makefile6
-rw-r--r--mail/mailagent/Makefile6
-rw-r--r--mail/mailcrypt/Makefile4
-rw-r--r--mail/maildrop/Makefile4
-rw-r--r--mail/mailfilter/Makefile4
-rw-r--r--mail/mailx/Makefile4
-rw-r--r--mail/majorcool/Makefile4
-rw-r--r--mail/majordomo/Makefile4
-rw-r--r--mail/mbx2mbox/Makefile4
-rw-r--r--mail/metamail/Makefile6
-rw-r--r--mail/mew-emacs20/Makefile1
-rw-r--r--mail/mew-mule/Makefile1
-rw-r--r--mail/mew-xemacs/Makefile1
-rw-r--r--mail/mew-xemacs20/Makefile1
-rw-r--r--mail/mew-xemacs21-mule/Makefile1
-rw-r--r--mail/mew-xemacs21/Makefile1
-rw-r--r--mail/mew/Makefile10
-rw-r--r--mail/mh/Makefile8
-rw-r--r--mail/minimalist/Makefile4
-rw-r--r--mail/ml/Makefile4
-rw-r--r--mail/mmr/Makefile4
-rw-r--r--mail/movemail/Makefile4
-rw-r--r--mail/mreport/Makefile4
-rw-r--r--mail/mutt-devel/Makefile7
-rw-r--r--mail/mutt/Makefile7
-rw-r--r--mail/mutt14/Makefile7
-rw-r--r--mail/muttzilla/Makefile4
-rw-r--r--mail/newmail/Makefile4
-rw-r--r--mail/nmh/Makefile3
-rw-r--r--mail/p5-IMAP-Admin/Makefile6
-rw-r--r--mail/p5-MIME-Lite/Makefile6
-rw-r--r--mail/p5-MIME-Tools/Makefile6
-rw-r--r--mail/p5-Mail-Folder/Makefile6
-rw-r--r--mail/p5-Mail-POP3Client/Makefile7
-rw-r--r--mail/p5-Mail-Tools/Makefile6
-rw-r--r--mail/pathalias/Makefile7
-rw-r--r--mail/pgp4pine/Makefile4
-rw-r--r--mail/pgpsendmail/Makefile6
-rw-r--r--mail/pine4-ssl/Makefile6
-rw-r--r--mail/pine4/Makefile6
-rw-r--r--mail/popa3d/Makefile4
-rw-r--r--mail/poppassd/Makefile6
-rw-r--r--mail/popper/Makefile6
-rw-r--r--mail/postfix-current/Makefile6
-rw-r--r--mail/postfix/Makefile6
-rw-r--r--mail/postfix1/Makefile6
-rw-r--r--mail/postfix20/Makefile6
-rw-r--r--mail/postfix21/Makefile6
-rw-r--r--mail/postfix22/Makefile6
-rw-r--r--mail/postfix23/Makefile6
-rw-r--r--mail/postfix24/Makefile6
-rw-r--r--mail/postfix25/Makefile6
-rw-r--r--mail/postfix26/Makefile6
-rw-r--r--mail/postfix27/Makefile6
-rw-r--r--mail/postfix28/Makefile6
-rw-r--r--mail/postilion/Makefile4
-rw-r--r--mail/premail/Makefile6
-rw-r--r--mail/procmail/Makefile5
-rw-r--r--mail/prom-mew/Makefile4
-rw-r--r--mail/prom-wl/Makefile4
-rw-r--r--mail/qmail-contrib/Makefile5
-rw-r--r--mail/qmail/Makefile4
-rw-r--r--mail/qmailanalog/Makefile5
-rw-r--r--mail/qpopper/Makefile6
-rw-r--r--mail/rblcheck/Makefile4
-rw-r--r--mail/rblsmtpd/Makefile4
-rw-r--r--mail/rftp/Makefile4
-rw-r--r--mail/rlytest/Makefile6
-rw-r--r--mail/serialmail/Makefile4
-rw-r--r--mail/sigrot/Makefile6
-rw-r--r--mail/smail/Makefile4
-rw-r--r--mail/smtpd/Makefile4
-rw-r--r--mail/smtpfeed/Makefile4
-rw-r--r--mail/spruce/Makefile4
-rw-r--r--mail/tkrat/Makefile4
-rw-r--r--mail/tkrat2/Makefile4
-rw-r--r--mail/wanderlust-emacs/Makefile6
-rw-r--r--mail/wanderlust-emacs20/Makefile1
-rw-r--r--mail/wanderlust-mule/Makefile1
-rw-r--r--mail/wanderlust-xemacs20/Makefile1
-rw-r--r--mail/wanderlust-xemacs21-mule/Makefile1
-rw-r--r--mail/wanderlust/Makefile6
-rw-r--r--mail/wmbiff/Makefile4
-rw-r--r--mail/wmmail/Makefile6
-rw-r--r--mail/wmpop3/Makefile6
-rw-r--r--mail/xbuffy/Makefile6
-rw-r--r--mail/xfaces/Makefile6
-rw-r--r--mail/xfmail/Makefile4
-rw-r--r--mail/xlbiff/Makefile5
-rw-r--r--mail/xmail/Makefile6
-rw-r--r--mail/xmailbox/Makefile4
-rw-r--r--mail/xpbiff-youbin/Makefile5
-rw-r--r--mail/xpbiff/Makefile7
-rw-r--r--mail/youbin/Makefile4
-rw-r--r--mail/zmailer/Makefile4
134 files changed, 318 insertions, 323 deletions
diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index 0453bbc9308b..91405a321602 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: adcomplain
-# http://www.rdrop.com/users/billmc/adcomplain.html
-# Version required: 3.*
# Date created: 13 Sep 1997
# Whom: ache@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= adcomplain.pl
-PKGNAME= adcomplain-3.52
+PORTNAME= adcomplain
+PORTVERSION= 3.52
CATEGORIES= mail news
MASTER_SITES= http://www.rdrop.com/users/billmc/
+DISTNAME= ${PORTNAME}.pl
EXTRACT_SUFX= .uu
MAINTAINER= ache@FreeBSD.org
diff --git a/mail/asmail/Makefile b/mail/asmail/Makefile
index 3a6fb599ba54..914458d7e596 100644
--- a/mail/asmail/Makefile
+++ b/mail/asmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: asmail
-# Version required: 0.54
# Date created: 15 August 1997
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= asmail-0.54
+PORTNAME= asmail
+PORTVERSION= 0.53
CATEGORIES= mail afterstep
MASTER_SITES= http://www.tigr.net/afterstep/as-apps/download/asmail/ \
ftp://ftp.afterstep.org/apps/asmail/
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 1f07c9cec262..3f1944928189 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: autorespond
-# Version required: 1.0.0
# Date created: 24 Jan 2000
# Whom: Neil Blakey-Milner <nbm@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= autorespond-1.0.0
+PORTNAME= autorespond
+PORTVERSION= 1.0.0
CATEGORIES= mail
MASTER_SITES= http://www.inter7.com/vpopmail/
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 722e931380e8..433e3a98ebd0 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: balsa
-# Version required: 0.6.0
# Date created: 02 December 1998
# Whom: Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD$
#
-DISTNAME= balsa-0.6.0
+PORTNAME= balsa
+PORTVERSION= 0.6.0
CATEGORIES= mail gnome
MASTER_SITES= ftp://ftp.balsa.net/pub/balsa/
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 722e931380e8..433e3a98ebd0 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: balsa
-# Version required: 0.6.0
# Date created: 02 December 1998
# Whom: Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD$
#
-DISTNAME= balsa-0.6.0
+PORTNAME= balsa
+PORTVERSION= 0.6.0
CATEGORIES= mail gnome
MASTER_SITES= ftp://ftp.balsa.net/pub/balsa/
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index 8d7468594407..8c2f5b3cbb0e 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bbmail
-# Version required: 0.6.2
# Date created: May 3 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= bbmail-0.6.2
+PORTNAME= bbmail
+PORTVERSION= 0.6.2
CATEGORIES= mail
MASTER_SITES= http://bbtools.windsofstorm.net/sources/ \
ftp://stokes.tte.ele.tue.nl/pub/bbmail/
diff --git a/mail/biffer/Makefile b/mail/biffer/Makefile
index 2d50f0018270..c2b33a73f09a 100644
--- a/mail/biffer/Makefile
+++ b/mail/biffer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: biffer
-# Version required: 1.0
# Date created: 21 September 1999
# Whom: jsellens
#
# $FreeBSD$
#
-DISTNAME= biffer-1.0
+PORTNAME= biffer
+PORTVERSION= 1.0
CATEGORIES= mail
MASTER_SITES= http://www.generalconcepts.com/resources/software/
diff --git a/mail/bulk_mailer/Makefile b/mail/bulk_mailer/Makefile
index f56525f87591..d95eb5fbaab1 100644
--- a/mail/bulk_mailer/Makefile
+++ b/mail/bulk_mailer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bulk_mailer
-# Version required: 1.11
# Date created: 20 March 1997
# Whom: dlowe
#
# $FreeBSD$
#
-DISTNAME= bulk_mailer-1.12
+PORTNAME= bulk_mailer
+PORTVERSION= 1.12
CATEGORIES= mail
MASTER_SITES= ftp://cs.utk.edu/pub/moore/bulk_mailer/
diff --git a/mail/cmail/Makefile b/mail/cmail/Makefile
index ffae35016963..29fd493803ba 100644
--- a/mail/cmail/Makefile
+++ b/mail/cmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cmail
-# Version required: 2.10
# Date created: 31 Dec 1998
# Whom: Chip Marshall <chip@eboai.org>
#
# $FreeBSD$
#
-DISTNAME= cmail-2.10
+PORTNAME= cmail
+PORTVERSION= 2.10
CATEGORIES= mail
MASTER_SITES= ftp://ftp.eboai.org/pub/users/chip/
EXTRACT_SUFX= .tgz
diff --git a/mail/coolmail/Makefile b/mail/coolmail/Makefile
index e24094352d61..b81402fae332 100644
--- a/mail/coolmail/Makefile
+++ b/mail/coolmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: coolmail
-# Version required: 1.3
# Date created: Mon 6 Jul 12:00:06 CEST 1998
# Whom: Udo Schweigert <ust@cert.siemens.de>
#
# $FreeBSD$
#
-DISTNAME= coolmail-1.3
+PORTNAME= coolmail
+PORTVERSION= 1.3
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR=system/mail/biffs
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index ea7aeeed8057..21a7528f9d9d 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: courierimap
-# Version required: 0.26
# Date created: 19 Feb 2000
# Whom: Neil Blakey-Milner
#
# $FreeBSD$
#
-DISTNAME= courier-imap-0.26
+PORTNAME= courier-imap
+PORTVERSION= 0.26
CATEGORIES= mail
MASTER_SITES= http://www.inter7.com/courierimap/
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index e71bde0d5fec..cb66b91d19d5 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: cucipop
-# Version required: 1.31
# Date created: 7 Jun 1997
# Whom: igor@zynaps.ru
#
@@ -9,7 +8,8 @@
# Virtual hosts works only with Berkeley DB2.
# Berkeley DB2 is in conflict with libc, so commented out. :-(
-DISTNAME= cucipop-1.31
+PORTNAME= cucipop
+PORTVERSION= 1.31
CATEGORIES= mail
MASTER_SITES= ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 9efe060f6008..36413bc3efd9 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: cyrus
-# Version required: 1.5.19
# Date created: May 4th 1997
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cyrus-imapd-v1.5.19
-PKGNAME= cyrus-1.5.19
+PORTNAME= cyrus
+PORTVERSION= 1.5.19
CATEGORIES= mail tcl82
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
http://people.FreeBSD.org/~stb/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
+DISTNAME= ${PORTNAME}-imapd-v${PORTVERSION}
MAINTAINER= stb@FreeBSD.org
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index 1b64fe9b2e11..0fea2a6ff32f 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: distribute
-# Version required: 2.1pl24
# Date created: 1 Oct 1997
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= distribute-2.1-pl19
-PKGNAME= distribute-2.1.24
+PORTNAME= distribute
+PORTVERSION= 2.1.24
CATEGORIES= mail
MASTER_SITES= ftp://ftp.foretune.co.jp/pub/network/mail/distribute/
+DISTNAME= ${PORTNAME}-2.1-pl19
PATCH_SITES= ${MASTER_SITES}BETA/
PATCHFILES= patch.20.gz patch.21e.gz patch.22e.gz patch.23e.gz patch.24e.gz
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 2d0ef559f2cb..8c93ab2fffdc 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -1,14 +1,13 @@
# New ports collection makefile for: elm ME+ (unofficial Elm)
-# See also: http://www.ozone.fmi.fi/KEH/
-# Version required: 2.4ME+
# Date created: 26 June 1995
# Whom: ache
#
# $FreeBSD$
#
-
# WARNING: it is NOT official Elm 2.*
-DISTNAME= elm-2.4ME+68
+
+PORTNAME= elm
+PORTVERSION= 2.4ME+68
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 2d0ef559f2cb..8c93ab2fffdc 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,14 +1,13 @@
# New ports collection makefile for: elm ME+ (unofficial Elm)
-# See also: http://www.ozone.fmi.fi/KEH/
-# Version required: 2.4ME+
# Date created: 26 June 1995
# Whom: ache
#
# $FreeBSD$
#
-
# WARNING: it is NOT official Elm 2.*
-DISTNAME= elm-2.4ME+68
+
+PORTNAME= elm
+PORTVERSION= 2.4ME+68
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
diff --git a/mail/emil/Makefile b/mail/emil/Makefile
index b5f961774f07..b67f3b85c864 100644
--- a/mail/emil/Makefile
+++ b/mail/emil/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: emil
-# Version required: 2.1.0-beta9
# Date created: 21 April 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= emil-2.1.0-beta9
-PKGNAME= emil-2.1b9
+PORTNAME= emil
+PORTVERSION= 2.1b9
CATEGORIES= mail
MASTER_SITES= ftp://ftp.uu.se/pub/unix/networking/mail/emil/ \
ftp://ftp.gwdg.de/pub/misc/emil/ \
ftp://ftp.funet.fi/pub/unix/mail/emil/ \
ftp://ftp.enst.fr/pub/unix/network/mail/ \
ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.uu.se/pub/unix/networking/mail/emil/
+DISTNAME= ${PORTNAME}-2.1.0-beta9
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index c98a4661140c..ef9b4ca581d7 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: exim
-# Version required: 3.13
# Date created: 23 June 1996
# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= exim-3.13
+PORTNAME= exim
+PORTVERSION= 3.13
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
http://www.exim.org/ftp/ \
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index c98a4661140c..ef9b4ca581d7 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: exim
-# Version required: 3.13
# Date created: 23 June 1996
# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= exim-3.13
+PORTNAME= exim
+PORTVERSION= 3.13
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
http://www.exim.org/ftp/ \
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index c98a4661140c..ef9b4ca581d7 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: exim
-# Version required: 3.13
# Date created: 23 June 1996
# Whom: markm@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= exim-3.13
+PORTNAME= exim
+PORTVERSION= 3.13
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cus.cam.ac.uk/pub/software/programs/exim/ \
http://www.exim.org/ftp/ \
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 96adfaeddffc..ea0d5c90efdf 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: ezmlm-idx
-# Version required: 0.40
# Date created: 28 November 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
+#
-DISTNAME= ezmlm-idx-${IDX_VERSION}
+PORTNAME= ezmlm-idx
+PORTVERSION= 0.40
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ezmlm.org/pub/patches/ \
ftp://ftp.rivertown.net/pub/ezmlm/ \
@@ -65,12 +66,11 @@ MY_SCRIPTS= accept check glconf mktab test
MY_CONFIG= ezmlmglrc ezmlmrc ezmlmsubrc
EZMLM_VERSION= 0.53
-IDX_VERSION= 0.40
PLIST= ${WRKDIR}/PLIST
pre-patch:
- @${MV} -f ${WRKDIR}/ezmlm-idx-${IDX_VERSION}/* ${WRKSRC}
+ @${MV} -f ${WRKDIR}/ezmlm-idx-${PORTVERSION}/* ${WRKSRC}
@cd ${WRKSRC} && ${PATCH} < idx.patch
post-patch:
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index d9d83159a447..b1107ae8c4fb 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ezmlm
-# Version required: 0.53
# Date created: 28 November 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
#
-DISTNAME= ezmlm-0.53
+PORTNAME= ezmlm
+PORTVERSION= 0.53
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ezmlm.org/pub/qmail/ \
ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 6e3ca8941eca..5e1dce9f2cf7 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: faces-1.6.1
-# Version required: 1.6.1
# Date created: 09 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
# Andreas Klemm <andreas@FreeBSD.org>
@@ -7,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= faces-1.6.1
+PORTNAME= faces
+PORTVERSION= 1.6.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/
EXTRACT_SUFX= .tar.Z
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 355d4cf17109..81f9013fc667 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: fetchmail
-# Version required: 5.3.0
# Date created: 25 Feb 2000
# Whom: Ville Eerola <ve@sci.fi>
#
@@ -11,7 +10,8 @@
# does not need Python, so there is no RUN_DEPENDS for Python in
# this Makefile.
-DISTNAME= fetchmail-5.3.0
+PORTNAME= fetchmail
+PORTVERSION= 5.3.0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.ccil.org/pub/esr/fetchmail/
diff --git a/mail/gbuffy/Makefile b/mail/gbuffy/Makefile
index b1c543f9b570..e6bba9e99d91 100644
--- a/mail/gbuffy/Makefile
+++ b/mail/gbuffy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gbuffy
-# Version required: 0.2.1
# Date created: 2 October 1999
# Whom: kaj@Raditex.se
#
# $FreeBSD$
#
-DISTNAME= gbuffy-0.2.2
+PORTNAME= gbuffy
+PORTVERSION= 0.2.2
CATEGORIES= mail gnome
MASTER_SITES= http://www.fiction.net/blong/programs/gbuffy/
diff --git a/mail/gensig/Makefile b/mail/gensig/Makefile
index 9261312f845d..caa866c2a498 100644
--- a/mail/gensig/Makefile
+++ b/mail/gensig/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gensig
-# Version required: 2.2
# Date created: 6 August 1999
# Whom: arensb@ooblick.com
#
# $FreeBSD$
#
-DISTNAME= gensig-2.2
+PORTNAME= gensig
+PORTVERSION= 2.2
CATEGORIES= mail
MASTER_SITES= http://www.geeks.com/~robf/ware/gensig/ \
http://www.ooblick.com/software/gensig/
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index 22f37e199b45..aa22428787f7 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glacier
-# Version required: 0.0.2
# Date created: 30 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= glacier-0.0.2
+PORTNAME= glacier
+PORTVERSION= 0.0.2
CATEGORIES= mail gnome
MASTER_SITES= http://glacier.linuxave.net/
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index 08ec91e3eb7f..bda1100778b2 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glbiff
-# Version required: 0.2.11
# Date created: 18 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= glbiff-0.2.11
+PORTNAME= glbiff
+PORTVERSION= 0.2.11
CATEGORIES= mail
MASTER_SITES= http://www.eecg.utoronto.ca/~mac/projects/
EXTRACT_SUFX= .tgz
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 58293d9b6797..d339eeda3bc4 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: grepmail
-# Version required: 4.22
# Date created: 20 November 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= grepmail-4.22
+PORTNAME= grepmail
+PORTVERSION= 4.22
CATEGORIES= mail
MASTER_SITES= http://download.sourceforge.net/grepmail/
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index fab8560b270a..dac29d812268 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: hbiff
-# Version required: 0.0
# Date created: Mon Dec 23, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= hbiff-1.2
+PORTNAME= hbiff
+PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
http://people.FreeBSD.org/~obrien/Distfiles/
diff --git a/mail/im/Makefile b/mail/im/Makefile
index d79e33402d41..e64d0c825125 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: IM
-# Version required: 130
# Date created: 13 November 1997
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= im-140
+PORTNAME= im
+PORTVERSION= 140
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mew.org/pub/Mew/ \
ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 1af75e292215..e534ffb9c213 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: imap-uw
-# Version required: 4.7b
# Date created: 9 Jan 1997
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= imap-4.7b
-PKGNAME= imap-uw-4.7b
+PORTNAME= imap-uw
+PORTVERSION= 4.7b
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/ \
http://mirror.nucba.ac.jp/mirror/imap/ \
ftp://ftp.uni-halle.de/pub/mail/pine/
+DISTNAME= imap-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
imap-utils${EXTRACT_SUFX}
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 43af12e29615..de1f91cc7a26 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kbiff
-# Version required: 2.3.12
# Date created: So 14 Jun 1998 13:09:18 CEST
# Whom: andreas
#
# $FreeBSD$
#
-DISTNAME= kbiff-2.3.12
+PORTNAME= kbiff
+PORTVERSION= 2.3.12
CATEGORIES= mail kde
MASTER_SITES= http://home.sprintmail.com/~granroth/kbiff/
diff --git a/mail/knewmail/Makefile b/mail/knewmail/Makefile
index c9eb79897f53..5add7e256c8b 100644
--- a/mail/knewmail/Makefile
+++ b/mail/knewmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: KNewMail
-# Version required: 3.1
# Date created: 6 June 1999
# Whom: Tomer Weller
#
# $FreeBSD$
#
-DISTNAME= knewmail-3.1
+PORTNAME= knewmail
+PORTVERSION= 3.1
CATEGORIES= mail kde
MASTER_SITES= http://www.slac.com/mpilone/knewmail_home/downloads/
EXTRACT_SUFX= .src.tar.gz
diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index addd5fa86462..b9700b7b75ab 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lbdb
-# Version required: 0.18.5
# Date created: 2 February 2000
# Whom: mwest@uct.ac.za
#
# $FreeBSD$
#
-DISTNAME= lbdb_0.18.5
-PKGNAME= lbdb-0.18.5
+PORTNAME= lbdb
+PORTVERSION= 0.18.5
CATEGORIES= mail
MASTER_SITES= http://www.rhein.de/~roland/debian/
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= mwest@uct.ac.za
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 73e89e0e7ea3..b11ea0c2c509 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: mailagent
-# Version required: 3.0pl68
# Date created: 23 Sep 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mailagent-3.0@68
-PKGNAME= mailagent-3.0.68
+PORTNAME= mailagent
+PORTVERSION= 3.0.68
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/RAM
+DISTNAME= ${PORTNAME}-3.0@68
MAINTAINER= max@FreeBSD.org
diff --git a/mail/mailcrypt/Makefile b/mail/mailcrypt/Makefile
index 1ee2d197be2c..cadb5ff67158 100644
--- a/mail/mailcrypt/Makefile
+++ b/mail/mailcrypt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mailcrypt
-# Version required: 3.4
# Date created: 29 May 1998
# Whom: Murray Stokely <murray@cdrom.com>
#
# $FreeBSD$
#
-DISTNAME= mailcrypt-3.5.5
+PORTNAME= mailcrypt
+PORTVERSION= 3.5.5
CATEGORIES= mail
MASTER_SITES= http://www.nb.net/~lbudney/linux/software/mailcrypt/
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 3c8827b03fb1..d1c20b520b75 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: maildrop
-# Version required: 0.64
# Date created: 16 November 1998
# Whom: Tom Hukins <tom@eborcom.com>
#
# $FreeBSD$
#
-DISTNAME= maildrop-0.64
+PORTNAME= maildrop
+PORTVERSION= 0.64
CATEGORIES= mail
MASTER_SITES= http://www.flounder.net/~mrsam/maildrop/ \
${MASTER_SITE_SUNSITE}
diff --git a/mail/mailfilter/Makefile b/mail/mailfilter/Makefile
index 29ba631c964c..3e7f7a81520e 100644
--- a/mail/mailfilter/Makefile
+++ b/mail/mailfilter/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mailfilter
-# Version required: 1.0b
# Date created: 22 November 1999
# Whom: jmrobins
#
# $FreeBSD$
#
-DISTNAME= mailfilter-1.0b
+PORTNAME= mailfilter
+PORTVERSION= 1.0b
CATEGORIES= mail
MASTER_SITES= ftp://samurai.ruin.org/pub/All/
diff --git a/mail/mailx/Makefile b/mail/mailx/Makefile
index d4a191bc1a48..3db5c5273bc5 100644
--- a/mail/mailx/Makefile
+++ b/mail/mailx/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mailx
-# Version required: 5
# Date created: 18 Febrary 1999
# Whom: Issei Suzuki <issei@jp.FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mailx-0.5
+PORTNAME= mailx
+PORTVERSION= 0.5
CATEGORIES= mail
MASTER_SITES= ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
ftp://ftp.noc.titech.ac.jp/pub/tmp/aki/FreeBSD/mailx/
diff --git a/mail/majorcool/Makefile b/mail/majorcool/Makefile
index a085efd67354..dae25ccd227b 100644
--- a/mail/majorcool/Makefile
+++ b/mail/majorcool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: majorcool
-# Version required: 1.2.0
# Date created: Wed Aug 13 18:34:14 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= majorcool-1.3.2
+PORTNAME= majorcool
+PORTVERSION= 1.3.2
CATEGORIES= mail
MASTER_SITES= http://people.FreeBSD.org/~andreas/download/
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 5dd4f19cb5fd..fad7658df555 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: majordomo
-# Version required: 1.94.4
# Date created: 23 October 1996
# Whom: jfitz@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= majordomo-1.94.4
+PORTNAME= majordomo
+PORTVERSION= 1.94.4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.sgi.com/other/majordomo/1.94.4/ \
ftp://ftp-europe.sgi.com/other/majordomo/1.94.4/
diff --git a/mail/mbx2mbox/Makefile b/mail/mbx2mbox/Makefile
index 2aa62255bbd8..f9a35f97d6f8 100644
--- a/mail/mbx2mbox/Makefile
+++ b/mail/mbx2mbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mbx2mbox
-# Version required: 0.32
# Date created: 23 November 1998
# Whom: Josh Gilliam <josh@quick.net>
#
# $FreeBSD$
#
-DISTNAME= mbx2mbox-0.32
+PORTNAME= mbx2mbox
+PORTVERSION= 0.32
CATEGORIES= mail
MASTER_SITES= http://www.cs.virginia.edu/~dwc3q/code/
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index a850f7c01a7c..3bcf75f11942 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: metamail
-# Version required: 2.7
# Date created: 17 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= mm2.7
-PKGNAME= metamail-2.7
+PORTNAME= metamail
+PORTVERSION= 2.7
CATEGORIES= mail
MASTER_SITES= ftp://thumper.bellcore.com/pub/nsb/
+DISTNAME= mm${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/mew-emacs20/Makefile b/mail/mew-emacs20/Makefile
index 4235f7dfc1f5..6f2553238968 100644
--- a/mail/mew-emacs20/Makefile
+++ b/mail/mew-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for emacs20)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew-mule/Makefile b/mail/mew-mule/Makefile
index 6b502623fb89..54ba4ad5a84c 100644
--- a/mail/mew-mule/Makefile
+++ b/mail/mew-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for mule)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew-xemacs/Makefile b/mail/mew-xemacs/Makefile
index 9fbe38872bd5..540461dfee5a 100644
--- a/mail/mew-xemacs/Makefile
+++ b/mail/mew-xemacs/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for xemacs)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew-xemacs20/Makefile b/mail/mew-xemacs20/Makefile
index 2cd4f6ecc7b2..00d7d23e3f14 100644
--- a/mail/mew-xemacs20/Makefile
+++ b/mail/mew-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for xemacs20)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew-xemacs21-mule/Makefile b/mail/mew-xemacs21-mule/Makefile
index 0833852b229d..6dca61906fa2 100644
--- a/mail/mew-xemacs21-mule/Makefile
+++ b/mail/mew-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for xemacs21-mule)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew-xemacs21/Makefile b/mail/mew-xemacs21/Makefile
index 290a1a3e9cca..8a6426b9c6c9 100644
--- a/mail/mew-xemacs21/Makefile
+++ b/mail/mew-xemacs21/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Mew (for xemacs21)
-# Version required: 1.94.1
# Date created: 17 January 1998
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index a77ce9394fae..5b6d823f8336 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: Mew
-# Version required: 1.94.1
# Date created: 21 November 1997
# Whom: Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= mew-${VERSION}
-PKGNAME= mew-${EMACS_PORT_NAME}-${VERSION}
+PORTNAME= mew-${EMACS_PORT_NAME}
+PORTVERSION= 1.94.1
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.mew.org/pub/Mew/ \
ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+DISTNAME= mew-${PORTVERSION}
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
@@ -26,7 +26,8 @@ SCRIPTS_ENV= AWK=${AWK} CAT=${CAT} CP=${CP} ECHO=${ECHO} MKDIR="${MKDIR}" \
ETCDIR=${ETCDIR} SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
PORTDIR=${.CURDIR:S!^${PORTSDIR}/!!} \
EMACS_CMD=${EMACS_CMD} EMACS_PORT_NAME=${EMACS_PORT_NAME} \
- PKGNAME=${PKGNAME} TMPL_FILES="${TMPL_FILES}" VERSION=${VERSION} \
+ PKGNAME=${PKGNAME} TMPL_FILES="${TMPL_FILES}" \
+ VERSION=${PORTVERSION} \
SITE_STARTUP_FILE=${SITE_STARTUP_FILE} REQUIRE="${REQUIRE}"
MAKE_ARGS= PREFIX=${PREFIX} EMACS=${EMACS_CMD} ELISPDIR=${ELISPDIR} \
INFODIR=${INFODIR} ETCDIR=${ETCDIR}
@@ -42,7 +43,6 @@ PATCHDIR= ${.CURDIR}/../mew/patches
SCRIPTDIR= ${.CURDIR}/../mew/scripts
FILESDIR= ${.CURDIR}/../mew/files
-VERSION= 1.94.1
EMACS_PORT_NAME?= emacs
SAMPLEFILES= Addrbook
SAMPLEDOTEMACS= dot.emacs.el
diff --git a/mail/mh/Makefile b/mail/mh/Makefile
index 23f70f261617..fac8451cda3d 100644
--- a/mail/mh/Makefile
+++ b/mail/mh/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: mh
-# Version required: 6.8.4
# Date created: Oct 4, 1994
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= mh-6.8.3
-PKGNAME= mh-6.8.4
+PORTNAME= mh
+PORTVERSION= 6.8.4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ics.uci.edu/pub/mh/tar/
+DISTNAME= ${PORTNAME}-6.8.3
EXTRACT_SUFX= .tar.Z
PATCH_SITES= ftp://ftp.ics.uci.edu/pub/mh/updates/
@@ -24,7 +24,7 @@ MAN1= ali.1 anno.1 burst.1 comp.1 dist.1 folder.1 forw.1 inc.1 mark.1 \
msgchk.1 msh.1 next.1 packf.1 pick.1 prev.1 prompter.1 rcvstore.1 \
refile.1 repl.1 rmf.1 rmm.1 scan.1 send.1 show.1 slocal.1 sortm.1 \
vmh.1 whatnow.1 whom.1
-MAN5= mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5
+MAN5= mh-alias.5 mh-format.5 mh-mail.5 mh-profile.5 mh-sequence.5 mh-tailor.5
MAN8= ap.8 conflict.8 dp.8 install-mh.8 post.8 fmtdump.8
post-install:
diff --git a/mail/minimalist/Makefile b/mail/minimalist/Makefile
index 41fbf661ff73..27283e10cc1b 100644
--- a/mail/minimalist/Makefile
+++ b/mail/minimalist/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: minimalist
-# Version required: 2.0.1
# Date created: 15 September 1999
# Whom: gmarco@scotty.masternet.it
#
# $FreeBSD$
#
-DISTNAME= minimalist-2.0.2
+PORTNAME= minimalist
+PORTVERSION= 2.0.2
CATEGORIES= mail
MASTER_SITES= http://www.webest.com/minimalist/ \
http://www.giovannelli.it/~gmarco/files/
diff --git a/mail/ml/Makefile b/mail/ml/Makefile
index 375ba6a8189e..9cc93b8aa30d 100644
--- a/mail/ml/Makefile
+++ b/mail/ml/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: YACL
-# Version required: 3.4
# Date created: 15 March 1998
# Whom: Jeroen Hogeveen <albast@xs4all.nl>
#
# $FreeBSD$
#
-DISTNAME= ml-3.4
+PORTNAME= ml
+PORTVERSION= 3.4
CATEGORIES= mail
MASTER_SITES= http://people.netscape.com/max/ml/
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 4e0cba376148..0c0287b9fe33 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mmr
-# Version required: 1.5.4
# Date created: 23 October 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= mmr-1.5.4
+PORTNAME= mmr
+PORTVERSION= 1.5.4
CATEGORIES= mail
MASTER_SITES= http://www.devolution.com/~slouken/projects/mmr/
diff --git a/mail/movemail/Makefile b/mail/movemail/Makefile
index 64b6a79becf2..f4e71964eb10 100644
--- a/mail/movemail/Makefile
+++ b/mail/movemail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: movemail
-# Version required: 1.0
# Date created: 1997/09/09
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= movemail-1.0
+PORTNAME= movemail
+PORTVERSION= 1.0
CATEGORIES= mail
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index 25c841ee4933..a797fb16280d 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mreport
-# Version required: 0.9
# Date created: 19 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= mreport-0.9
+PORTNAME= mreport
+PORTVERSION= 0.9
CATEGORIES= mail sysutils
MASTER_SITES= ftp://ftp.datrix.co.za/pub/mreport/
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index ccc144afb292..8015b1a9ce49 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: mutt w/pgp hooks
-# Version required: 0.0
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
+#
-DISTNAME= mutt-1.0.1i
-PKGNAME= mutt-1.0.1
+PORTNAME= mutt
+PORTVERSION= 1.0.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
+DISTNAME= ${PKGNAME}i
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index ccc144afb292..8015b1a9ce49 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: mutt w/pgp hooks
-# Version required: 0.0
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
+#
-DISTNAME= mutt-1.0.1i
-PKGNAME= mutt-1.0.1
+PORTNAME= mutt
+PORTVERSION= 1.0.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
+DISTNAME= ${PKGNAME}i
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index ccc144afb292..8015b1a9ce49 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: mutt w/pgp hooks
-# Version required: 0.0
# Date created: Thur July 25, 1996
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
+#
-DISTNAME= mutt-1.0.1i
-PKGNAME= mutt-1.0.1
+PORTNAME= mutt
+PORTVERSION= 1.0.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.uib.no/pub/mutt/ \
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.guug.de/pub/mutt/ \
ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
+DISTNAME= ${PKGNAME}i
PATCH_SITES= http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index b53ea8ee8b3a..a1550aa34995 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: foo
-# Version required: 0.0
# Date created: Mon Feb 03, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= muttzilla-0.40
+PORTNAME= muttzilla
+PORTVERSION= 0.40
CATEGORIES= mail www
MASTER_SITES= http://www3.bc.sympatico.ca/brian_winters/mutt/
diff --git a/mail/newmail/Makefile b/mail/newmail/Makefile
index 3f3bf37f7ae6..d306565e311d 100644
--- a/mail/newmail/Makefile
+++ b/mail/newmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: newmail
-# Version required: 1.0.1
# Date created: 30 Sep 1999
# Whom: Andrew Stevenson <andrew@ugh.net.au>
#
# $FreeBSD$
#
-DISTNAME= newmail-1.0.1
+PORTNAME= newmail
+PORTVERSION= 1.0.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ugh.net.au/pub/unix/newmail/ \
ftp://css.tuu.utas.edu.au/pub/unix/newmail/
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 757ef5fd6239..d3223b64a67d 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -35,7 +35,8 @@
# program).
#
-DISTNAME= nmh-1.0.3
+PORTNAME= nmh
+PORTVERSION= 1.0.3
CATEGORIES= mail
MASTER_SITES= ftp://ftp.mhost.com/pub/nmh/ \
http://people.FreeBSD.org/~jkoshy/PORTS/
diff --git a/mail/p5-IMAP-Admin/Makefile b/mail/p5-IMAP-Admin/Makefile
index ff92c27b327e..7178ca4b62c6 100644
--- a/mail/p5-IMAP-Admin/Makefile
+++ b/mail/p5-IMAP-Admin/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-IMAP-Admin
-# Version required: 1.2.1
# Date created: Sun Sep 26 09:25:38 EEST 1999
# Whom: Martti Kuparinen <martti.kuparinen@ericsson.com>
#
# $FreeBSD$
#
-DISTNAME= IMAP-Admin-1.2.1
-PKGNAME= p5-IMAP-Admin-1.2.1
+PORTNAME= IMAP-Admin
+PORTVERSION= 1.2.1
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= IMAP
diff --git a/mail/p5-MIME-Lite/Makefile b/mail/p5-MIME-Lite/Makefile
index 406755038286..dede7fc1d2e4 100644
--- a/mail/p5-MIME-Lite/Makefile
+++ b/mail/p5-MIME-Lite/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-MIME-Lite
-# Version required: 1.135
# Date created: August 3, 1999
# Whom: Alex Perel <veers@disturbed.net>
#
# $FreeBSD$
#
-DISTNAME= MIME-Lite-1.135
-PKGNAME= p5-MIME-Lite-1.135
+PORTNAME= MIME-Lite
+PORTVERSION= 1.135
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MIME
diff --git a/mail/p5-MIME-Tools/Makefile b/mail/p5-MIME-Tools/Makefile
index 6d62b8e3688d..a940d19d146a 100644
--- a/mail/p5-MIME-Tools/Makefile
+++ b/mail/p5-MIME-Tools/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-MIME-Tools
-# Version required: 4.122
# Date created: April 27th 1998
# Whom: Eivind Eklund <eivind@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= MIME-tools-4.122
-PKGNAME= p5-MIME-Tools-4.122
+PORTNAME= MIME-tools
+PORTVERSION= 4.122
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= MIME
diff --git a/mail/p5-Mail-Folder/Makefile b/mail/p5-Mail-Folder/Makefile
index 666951dab1ba..e044329e5b88 100644
--- a/mail/p5-Mail-Folder/Makefile
+++ b/mail/p5-Mail-Folder/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-Mail-Folder
-# Version required: 0.07
# Date created: October 24th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= MailFolder-0.07
-PKGNAME= p5-Mail-Folder-0.07
+PORTNAME= MailFolder
+PORTVERSION= 0.07
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 2ce71570aa97..a2286ba2b3c1 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -1,16 +1,17 @@
# New ports collection makefile for: p5-Mail-POP3Client
-# Version required: 1.15
# Date created: October 24th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= POP3Client-1_15
-PKGNAME= p5-Mail-POP3Client-1.15
+PORTNAME= POP3Client
+PORTVERSION= 1.15
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
+DISTNAME= ${PORTNAME}-1_15
MAINTAINER= jfitz@FreeBSD.org
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 2484f3780db5..569ad6750921 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -1,13 +1,13 @@
# New ports collection makefile for: p5-Mail-Tools
-# Version required: 1.12
# Date created: October 24th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= MailTools-1.12
-PKGNAME= p5-Mail-Tools-1.12
+PORTNAME= MailTools
+PORTVERSION= 1.12
+PKGNAMEPREFIX= p5-
CATEGORIES= mail perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Mail
diff --git a/mail/pathalias/Makefile b/mail/pathalias/Makefile
index c840e93f2d62..9e75b5c8acf1 100644
--- a/mail/pathalias/Makefile
+++ b/mail/pathalias/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: pathalias
-# Version required: 9.11
# Date created: 03 Dec 1997
# Whom: dirk.meyer@dinoex.sub.org
#
# $FreeBSD$
+#
-DISTNAME= pathalias11
-PKGNAME= pathalias-9.11
+PORTNAME= pathalias
+PORTVERSION= 9.11
CATEGORIES= mail
MASTER_SITES= ftp://ftp.lan-ks.de/pub/approved/ \
ftp://ftp.dinoex.sub.de/pub/approved/
+DISTNAME= ${PORTNAME}11
EXTRACT_SUFX= .tar.Z
MAINTAINER= dirk.meyer@dinoex.sub.org
diff --git a/mail/pgp4pine/Makefile b/mail/pgp4pine/Makefile
index 9ed1a7566bed..8f2c4122f85a 100644
--- a/mail/pgp4pine/Makefile
+++ b/mail/pgp4pine/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pgp4pine
-# Version required: 1.74
# Date created: 29 February 2000
# Whom: Holger Lamm <holger@flatline.de>
#
# $FreeBSD$
#
-DISTNAME= pgp4pine-1.74
+PORTNAME= pgp4pine
+PORTVERSION= 1.74
CATEGORIES= mail
MASTER_SITES= http://pgp4pine.flatline.de/
EXTRACT_SUFX= .tgz
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index 0b1ccc41ad7f..8a41901534c3 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pgpsendmail
-# Version required: 1.4
# Date created: 20 Jan 1995
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= PGPsendmail-v1.4
-PKGNAME= pgpsendmail-1.4
+PORTNAME= pgpsendmail
+PORTVERSION= 1.4
CATEGORIES= mail
MASTER_SITES= ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
+DISTNAME= PGPsendmail-v${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
diff --git a/mail/pine4-ssl/Makefile b/mail/pine4-ssl/Makefile
index 264e29c9635a..c9692141bcef 100644
--- a/mail/pine4-ssl/Makefile
+++ b/mail/pine4-ssl/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: pine4-ssl
-# Version required: 1.4
# Date created: 29 Jul 1999
# Whom: Nick Sayer <nsayer@freebsd.org>
#
@@ -11,11 +10,12 @@
# The warnings are getting harder to fix.
# Good luck to you. :-P
-DISTNAME= pine4+ssl-1.4
-PKGNAME= pine4-ssl-4.21.1.4
+PORTNAME= pine4-ssl
+PORTVERSION= 4.21.1.4
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/ \
http://www.kfu.com/~nsayer/encryption/software/
+DISTNAME= pine4+ssl-1.4
DISTFILES= pine4.21${EXTRACT_SUFX}
PATCH_SITES= http://www.kfu.com/~nsayer/encryption/software/
diff --git a/mail/pine4/Makefile b/mail/pine4/Makefile
index 93e4427b6648..b603e51ac322 100644
--- a/mail/pine4/Makefile
+++ b/mail/pine4/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: pine
-# Version required: 4.21
# Date created: 09 July 1998
# Whom: Adrian Penisoara <ady@freebsd.ady.ro>
#
@@ -9,10 +8,11 @@
# pine4-ssl port. Also, please mirror changes to the files/
# directory to the pine4-ssl port.
-DISTNAME?= pine4.21
-PKGNAME?= pine-4.21
+PORTNAME?= pine
+PORTVERSION?= 4.21
CATEGORIES= mail news
MASTER_SITES= ftp://ftp.cac.washington.edu/pine/
+DISTNAME?= ${PORTNAME}${PORTVERSION}
MAINTAINER?= pine@freebsd.ady.ro
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 73ecb6751d4a..75c4957945ff 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: popa3d
-# Version required: 0.4
# Date created: Sun Feb 6 12:31:29 MSK 2000
# Whom: Sergey Samoyloff <gonza@techline.ru>
#
# $FreeBSD$
#
-DISTNAME= popa3d-0.4
+PORTNAME= popa3d
+PORTVERSION= 0.4
CATEGORIES= mail
MASTER_SITES= http://www.openwall.com/popa3d/ \
ftp://ftp.openwall.com/popa3d/ \
diff --git a/mail/poppassd/Makefile b/mail/poppassd/Makefile
index eb37874e2c1d..4426b0a5c6fe 100644
--- a/mail/poppassd/Makefile
+++ b/mail/poppassd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: poppassd
-# Version required: 4.0
# Date Created: 21 August 1996
# Whom: Andrew Stevenson <andrew@ugh.net.au> based heavily on the changes by Stephen Melvin <melvin@zytek.com>
#
# $FreeBSD$
#
-DISTNAME= pwserve-4
-PKGNAME= poppassd-4.0
+PORTNAME= poppassd
+PORTVERSION= 4.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/password/
+DISTNAME= pwserve-4
MAINTAINER= andrew@ugh.net.au
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 214ba1a063e2..72dad9fe0e3b 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: popper
-# Version required: 2.5*
# Date created: 1 April 1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= qpopper2.53
-PKGNAME= qpopper-2.53
+PORTNAME= qpopper
+PORTVERSION= 2.53
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@freebsd.org
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 440cf692d1f3..fbb48fc5a8e8 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: postfix
-# Version required: 19991231
# Date created: 18 Mar 1999
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= postfix-19991231-pl06
-PKGNAME= postfix-19991231.06
+PORTNAME= postfix
+PORTVERSION= 19991231.06
CATEGORIES= mail
MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.snoopy.net/pub/mirrors/postfix/official/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://ftp.merit.edu/postfix/official/ \
ftp://ftp.sunet.se/pub/unix/mail/postfix/official/ \
ftp://ftp.cs.tu-berlin.de/pub/net/mail/postfix/official/ \
ftp://ftp.postfix.oaktree.co.uk/pub/postfix/official/
+DISTNAME= ${PORTNAME}-19991231-pl06
MAINTAINER= torstenb@FreeBSD.org
diff --git a/mail/postilion/Makefile b/mail/postilion/Makefile
index ba163a5747b7..9b54052c1a22 100644
--- a/mail/postilion/Makefile
+++ b/mail/postilion/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: postilion
-# Version required: 0.9.3c
# Date created: 20 February 1999
# Whom: Glenn Johnson <gljohns@bellsouth.net>
#
# $FreeBSD$
#
-DISTNAME= postilion-0.9.3c
+PORTNAME= postilion
+PORTVERSION= 0.9.3c
CATEGORIES= mail tk82
MASTER_SITES= http://www.postilion.org/
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index d4317cc70743..2975dc780d91 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -1,14 +1,12 @@
# New ports collection makefile for: premail
-# Version required: 0.46
-# Premail homepage is http://www.c2.net/~raph/premail.html
-#
# Date created: 31 Jan 1997
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= premail-0.46
+PORTNAME= premail
+PORTVERSION= 0.46
CATEGORIES= security mail
MASTER_SITES= ftp://ftp.jpunix.com/pub/remailer-tools/ \
ftp://ftp.kiarchive.ru/pub/unix/crypto/
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index ab3d62ec58de..fbf25c74607a 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: procmail
-# http://www.procmail.org/
-# Version required: 3.*
# Date created: 24 September 1994
# Whom: adam
#
# $FreeBSD$
#
-DISTNAME= procmail-3.14
+PORTNAME= procmail
+PORTVERSION= 3.14
CATEGORIES= mail
MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/ \
ftp://ftp.informatik.rwth-aachen.de/pub/packages/procmail/
diff --git a/mail/prom-mew/Makefile b/mail/prom-mew/Makefile
index b90242440c89..6c9a87e5252b 100644
--- a/mail/prom-mew/Makefile
+++ b/mail/prom-mew/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: prom-mew
-# Version required: 1.93.4
# Date created: 28 Jun 1999
# Whom: KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= prom-mew-1.93.4
+PORTNAME= prom-mew
+PORTVERSION= 1.93.4
CATEGORIES= mail elisp
MASTER_SITES= http://www02.so-net.ne.jp/~murata/software/pub/
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index 7a63fe49ea90..c18b69b94682 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: prom-wl
-# Version required: 1.0.2
# Date created: 28 Aug 1999
# Whom: KIRIYAMA Kazuhiko<kiri@pis.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= prom-wl-1.0.2
+PORTNAME= prom-wl
+PORTVERSION= 1.0.2
CATEGORIES= mail elisp
MASTER_SITES= http://www02.so-net.ne.jp/~murata/software/pub/
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index c149ccb211cb..62d87e8fb233 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: qmail-contrib
-# Version required: 1.0
# Date created: 28 November 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
+#
-DISTNAME= qmail-contrib-0.1
+PORTNAME= qmail-contrib
+PORTVERSION= 0.1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qmail.org/pub/software/ \
ftp://rucus.ru.ac.za/pub/mail/qmail/src/
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 89f1b83773cf..89b22785dfb1 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: qmail
-# Version required: 1.03
# Date created: 25 May 1998
# Whom: Mario S F Ferreira <lioux@linf.unb.br> et al.
#
# $FreeBSD$
#
-DISTNAME= qmail-1.03
+PORTNAME= qmail
+PORTVERSION= 1.03
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.ntnu.no/pub/unix/mail/qmail/ \
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 30983ada2194..c1ef44f5da47 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: qmailanalog
-# Version required: 0.70
# Date created: 29 November 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
+#
-DISTNAME= qmailanalog-0.70
+PORTNAME= qmailanalog
+PORTVERSION= 0.70
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qmail.org/pub/software/
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 214ba1a063e2..72dad9fe0e3b 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: popper
-# Version required: 2.5*
# Date created: 1 April 1995
# Whom: pst
#
# $FreeBSD$
#
-DISTNAME= qpopper2.53
-PKGNAME= qpopper-2.53
+PORTNAME= qpopper
+PORTVERSION= 2.53
CATEGORIES= mail
MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/
+DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@freebsd.org
diff --git a/mail/rblcheck/Makefile b/mail/rblcheck/Makefile
index 0c41ee67b38c..7219a1029669 100644
--- a/mail/rblcheck/Makefile
+++ b/mail/rblcheck/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rblcheck
-# Version required: 1.4
# Date created: 28 January 1998
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= rblcheck-1.4
+PORTNAME= rblcheck
+PORTVERSION= 1.4
CATEGORIES= mail
MASTER_SITES= http://download.sourceforge.net/rblcheck/ \
http://www.xnet.com/%7Eemarshal/rblcheck/
diff --git a/mail/rblsmtpd/Makefile b/mail/rblsmtpd/Makefile
index 8dcb520805eb..634efbaf3ac8 100644
--- a/mail/rblsmtpd/Makefile
+++ b/mail/rblsmtpd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rblsmtpd
-# Version required: 0.70
# Date created: 30 October 1998
# Whom: John Saunders <john@nlc.net.au>
#
# $FreeBSD$
#
-DISTNAME= rblsmtpd-0.70
+PORTNAME= rblsmtpd
+PORTVERSION= 0.70
CATEGORIES= mail
MASTER_SITES= ftp://koobera.math.uic.edu/www/software/
diff --git a/mail/rftp/Makefile b/mail/rftp/Makefile
index 92443e7eeeb7..e9e93fbd26f8 100644
--- a/mail/rftp/Makefile
+++ b/mail/rftp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rftp
-# Version required: 1.2
# Date created: 13 Dec, 1997
# Whom: kline
#
# $FreeBSD$
#
-DISTNAME= rftp-1.2
+PORTNAME= rftp
+PORTVERSION= 1.2
CATEGORIES= mail
MASTER_SITES= ftp://toxic.magnesium.net/pub/FreeBSD/rftp/
diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile
index 840b9fee27c3..c396874549b2 100644
--- a/mail/rlytest/Makefile
+++ b/mail/rlytest/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rlytest
-# Version required: 1.16
# Date created: 16 January 1999
# Whom: Paul Chvostek <paul@it.ca>
#
# $FreeBSD$
#
-DISTNAME= rlytest
-PKGNAME= rlytest-1.16
+PORTNAME= rlytest
+PORTVERSION= 1.16
CATEGORIES= mail security
MASTER_SITES= http://www.unicom.com/sw/rlytest/
+DISTNAME= ${PORTNAME}
MAINTAINER= paul@it.ca
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index 7b8cc6d627a5..06a77be99c0e 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: serialmail
-# Version required: 0.75
# Date created: 2 November 1998
# Whom: Tom Hukins <tom@eborcom.com>
#
# $FreeBSD$
#
-DISTNAME= serialmail-0.75
+PORTNAME= serialmail
+PORTVERSION= 0.75
CATEGORIES= mail
MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.qmail.org/pub/koobera.math.uic.edu/pub/software/ \
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index 1c4a2eb4f24b..c0807f24606e 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: sigrot
-# Version required: 1.0
# Date created: 4 Mar 1998
# Whom: Marijn Meijles <marijn@stack.nl>
#
# $FreeBSD$
#
-DISTNAME= sigrot_v1.0
-PKGNAME= sigrot-1.0
+PORTNAME= sigrot
+PORTVERSION= 1.0
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/mail/misc
+DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= marijn@stack.nl
diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index 05ea8b538af9..685f2defdc26 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: smail
-# Version required: 3.2
# Date created: 16 Oct 1994
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= smail-3.2.0.111
+PORTNAME= smail
+PORTVERSION= 3.2.0.111
CATEGORIES= mail
MASTER_SITES= ftp://ftp.uu.net/networking/mail/smail/ \
ftp://ftp.planix.com/pub/Smail/ \
diff --git a/mail/smtpd/Makefile b/mail/smtpd/Makefile
index 34dc430fceda..615087c7a0c8 100644
--- a/mail/smtpd/Makefile
+++ b/mail/smtpd/Makefile
@@ -1,12 +1,12 @@
# Ports collection makefile for: smtpd
-# Version required: 2.0
# Date created: 06 Feb 1998
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= smtpd-2.0
+PORTNAME= smtpd
+PORTVERSION= 2.0
CATEGORIES= mail security
MASTER_SITES= ftp://ftp.obtuse.com/pub/smtpd/
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index 78d38147ca55..00c547b54604 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: smtpfeed
-# Version required: 1.04
# Date created: 17 January 1998
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= smtpfeed-1.04
+PORTNAME= smtpfeed
+PORTVERSION= 1.04
CATEGORIES= mail
MASTER_SITES= ftp://ftp.kyoto.wide.ad.jp/pub/mail/smtpfeed/ \
ftp://ftp.kyoto.wide.ad.jp/pub/mail/sendmail/ \
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 816249c1e7f8..a6fe9350fd20 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: spruce
-# Version required: 0.4.9f
# Date created: 05 June 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= spruce-0.4.9f
+PORTNAME= spruce
+PORTVERSION= 0.4.9f
CATEGORIES= mail
MASTER_SITES= http://www.xtorshun.org/spruce/ \
http://fundy.linuxberg.com/files/x11/network/ \
diff --git a/mail/tkrat/Makefile b/mail/tkrat/Makefile
index 9701251fa2ed..6342eb075502 100644
--- a/mail/tkrat/Makefile
+++ b/mail/tkrat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkrat
-# Version required: 1.1
# Date created: 24 October 1997
# Whom: Bruce Gingery <bgingery@gtcs.com>
#
# $FreeBSD$
#
-DISTNAME= tkrat-1.2
+PORTNAME= tkrat
+PORTVERSION= 1.2
CATEGORIES= mail tk82
MASTER_SITES= ftp://ftp.md.chalmers.se/pub/tkrat/ \
ftp://ftp.sunet.se/pub/unix/mail/tkrat/
diff --git a/mail/tkrat2/Makefile b/mail/tkrat2/Makefile
index 01bf09403454..03edcdcbd9b7 100644
--- a/mail/tkrat2/Makefile
+++ b/mail/tkrat2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkrat2
-# Version required: 2.0b9
# Date created: 9 November 1999
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= tkrat-2.0b9
+PORTNAME= tkrat
+PORTVERSION= 2.0b9
CATEGORIES= mail tk82
MASTER_SITES= ftp://ftp.md.chalmers.se/pub/tkrat/ \
ftp://ftp.sunet.se/pub/unix/mail/tkrat/
diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
index f7cef49be8c2..af8f7efdb4ae 100644
--- a/mail/wanderlust-emacs/Makefile
+++ b/mail/wanderlust-emacs/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: Wanderlust (for emacs)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
-DISTNAME= wl-1.0.3
-PKGNAME= wanderlust-${EMACS_PORT}-1.0.3
+PORTNAME= wanderlust-${EMACS_PORT}
+PORTVERSION= 1.0.3
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \
ftp://ftp.jaist.ac.jp/pub/GNU/elisp/wanderlust/stable/ \
ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/ \
ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
+DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@nobutaka.com
diff --git a/mail/wanderlust-emacs20/Makefile b/mail/wanderlust-emacs20/Makefile
index 61fb8b22c9e6..892d6671469b 100644
--- a/mail/wanderlust-emacs20/Makefile
+++ b/mail/wanderlust-emacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Wanderlust (for emacs20)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
diff --git a/mail/wanderlust-mule/Makefile b/mail/wanderlust-mule/Makefile
index ce475a4de0d3..0195e87da194 100644
--- a/mail/wanderlust-mule/Makefile
+++ b/mail/wanderlust-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Wanderlust (for mule)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
diff --git a/mail/wanderlust-xemacs20/Makefile b/mail/wanderlust-xemacs20/Makefile
index 7271af899d35..80ca4065e227 100644
--- a/mail/wanderlust-xemacs20/Makefile
+++ b/mail/wanderlust-xemacs20/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Wanderlust (for xemacs20)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
diff --git a/mail/wanderlust-xemacs21-mule/Makefile b/mail/wanderlust-xemacs21-mule/Makefile
index 44b22e32a76c..b517816fe88d 100644
--- a/mail/wanderlust-xemacs21-mule/Makefile
+++ b/mail/wanderlust-xemacs21-mule/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: Wanderlust (for xemacs-mule)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
diff --git a/mail/wanderlust/Makefile b/mail/wanderlust/Makefile
index f7cef49be8c2..af8f7efdb4ae 100644
--- a/mail/wanderlust/Makefile
+++ b/mail/wanderlust/Makefile
@@ -1,18 +1,18 @@
# New ports collection makefile for: Wanderlust (for emacs)
-# Version required: 1.0.x
# Date created: 7 Apr 1999
# Whom: MANTANI Nobutaka <nobutaka@nobutaka.com>
#
# $FreeBSD$
#
-DISTNAME= wl-1.0.3
-PKGNAME= wanderlust-${EMACS_PORT}-1.0.3
+PORTNAME= wanderlust-${EMACS_PORT}
+PORTVERSION= 1.0.3
CATEGORIES= mail elisp
MASTER_SITES= ftp://ftp.gohome.org/wl/stable/ \
ftp://ftp.jaist.ac.jp/pub/GNU/elisp/wanderlust/stable/ \
ftp://daidai.kuis.kyoto-u.ac.jp/pub/mirror/ftp.gohome.org/pub/elisp/wl/stable/ \
ftp://ftp.ring.gr.jp/pub/text/elisp/wl/stable/
+DISTNAME= wl-${PORTVERSION}
MAINTAINER= nobutaka@nobutaka.com
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index 01c120f3fd23..da6561154d22 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmbiff
-# Version required: 0.2
# Date created: 19 Nov 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmbiff-0.2
+PORTNAME= wmbiff
+PORTVERSION= 0.2
CATEGORIES= mail windowmaker afterstep
MASTER_SITES= http://ccat.elect.ru:8100/wmbiff/ \
http://people.FreeBSD.org/~jim/distfiles/
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index edef59d18fe8..12b5b7924238 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmmail
-# Version required: 0.63a
# Date created: 7 Jun 1998
# Whom: rom
#
# $FreeBSD$
#
-DISTNAME= WMMail.app-0.63a
-PKGNAME= wmmail-0.63a
+PORTNAME= wmmail
+PORTVERSION= 0.63a
CATEGORIES= mail windowmaker
MASTER_SITES= http://www.eecg.utoronto.ca/~chanb/
+DISTNAME= WMMail.app-${PORTVERSION}
MAINTAINER= jim@FreeBSD.org
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index d1fb5baf8658..eb0803fce0a6 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmpop3
-# Version required: 0.5.6a
# Date created: 28 Mar 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= WMPop3-0.5.6a
-PKGNAME= wmpop3-0.5.6a
+PORTNAME= wmpop3
+PORTVERSION= 0.5.6a
CATEGORIES= mail windowmaker
MASTER_SITES= http://www.cs.mun.ca/~scotth/download/
+DISTNAME= WMPop3-${PORTVERSION}
MAINTAINER= jim@FreeBSD.org
diff --git a/mail/xbuffy/Makefile b/mail/xbuffy/Makefile
index 399e53527eae..63e9f77bfdcb 100644
--- a/mail/xbuffy/Makefile
+++ b/mail/xbuffy/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xbuffy
-# Version required: 3.3
# Date created: 18 June 1995
# Whom: dchapes@zeus.leitch.com
#
# $FreeBSD$
#
-DISTNAME= xbuffy3.3
-PKGNAME= xbuffy-3.3
+PORTNAME= xbuffy
+PORTVERSION= 3.3
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= dchapes@zeus.leitch.com
diff --git a/mail/xfaces/Makefile b/mail/xfaces/Makefile
index 14bb1d3d0c5e..d725b37e8a8a 100644
--- a/mail/xfaces/Makefile
+++ b/mail/xfaces/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: xfaces-3.3
-# Version required: 1.6.1
# Date created: 11 December 96
# Whom: Lars Koeller <Lars_Koeller@odie.physik2.uni-rostock.de>
-# With some
+# With some
# modifications from: Andreas Klemm <andreas@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xfaces-3.3
+PORTNAME= xfaces
+PORTVERSION= 3.3
CATEGORIES= mail
# xfaces-sounds.tar.gz only in LOCAL_PORTS
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/xfaces/ \
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index 46fdccd4b74f..b669a539c3be 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfmail
-# Version required: 1.3.1
# Date created: 30 June 1996
# Whom: gena
#
# $FreeBSD$
#
-DISTNAME= xfmail-1.4.0
+PORTNAME= xfmail
+PORTVERSION= 1.4.0
CATEGORIES= mail
MASTER_SITES= ftp://xfmail.ufies.org/pub/xfmail/release/1.4.0/
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 4222fe7afc21..cdc36dca2f20 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -1,12 +1,13 @@
# ex:ts=8
# Ports collection makefile for: xlbiff
-# Version required: 0.0
# Date created: 23-Aug-1995
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
# $FreeBSD$
+#
-DISTNAME= xlbiff-3.0
+PORTNAME= xlbiff
+PORTVERSION= 3.0
CATEGORIES= mail
MASTER_SITES= ftp://ftp.x.org/R5contrib/ \
ftp://ftp.freesoftware.com/pub/X11/R5contrib/
diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile
index 640b616c9055..6abd4f74d781 100644
--- a/mail/xmail/Makefile
+++ b/mail/xmail/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xmail
-# Version required: 1.6
# Date created: 15 July 1997
# Whom: Stephen Roznowski <sjr1@flash.net>
#
# $FreeBSD$
#
-DISTNAME= xmail_1.6
-PKGNAME= xmail-1.6
+PORTNAME= xmail
+PORTVERSION= 1.6
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
+DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 8922b22144b4..cfee7b165774 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xmailbox
-# Version required: 2.5
# Date created: 23 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= xmailbox-2.5
+PORTNAME= xmailbox
+PORTVERSION= 2.5
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= applications
diff --git a/mail/xpbiff-youbin/Makefile b/mail/xpbiff-youbin/Makefile
index ada18a9f5217..196c5b774631 100644
--- a/mail/xpbiff-youbin/Makefile
+++ b/mail/xpbiff-youbin/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: xpbiff-youbin
-# Version required: 1.27
# Date created: 7 April 1997
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
@@ -7,7 +6,9 @@
#
# can't use PORTSDIR here, since we haven't included bsd.port.mk
-PKGNAME= xpbiff-youbin-1.27
+
+PORTNAME= xpbiff-youbin
+PORTVERSION= 1.27
MAINTAINER= sanpei@jp.FreeBSD.org
diff --git a/mail/xpbiff/Makefile b/mail/xpbiff/Makefile
index 62e92de45f60..d61a3be38412 100644
--- a/mail/xpbiff/Makefile
+++ b/mail/xpbiff/Makefile
@@ -1,14 +1,15 @@
# New ports collection makefile for: xpbiff
-# Version required: 1.27
# Date created: 2 April 1997
# Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
#
# $FreeBSD$
+#
-DISTNAME= xpbiff
-PKGNAME?= xpbiff-1.27
+PORTNAME?= xpbiff
+PORTVERSION?= 1.27
CATEGORIES= mail
MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/xpbiff/
+DISTNAME= xpbiff
DISTFILES= xpbiff-1.27-with-YOUBIN.tar.gz.uu
MAINTAINER= sanpei@yy.cs.keio.ac.jp
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index 356a85d6b7f9..76cd33d57ae4 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: youbin
-# Version required: 2.13
# Date created: 09 Aug 1996
# Whom: Masafumi NAKANE <max@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= youbin-2.13
+PORTNAME= youbin
+PORTVERSION= 2.13
CATEGORIES= mail
MASTER_SITES= ftp://ftp.nuie.nagoya-u.ac.jp/pub/nagoya-u/ \
ftp://ftp.kyoto.wide.ad.jp/pub/net/
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index 9467eb447fe0..dd3f8abb2efc 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: zmailer
-# Version required: 2.99.50s11
# Date created: 4 January 1999
# Whom: Alex Perel <veers@disturbed.net>
#
# $FreeBSD$
#
-DISTNAME= zmailer-2.99.51
+PORTNAME= zmailer
+PORTVERSION= 2.99.51
CATEGORIES= mail
MASTER_SITES= ftp://ftp.funet.fi/pub/unix/mail/zmailer/src/