aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/ark/Makefile4
-rw-r--r--archivers/rpm/Makefile4
-rw-r--r--archivers/rpm2cpio/Makefile8
-rw-r--r--audio/rat/Makefile4
-rw-r--r--audio/speak_freely/Makefile4
-rw-r--r--audio/vat/Makefile4
-rw-r--r--comms/kremotecontrol/Makefile4
-rw-r--r--deskutils/gnome-utils/Makefile6
-rw-r--r--deskutils/gnomeutils2/Makefile6
-rw-r--r--deskutils/kcharselect/Makefile4
-rw-r--r--finance/p5-Business-CreditCard/Makefile6
-rw-r--r--finance/qhacc/Makefile6
-rw-r--r--finance/wmstock/Makefile4
-rw-r--r--finance/xquote/Makefile4
-rw-r--r--math/kcalc/Makefile4
-rw-r--r--mbone/imm/Makefile6
-rw-r--r--mbone/nte/Makefile4
-rw-r--r--mbone/rat/Makefile4
-rw-r--r--mbone/rqm/Makefile4
-rw-r--r--mbone/rtpmon/Makefile4
-rw-r--r--mbone/rtptools/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--mbone/speak_freely/Makefile4
-rw-r--r--mbone/vat/Makefile4
-rw-r--r--mbone/vic/Makefile4
-rw-r--r--mbone/wb/Makefile4
-rw-r--r--misc/221upgrade/Makefile4
-rw-r--r--misc/222upgrade/Makefile4
-rw-r--r--misc/225upgrade/Makefile4
-rw-r--r--misc/227upgrade/Makefile4
-rw-r--r--misc/30upgrade/Makefile4
-rw-r--r--misc/31upgrade/Makefile4
-rw-r--r--misc/32upgrade/Makefile4
-rw-r--r--misc/34upgrade/Makefile4
-rw-r--r--misc/Howto/Makefile5
-rw-r--r--misc/aclgen/Makefile6
-rw-r--r--misc/acron/Makefile6
-rw-r--r--misc/alevt/Makefile4
-rw-r--r--misc/amanda-client/Makefile6
-rw-r--r--misc/amanda-server/Makefile6
-rw-r--r--misc/amanda/Makefile4
-rw-r--r--misc/amanda24-client/Makefile6
-rw-r--r--misc/amanda24-server/Makefile6
-rw-r--r--misc/amanda24/Makefile6
-rw-r--r--misc/amanda25-client/Makefile6
-rw-r--r--misc/amanda25-server/Makefile6
-rw-r--r--misc/amanda26-client/Makefile6
-rw-r--r--misc/amanda26-server/Makefile6
-rw-r--r--misc/amanda32-client/Makefile6
-rw-r--r--misc/amanda32-server/Makefile6
-rw-r--r--misc/asbutton/Makefile4
-rw-r--r--misc/astrolog/Makefile7
-rw-r--r--misc/bb/Makefile4
-rw-r--r--misc/bbjd/Makefile4
-rw-r--r--misc/bidwatcher/Makefile4
-rw-r--r--misc/bottlerocket/Makefile4
-rw-r--r--misc/boxes/Makefile4
-rw-r--r--misc/buffer/Makefile4
-rw-r--r--misc/cassowary/Makefile4
-rw-r--r--misc/chord/Makefile8
-rw-r--r--misc/cmatrix/Makefile4
-rw-r--r--misc/colorls/Makefile5
-rw-r--r--misc/colortail/Makefile8
-rw-r--r--misc/crosspad/Makefile4
-rw-r--r--misc/cstream/Makefile4
-rw-r--r--misc/cwish/Makefile4
-rw-r--r--misc/deco/Makefile6
-rw-r--r--misc/dejagnu/Makefile4
-rw-r--r--misc/delay/Makefile4
-rw-r--r--misc/diction/Makefile4
-rw-r--r--misc/display/Makefile4
-rw-r--r--misc/dnetc/Makefile7
-rw-r--r--misc/dotfile/Makefile4
-rw-r--r--misc/estic/Makefile6
-rw-r--r--misc/ezload/Makefile4
-rw-r--r--misc/fd/Makefile6
-rw-r--r--misc/fep/Makefile6
-rw-r--r--misc/figlet/Makefile6
-rw-r--r--misc/fortuneit/Makefile6
-rw-r--r--misc/freedialog/Makefile6
-rw-r--r--misc/geekcode/Makefile4
-rw-r--r--misc/git/Makefile4
-rw-r--r--misc/gnomeusersguide/Makefile6
-rw-r--r--misc/gnomeutils/Makefile6
-rw-r--r--misc/gnomeutils2/Makefile6
-rw-r--r--misc/gnuit/Makefile4
-rw-r--r--misc/gnuls/Makefile5
-rw-r--r--misc/gone/Makefile4
-rw-r--r--misc/gplbp/Makefile4
-rw-r--r--misc/grun/Makefile4
-rw-r--r--misc/gtkfind/Makefile4
-rw-r--r--misc/gtl/Makefile6
-rw-r--r--misc/hello/Makefile6
-rw-r--r--misc/heyu/Makefile6
-rw-r--r--misc/heyu2/Makefile6
-rw-r--r--misc/iselect/Makefile4
-rw-r--r--misc/jargon/Makefile4
-rw-r--r--misc/jive/Makefile4
-rw-r--r--misc/kcd-devel/Makefile4
-rw-r--r--misc/kcd/Makefile4
-rw-r--r--misc/kdeutils11/Makefile4
-rw-r--r--misc/kdeutils2/Makefile4
-rw-r--r--misc/kdeutils3/Makefile4
-rw-r--r--misc/kdeutils4/Makefile4
-rw-r--r--misc/kp/Makefile4
-rw-r--r--misc/kwatch/Makefile4
-rw-r--r--misc/lc/Makefile4
-rw-r--r--misc/less/Makefile5
-rw-r--r--misc/lile/Makefile6
-rw-r--r--misc/logsurfer+/Makefile4
-rw-r--r--misc/logsurfer/Makefile4
-rw-r--r--misc/lv/Makefile6
-rw-r--r--misc/man.el/Makefile4
-rw-r--r--misc/mc/Makefile4
-rw-r--r--misc/mgp-mode.el/Makefile7
-rw-r--r--misc/mmv/Makefile7
-rw-r--r--misc/most/Makefile4
-rw-r--r--misc/mshell/Makefile4
-rw-r--r--misc/numchar/Makefile4
-rw-r--r--misc/nwrite/Makefile4
-rw-r--r--misc/orville-write/Makefile4
-rw-r--r--misc/p5-Array-PrintCols/Makefile6
-rw-r--r--misc/p5-Business-CreditCard/Makefile6
-rw-r--r--misc/p5-I18N-Charset/Makefile6
-rw-r--r--misc/p5-I18N-LangTags/Makefile6
-rw-r--r--misc/p5-Locale-Codes/Makefile6
-rw-r--r--misc/pdmenu/Makefile6
-rw-r--r--misc/peq/Makefile4
-rw-r--r--misc/pinfo/Makefile4
-rw-r--r--misc/proxyper/Makefile6
-rw-r--r--misc/py-distutils/Makefile7
-rw-r--r--misc/qclock/Makefile6
-rw-r--r--misc/qhacc/Makefile6
-rw-r--r--misc/quotes/Makefile6
-rw-r--r--misc/rfc/Makefile6
-rw-r--r--misc/rpm/Makefile4
-rw-r--r--misc/rpm2cpio/Makefile8
-rw-r--r--misc/rtfm/Makefile4
-rw-r--r--misc/screen/Makefile4
-rw-r--r--misc/scriptkit/Makefile6
-rw-r--r--misc/sls/Makefile6
-rw-r--r--misc/sma/Makefile7
-rw-r--r--misc/snowflake/Makefile6
-rw-r--r--misc/splitvt/Makefile4
-rw-r--r--misc/sshbuddy/Makefile7
-rw-r--r--misc/tcb/Makefile4
-rw-r--r--misc/team/Makefile3
-rw-r--r--misc/tet/Makefile7
-rw-r--r--misc/tkcron/Makefile4
-rw-r--r--misc/tkinfo/Makefile4
-rw-r--r--misc/tkman/Makefile4
-rw-r--r--misc/tkrunit/Makefile6
-rw-r--r--misc/uk-phone/Makefile8
-rw-r--r--misc/uk-postcodes/Makefile8
-rw-r--r--misc/unclutter/Makefile4
-rw-r--r--misc/upclient/Makefile4
-rw-r--r--misc/us-zipcodes/Makefile8
-rw-r--r--misc/vbidecode/Makefile4
-rw-r--r--misc/vera/Makefile4
-rw-r--r--misc/videotext/Makefile4
-rw-r--r--misc/viz/Makefile4
-rw-r--r--misc/wmcp/Makefile4
-rw-r--r--misc/wmmand/Makefile6
-rw-r--r--misc/wmstock/Makefile4
-rw-r--r--misc/wmweather/Makefile4
-rw-r--r--misc/xd/Makefile6
-rw-r--r--misc/xdelta/Makefile4
-rw-r--r--misc/xenmenu/Makefile4
-rw-r--r--misc/xgas/Makefile6
-rw-r--r--misc/xless/Makefile4
-rw-r--r--misc/xpns/Makefile7
-rw-r--r--misc/xquote/Makefile4
-rw-r--r--misc/xtail/Makefile6
-rw-r--r--misc/xtar/Makefile4
-rw-r--r--misc/yaunc/Makefile4
-rw-r--r--misc/ytree/Makefile4
-rw-r--r--multimedia/vic/Makefile4
-rw-r--r--net/imm/Makefile6
-rw-r--r--net/rqm/Makefile4
-rw-r--r--net/rtptools/Makefile4
-rw-r--r--net/sdr/Makefile4
-rw-r--r--net/wb/Makefile4
-rw-r--r--security/kgpg-kde4/Makefile4
-rw-r--r--security/kwallet/Makefile4
-rw-r--r--shells/fd/Makefile6
-rw-r--r--sysutils/kdf/Makefile4
-rw-r--r--sysutils/kfloppy/Makefile4
-rw-r--r--sysutils/less/Makefile5
-rw-r--r--sysutils/most/Makefile4
-rw-r--r--sysutils/screen/Makefile4
-rw-r--r--sysutils/sweeper/Makefile4
-rw-r--r--x11-wm/wmcp/Makefile4
192 files changed, 465 insertions, 472 deletions
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index 52f878a0c105..8526d17f3d8e 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rpm
-# Version required: 2.5.6
# Date created: 30 April 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rpm-2.5.6
+PORTNAME= rpm
+PORTVERSION= 2.5.6
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
diff --git a/archivers/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile
index c1bdb3c44c6f..759134ebb0d3 100644
--- a/archivers/rpm2cpio/Makefile
+++ b/archivers/rpm2cpio/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: rpm2cpio
-# Version required: #no version#
# Date created: Sun Jul 18 21:51:23 MET DST 1999
# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
#
# $FreeBSD$
#
-DISTNAME= rpm2cpio
-PKGNAME= rpm2cpio-1.0
+PORTNAME= rpm2cpio
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/
-EXTRACT_SUFX=
+DISTFILES= ${PORTNAME}
MAINTAINER= nox@jelal.kn-bremen.de
+NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= .
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 0268f5baa1b2..034e665cc84f 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rat
-# Version required: 4.0.4
# Date created: 3 July 1999
# Whom: O.Hodson@cs.ucl.ac.uk (Orion Hodson)
#
# $FreeBSD$
#
-DISTNAME= rat-4.0.4
+PORTNAME= rat
+PORTVERSION= 4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
http://people.FreeBSD.org/~cpiazza/distfiles/
diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile
index ecd1824f93ab..c678bc233df4 100644
--- a/audio/speak_freely/Makefile
+++ b/audio/speak_freely/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: speak_freely
-# Version required: 7.1
# Date created: 18 Apr 1996
# Whom: Mister X (to make portlint happy ;)
#
# $FreeBSD$
#
-DISTNAME= speak_freely-7.1
+PORTNAME= speak_freely
+PORTVERSION= 7.1
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index 667d2d408c35..096f092a0284 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vat
-# Version required: 4.0b2
# Date created: 2 November 1996
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= vat-4.0b2
+PORTNAME= vat
+PORTVERSION= 4.0b2
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index fb5bab56eabc..2480f0f6c2f3 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeutils
-# Version required: 1.0.51
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-utils-1.0.51
-PKGNAME= gnomeutils-1.0.51
+PORTNAME= gnomeutils
+PORTVERSION= 1.0.51
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
+DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index fb5bab56eabc..2480f0f6c2f3 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeutils
-# Version required: 1.0.51
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-utils-1.0.51
-PKGNAME= gnomeutils-1.0.51
+PORTNAME= gnomeutils
+PORTVERSION= 1.0.51
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
+DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index 977c3b0799b5..983e66085a36 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Business-CreditCard
-# Version required: 0.21
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Business-CreditCard-0.21
-PKGNAME= p5-Business-CreditCard-0.21
+PORTNAME= Business-CreditCard
+PORTVERSION= 0.21
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Business
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index 9cce0ee32f67..8be9234b6f79 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qhacc
-# Version required: 0.3.1
# Date created: 28 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= qhacc_0.3.1
-PKGNAME= qhacc-0.3.1
+PORTNAME= qhacc
+PORTVERSION= 0.3.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ostrich-emulators.cx/qhacc/
+DISTNAME= qhacc_${PORTVERSION}
MAINTAINER= will@FreeBSD.org
diff --git a/finance/wmstock/Makefile b/finance/wmstock/Makefile
index 0e8b6f14fb6c..3afa3a3ddafc 100644
--- a/finance/wmstock/Makefile
+++ b/finance/wmstock/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmstock
-# Version required: 0.06
# Date created: 19 Jun 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmstock-0.06
+PORTNAME= wmstock
+PORTVERSION= 0.06
CATEGORIES= misc windowmaker
MASTER_SITES= http://mattfischer.com/wmstock/src/ \
http://www.psn.net/~andrews/wmstock/
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 54f6b276123a..1555a0a30560 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: xquote
-# Version required: 1.1
# Date created: 4 Jan 1998
# Whom: Ian Struble <ian@broken.net>
#
# $FreeBSD$
-DISTNAME= xquote-1.1
+PORTNAME= xquote
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= http://sunsite.auc.dk/xinvest/ \
${MASTER_SITE_XCONTRIB}
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 9506e8bb2ea1..4ca41dd5f326 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: imm
-# Version required: 3.5a1
# Date created: 13 October 1994
# Whom: wollman
#
# $FreeBSD$
#
-DISTNAME= imm.source
-PKGNAME= imm-3.5a1
+PORTNAME= imm
+PORTVERSION= 3.5a1
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
+DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index f40ceb86c80d..d159e9a9549c 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nte
-# Version required: 1.5a23
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= nte-1.5a29
+PORTNAME= nte
+PORTVERSION= 1.5a29
CATEGORIES= mbone tk80
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 0268f5baa1b2..034e665cc84f 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rat
-# Version required: 4.0.4
# Date created: 3 July 1999
# Whom: O.Hodson@cs.ucl.ac.uk (Orion Hodson)
#
# $FreeBSD$
#
-DISTNAME= rat-4.0.4
+PORTNAME= rat
+PORTVERSION= 4.0.4
CATEGORIES= mbone audio
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/4.0.4/ \
http://people.FreeBSD.org/~cpiazza/distfiles/
diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile
index 9588586eb93b..b3bf4bda8cb3 100644
--- a/mbone/rqm/Makefile
+++ b/mbone/rqm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rqm
-# Version required: 1.0.0
# Date created: 30 January 2000
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= rqm-1.0.0
+PORTNAME= rqm
+PORTVERSION= 1.0.0
CATEGORIES= mbone
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 92f2dd8c4bf6..d4e372f72933 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rtpmon
-# Version required: 1.0a7
# Date created: 1 November 1996
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rtpmon-1.0a7
+PORTNAME= rtpmon
+PORTVERSION= 1.0a7
CATEGORIES= mbone tk82
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/rtpmon/
diff --git a/mbone/rtptools/Makefile b/mbone/rtptools/Makefile
index 2908ef56c818..a926a4843282 100644
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rtptools
-# Version required: 1.14
# Date created: 5 January 1998
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= rtptools-1.14
+PORTNAME= rtptools
+PORTVERSION= 1.14
CATEGORIES= mbone
MASTER_SITES= http://www.cs.columbia.edu/~hgs/rtptools/src/
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index d57497b4a949..9d59b2a9304c 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sdr
-# Version required: 2.9
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sdr-2.9
+PORTNAME= sdr
+PORTVERSION= 2.9
CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile
index ecd1824f93ab..c678bc233df4 100644
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: speak_freely
-# Version required: 7.1
# Date created: 18 Apr 1996
# Whom: Mister X (to make portlint happy ;)
#
# $FreeBSD$
#
-DISTNAME= speak_freely-7.1
+PORTNAME= speak_freely
+PORTVERSION= 7.1
CATEGORIES= mbone audio security
MASTER_SITES= http://www.fourmilab.ch/speakfree/unix/
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index 667d2d408c35..096f092a0284 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vat
-# Version required: 4.0b2
# Date created: 2 November 1996
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= vat-4.0b2
+PORTNAME= vat
+PORTVERSION= 4.0b2
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index e759aaefda59..e6565f95172a 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vic
-# Version required: 2.6
# Date created: 14 December 1994
# Whom: wollman
#
# $FreeBSD$
#
-DISTNAME= vic-2.8
+PORTNAME= vic
+PORTVERSION= 2.8
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
DISTFILES= vicsrc-2.8.tar.gz
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 7d0a13f0bee0..a95e50014aa9 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wb
-# Version required: 1.59
# Date created: 2 Novermber 1996
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= wb-1.59
+PORTNAME= wb
+PORTVERSION= 1.59
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
diff --git a/misc/221upgrade/Makefile b/misc/221upgrade/Makefile
index 84321ba48ed5..c6642f6a179c 100644
--- a/misc/221upgrade/Makefile
+++ b/misc/221upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 2.2.1R to 2.2-stable upgrade kit
-# Version required: n/a
# Date created: 18 Apr 1997
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 221upgrade-1998.03.08
+PORTNAME= 221upgrade
+PORTVERSION= 1998.03.08
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/222upgrade/Makefile b/misc/222upgrade/Makefile
index 39432930ac22..4f4c47fbac33 100644
--- a/misc/222upgrade/Makefile
+++ b/misc/222upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 2.2.2R to 2.2-stable upgrade kit
-# Version required: n/a
# Date created: 18 Apr 1997
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 222upgrade-1998.03.08
+PORTNAME= 222upgrade
+PORTVERSION= 1998.03.08
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/225upgrade/Makefile b/misc/225upgrade/Makefile
index 732a931d6d41..75459d788938 100644
--- a/misc/225upgrade/Makefile
+++ b/misc/225upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 2.2.5R to 2.2-stable upgrade kit
-# Version required: n/a
# Date created: 30 Nov 1997
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 225upgrade-1998.03.08
+PORTNAME= 225upgrade
+PORTVERSION= 1998.03.08
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/227upgrade/Makefile b/misc/227upgrade/Makefile
index 5c3c0a9d5593..15711ab37e49 100644
--- a/misc/227upgrade/Makefile
+++ b/misc/227upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 2.2.7R to 2.2-stable upgrade kit
-# Version required: n/a
# Date created: 17 Dec 1998
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 227upgrade-1998.03.08
+PORTNAME= 227upgrade
+PORTVERSION= 1998.03.08
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/30upgrade/Makefile b/misc/30upgrade/Makefile
index 8481c6f8145b..5862dae01b0c 100644
--- a/misc/30upgrade/Makefile
+++ b/misc/30upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 3.0R to 3-stable upgrade kit
-# Version required: n/a
# Date created: 17 Dec 1998
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 30upgrade-2000.02.02
+PORTNAME= 30upgrade
+PORTVERSION= 2000.02.02
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/31upgrade/Makefile b/misc/31upgrade/Makefile
index 2dc98f4e0f3b..746726341c66 100644
--- a/misc/31upgrade/Makefile
+++ b/misc/31upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 3.1R to 3-stable upgrade kit
-# Version required: n/a
# Date created: 8 Mar 1999
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 31upgrade-2000.02.02
+PORTNAME= 31upgrade
+PORTVERSION= 2000.02.02
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/32upgrade/Makefile b/misc/32upgrade/Makefile
index e439ffa1790b..ca676b06e508 100644
--- a/misc/32upgrade/Makefile
+++ b/misc/32upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 3.2R to 3-stable upgrade kit
-# Version required: n/a
# Date created: 20 May 1999
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 32upgrade-2000.02.02
+PORTNAME= 32upgrade
+PORTVERSION= 2000.02.02
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/34upgrade/Makefile b/misc/34upgrade/Makefile
index 7b17b3e20805..b3804b760b28 100644
--- a/misc/34upgrade/Makefile
+++ b/misc/34upgrade/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: 3.3/3.4R to 3-stable upgrade kit
-# Version required: n/a
# Date created: 5 Jan 2000
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= 34upgrade-2000.02.02
+PORTNAME= 34upgrade
+PORTVERSION= 2000.02.02
CATEGORIES= misc
DISTFILES= # empty
diff --git a/misc/Howto/Makefile b/misc/Howto/Makefile
index 3b14b29418e8..e9750ff8aa93 100644
--- a/misc/Howto/Makefile
+++ b/misc/Howto/Makefile
@@ -1,13 +1,12 @@
-# ex:ts=8
# Ports collection makefile for: Howto
-# Version required: 1.0
# Date created: Fri Oct 02, 1998
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= Howto-1.0
+PORTNAME= Howto
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/other-formats/sgml/ \
ftp://metalab.unc.edu/pub/Linux/docs/HOWTO/mini/other-formats/sgml/
diff --git a/misc/aclgen/Makefile b/misc/aclgen/Makefile
index 68bad4c6a75b..eaf968fa68f9 100644
--- a/misc/aclgen/Makefile
+++ b/misc/aclgen/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: aclgen
-# Version required: 2.02
# Date created: 17 September 1999
# Whom: igor@zynaps.ru
#
# $FreeBSD$
#
-DISTNAME= aclgen-202
-PKGNAME= aclgen-2.02
+PORTNAME= aclgen
+PORTVERSION= 2.02
CATEGORIES= misc
MASTER_SITES= ftp://ftp.sztaki.hu/pub/private/kissg/aclgen/
+DISTNAME= aclgen-202
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/acron/Makefile b/misc/acron/Makefile
index ea7f1f81345e..39021117b87d 100644
--- a/misc/acron/Makefile
+++ b/misc/acron/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: acron
-# Version required: 1.2.4
# Date created: 13 Dec 1997
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= acron
-PKGNAME= acron-1.0
+PORTNAME= acron
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ftp://ftp.cs.uni-sb.de/pub/others/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index 75f622e0df0a..8a3624b3d0b5 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: alevt
-# Version required: 1.5.1
# Date created: Wed Aug 18 13:23:00 BST 1999
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= alevt-1.5.1
+PORTNAME= alevt
+PORTVERSION= 1.5.1
CATEGORIES= misc
MASTER_SITES= http://user.exit.de/froese/alevt/ \
ftp://metalab.unc.edu/pub/Linux/apps/video/
diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index c4dcc3ce2239..4a59ef274d91 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.3.0
+PORTNAME= amanda
+PORTVERSION= 2.3.0
CATEGORIES= misc
MASTER_SITES= ftp://ftp.cs.umd.edu/pub/amanda/old-versions/
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index 569081f5f07b..431af9ef94f6 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: amanda
-# Version required: 2.3.0
# Date created: 28th Feb 1995
# Whom: gpalmer
#
# $FreeBSD$
#
-DISTNAME= amanda-2.4.1p1
-PKGNAME= amanda-2.4.1
+PORTNAME= amanda
+PORTVERSION= 2.4.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.amanda.org/pub/amanda/
+DISTNAME= amanda-2.4.1p1
MAINTAINER= cwt@FreeBSD.org
diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index 22cab74e0f34..372671efa77f 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: asbutton
-# Version required: 0.3
# Date created: 10 May 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= asbutton-0.3
+PORTNAME= asbutton
+PORTVERSION= 0.3
CATEGORIES= misc windowmaker afterstep
MASTER_SITES= http://www.tigr.net/afterstep/as-apps/download/asbutton/ \
ftp://ftp.afterstep.org/apps/asbutton/
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index d9e95dcb24a8..4555a54fb61b 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -3,20 +3,19 @@
# http://rpkalf2.mach.uni-karlsruhe.de/~ferber/astrolog/
# http://www.magitech.com/~cruiser1/astrolog.htm
#
-# Version required: 5.*
# Date created: 31 July 1995
# Whom: faulkner@cactus.org
#
# $FreeBSD$
#
-DISTNAME= ast54unx
-PKGNAME= astrolog-5.40
+PORTNAME= astrolog
+PORTVERSION= 5.40
CATEGORIES= misc
MASTER_SITES= http://www.astrolog.org/ftp/ephem/ \
http://www.astrolog.org/ftp/ \
ftp://ftp.kiarchive.ru/pub/unix/magick/astrology/astrolog/
-EXTRACT_ONLY= ${DISTNAME}.shr
+EXTRACT_ONLY= ast54unx.shr
EPHEM= LRZ5_24 CHI_24 CPJV_24
DISTFILES= ${EXTRACT_ONLY} ${EPHEM}
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 313a8de03065..2277ca1bc28c 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bb
-# Version required: 1.2
# Date created: 22 June 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= bb-1.2
+PORTNAME= bb
+PORTVERSION= 1.2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ta.jcu.cz/pub/aa/bb/ \
${MASTER_SITE_SUNSITE}
diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile
index a5cd4b8051f8..8c65925b5766 100644
--- a/misc/bbjd/Makefile
+++ b/misc/bbjd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bbjd
-# Version required: 1.01
# Date created: 3 February 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= bbjd-1.01
+PORTNAME= bbjd
+PORTVERSION= 1.01
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index 479ae830e92f..df6ebe50334b 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bidwatcher
-# Version required: 1.0.3b
# Date created: 24 Aug 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= bidwatcher-1.0.3b
+PORTNAME= bidwatcher
+PORTVERSION= 1.0.3b
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://people.FreeBSD.org/~mph/distfiles/
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index f83b4cecff98..4a6f080d2606 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bottlerocket
-# Version required: 0.04c
# Date created: 15 July 1999
# Whom: Mike Smith <msmith@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= bottlerocket-0.04c
+PORTNAME= bottlerocket
+PORTVERSION= 0.04c
CATEGORIES= misc
MASTER_SITES= http://mlug.missouri.edu/~tymm/
diff --git a/misc/boxes/Makefile b/misc/boxes/Makefile
index cde5825a1a26..6485a558b219 100644
--- a/misc/boxes/Makefile
+++ b/misc/boxes/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: boxes
-# Version required: 1.0
# Date created: 3 March 2000
# Whom: Patrick Seal (patseal@hyperhost.net)
#
# $FreeBSD$
#
-DISTNAME= boxes-1.0
+PORTNAME= boxes
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://www6.informatik.uni-erlangen.de/~tsjensen/software/boxes/download/ \
${MASTER_SITE_SUNSITE}
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 16629517fe8b..f9e7a949f4ff 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: buffer
-# Version required: 1.17.1
# Date created: 23 February 1998
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= buffer-1.17.1
+PORTNAME= buffer
+PORTVERSION= 1.17.1
CATEGORIES= misc
MASTER_SITES= http://people.FreeBSD.org/~steve/distfiles/
diff --git a/misc/cassowary/Makefile b/misc/cassowary/Makefile
index 27ce29aed1f6..7e6e2bcc60fa 100644
--- a/misc/cassowary/Makefile
+++ b/misc/cassowary/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cassowary
-# Version required: 0.55
# Date created: 01 October 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD>org>
#
# $FreeBSD$
#
-DISTNAME= cassowary-0.55
+PORTNAME= cassowary
+PORTVERSION= 0.55
CATEGORIES= misc
MASTER_SITES= http://www.cs.washington.edu/research/constraints/cassowary/
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index b6fc36b71883..a8a7cb50cfc9 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for: chard
-# Version required: 3.6
+# New ports collection makefile for: chord
# Date created: 24 April 1995
# Whom: Satoshi Asami
#
# $FreeBSD$
#
-DISTNAME= chord
-PKGNAME= chord-3.6
+PORTNAME= chord
+PORTVERSION= 3.6
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL}
+DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index 364e7571da35..bbfa950ee227 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cmatrix
-# Version required: 1.0b
# Date created: 1 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= cmatrix-1.0b
+PORTNAME= cmatrix
+PORTVERSION= 1.0b
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/hacks/curses
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 59ae652277ae..6650bd6e22de 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -6,10 +6,11 @@
# $FreeBSD$
#
-DISTNAME= colorls-2.2.7
+PORTNAME= colorls
+PORTVERSION= 2.2.7
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL}
-DISTFILES= ls-2.2.7.tar.gz
+DISTFILES= ls-${PORTVERSION}.tar.gz
MAINTAINER= asami@FreeBSD.org
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index fd7213968665..51e51a4a2443 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: colortail
-# Version required: 0.2.0
# Date created: 25 February 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= colortail-0.2.0
-CATEGORIES= misc
+PORTNAME= colortail
+PORTVERSION= 0.2.0
+CATEGORIES= misc
MASTER_SITES= http://people.FreeBSD.org/~cpiazza/distfiles/
# commented out until I upgrade to 0.3.0
-# MASTER_SITES= http://www.student.hk-r.se/~pt98jan/
+# MASTER_SITES= http://www.student.hk-r.se/~pt98jan/
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/misc/crosspad/Makefile b/misc/crosspad/Makefile
index 488dc839aaab..8c3c9b8fee7a 100644
--- a/misc/crosspad/Makefile
+++ b/misc/crosspad/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: crosspad
-# Version required: 19991202
# Date created: 23 September 1998
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= crosspad-19991202
+PORTNAME= crosspad
+PORTVERSION= 19991202
CATEGORIES= misc
MASTER_SITES= ftp://ftp.itojun.org/pub/misc/
diff --git a/misc/cstream/Makefile b/misc/cstream/Makefile
index 80666313f322..ecda0fce9d31 100644
--- a/misc/cstream/Makefile
+++ b/misc/cstream/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cstream
-# Version required: 1.0
# Date created: 19990304
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= cstream-2.0
+PORTNAME= cstream
+PORTVERSION= 2.0
CATEGORIES= misc
MASTER_SITES= http://www.cons.org/cracauer/download/ \
http://www2.cons.org/cracauer/download/ \
diff --git a/misc/cwish/Makefile b/misc/cwish/Makefile
index 858d5ed3fdbf..efbb1e0cc8e9 100644
--- a/misc/cwish/Makefile
+++ b/misc/cwish/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: cwish
-# Version required: 0.0
# Date created: Thur Sept 25, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= cwish-3.52
+PORTNAME= cwish
+PORTVERSION= 3.52
CATEGORIES= misc
MASTER_SITES= http://www.hcs.de/users/hm/packages/
diff --git a/misc/deco/Makefile b/misc/deco/Makefile
index c8200bb6ec98..b60102393839 100644
--- a/misc/deco/Makefile
+++ b/misc/deco/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: deco
-# Version required: 3.8
# Date created: 16 Dec 1997
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= deco383
-PKGNAME= deco-3.8.3
+PORTNAME= deco
+PORTVERSION= 3.8.3
CATEGORIES= misc
MASTER_SITES= ftp://ftp.cronyx.ru/cronyx/deco/
+DISTNAME= deco383
EXTRACT_SUFX= .tgz
MAINTAINER= dima@Chg.RU
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index a4130ad06b12..66f6befd421c 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dejagnu
-# Version required: 1.3
# Date created: 12 October 1996
# Whom: markm
#
# $FreeBSD$
#
-DISTNAME= dejagnu-1.3
+PORTNAME= dejagnu
+PORTVERSION= 1.3
CATEGORIES= misc tk80
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= dejagnu
diff --git a/misc/delay/Makefile b/misc/delay/Makefile
index 1e8396fa312a..daaa98a54cf5 100644
--- a/misc/delay/Makefile
+++ b/misc/delay/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: misc/delay
-# Version required: delay-1.4
# Date created: 03 Mar 1999
# Whom: gmarco@giovannelli.it
#
# $FreeBSD$
#
-DISTNAME= delay-1.4
+PORTNAME= delay
+PORTVERSION= 1.4
CATEGORIES= misc
MASTER_SITES= http://onegeek.org/~tom/software/delay/dl/
diff --git a/misc/diction/Makefile b/misc/diction/Makefile
index d5fc0f7fcc26..3ae3dd9f9553 100644
--- a/misc/diction/Makefile
+++ b/misc/diction/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: diction
-# Version required: 0.8
# Date created: 2 August 1998
# Whom: J Han <hjh@best.com>
#
# $FreeBSD$
#
-DISTNAME= diction-0.8
+PORTNAME= diction
+PORTVERSION= 0.8
CATEGORIES= misc
MASTER_SITES= ftp://cantor.informatik.rwth-aachen.de/pub/unix/
diff --git a/misc/display/Makefile b/misc/display/Makefile
index 6a15c6b6de70..6b0724375c3a 100644
--- a/misc/display/Makefile
+++ b/misc/display/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: display
-# Version required: 1.0
# Date created: 25 August 1997
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= display-1.1
+PORTNAME= display
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= http://www.ipsmart.com/src/
EXTRACT_SUFX= .tgz
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index bc100518a850..e7a74453d414 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: dnetc
-# Version required: 450
# Date created: 26 Dec 1999
# Whom: dbaker
#
# $FreeBSD$
#
-.include <bsd.port.pre.mk>
-DISTNAME= dnetc
-PKGNAME= dnetc-2.8007.458b
+PORTNAME= dnetc
+PORTVERSION= 2.8007.458b
CATEGORIES= misc
MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/v2.8007/ \
http://http.distributed.net/pub/dcti/v2.8007/
+.include <bsd.port.pre.mk>
.if ${ARCH} == "i386"
DISTFILES= dnetc458b-freebsd-x86-elf.tar.gz
.elif ${ARCH} == "alpha"
diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile
index 53ba1ca653c9..2063f5c8b4ae 100644
--- a/misc/dotfile/Makefile
+++ b/misc/dotfile/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: dotfile
-# Version required: 2.0
# Date created: 11/12/96
# Whom: oly@world.std.com
#
# $FreeBSD$
#
-DISTNAME= dotfile-2.2
+PORTNAME= dotfile
+PORTVERSION= 2.2
CATEGORIES= misc tk82
MASTER_SITES= ftp://ftp.imada.ou.dk/pub/dotfile/
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 1a56911668c8..e644869c9be1 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -1,17 +1,17 @@
# ports collection makefile for: estic
-# Version required: 1.40
# Date created: 21 Sep 1996
# Whom: Julian Stacey <jhs@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= estic-1.40-sources
-PKGNAME= estic-1.40
+PORTNAME= estic
+PORTVERSION= 1.40
CATEGORIES= misc
MASTER_SITES= ftp://linux01.gwdg.de/pub/isdn/estic/ \
ftp://ftp.franken.de/pub/isdn4linux/estic/ \
http://www.fast.de/~uli/isdn/estic/
+DISTNAME= estic-${PORTVERSION}-sources
MAINTAINER= jhs@FreeBSD.org
diff --git a/misc/ezload/Makefile b/misc/ezload/Makefile
index fadd46d68ce3..471802db5064 100644
--- a/misc/ezload/Makefile
+++ b/misc/ezload/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ezload
-# Version required: 0.3.1
# Date created: 18 november 1999
# Whom: n_hibma
#
# $FreeBSD$
#
-DISTNAME= ezload-0.3.1
+PORTNAME= ezload
+PORTVERSION= 0.3.1
CATEGORIES= misc
MASTER_SITES= http://www.etla.net/~n_hibma/usb/
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index bbb5aace37c2..373018b1c55f 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: FDclone
-# Version required: 1.03i
# Date created: 20 Feb 1996
# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
#
# $FreeBSD$
#
-DISTNAME= FD-1.03l
-PKGNAME= fd-1.03l
+PORTNAME= fd
+PORTVERSION= 1.03l
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
http://people.FreeBSD.org/~steve/distfiles/
+DISTNAME= FD-${PORTVERSION}
MAINTAINER= nobu@psrc.isac.co.jp
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index cb7a5755e93d..9564b57ef4f2 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fep
-# Version required: 1.0
# Date created: 20 Feb 1996
# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
#
# $FreeBSD$
#
-DISTNAME= fep
-PKGNAME= fep-1.0
+PORTNAME= fep
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ftp://ftp.sra.co.jp/pub/cmd/
+DISTNAME= ${PORTNAME}
MAINTAINER= nobu@psrc.isac.co.jp
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 29863629f82b..256431baa337 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -1,20 +1,20 @@
# ex:ts=8
# Ports collection makefile for: figlet
-# Version required: 0.0
# Date created: Sat July 20, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= figlet22
-PKGNAME= figlet-2.2
+PORTNAME= figlet
+PORTVERSION= 2.2
CATEGORIES= misc
MASTER_SITES= ftp://wuarchive.wustl.edu/graphics/graphics/misc/figlet/program/unix/ \
ftp://ftp.funet.fi/pub/unix/tools/figlet/program/unix/ \
ftp://ftp.internexus.net/pub/figlet/program/unix/ \
http://people.FreeBSD.org/~obrien/Distfiles/ \
ftp://nuxi.ucdavis.edu/pub/misc/
+DISTNAME= figlet22
MAINTAINER= obrien@FreeBSD.org
diff --git a/misc/fortuneit/Makefile b/misc/fortuneit/Makefile
index 297b1c63e768..566e957c308e 100644
--- a/misc/fortuneit/Makefile
+++ b/misc/fortuneit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: fortuneit
-# Version required: fortune.it-1.51
# Date created: 25-01-1999
# Whom: gmarco@giovannelli.it
#
# $FreeBSD$
#
-DISTNAME= fortune.it-1.51
-PKGNAME= fortuneit-1.51
+PORTNAME= fortuneit
+PORTVERSION= 1.51
CATEGORIES= misc
MASTER_SITES= http://www.giovannelli.it/~gmarco/files/
+DISTNAME= fortune.it-${PORTVERSION}
MAINTAINER= gmarco@giovannelli.it
diff --git a/misc/freedialog/Makefile b/misc/freedialog/Makefile
index d7354bb15580..b7fa5b3ab947 100644
--- a/misc/freedialog/Makefile
+++ b/misc/freedialog/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: freedialog
-# Version required: 0.3
# Date created: 30 October 1999
# Whom: James Howard <howardj@wam.umd.edu>
#
# $FreeBSD$
#
-DISTNAME= dialog-0.3
-PKGNAME= freedialog-0.3
+PORTNAME= freedialog
+PORTVERSION= 0.3
CATEGORIES= misc
MASTER_SITES= ftp://ftp.wam.umd.edu/pub/howardjp/software/dialog/ \
http://www.wam.umd.edu/~howardjp/software/dialog/ \
ftp://dragon.ham.muohio.edu/pub/howardjp/software/dialog/
+DISTNAME= dialog-${PORTVERSION}
MAINTAINER= howardjp@wam.umd.edu
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index 43292d670272..9ab39c70a547 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: geekcode generator
-# Version required: 1.5
# Date created: 30 Aug 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= geekcode-1.7
+PORTNAME= geekcode
+PORTVERSION= 1.7
CATEGORIES= misc
MASTER_SITES= http://seymour.lazygenes.net/ \
http://www.zort.on.ca/software/
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 6f3dc4485cb3..8aaa3e023976 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: git
-# Version required: 4.3.19
# Date created: 12 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= git-4.3.19
+PORTNAME= git
+PORTVERSION= 4.3.19
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= git
diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile
index 707ac17a8cab..00304c910829 100644
--- a/misc/gnomeusersguide/Makefile
+++ b/misc/gnomeusersguide/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeusersguide
-# Version required: 1.0.72
# Date created: 02 August 1999
# Whom: Yukihiro Nakai <Nacai@iname.com>
#
# $FreeBSD$
#
-DISTNAME= users-guide-1.0.72
-PKGNAME= gnomeusersguide-1.0.72
+PORTNAME= gnomeusersguide
+PORTVERSION= 1.0.72
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/users-guide
+DISTNAME= users-guide-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index fb5bab56eabc..2480f0f6c2f3 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeutils
-# Version required: 1.0.51
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-utils-1.0.51
-PKGNAME= gnomeutils-1.0.51
+PORTNAME= gnomeutils
+PORTVERSION= 1.0.51
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
+DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index fb5bab56eabc..2480f0f6c2f3 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomeutils
-# Version required: 1.0.51
# Date created: 03 July 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gnome-utils-1.0.51
-PKGNAME= gnomeutils-1.0.51
+PORTNAME= gnomeutils
+PORTVERSION= 1.0.51
CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-utils
+DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= ade@FreeBSD.org
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 6f3dc4485cb3..8aaa3e023976 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: git
-# Version required: 4.3.19
# Date created: 12 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= git-4.3.19
+PORTNAME= git
+PORTVERSION= 4.3.19
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= git
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index b41107b29462..045c857b3570 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -6,11 +6,12 @@
# $FreeBSD$
#
-DISTNAME= fileutils-4.0
-PKGNAME= gnuls-4.0
+PORTNAME= gnuls
+PORTVERSION= 4.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= fileutils
+DISTNAME= fileutils-${PORTVERSION}
MAINTAINER= bmc@WillsCreek.COM
diff --git a/misc/gone/Makefile b/misc/gone/Makefile
index 1aaa2957ba91..254c518c74c9 100644
--- a/misc/gone/Makefile
+++ b/misc/gone/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gone
-# Version required: 1.3.1
# Date created: 19 April 1998
# Whom: marcus
#
# $FreeBSD$
#
-DISTNAME= gone-1.3.1
+PORTNAME= gone
+PORTVERSION= 1.3.1
CATEGORIES= misc
MASTER_SITES= http://jaguar.ir.miami.edu/~marcus/
diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile
index 7422a03ea167..f3549712bfcf 100644
--- a/misc/gplbp/Makefile
+++ b/misc/gplbp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gplbp
-# Version required: 0.92
# Date created: 23 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= gplbp-0.92
+PORTNAME= gplbp
+PORTVERSION= 0.92
CATEGORIES= misc
MASTER_SITES= ftp://ftp.stampede.org/skibum/
diff --git a/misc/grun/Makefile b/misc/grun/Makefile
index 8b3fb2ed9ef8..a5c91a88c5e5 100644
--- a/misc/grun/Makefile
+++ b/misc/grun/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: grun
-# Version required: 0.8.1
# Date created: Sun Jul 18 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= grun-0.8.1
+PORTNAME= grun
+PORTVERSION= 0.8.1
CATEGORIES= misc
MASTER_SITES= http://www.geocities.com/ResearchTriangle/Facility/1468/sg/
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index 0928a673a581..534be4b69689 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtkfind
-# Version required: 1.1
# Date created: 28 Sept 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
# $FreeBSD$
#
-DISTNAME= gtkfind-1.1
+PORTNAME= gtkfind
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= http://www.oz.net/~mattg/
# metalab hasn't caught up yet...
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index d5ca2d525452..37d68091122a 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: gtl
-# Version required: 0.3.2
# Date created: 05 October 1999
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= GTL-0.3.2
-PKGNAME= gtl-0.3.2
+PORTNAME= gtl
+PORTVERSION= 0.3.2
CATEGORIES= misc
MASTER_SITES= http://infosun.fmi.uni-passau.de/GTL/archive/
+DISTNAME= GTL-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index 6bb6d6c80e9d..c541da4f15bd 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: hello
-# Version required: 1.3
# Date created: Fri Jul 23, 1999
# Whom: shipley@dis.org
#
# $FreeBSD$
#
-DISTNAME= hello-1.3
-PKGNAME= hello-1.3.1
+PORTNAME= hello
+PORTVERSION= 1.3.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= hello
+DISTNAME= hello-1.3
MAINTAINER= shipley@dis.org
diff --git a/misc/heyu/Makefile b/misc/heyu/Makefile
index 393e28fe296c..be5fa78e3aba 100644
--- a/misc/heyu/Makefile
+++ b/misc/heyu/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: heyu
-# Version required: 1.28h
# Date created: 27 December 1999
# Whom: plambert@plambert.net
#
# $FreeBSD$
#
-DISTNAME= x10_heyu
-PKGNAME= heyu-1.28h
+PORTNAME= heyu
+PORTVERSION= 1.28h
CATEGORIES= misc
MASTER_SITES= http://www.prado.com/~dbs/
+DISTNAME= x10_heyu
EXTRACT_SUFX= .tgz
MAINTAINER= plambert@plambert.net
diff --git a/misc/heyu2/Makefile b/misc/heyu2/Makefile
index 393e28fe296c..be5fa78e3aba 100644
--- a/misc/heyu2/Makefile
+++ b/misc/heyu2/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: heyu
-# Version required: 1.28h
# Date created: 27 December 1999
# Whom: plambert@plambert.net
#
# $FreeBSD$
#
-DISTNAME= x10_heyu
-PKGNAME= heyu-1.28h
+PORTNAME= heyu
+PORTVERSION= 1.28h
CATEGORIES= misc
MASTER_SITES= http://www.prado.com/~dbs/
+DISTNAME= x10_heyu
EXTRACT_SUFX= .tgz
MAINTAINER= plambert@plambert.net
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 492f7d9e7403..7f02b8be29ca 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: iselect
-# Version required: 1.2.0
# Date created: 03-Jan-1998
# Whom: Ralf S. Engelschall <rse@engelschall.com>
#
# $FreeBSD$
#
-DISTNAME= iselect-1.2.0
+PORTNAME= iselect
+PORTVERSION= 1.2.0
CATEGORIES= misc
MASTER_SITES= http://www.engelschall.com/sw/iselect/distrib/ \
ftp://ftp.engelschall.com/sw/iselect/
diff --git a/misc/jargon/Makefile b/misc/jargon/Makefile
index 907e50ba59cf..be03c0df1c6a 100644
--- a/misc/jargon/Makefile
+++ b/misc/jargon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: jargon
-# Version required: 4.0.0
# Date created: 11 July 1998
# Whom: moeding
#
# $FreeBSD$
#
-DISTNAME= jargon-4.1.1
+PORTNAME= jargon
+PORTVERSION= 4.1.1
CATEGORIES= misc
MASTER_SITES= http://www.tuxedo.org/~esr/jargon/ \
http://www.nectar.com/distfiles/
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index d576c0acb663..1f34940c0d49 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: jive
-# Version required: 0.0
# Date created: Mon Feb 17, 1997
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= jive-1.1
+PORTNAME= jive
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
http://people.FreeBSD.org/~obrien/Distfiles/
diff --git a/misc/kcd-devel/Makefile b/misc/kcd-devel/Makefile
index 7e69e6e17280..581834c00153 100644
--- a/misc/kcd-devel/Makefile
+++ b/misc/kcd-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kcd
-# Version required: 4.11.1
# Date created: 5 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= kcd-4.11.1
+PORTNAME= kcd
+PORTVERSION= 4.11.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www-scf.usc.edu/~lerdsuwa/util/
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index 7e69e6e17280..581834c00153 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kcd
-# Version required: 4.11.1
# Date created: 5 May 1999
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= kcd-4.11.1
+PORTNAME= kcd
+PORTVERSION= 4.11.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www-scf.usc.edu/~lerdsuwa/util/
diff --git a/misc/kdeutils11/Makefile b/misc/kdeutils11/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/misc/kdeutils11/Makefile
+++ b/misc/kdeutils11/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/misc/kdeutils2/Makefile b/misc/kdeutils2/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/misc/kdeutils2/Makefile
+++ b/misc/kdeutils2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 395693b361a0..c1e419bda8ac 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kp
-# Version required: 1.00
# Date created: 8 May 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= kp-1.00
+PORTNAME= kp
+PORTVERSION= 1.00
CATEGORIES= misc
MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index e496383cf29c..17b12a7101b1 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kwatch
-# Version required: Beta4
# Date created: 23 May 1998
# Whom: Hans Petter Bieker <zerium@webindex.no>
#
# $FreeBSD$
#
-DISTNAME= kwatch-0.3
+PORTNAME= kwatch
+PORTVERSION= 0.3
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1/apps/utils
diff --git a/misc/lc/Makefile b/misc/lc/Makefile
index 32723c57ebc9..0c81beb26ddc 100644
--- a/misc/lc/Makefile
+++ b/misc/lc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lc
-# Version required: 1.0
# Date created: 13 November 1999
# Whom: jsellens
#
# $FreeBSD$
#
-DISTNAME= lc-1.0
+PORTNAME= lc
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://www.generalconcepts.com/resources/software/
diff --git a/misc/less/Makefile b/misc/less/Makefile
index 3d7181ff42e9..4e008c1c1022 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: less
-# http://www.flash.net/~marknu/less/
-# Version required: 3.*
# Date created: 8 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= less-352
+PORTNAME= less
+PORTVERSION= 352
CATEGORIES= misc
MASTER_SITES= http://home.flash.net/~marknu/less/ \
${MASTER_SITE_GNU}
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index afc15e365974..44b6455b69ab 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ile
-# Version required: 2.0
# Date created: 25 Jun 1997
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= lile-2.0
-PKGNAME= ile-2.0
+PORTNAME= ile
+PORTVERSION= 2.0
CATEGORIES= misc
MASTER_SITES= ftp://ftp.inria.fr/system/user/
+DISTNAME= lile-2.0
EXTRACT_SUFX= .tar.z
MAINTAINER= jmz@FreeBSD.org
diff --git a/misc/logsurfer+/Makefile b/misc/logsurfer+/Makefile
index 496834fd6730..30a663098e8f 100644
--- a/misc/logsurfer+/Makefile
+++ b/misc/logsurfer+/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: logsurfer
-# Version required: 1.41
# Date created: 28 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= logsurfer-1.41
+PORTNAME= logsurfer
+PORTVERSION= 1.41
CATEGORIES= misc
MASTER_SITES= ftp://ftp.fh-rosenheim.de/pub/mirror/cert.dfn/tools/audit/logsurfer/ \
ftp://ftp.tuwien.ac.at/infosys/security/dfn/tools/audit/logsurfer/ \
diff --git a/misc/logsurfer/Makefile b/misc/logsurfer/Makefile
index 496834fd6730..30a663098e8f 100644
--- a/misc/logsurfer/Makefile
+++ b/misc/logsurfer/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: logsurfer
-# Version required: 1.41
# Date created: 28 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= logsurfer-1.41
+PORTNAME= logsurfer
+PORTVERSION= 1.41
CATEGORIES= misc
MASTER_SITES= ftp://ftp.fh-rosenheim.de/pub/mirror/cert.dfn/tools/audit/logsurfer/ \
ftp://ftp.tuwien.ac.at/infosys/security/dfn/tools/audit/logsurfer/ \
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index 3711a7d58241..940eb636eba8 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: lv
-# Version required: 4.49.3
# Date created: Fri Nov 6 09:06:33 PST 1998
# Whom: sumikawa@kame.net
#
# $FreeBSD$
#
-DISTNAME= lv4493
-PKGNAME= lv-4.49.3
+PORTNAME= lv
+PORTVERSION= 4.49.3
CATEGORIES= misc
MASTER_SITES= http://www.ff.iij4u.or.jp/~nrt/freeware/
+DISTNAME= lv4493
MAINTAINER= sumikawa@kame.net
diff --git a/misc/man.el/Makefile b/misc/man.el/Makefile
index af55d8d4e0f9..00286817b832 100644
--- a/misc/man.el/Makefile
+++ b/misc/man.el/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: man.el with I18N
-# Version required: 1.1
# Date created: 10 September 1998
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= i18n-man-1.1
+PORTNAME= i18n-man
+PORTVERSION= 1.1
CATEGORIES= misc elisp
MASTER_SITES= ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
${MASTER_SITE_PORTS_JP}
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 77d09b124bd2..cdb778e46bc3 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mc
-# Version required: 4.5.44
# Date created: 15 Jul 1995
# Whom: torstenb@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= mc-4.5.44
+PORTNAME= mc
+PORTVERSION= 4.5.44
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/mc
diff --git a/misc/mgp-mode.el/Makefile b/misc/mgp-mode.el/Makefile
index c87d68a5eb5c..93d9723fb6e6 100644
--- a/misc/mgp-mode.el/Makefile
+++ b/misc/mgp-mode.el/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: mgp-mode.el
-# Version required: 1.30
# Date created: 99/10/6
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= mgp-mode.el
-PKGNAME= mgp-mode.el-1.30
+PORTNAME= mgp-mode.el
+PORTVERSION= 1.30
CATEGORIES= misc elisp
MASTER_SITES= ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/Emacs/MagicPoint/
-EXTRACT_SUFX= # empty
+DISTFILES= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 0d9de87fb0e2..9278bdd4fb54 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: mmv
-# Version required: 1.01b
# Date created: 2 Feb 1995
# Whom: Michael Elbel (me)
#
# $FreeBSD$
#
-DISTNAME= mmv
-PKGNAME= mmv-1.01b
+PORTNAME= mmv
+PORTVERSION= 1.01b
CATEGORIES= misc
MASTER_SITES= ftp://gatekeeper.dec.com/pub/usenet/comp.sources.unix/volume21/mmv/
DISTFILES= part01.Z part02.Z
@@ -19,7 +18,7 @@ MAINTAINER= me@FreeBSD.org
NO_CDROM= "No redistribution for charge"
NO_PACKAGE= "No modification"
-DIST_SUBDIR= ${DISTNAME}
+DIST_SUBDIR= ${PORTNAME}
NO_WRKSUBDIR= yes
PATCH_DIST_ARGS= -d ${WRKSRC} --forward --quiet -E ${PATCH_DIST_STRIP} mmv.c
MAN1= mmv.1
diff --git a/misc/most/Makefile b/misc/most/Makefile
index 736e4c311dbc..4a255c8a70a0 100644
--- a/misc/most/Makefile
+++ b/misc/most/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: most
-# Version required: 4.9.0
# Date created: 31 May 1997
# Whom: rhwang@bigpanda.com
#
# $FreeBSD$
#
-DISTNAME= most-4.9.0
+PORTNAME= most
+PORTVERSION= 4.9.0
CATEGORIES= misc
MASTER_SITES= ftp://space.mit.edu/pub/davis/most/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index 7cbeedf40b77..37db90d0d009 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -6,8 +6,8 @@
# $FreeBSD$
#
-DISTNAME= mshell
-PKGNAME= mshell-1.0
+PORTNAME= mshell
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ftp://src.doc.ic.ac.uk/usenet/alt.sources/articles/07000-07999/
DISTFILES= 7432.Z
diff --git a/misc/numchar/Makefile b/misc/numchar/Makefile
index 138528354602..26e0b1dad5c3 100644
--- a/misc/numchar/Makefile
+++ b/misc/numchar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: numchar
-# Version required: 1.0
# Date created: 3 August 1999
# Whom: G. Adam Stanislav <adam@whizkidtech.net>
#
# $FreeBSD$
#
-DISTNAME= numchar-1.0
+PORTNAME= numchar
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ftp://www.whizkidtech.net/unix/
diff --git a/misc/nwrite/Makefile b/misc/nwrite/Makefile
index 703fb53fa4b3..d2ffdfe57b63 100644
--- a/misc/nwrite/Makefile
+++ b/misc/nwrite/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nwrite
-# Version required: 1.9.2
# Date created: 29 July 1997
# Whom: daveh
#
# $FreeBSD$
#
-DISTNAME= nwrite-1.9.2
+PORTNAME= nwrite
+PORTVERSION= 1.9.2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.csua.berkeley.edu/pub/nwrite/
diff --git a/misc/orville-write/Makefile b/misc/orville-write/Makefile
index 5c1d829140e1..f533c05c3d5c 100644
--- a/misc/orville-write/Makefile
+++ b/misc/orville-write/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: orville-write
-# Version required: 2.41a
# Date created: 4 December 1999
# Whom: James Howard <howardj@wam.umd.edu>
#
# $FreeBSD$
#
-DISTNAME= orville-write-2.41a
+PORTNAME= orville-write
+PORTVERSION= 2.41a
CATEGORIES= misc
MASTER_SITES= http://www.wwnet.net/~janc/software/
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index 3afd415d78ef..3b4c5800d5ab 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Array-PrintCols
-# Version required: 2.1
# Date created: October 17th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Array-PrintCols-2.1
-PKGNAME= p5-Array-PrintCols-2.1
+PORTNAME= Array-PrintCols
+PORTVERSION= 2.1
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Array
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 977c3b0799b5..983e66085a36 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Business-CreditCard
-# Version required: 0.21
# Date created: October 20th 1996
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Business-CreditCard-0.21
-PKGNAME= p5-Business-CreditCard-0.21
+PORTNAME= Business-CreditCard
+PORTVERSION= 0.21
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Business
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index 15e8458c45ed..13c3af5b7e41 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-I18N-Charset
-# Version required: 1.03
# Date created: 26 December 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= I18N-Charset-1.03
-PKGNAME= p5-I18N-Charset-1.03
+PORTNAME= I18N-Charset
+PORTVERSION= 1.03
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= I18N
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
diff --git a/misc/p5-I18N-LangTags/Makefile b/misc/p5-I18N-LangTags/Makefile
index 634b7c20b167..6c5e9c5e0a34 100644
--- a/misc/p5-I18N-LangTags/Makefile
+++ b/misc/p5-I18N-LangTags/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-I18N-LangTags
-# Version required: 0.12
# Date created: 26 December 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= I18N-LangTags-0.12
-PKGNAME= p5-I18N-LangTags-0.12
+PORTNAME= I18N-LangTags
+PORTVERSION= 0.12
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= I18N
+PKGNAMEPREFIX= p5-
MAINTAINER= dima@Chg.RU
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index 0ff9bc1c3463..ec1fb3a213bc 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-Locale-Codes
-# Version required: 1.00
# Date created: June 26th 1997
# Whom: James FitzGibbon <jfitz@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Locale-Codes-1.00
-PKGNAME= p5-Locale-Codes-1.00
+PORTNAME= Locale-Codes
+PORTVERSION= 1.00
CATEGORIES= misc perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Locale
+PKGNAMEPREFIX= p5-
MAINTAINER= jfitz@FreeBSD.org
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 273f559b88d8..284c41e76a55 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: pdmenu
-# Version required: 1.2.48
# Date created: 14 December 1998
# Whom: Neil Blakey-Milner <nbm@rucus.ru.ac.za>
#
# $FreeBSD$
-DISTNAME= pdmenu_1.2.59
-PKGNAME= pdmenu-1.2.59
+PORTNAME= pdmenu
+PORTVERSION= 1.2.59
CATEGORIES= misc
MASTER_SITES= http://kitenet.net/programs/code/pdmenu/
+DISTNAME= pdmenu_${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
diff --git a/misc/peq/Makefile b/misc/peq/Makefile
index d29513a300bc..19414b9136d2 100644
--- a/misc/peq/Makefile
+++ b/misc/peq/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: peq
-# Version required: 0.7.1
# Date created: 2 April 1999
# Whom: Gordon Greeff
#
# $FreeBSD$
#
-DISTNAME= peq-0.7.1
+PORTNAME= peq
+PORTVERSION= 0.7.1
CATEGORIES= games
MASTER_SITES= http://silverstone.fortunecity.com/jaguar/37/ \
ftp://lost.iafrica.com/pub/peq/
diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile
index 0b87e2af88d4..a273d5515c41 100644
--- a/misc/pinfo/Makefile
+++ b/misc/pinfo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pinfo
-# Version required: 0.5.9
# Date created: 19 May 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= pinfo-0.5.9
+PORTNAME= pinfo
+PORTVERSION= 0.5.9
CATEGORIES= misc
MASTER_SITES= http://zeus.polsl.gliwice.pl/~pborys/stable-version/
diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index 697fb118674e..dbbe3483db76 100644
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: distributed.net-v2personalproxy
-# Version required: 308
# Date created: 31 Oct 1999
# Whom: globalpanic@gmx.net
#
# $FreeBSD$
#
-DISTNAME= proxyper313-freebsd-x86
-PKGNAME= proxyper-freebsd3-elf-x86-313
+PORTNAME= proxyper-freebsd3-elf-x86
+PORTVERSION= 313
CATEGORIES= misc
MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/proxyper-rc5des/ \
http://http.distributed.net/pub/dcti/proxyper-rc5des/
+DISTNAME= proxyper${PORTVERSION}-freebsd-x86
MAINTAINER= dbaker@FreeBSD.org
diff --git a/misc/py-distutils/Makefile b/misc/py-distutils/Makefile
index 3040857219bc..3d7ab8130865 100644
--- a/misc/py-distutils/Makefile
+++ b/misc/py-distutils/Makefile
@@ -1,15 +1,16 @@
# New ports collection makefile for: Distutils
-# Version required: 0.1.3
# Date created: 23 March 2000
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= Distutils-0.1.3
-PKGNAME= py-distutils-0.1.3
+PORTNAME= distutils
+PORTVERSION= 0.1.3
CATEGORIES= misc python
MASTER_SITES= http://www.python.org/sigs/distutils-sig/
+PKGNAMEPREFIX= py-
+DISTNAME= Distutils-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
diff --git a/misc/qclock/Makefile b/misc/qclock/Makefile
index 1231e996477f..4157cbbb9082 100644
--- a/misc/qclock/Makefile
+++ b/misc/qclock/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qclock
-# Version required: 1.0
# Date created: 12 August 1998
# Whom: brett@peloton.physics.montana.edu
#
# $FreeBSD$
#
-DISTNAME= qclock
-PKGNAME= qclock-1.0
+PORTNAME= qclock
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://peloton.runet.edu/distfiles/
+DISTNAME= ${PORTNAME}
MAINTAINER= brett@peloton.runet.edu
diff --git a/misc/qhacc/Makefile b/misc/qhacc/Makefile
index 9cce0ee32f67..8be9234b6f79 100644
--- a/misc/qhacc/Makefile
+++ b/misc/qhacc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: qhacc
-# Version required: 0.3.1
# Date created: 28 Dec 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= qhacc_0.3.1
-PKGNAME= qhacc-0.3.1
+PORTNAME= qhacc
+PORTVERSION= 0.3.1
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ostrich-emulators.cx/qhacc/
+DISTNAME= qhacc_${PORTVERSION}
MAINTAINER= will@FreeBSD.org
diff --git a/misc/quotes/Makefile b/misc/quotes/Makefile
index 71ea851597fd..e7616817a046 100644
--- a/misc/quotes/Makefile
+++ b/misc/quotes/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: quotes
-# Version required: 1.5-2
# Date created: 9 February 1999
# Whom: Dima Sivachenko
#
# $FreeBSD$
#
-DISTNAME= quotes-1.5-2
-PKGNAME= quotes-1.5.2
+PORTNAME= quotes
+PORTVERSION= 1.5.2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.iae.nl/pub/users/grimaldo/
+DISTNAME= quotes-1.5-2
MAINTAINER= dima@Chg.RU
diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile
index 2441e953ffe6..b0b857b70f37 100644
--- a/misc/rfc/Makefile
+++ b/misc/rfc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: rfc
-# Version required: 2.2
# Date created: 05 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= rfc
-PKGNAME= rfc-2.2
+PORTNAME= rfc
+PORTVERSION= 2.2
CATEGORIES= misc
MASTER_SITES= http://www.dewn.com/rfc/
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX=
MAINTAINER= jedgar@FreeBSD.org
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 52f878a0c105..8526d17f3d8e 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rpm
-# Version required: 2.5.6
# Date created: 30 April 1999
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= rpm-2.5.6
+PORTNAME= rpm
+PORTVERSION= 2.5.6
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-2.5.x/
diff --git a/misc/rpm2cpio/Makefile b/misc/rpm2cpio/Makefile
index c1bdb3c44c6f..759134ebb0d3 100644
--- a/misc/rpm2cpio/Makefile
+++ b/misc/rpm2cpio/Makefile
@@ -1,19 +1,19 @@
# New ports collection makefile for: rpm2cpio
-# Version required: #no version#
# Date created: Sun Jul 18 21:51:23 MET DST 1999
# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
#
# $FreeBSD$
#
-DISTNAME= rpm2cpio
-PKGNAME= rpm2cpio-1.0
+PORTNAME= rpm2cpio
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://www.eleves.ens.fr:8080/home/espel/
-EXTRACT_SUFX=
+DISTFILES= ${PORTNAME}
MAINTAINER= nox@jelal.kn-bremen.de
+NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
EXTRACT_AFTER_ARGS= .
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index e791fafe1372..064de5e18b7d 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rtfm
-# Version required: 1.0
# Date created: 20 July 1999
# Whom: Chris Costello <chris@calldei.com>
#
# $FreeBSD$
#
-DISTNAME= rtfm-1.0
+PORTNAME= rtfm
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= http://people.FreeBSD.org/~chris/distfiles/
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 098d0b67c73d..1ce2ab5b4ae8 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: screen
-# Version required: 3.9.5
# Date created: 25 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= screen-3.9.5
+PORTNAME= screen
+PORTVERSION= 3.9.5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}
diff --git a/misc/scriptkit/Makefile b/misc/scriptkit/Makefile
index a8426b58fc65..da404782679a 100644
--- a/misc/scriptkit/Makefile
+++ b/misc/scriptkit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: scriptkit
-# Version required: 0.1.6
# Date created: 22 April 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= ScriptKit-0.1.6
-PKGNAME= scriptkit-0.1.6
+PORTNAME= scriptkit
+PORTVERSION= 0.1.6
CATEGORIES= misc
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gyve/fullkit/gyve-0.1.2.4/
+DISTNAME= ScriptKit-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
diff --git a/misc/sls/Makefile b/misc/sls/Makefile
index 6d9309b18688..6ff324954a5c 100644
--- a/misc/sls/Makefile
+++ b/misc/sls/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: sls
-# Version required: 1.00
# Date created: 16. Dec 97
# Whom: sec@42.org
#
# $FreeBSD$
#
-DISTNAME= sls
-PKGNAME= sls-1.00
+PORTNAME= sls
+PORTVERSION= 1.00
CATEGORIES= misc
MASTER_SITES= ftp://ftp.cse.psu.edu/pub/src/
+DISTNAME= ${PORTNAME}
MAINTAINER= sec@42.org
diff --git a/misc/sma/Makefile b/misc/sma/Makefile
index 0becfe4381d0..d53c27867190 100644
--- a/misc/sma/Makefile
+++ b/misc/sma/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: sma
-# Version required: 0.9.13
# Date created: 8 May 1998
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= SMA
-PKGNAME= sma-0.9.13
+PORTNAME= sma
+PORTVERSION= 0.9.13
CATEGORIES= misc
MASTER_SITES= http://www.scour.net/sma/
-EXTRACT_SUFX= .pl
+DISTFILES= SMA.pl
MAINTAINER= dburr@FreeBSD.org
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile
index 938bd5ed696a..ba0fa3902d8c 100644
--- a/misc/snowflake/Makefile
+++ b/misc/snowflake/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: snowflake
-# Version required: 0.01a
# Date created: 29 January 2000
# Whom: Yukihiro Nakai <nakai@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= snowflake
-PKGNAME= snowflake-0.01a
+PORTNAME= snowflake
+PORTVERSION= 0.01a
CATEGORIES= misc
MASTER_SITES= http://www.infomatch.com/~donaldj/
+DISTNAME= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index fff1cbe59b04..983a55266789 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: Splitvt
-# Version required: 0.0
# Date created: Fri Oct 4, 1996
# Whom: David O'Brien (obrien@cs.ucdavis.edu)
#
# $FreeBSD$
#
-DISTNAME= splitvt-1.6.3
+PORTNAME= splitvt
+PORTVERSION= 1.6.3
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/console
diff --git a/misc/sshbuddy/Makefile b/misc/sshbuddy/Makefile
index 506f59a3ee56..60962b22fa81 100644
--- a/misc/sshbuddy/Makefile
+++ b/misc/sshbuddy/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: sshbuddy
-# Version required: 1.0
# Date created: 26 September 1999
# Whom: Dan Moschuk <dan@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= sshbuddy1.05
-PKGNAME= sshbuddy-1.05
+PORTNAME= sshbuddy
+PORTVERSION= 1.05
CATEGORIES= misc
MASTER_SITES= ftp://ftp.sundilla.net/pub/linux/apps/sshbuddy/beta1.05/
-EXTRACT_SUFX= .tar
+DISTFILES= ${PORTNAME}${PORTVERSION}.tar
MAINTAINER= dan@freebsd.org
diff --git a/misc/tcb/Makefile b/misc/tcb/Makefile
index 5a7f8f1d7264..beb0b6bbbbbd 100644
--- a/misc/tcb/Makefile
+++ b/misc/tcb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tcb
-# Version required: 1.4a
# Date created: 1 December 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= tcb-1.4a
+PORTNAME= tcb
+PORTVERSION= 1.4a
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://www.osk.3web.ne.jp/~moody/tcbj/
diff --git a/misc/team/Makefile b/misc/team/Makefile
index 656cf6fe2e32..594486b7a2ad 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -6,7 +6,8 @@
# $FreeBSD$
#
-DISTNAME= team-3.1
+PORTNAME= team
+PORTVERSION= 3.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/misc/tet/Makefile b/misc/tet/Makefile
index f8e18427a327..6ec1f63daa9d 100644
--- a/misc/tet/Makefile
+++ b/misc/tet/Makefile
@@ -1,17 +1,16 @@
# New ports collection makefile for: tet
-# Version required: 3.2b
# Date created: 02 Oct 1998
# Whom: jkoshy
#
# $FreeBSD$
#
-DISTNAME= tet3.3d-unsup
-PKGNAME= tet-3.3d
+PORTNAME= tet
+PORTVERSION= 3.3d
CATEGORIES= misc
MASTER_SITES= ftp://ftp.rdg.opengroup.org/pub/TET/TET3/ \
http://people.FreeBSD.org/~jkoshy/PORTS/
-EXTRACT_SUFX= .src.tar.gz
+DISTFILES= ${PORTNAME}${PORTVERSION}-unsup.src.tar.gz
MAINTAINER= jkoshy@freebsd.org
diff --git a/misc/tkcron/Makefile b/misc/tkcron/Makefile
index d4811e53ac20..762ca43ce15b 100644
--- a/misc/tkcron/Makefile
+++ b/misc/tkcron/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkcron-2.12
-# Version required: 2.12
# Date created: 30 July 1996
# Whom: Sander Vesik <sander@haldjas.folklore.ee>
#
# $FreeBSD$
#
-DISTNAME= tkcron-2.12
+PORTNAME= tkcron
+PORTVERSION= 2.12
CATEGORIES= misc tk82
MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/
EXTRACT_SUFX= .tcl.gz
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index 00a17f7c0514..34c38b07dbca 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkinfo
-# Version required: 2.4
# Date created: 16 Jan 1995
# Whom: Thomas Gellekum <tg@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= tkinfo-2.4
+PORTNAME= tkinfo
+PORTVERSION= 2.4
CATEGORIES= misc tk82
MASTER_SITES= http://math-www.uni-paderborn.de/~axel/tkinfo/
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index 8765b924a2ae..c9b3ca9ecb5f 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tkman
-# Version required: 2.1b2
# Date created: 27 Dec 1994
# Whom: Thomas Gellekum <tg@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= tkman-2.1b2
+PORTNAME= tkman
+PORTVERSION= 2.1b2
CATEGORIES= misc tk82
MASTER_SITES= ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
EXTRACT_SUFX= .tar.Z
diff --git a/misc/tkrunit/Makefile b/misc/tkrunit/Makefile
index 38ea9cfb7386..fa1999139720 100644
--- a/misc/tkrunit/Makefile
+++ b/misc/tkrunit/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: tkrunnit
-# Version required: 0.94.1
# Date created: 6 February, 1999
# Whom: Stephen Farrell <steve@farrell.org>
#
# $FreeBSD$
#
-DISTNAME= tkRunIt-0941
-PKGNAME= tkRunIt-0.94.1
+PORTNAME= tkRunIt
+PORTVERSION= 0.94.1
CATEGORIES= misc
MASTER_SITES= http://www.cs.columbia.edu/~etgold/software/tkRunIt/
+DISTNAME= tkRunIt-0941
MAINTAINER= steve@farrell.org
diff --git a/misc/uk-phone/Makefile b/misc/uk-phone/Makefile
index 7ce8c621ccd3..6c9a7685f405 100644
--- a/misc/uk-phone/Makefile
+++ b/misc/uk-phone/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: United Kingdom phone codes.
-# Version required: 1.0
# Date created: 1998-01-01
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= uk.phone
-PKGNAME= uk-phone-1.0
+PORTNAME= phone
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.FreeBSD.org/~wosch/src/
-EXTRACT_SUFX= .gz
+PKGNAMEPREFIX= uk-
+DISTFILES= uk.phone.gz
MAINTAINER= brian@FreeBSD.org
diff --git a/misc/uk-postcodes/Makefile b/misc/uk-postcodes/Makefile
index fcba7d0d1cdf..2bd57d0d0813 100644
--- a/misc/uk-postcodes/Makefile
+++ b/misc/uk-postcodes/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: United Kingdom post codes.
-# Version required: 1.0
# Date created: 1998-01-01
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= uk.postcodes
-PKGNAME= uk-postcodes-1.0
+PORTNAME= postcodes
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.FreeBSD.org/~wosch/src/
-EXTRACT_SUFX= .gz
+PKGNAMEPREFIX= uk-
+DISTFILES= uk.postcodes.gz
MAINTAINER= brian@FreeBSD.org
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index a746a1d0366d..379cd2c37e57 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: unclutter
-# Version required: -8
# Date created: 03 Aug 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= unclutter-8
+PORTNAME= unclutter
+PORTVERSION= 8
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index ff0c154b9970..f8e7554697ae 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: upclient
-# Version required: 3.04
# Date created: 20 Aug 1999
# Whom: Kelly Yancey <kbyanc@posi.net>
#
# $FreeBSD$
#
-DISTNAME= upclient-3.04
+PORTNAME= upclient
+PORTVERSION= 3.04
CATEGORIES= misc
MASTER_SITES= http://uptime.hexon.cx/download/
diff --git a/misc/us-zipcodes/Makefile b/misc/us-zipcodes/Makefile
index 32cf48cb7896..b66e15ef5f60 100644
--- a/misc/us-zipcodes/Makefile
+++ b/misc/us-zipcodes/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: USA zipcodes
-# Version required: 1.0
# Date created: 1997-12-30
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= zipcodes
-PKGNAME= us-zipcodes-1.0
+PORTNAME= zipcodes
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_LOCAL} \
http://people.FreeBSD.org/~wosch/src/
-EXTRACT_SUFX= .gz
+PKGNAMEPREFIX= us-
+DISTFILES= ${PORTNAME}.gz
MAINTAINER= ports@FreeBSD.org
diff --git a/misc/vbidecode/Makefile b/misc/vbidecode/Makefile
index 44d9ddaa4934..5c75dbb3d732 100644
--- a/misc/vbidecode/Makefile
+++ b/misc/vbidecode/Makefile
@@ -1,5 +1,4 @@
# New ports collection makefile for: vbidecode
-# Version required: 1.1.3
# Date created: Mon June 7 16:11:00 BST 1999
# Whom: Roger Hardiman <roger@freebsd.org>
#
@@ -8,7 +7,8 @@
# Note: vbidecode is one part of the bttv distribution, the Linux bt848 driver
# It therefore has a DISTNAME of vbidecode but DISTFILES of bttv
-DISTNAME= vbidecode-1.1.3
+PORTNAME= vbidecode
+PORTVERSION= 1.1.3
CATEGORIES= misc
MASTER_SITES= http://www.thp.Uni-Koeln.DE/~rjkm/linux/
DISTFILES= bttv-0.6.4.tar.gz
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index f69d83cae84e..0e94b402599b 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: V.E.R.A.
-# Version required: 1.5
# Date created: 9 March 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= vera-1.5
+PORTNAME= vera
+PORTVERSION= 1.5
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= vera
diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index d83aa2d12afc..62b1e2fe73d9 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vbidecode
-# Version required: 0.6.971023
# Date created: Tue June 8 15:11:00 BST 1999
# Whom: Roger Hardiman <roger@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= videotext-0.6.971023
+PORTNAME= videotext
+PORTVERSION= 0.6.971023
CATEGORIES= misc
MASTER_SITES= http://elektra.e-technik.uni-ulm.de/~mbuck/download/
diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 304d9a70d160..5b846e512f21 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: viz
-# Version required: 1.1.1
# Date created: 8 Mar 1997
# Whom: Brent J. Nordquist <bjn@visi.com>
#
# $FreeBSD$
#
-DISTNAME= viz-1.1.1
+PORTNAME= viz
+PORTVERSION= 1.1.1
CATEGORIES= misc
MASTER_SITES= http://people.FreeBSD.org/~fenner/distfiles/
EXTRACT_SUFX= .tgz
diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile
index f733a78b55cb..5f0a6d36f732 100644
--- a/misc/wmcp/Makefile
+++ b/misc/wmcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmcp
-# Version required: 1.2.8
# Date created: 10 February 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmcp-1.2.8
+PORTNAME= wmcp
+PORTVERSION= 1.2.8
CATEGORIES= misc windowmaker
MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/
diff --git a/misc/wmmand/Makefile b/misc/wmmand/Makefile
index da2fdb504cff..fd5608c120c9 100644
--- a/misc/wmmand/Makefile
+++ b/misc/wmmand/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: wmMand
-# Version required: 1.0
# Date created: 16 April 1999
# Whom: Chris Piazza <cpiazza@FreeBSD.org>
#
# $FreeBSD$
-DISTNAME= wmMand-1.0
-PKGNAME= wmmand-1.0
+PORTNAME= wmmand
+PORTVERSION= 1.0
CATEGORIES= misc windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
+DISTNAME= wmMand-${PORTVERSION}
MAINTAINER= cpiazza@FreeBSD.org
diff --git a/misc/wmstock/Makefile b/misc/wmstock/Makefile
index 0e8b6f14fb6c..3afa3a3ddafc 100644
--- a/misc/wmstock/Makefile
+++ b/misc/wmstock/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmstock
-# Version required: 0.06
# Date created: 19 Jun 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmstock-0.06
+PORTNAME= wmstock
+PORTVERSION= 0.06
CATEGORIES= misc windowmaker
MASTER_SITES= http://mattfischer.com/wmstock/src/ \
http://www.psn.net/~andrews/wmstock/
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index 4c2721b114b7..7b4592f81ce9 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: wmWeather-1.28
-# Version required: 1.31
# Date created: 26 January 1998
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
-DISTNAME= wmWeather-1.31
+PORTNAME= wmWeather
+PORTVERSION= 1.31
CATEGORIES= misc windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
diff --git a/misc/xd/Makefile b/misc/xd/Makefile
index 0db095f0bc99..e30999c074ed 100644
--- a/misc/xd/Makefile
+++ b/misc/xd/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xd
-# Version required: 2.3
# Date created: 17 October 1997
# Whom: KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xd-8087
-PKGNAME= xd-2.3
+PORTNAME= xd
+PORTVERSION= 2.3
CATEGORIES= misc
MASTER_SITES= http://spock.vector.co.jp/authors/VA004959/xd/
+DISTNAME= xd-8087
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 3f79db186e48..8332021cfcac 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdelta
-# Version required: 1.0.2
# Date created: Sun May 4 21:40:06 CDT 1997
# Whom: jmacd
#
# $FreeBSD$
#
-DISTNAME= xdelta-1.0.2
+PORTNAME= xdelta
+PORTVERSION= 1.0.2
CATEGORIES= misc
MASTER_SITES= ftp://ftp.xcf.berkeley.edu/pub/xdelta/
diff --git a/misc/xenmenu/Makefile b/misc/xenmenu/Makefile
index d12795fe90f4..006e7577efae 100644
--- a/misc/xenmenu/Makefile
+++ b/misc/xenmenu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xenmenu
-# Version required: 0.8b
# Date created: 19 May 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= xenmenu-0.8b
+PORTNAME= xenmenu
+PORTVERSION= 0.8b
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE} \
http://freeport.xenos.net/~xenon/software/xenmenu/
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index 48c27c0c6558..aa6db91abc63 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: xgas
-# Version required: 1.0
# Date created: 20 Oct 1996
# Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= xgas
-PKGNAME= xgas-1.0
+PORTNAME= xgas
+PORTVERSION= 1.0
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/demos
+DISTNAME= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
diff --git a/misc/xless/Makefile b/misc/xless/Makefile
index af33319f1d82..be6eaee71bda 100644
--- a/misc/xless/Makefile
+++ b/misc/xless/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xless
-# Version required: 1.7
# Date created: 23 December 1996
# Whom: Conrad Sabatier <conrads@home.com>
#
# $FreeBSD$
#
-DISTNAME= xless-1.7
+PORTNAME= xless
+PORTVERSION= 1.7
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
ftp://ftp.cs.berkeley.edu/ucb/people/dglo/xless/
diff --git a/misc/xpns/Makefile b/misc/xpns/Makefile
index 3496441b4d04..eca6f6ea84a2 100644
--- a/misc/xpns/Makefile
+++ b/misc/xpns/Makefile
@@ -1,16 +1,15 @@
# New ports collection makefile for: xpns
-# Version required: 1.0
# Date created: 6 Apr 97
# Whom: Pedro Giffuni
#
# $FreeBSD$
#
-DISTNAME= pns_source
-PKGNAME= xpns-1.0
+PORTNAME= xpns
+PORTVERSION= 1.0
CATEGORIES= misc cad
MASTER_SITES= http://www.ee.uwa.edu.au/~braunl/pns/ftp/
-EXTRACT_SUFX= .tar.Z
+DISTFILES= pns_source.tar.Z
MAINTAINER= giffunip@asme.org
diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile
index 54f6b276123a..1555a0a30560 100644
--- a/misc/xquote/Makefile
+++ b/misc/xquote/Makefile
@@ -1,11 +1,11 @@
# New ports collection makefile for: xquote
-# Version required: 1.1
# Date created: 4 Jan 1998
# Whom: Ian Struble <ian@broken.net>
#
# $FreeBSD$
-DISTNAME= xquote-1.1
+PORTNAME= xquote
+PORTVERSION= 1.1
CATEGORIES= misc
MASTER_SITES= http://sunsite.auc.dk/xinvest/ \
${MASTER_SITE_XCONTRIB}
diff --git a/misc/xtail/Makefile b/misc/xtail/Makefile
index 668d5a6fa1fd..4677b247118e 100644
--- a/misc/xtail/Makefile
+++ b/misc/xtail/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xtail
-# Version required: 0.1
# Date created: 20 January 1999
# Whom: gmarco@giovannelli.it
#
# $FreeBSD$
#
-DISTNAME= xtail
-PKGNAME= xtail-0.1
+PORTNAME= xtail
+PORTVERSION= 0.1
CATEGORIES= misc
MASTER_SITES= http://www.giovannelli.it/~gmarco/files/
+DISTNAME= ${PORTNAME}
MAINTAINER= gmarco@giovannelli.it
diff --git a/misc/xtar/Makefile b/misc/xtar/Makefile
index 28ed2a61e0c8..d99a5a6a9ed6 100644
--- a/misc/xtar/Makefile
+++ b/misc/xtar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xtar
-# Version required: 1.4
# Date created: 31 Jul 1996
# Whom: shanee@augusta.de
#
# $FreeBSD$
#
-DISTNAME= xtar-1.4
+PORTNAME= xtar
+PORTVERSION= 1.4
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
diff --git a/misc/yaunc/Makefile b/misc/yaunc/Makefile
index bbdd9e78fb2e..880f5c6af2c8 100644
--- a/misc/yaunc/Makefile
+++ b/misc/yaunc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: yaunc
-# Version required: 0.02
# Date created: 5 March 2000
# Whom: nsayer@freebsd.org
#
# $FreeBSD$
#
-DISTNAME= yaunc-0.02
+PORTNAME= yaunc
+PORTVERSION= 0.02
CATEGORIES= misc
MASTER_SITES= http://www.redterror.net/code/yaunc/
diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index c1b606ae4698..0141a43a64a4 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ytree
-# Version required: 1.65
# Date created: 5 Jan 1998
# Whom: Andrey Zakhvatov
#
# $FreeBSD$
#
-DISTNAME= ytree-1.65
+PORTNAME= ytree
+PORTVERSION= 1.65
CATEGORIES= misc
#MASTER_SITES= ${MASTER_SITE_SUNSITE} \
# http://www.han.de/~werner/
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index e759aaefda59..e6565f95172a 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: vic
-# Version required: 2.6
# Date created: 14 December 1994
# Whom: wollman
#
# $FreeBSD$
#
-DISTNAME= vic-2.8
+PORTNAME= vic
+PORTVERSION= 2.8
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vic/
DISTFILES= vicsrc-2.8.tar.gz
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 9506e8bb2ea1..4ca41dd5f326 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: imm
-# Version required: 3.5a1
# Date created: 13 October 1994
# Whom: wollman
#
# $FreeBSD$
#
-DISTNAME= imm.source
-PKGNAME= imm-3.5a1
+PORTNAME= imm
+PORTVERSION= 3.5a1
CATEGORIES= mbone tk82
MASTER_SITES= ftp://ftp.hawaii.edu/paccom/imm-3.5a1/
+DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
index 9588586eb93b..b3bf4bda8cb3 100644
--- a/net/rqm/Makefile
+++ b/net/rqm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rqm
-# Version required: 1.0.0
# Date created: 30 January 2000
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= rqm-1.0.0
+PORTNAME= rqm
+PORTVERSION= 1.0.0
CATEGORIES= mbone
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index 2908ef56c818..a926a4843282 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rtptools
-# Version required: 1.14
# Date created: 5 January 1998
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= rtptools-1.14
+PORTNAME= rtptools
+PORTVERSION= 1.14
CATEGORIES= mbone
MASTER_SITES= http://www.cs.columbia.edu/~hgs/rtptools/src/
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index d57497b4a949..9d59b2a9304c 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sdr
-# Version required: 2.9
# Date created: 5 September 1996
# Whom: Bill Fenner <fenner@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= sdr-2.9
+PORTNAME= sdr
+PORTVERSION= 2.9
CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 7d0a13f0bee0..a95e50014aa9 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wb
-# Version required: 1.59
# Date created: 2 Novermber 1996
# Whom: fenner
#
# $FreeBSD$
#
-DISTNAME= wb-1.59
+PORTNAME= wb
+PORTVERSION= 1.59
CATEGORIES= mbone
MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/shells/fd/Makefile b/shells/fd/Makefile
index bbb5aace37c2..373018b1c55f 100644
--- a/shells/fd/Makefile
+++ b/shells/fd/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: FDclone
-# Version required: 1.03i
# Date created: 20 Feb 1996
# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
#
# $FreeBSD$
#
-DISTNAME= FD-1.03l
-PKGNAME= fd-1.03l
+PORTNAME= fd
+PORTVERSION= 1.03l
CATEGORIES= misc
MASTER_SITES= ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
http://people.FreeBSD.org/~steve/distfiles/
+DISTNAME= FD-${PORTVERSION}
MAINTAINER= nobu@psrc.isac.co.jp
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/sysutils/less/Makefile b/sysutils/less/Makefile
index 3d7181ff42e9..4e008c1c1022 100644
--- a/sysutils/less/Makefile
+++ b/sysutils/less/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: less
-# http://www.flash.net/~marknu/less/
-# Version required: 3.*
# Date created: 8 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= less-352
+PORTNAME= less
+PORTVERSION= 352
CATEGORIES= misc
MASTER_SITES= http://home.flash.net/~marknu/less/ \
${MASTER_SITE_GNU}
diff --git a/sysutils/most/Makefile b/sysutils/most/Makefile
index 736e4c311dbc..4a255c8a70a0 100644
--- a/sysutils/most/Makefile
+++ b/sysutils/most/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: most
-# Version required: 4.9.0
# Date created: 31 May 1997
# Whom: rhwang@bigpanda.com
#
# $FreeBSD$
#
-DISTNAME= most-4.9.0
+PORTNAME= most
+PORTVERSION= 4.9.0
CATEGORIES= misc
MASTER_SITES= ftp://space.mit.edu/pub/davis/most/ \
ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/most/
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index 098d0b67c73d..1ce2ab5b4ae8 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: screen
-# Version required: 3.9.5
# Date created: 25 Nov 1994
# Whom: ache
#
# $FreeBSD$
#
-DISTNAME= screen-3.9.5
+PORTNAME= screen
+PORTVERSION= 3.9.5
CATEGORIES= misc
MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
${MASTER_SITE_GNU}
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 6ec8ededa384..8fed890836c1 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: kdeutils
-# Version required: Beta2
# Date created: 28 October 1997
# Whom: Stefan Eßer <se@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= kdeutils-1.1.2
+PORTNAME= kdeutils
+PORTVERSION= 1.1.2
CATEGORIES= misc kde
MASTER_SITES= $(MASTER_SITE_KDE)
MASTER_SITE_SUBDIR= stable/1.1.2/distribution/tar/generic/source/bz2
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index f733a78b55cb..5f0a6d36f732 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmcp
-# Version required: 1.2.8
# Date created: 10 February 1999
# Whom: Jim Mock <jim@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmcp-1.2.8
+PORTNAME= wmcp
+PORTVERSION= 1.2.8
CATEGORIES= misc windowmaker
MASTER_SITES= http://users.linuxbox.com/~bac/src/wmcp/