aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorcpiazza <cpiazza@FreeBSD.org>2000-04-10 03:09:11 +0800
committercpiazza <cpiazza@FreeBSD.org>2000-04-10 03:09:11 +0800
commit131ffd06e984e988ee9c1c844568abdecd9f9ed4 (patch)
tree1ef79a394b0fe31c22015536e3350783acefb970 /sysutils
parent91082f1a1075c587148cdc85cbe1196f175a18e6 (diff)
downloadfreebsd-ports-gnome-131ffd06e984e988ee9c1c844568abdecd9f9ed4.tar.gz
freebsd-ports-gnome-131ffd06e984e988ee9c1c844568abdecd9f9ed4.tar.zst
freebsd-ports-gnome-131ffd06e984e988ee9c1c844568abdecd9f9ed4.zip
Update with the new PORTNAME/PORTVERSION variable
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/LPRng/Makefile9
-rw-r--r--sysutils/afio/Makefile4
-rw-r--r--sysutils/asapm/Makefile4
-rw-r--r--sysutils/ascpu/Makefile4
-rw-r--r--sysutils/asfsm/Makefile6
-rw-r--r--sysutils/asmem/Makefile5
-rw-r--r--sysutils/asmon/Makefile4
-rw-r--r--sysutils/asrpages/Makefile6
-rw-r--r--sysutils/bchunk/Makefile4
-rw-r--r--sysutils/bkpupsd/Makefile13
-rw-r--r--sysutils/cd-write/Makefile4
-rw-r--r--sysutils/cdrecord/Makefile4
-rw-r--r--sysutils/cdrtools-devel/Makefile4
-rw-r--r--sysutils/cdrtools/Makefile4
-rw-r--r--sysutils/cfengine/Makefile4
-rw-r--r--sysutils/cfengine2/Makefile4
-rw-r--r--sysutils/cfengine3-legacy/Makefile4
-rw-r--r--sysutils/cfengine3/Makefile4
-rw-r--r--sysutils/comconsole/Makefile4
-rw-r--r--sysutils/consolehm/Makefile4
-rw-r--r--sysutils/contool/Makefile4
-rw-r--r--sysutils/copytape/Makefile6
-rw-r--r--sysutils/cpbk/Makefile5
-rw-r--r--sysutils/cpdup/Makefile4
-rw-r--r--sysutils/cronolog/Makefile14
-rw-r--r--sysutils/daemontools/Makefile4
-rw-r--r--sysutils/detach/Makefile5
-rw-r--r--sysutils/diskusage/Makefile4
-rw-r--r--sysutils/doconfig/Makefile4
-rw-r--r--sysutils/doinkd/Makefile12
-rw-r--r--sysutils/eject/Makefile4
-rw-r--r--sysutils/ffsrecov/Makefile6
-rw-r--r--sysutils/flexbackup/Makefile4
-rw-r--r--sysutils/gcombust/Makefile4
-rw-r--r--sysutils/gkrellm/Makefile4
-rw-r--r--sysutils/gkrellm2/Makefile4
-rw-r--r--sysutils/glload/Makefile4
-rw-r--r--sysutils/gnome-control-center/Makefile6
-rw-r--r--sysutils/gnome-control-center1/Makefile6
-rw-r--r--sysutils/gnome-system-monitor/Makefile4
-rw-r--r--sysutils/gnomecontrolcenter/Makefile6
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile6
-rw-r--r--sysutils/gnomesystemmonitor/Makefile4
-rw-r--r--sysutils/gpart/Makefile4
-rw-r--r--sysutils/gtar/Makefile4
-rw-r--r--sysutils/gtop/Makefile4
-rw-r--r--sysutils/guitar/Makefile4
-rw-r--r--sysutils/healthd/Makefile4
-rw-r--r--sysutils/idled/Makefile12
-rw-r--r--sysutils/ipsc/Makefile6
-rw-r--r--sysutils/lavaps/Makefile11
-rw-r--r--sysutils/libretto-config/Makefile13
-rw-r--r--sysutils/lmmon/Makefile4
-rw-r--r--sysutils/logrotate/Makefile4
-rw-r--r--sysutils/lsof/Makefile6
-rw-r--r--sysutils/manck/Makefile4
-rw-r--r--sysutils/mei/Makefile4
-rw-r--r--sysutils/mkisofs-devel/Makefile6
-rw-r--r--sysutils/mkisofs/Makefile6
-rw-r--r--sysutils/muse/Makefile4
-rw-r--r--sysutils/no-login/Makefile5
-rw-r--r--sysutils/npadmin/Makefile4
-rw-r--r--sysutils/nut/Makefile4
-rw-r--r--sysutils/nut22/Makefile4
-rw-r--r--sysutils/obliterate/Makefile4
-rw-r--r--sysutils/p5-SyslogScan/Makefile6
-rw-r--r--sysutils/pib/Makefile4
-rw-r--r--sysutils/pkg_remove/Makefile6
-rw-r--r--sysutils/prips/Makefile6
-rw-r--r--sysutils/procmap/Makefile4
-rw-r--r--sysutils/psmisc/Makefile4
-rw-r--r--sysutils/rdate/Makefile4
-rw-r--r--sysutils/roottail/Makefile6
-rw-r--r--sysutils/rtty/Makefile6
-rw-r--r--sysutils/sarah/Makefile4
-rw-r--r--sysutils/sdd/Makefile4
-rw-r--r--sysutils/setcdboot/Makefile6
-rw-r--r--sysutils/setquota/Makefile4
-rw-r--r--sysutils/skill/Makefile6
-rw-r--r--sysutils/socket/Makefile4
-rw-r--r--sysutils/star/Makefile4
-rw-r--r--sysutils/stat/Makefile5
-rw-r--r--sysutils/stmpclean/Makefile5
-rw-r--r--sysutils/su2/Makefile4
-rw-r--r--sysutils/tcplist/Makefile4
-rw-r--r--sysutils/tua/Makefile4
-rw-r--r--sysutils/ucspi-tcp/Makefile4
-rw-r--r--sysutils/upsd/Makefile5
-rw-r--r--sysutils/upsmon/Makefile4
-rw-r--r--sysutils/uwatch/Makefile4
-rw-r--r--sysutils/webmin/Makefile21
-rw-r--r--sysutils/wmapm/Makefile4
-rw-r--r--sysutils/wmavgload/Makefile4
-rw-r--r--sysutils/wmbattery/Makefile6
-rw-r--r--sysutils/wmfire/Makefile6
-rw-r--r--sysutils/wmhm/Makefile4
-rw-r--r--sysutils/wminet/Makefile4
-rw-r--r--sysutils/wmlmmon/Makefile4
-rw-r--r--sysutils/wmmon/Makefile4
-rw-r--r--sysutils/wmmount/Makefile6
-rw-r--r--sysutils/wmpccard/Makefile4
-rw-r--r--sysutils/xbatt/Makefile4
-rw-r--r--sysutils/xbattbar/Makefile6
-rw-r--r--sysutils/xcpustate/Makefile4
-rw-r--r--sysutils/xdu/Makefile4
-rw-r--r--sysutils/xfsm/Makefile4
-rw-r--r--sysutils/xloadface/Makefile4
-rw-r--r--sysutils/xlogmaster/Makefile4
-rw-r--r--sysutils/xosview/Makefile4
-rw-r--r--sysutils/xperfmon/Makefile9
-rw-r--r--sysutils/xperfmon3/Makefile9
-rw-r--r--sysutils/xsysinfo/Makefile4
-rw-r--r--sysutils/xsysstats/Makefile6
-rw-r--r--sysutils/xwatch/Makefile4
114 files changed, 294 insertions, 300 deletions
diff --git a/sysutils/LPRng/Makefile b/sysutils/LPRng/Makefile
index 6dd33b4ec623..89b611a5d10e 100644
--- a/sysutils/LPRng/Makefile
+++ b/sysutils/LPRng/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: LPRng
-# Version required: 3.6.8
# Date created: 2 Apr 1997
# Whom: desmo@bandwidth.org
#
# $FreeBSD$
#
-DISTNAME= LPRng-${LPRNG_VER}
+PORTNAME= LPRng
+PORTVERSION= 3.6.8
CATEGORIES= sysutils print
MASTER_SITES= ftp://ftp.astart.com/pub/LPRng/LPRng/
EXTRACT_SUFX= .tgz
@@ -14,10 +14,9 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${LPRNG_DOC}
MAINTAINER= desmo@bandwidth.org
-LPRNG_VER= 3.6.8
-PLIST_SUB+= LPRNG_VER=${LPRNG_VER}
+PLIST_SUB+= LPRNG_VER=${PORTVERSION}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
-LPRNG_DOC= LPRng_DOC-${LPRNG_VER}.tgz
+LPRNG_DOC= LPRng_DOC-${PORTVERSION}.tgz
MAKEFILE= Makefile.bsd
HAS_CONFIGURE= yes
diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index 3733a08c1197..d958d2e7fd49 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: afio
-# Version required: 2.4.6
# Date created: 4 October 1995
# Whom: Juergen Lock <nox@jelal.hb.north.de>
#
# $FreeBSD$
#
-DISTNAME= afio-2.4.6
+PORTNAME= afio
+PORTVERSION= 2.4.6
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/backup
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index aa32b48f88ba..82e95f4a9600 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: asapm
-# Version required: 2.7
# Date created: 6 Aug 1998
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= asapm-2.7
+PORTNAME= asapm
+PORTVERSION= 2.7
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.afterstep.org/apps/asapm/ \
http://www.tigr.net/afterstep/as-apps/download/asapm/
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index 8891825228f7..1534dde6bf24 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ascpu
-# Version required: 1.8
# Date created: 18 February 1999
# Whom: Dima Sivachenko <dima@chg.ru>
#
# $FreeBSD$
#
-DISTNAME= ascpu-1.8
+PORTNAME= ascpu
+PORTVERSION= 1.8
CATEGORIES= sysutils afterstep
MASTER_SITES= http://bewoner.dma.be/Albert/software/ \
http://www.tigr.net/afterstep/as-apps/download/ascpu/ \
diff --git a/sysutils/asfsm/Makefile b/sysutils/asfsm/Makefile
index de9b17c7fd67..bce914c195d0 100644
--- a/sysutils/asfsm/Makefile
+++ b/sysutils/asfsm/Makefile
@@ -1,14 +1,14 @@
# New ports collection makefile for: asfsm
-# Version required: asfsm-1.0pre15
# Date created: 4 June 1999
# Whom: jack
#
# $FreeBSD$
-DISTNAME= asfsm-1.0pre15
-PKGNAME= asfsm-1.0p15
+PORTNAME= asfsm
+PORTVERSION= 1.0.p15
CATEGORIES= sysutils afterstep
MASTER_SITES= http://www.tigr.net/afterstep/as-apps/download/asfsm/
+DISTNAME= asfsm-1.0pre15
MAINTAINER= jack@germanium.xtalwind.net
diff --git a/sysutils/asmem/Makefile b/sysutils/asmem/Makefile
index 8ef06eb52d22..6275b91d5deb 100644
--- a/sysutils/asmem/Makefile
+++ b/sysutils/asmem/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: asfsm
-# Version required: asmem-1.5
# Date created: 4 June 1999
# Whom: jack
#
# $FreeBSD$
+#
-DISTNAME= asmem-1.5
+PORTNAME= asmem
+PORTVERSION= 1.5
CATEGORIES= sysutils afterstep
MASTER_SITES= ftp://ftp.afterstep.org/apps/asmem/ \
http://www.bewoner.dma.be/Albert/software/
diff --git a/sysutils/asmon/Makefile b/sysutils/asmon/Makefile
index 0f907965a3b9..85e08af76ba4 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: asfsm
-# Version required: asmon-0.60
# Date created: 27 Sep 1999
# Whom: jack
#
# $FreeBSD$
#
-DISTNAME= asmon-0.60
+PORTNAME= asmon
+PORTVERSION= 0.60
CATEGORIES= sysutils afterstep
MASTER_SITES= ftp://ftp.afterstep.org/apps/asmon/ \
http://www.tigr.net/afterstep/as-apps/download/asmon/
diff --git a/sysutils/asrpages/Makefile b/sysutils/asrpages/Makefile
index ca7ef6812f5d..348c10a4a067 100644
--- a/sysutils/asrpages/Makefile
+++ b/sysutils/asrpages/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: asrpages
-# Version required: 0.1
# Date created: 6 Nov 1997
# Whom: Sheldon Hearn <axl@iafrica.com>
#
# $FreeBSD$
#
-DISTNAME= asr.pages
-PKGNAME= asrpages-0.1
+PORTNAME= asrpages
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.winternet.com/users/eric/
+DISTNAME= asr.pages
EXTRACT_SUFX= .tar
MAINTAINER= sheldonh@FreeBSD.org
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index f373818a827f..f11e0914af60 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: bchunk
-# Version required: 1.0.0
# Date created: 9 Jan 1999
# Whom: bsdx
#
# $FreeBSD$
#
-DISTNAME= bchunk-1.0.0
+PORTNAME= bchunk
+PORTVERSION= 1.0.0
CATEGORIES= sysutils
MASTER_SITES= http://hes.iki.fi/bchunk/ \
${MASTER_SITE_SUNSITE}
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 2e7515e8b993..4f565bed3314 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,18 +1,17 @@
# New ports collection makefile for: bkpupsd
-# Version required: 1.0
# Date created: 26 May 1995
# Whom: Yoshifumi Watanabe <mwatts@edu1.tokyo-med.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= bkpupsd-1.0a
-PKGNAME= bkpupsd-1.0
-CATEGORIES= sysutils
-MASTER_SITES= ftp://edu1.tokyo-med.ac.jp/pub/contrib/bkpupsd/
+PORTNAME= bkpupsd
+PORTVERSION= 1.0a
+CATEGORIES= sysutils
+MASTER_SITES= ftp://edu1.tokyo-med.ac.jp/pub/contrib/bkpupsd/
-MAINTAINER= mwatts@edu1.tokyo-med.ac.jp
+MAINTAINER= mwatts@edu1.tokyo-med.ac.jp
-MAN8= bkpupsd.8
+MAN8= bkpupsd.8
.include <bsd.port.mk>
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index 8cf02abd3ba2..bf86998d5622 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cd-write
-# Version required: 1.4.1
# Date created: 1 May 1997
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= cd-write-1.4.1
+PORTNAME= cd-write
+PORTVERSION= 1.4.1
CATEGORIES= sysutils
MASTER_SITES= http://people.FreeBSD.org/~jmz/
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index e68cd90f2fb9..0213a799fb4e 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdrecord
-# Version required: 1.8
# Date created: 2 November 1997
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= cdrecord-1.8
+PORTNAME= cdrecord
+PORTVERSION= 1.8
CATEGORIES= sysutils audio
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index e68cd90f2fb9..0213a799fb4e 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdrecord
-# Version required: 1.8
# Date created: 2 November 1997
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= cdrecord-1.8
+PORTNAME= cdrecord
+PORTVERSION= 1.8
CATEGORIES= sysutils audio
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index e68cd90f2fb9..0213a799fb4e 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cdrecord
-# Version required: 1.8
# Date created: 2 November 1997
# Whom: jmz
#
# $FreeBSD$
#
-DISTNAME= cdrecord-1.8
+PORTNAME= cdrecord
+PORTVERSION= 1.8
CATEGORIES= sysutils audio
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/ \
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index e00b2d7a79a5..e1221de7ef5b 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cfengine
-# Version required: 1.5.3
# Date created: March 16, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cfengine-1.5.3
+PORTNAME= cfengine
+PORTVERSION= 1.5.3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index e00b2d7a79a5..e1221de7ef5b 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cfengine
-# Version required: 1.5.3
# Date created: March 16, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cfengine-1.5.3
+PORTNAME= cfengine
+PORTVERSION= 1.5.3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index e00b2d7a79a5..e1221de7ef5b 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cfengine
-# Version required: 1.5.3
# Date created: March 16, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cfengine-1.5.3
+PORTNAME= cfengine
+PORTVERSION= 1.5.3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index e00b2d7a79a5..e1221de7ef5b 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cfengine
-# Version required: 1.5.3
# Date created: March 16, 1998
# Whom: jseger@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= cfengine-1.5.3
+PORTNAME= cfengine
+PORTVERSION= 1.5.3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= cfengine
diff --git a/sysutils/comconsole/Makefile b/sysutils/comconsole/Makefile
index 21388a6800f5..57fbce7ad8be 100644
--- a/sysutils/comconsole/Makefile
+++ b/sysutils/comconsole/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: comconsole
-# Version required: 0.1
# Date created: 27 Dec 1998
# Whom: SADA Kenji <sada@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= comconsole-0.1
+PORTNAME= comconsole
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= #
DISTFILES=
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index 10eca3750595..8a2ebf65873e 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: consolehm
-# Version required: 1.2
# Date created: 27 September 1999
# Whom: Mike Muir <mmuir@es.co.nz>
#
# $FreeBSD$
#
-DISTNAME= consolehm-1.2
+PORTNAME= consolehm
+PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= ftp://mongol.dhis.org/pub/consolehm/ \
http://www.es.co.nz/~mmuir/
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index 7d6f5e86bf62..074b64838cab 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: contool
-# Version required: 3.3a
# Date created: 2 Dec 1996
# Whom: nsayer@quack.kfu.com
#
# $FreeBSD$
#
-DISTNAME= contool-3.3a
+PORTNAME= contool
+PORTVERSION= 3.3a
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.kfu.com/pub/
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 28f2388ad71b..74a3a0df2f76 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: copytape
-# Version required: 1.0
# Date created: 23 October 1998
# Whom: Stephen J. Roznowski <sjr@home.net>
#
# $FreeBSD$
#
-DISTNAME= copytape
-PKGNAME= copytape-1.0
+PORTNAME= copytape
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_COMP_SOURCES}
MASTER_SITE_SUBDIR= unix/volume10
+DISTNAME= copytape
EXTRACT_SUFX= .Z
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/cpbk/Makefile b/sysutils/cpbk/Makefile
index 70041853b433..62e18ff2bc57 100644
--- a/sysutils/cpbk/Makefile
+++ b/sysutils/cpbk/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: cpbk
-# Version required: 2.0
# Date created: 12 April 1999
# Whom: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
#
# $FreeBSD$
+#
-DISTNAME= cpbk-2.0
+PORTNAME= cpbk
+PORTVERSION= 2.0
CATEGORIES= sysutils
MASTER_SITES= http://pep.netnation.com/cpbk/ \
ftp://mocha.mkintraweb.com/pub/linux/cpbk/
diff --git a/sysutils/cpdup/Makefile b/sysutils/cpdup/Makefile
index a1cb811d8143..1e5683c25428 100644
--- a/sysutils/cpdup/Makefile
+++ b/sysutils/cpdup/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: cpdup
-# Version required: 3.*
# Date created: 28 Oct 1999
# Whom: dillon
#
# $FreeBSD$
#
-DISTNAME= cpdup-1.02
+PORTNAME= cpdup
+PORTVERSION= 1.02
CATEGORIES= sysutils
MASTER_SITES= http://www.backplane.com/FreeBSDPorts/
#MASTER_SITE_SUBDIR= cp
diff --git a/sysutils/cronolog/Makefile b/sysutils/cronolog/Makefile
index ae84694e9c4d..174f863b560f 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -1,20 +1,20 @@
# New ports collection makefile for: cronolog
-# Version required: 1.6.1
# Date created: 20 January 2000
# Whom: Mark Blackman <tmb_ports@maddog.u-net.com>
#
# $FreeBSD$
#
-DISTNAME= cronolog-1.6.1
-CATEGORIES= sysutils
-MASTER_SITES= http://www.ford-mason.co.uk/resources/cronolog/
+PORTNAME= cronolog
+PORTVERSION= 1.6.1
+CATEGORIES= sysutils
+MASTER_SITES= http://www.ford-mason.co.uk/resources/cronolog/
-MAINTAINER= tmb_ports@maddog.u-net.com
+MAINTAINER= tmb_ports@maddog.u-net.com
-MAN1= cronolog.1m cronosplit.1m
+MAN1= cronolog.1m cronosplit.1m
-GNU_CONFIGURE= yes
+GNU_CONFIGURE= yes
post-install:
${STRIP} ${PREFIX}/sbin/cronolog
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index d6d9044d3209..8a8f5fb552ae 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: daemontools
-# Version required: 0.53
# Date created: 09 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= daemontools-0.53
+PORTNAME= daemontools
+PORTVERSION= 0.53
CATEGORIES= sysutils
MASTER_SITES= ftp://koobera.math.uic.edu/www/software/
diff --git a/sysutils/detach/Makefile b/sysutils/detach/Makefile
index 8152d688180c..e3794b663c31 100644
--- a/sysutils/detach/Makefile
+++ b/sysutils/detach/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: detach
-# Version required: 1.3
# Date created: 2 November 1999
# Whom: arnej@pvv.org
#
# $FreeBSD$
+#
-DISTNAME= detach-1.3
+PORTNAME= detach
+PORTVERSION= 1.3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.ntnu.no/pub/unix/utils/
diff --git a/sysutils/diskusage/Makefile b/sysutils/diskusage/Makefile
index e4c52f4e6759..4d822a963e69 100644
--- a/sysutils/diskusage/Makefile
+++ b/sysutils/diskusage/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: diskusage
-# Version required: 1.01
# Whom: maske
# Date created: 23 August 1999
#
# $FreeBSD$
#
-DISTNAME= diskusage-1.01
+PORTNAME= diskusage
+PORTVERSION= 1.01
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.thinblue.net/pub/FreeBSD/distfiles/
diff --git a/sysutils/doconfig/Makefile b/sysutils/doconfig/Makefile
index aed21a0ab5f3..47cf7ea460f6 100644
--- a/sysutils/doconfig/Makefile
+++ b/sysutils/doconfig/Makefile
@@ -1,12 +1,12 @@
# Ports collection Makefile for: doconfig
-# Version required: 1.1
# Date created: 7/27/1998
# Whom: nectar@FreeBSD.org
#
# $FreeBSD$
#
-DISTNAME= doconfig-1.1
+PORTNAME= doconfig
+PORTVERSION= 1.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.cold.org/pub/brandon/
diff --git a/sysutils/doinkd/Makefile b/sysutils/doinkd/Makefile
index 2514b886d7ee..3fac05c720c2 100644
--- a/sysutils/doinkd/Makefile
+++ b/sysutils/doinkd/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: idled
-# Version required: 1.16
-# Date created: 12 March 1997
-# Whom: Andrew <andrew@ugh.net.au>, Iain Templeton <iain@ugh.net.au>
+# Date created: 12 March 1997
+# Whom: Andrew <andrew@ugh.net.au>, Iain Templeton <iain@ugh.net.au>
#
# $FreeBSD$
#
-DISTNAME= idled-1.16
+PORTNAME= idled
+PORTVERSION= 1.16
CATEGORIES= sysutils
MASTER_SITES= http://www.darkwing.com/idled/download/ \
- ftp://ftp.cs.hope.edu/pub/idled/
+ ftp://ftp.cs.hope.edu/pub/idled/
-MAINTAINER= andrew@ugh.net.au
+MAINTAINER= andrew@ugh.net.au
NO_CDROM= non-profit use and distribution only
MANCOMPRESSED= yes
diff --git a/sysutils/eject/Makefile b/sysutils/eject/Makefile
index 948466933db0..75dd844683da 100644
--- a/sysutils/eject/Makefile
+++ b/sysutils/eject/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: eject
-# Version required: 1.4
# Date created: 03 January 2000
# Whom: shige
#
# $FreeBSD$
#
-DISTNAME= eject-1.4
+PORTNAME= eject
+PORTVERSION= 1.4
CATEGORIES= sysutils
MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/OD/ \
ftp://ftp4.jp.FreeBSD.org/pub/FreeBSD-jp/OD/ \
diff --git a/sysutils/ffsrecov/Makefile b/sysutils/ffsrecov/Makefile
index 4bb1cf60acd2..d0635fe6d0cd 100644
--- a/sysutils/ffsrecov/Makefile
+++ b/sysutils/ffsrecov/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ffsrecov
-# Version required: no version
# Date created: 4 May 1999
# Whom: jmg
#
# $FreeBSD$
#
-DISTNAME= ffsrecov
-PKGNAME= ffsrecov-0.1
+PORTNAME= ffsrecov
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= http://people.FreeBSD.org/~jmg/
+DISTNAME= ffsrecov
MAINTAINER= jmg@freebsd.org
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index 81d3a040d7cf..d96723748233 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: flexbackup
-# Version required: 0.9.8
# Date created: Wed Nov 3 17:58:26 MST 1999
# Whom: John Reynolds <jjreynold@home.com>
#
# $FreeBSD$
#
-DISTNAME= flexbackup-0.9.8
+PORTNAME= flexbackup
+PORTVERSION= 0.9.8
CATEGORIES= sysutils
MASTER_SITES= http://www.bluecherry.net/~edwinh/flexbackup/tarball/ \
http://members.home.com/flexbackup/tarball/ \
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index 4d45e534a2b3..bf23701e7583 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gcombust
-# Version required: 0.1.28
# Date created: Tue Jun 22 21:17:03 MET DST 1999
# Whom: Juergen Lock <nox@jelal.kn-bremen.de>
#
# $FreeBSD$
#
-DISTNAME= gcombust-0.1.28
+PORTNAME= gcombust
+PORTVERSION= 0.1.28
CATEGORIES= sysutils
MASTER_SITES= http://www.abo.fi/~jmunsin/gcombust/
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index b5a470e6d8e0..dc542efb453c 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gkrellm
-# Version required: 0.9.7
# Date Created: Mar 4 2000
# Whom: Hajimu UMEMOTO <ume@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gkrellm-0.9.7
+PORTNAME= gkrellm
+PORTVERSION= 0.9.7
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
http://people.FreeBSD.org/~ume/gkrellm/
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index b5a470e6d8e0..dc542efb453c 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gkrellm
-# Version required: 0.9.7
# Date Created: Mar 4 2000
# Whom: Hajimu UMEMOTO <ume@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= gkrellm-0.9.7
+PORTNAME= gkrellm
+PORTVERSION= 0.9.7
CATEGORIES= sysutils ipv6
MASTER_SITES= http://web.wt.net/~billw/gkrellm/ \
http://people.FreeBSD.org/~ume/gkrellm/
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index abb4bae78003..5d89f56a51c4 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: glload
-# Version required: 0.4.0
# Date created: 04 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= glload-0.4.0
+PORTNAME= glload
+PORTVERSION= 0.4.0
CATEGORIES= sysutils
MASTER_SITES= http://glload.netpedia.net/source/ \
http://people.FreeBSD.org/~vanilla/
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 8c6937aa24c6..cdbf15ed2add 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: control-center
-# Version required: 1.0.53
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= control-center-1.0.53
-PKGNAME= gnomecontrolcenter-1.0.53
+PORTNAME= gnomecontrolcenter
+PORTVERSION= 1.0.53
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/control-center
+DISTNAME= control-center-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index 8c6937aa24c6..cdbf15ed2add 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: control-center
-# Version required: 1.0.53
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= control-center-1.0.53
-PKGNAME= gnomecontrolcenter-1.0.53
+PORTNAME= gnomecontrolcenter
+PORTVERSION= 1.0.53
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/control-center
+DISTNAME= control-center-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 8cdd477a236f..721b92a47d0c 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtop
-# Version required: 1.0.7
# Date created: 28 September 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gtop-1.0.7
+PORTNAME= gtop
+PORTVERSION= 1.0.7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtop
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index 8c6937aa24c6..cdbf15ed2add 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: control-center
-# Version required: 1.0.53
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= control-center-1.0.53
-PKGNAME= gnomecontrolcenter-1.0.53
+PORTNAME= gnomecontrolcenter
+PORTVERSION= 1.0.53
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/control-center
+DISTNAME= control-center-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 8c6937aa24c6..cdbf15ed2add 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: control-center
-# Version required: 1.0.53
# Date created: 29 Dec 1998
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= control-center-1.0.53
-PKGNAME= gnomecontrolcenter-1.0.53
+PORTNAME= gnomecontrolcenter
+PORTVERSION= 1.0.53
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/control-center
+DISTNAME= control-center-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 8cdd477a236f..721b92a47d0c 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtop
-# Version required: 1.0.7
# Date created: 28 September 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gtop-1.0.7
+PORTNAME= gtop
+PORTVERSION= 1.0.7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtop
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
index 54a33e74d1a1..919fa3a44458 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gpart
-# Version required: 0.1f
# Date created: 29 Sep 1999
# Whom: Andrew Stevenson <andrew@ugh.net.au>
#
# $FreeBSD$
#
-DISTNAME= gpart-0.1f
+PORTNAME= gpart
+PORTVERSION= 0.1f
CATEGORIES= sysutils
MASTER_SITES= http://www.stud.uni-hannover.de/user/76201/gpart/ \
${MASTER_SITE_SUNSITE}
diff --git a/sysutils/gtar/Makefile b/sysutils/gtar/Makefile
index 81194ff26073..fa15a2ccba4b 100644
--- a/sysutils/gtar/Makefile
+++ b/sysutils/gtar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtar
-# Version required: 1.12
# Date created: Sa 6 Jun 1998 10:24:51 CEST
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= tar-1.12
+PORTNAME= tar
+PORTVERSION= 1.12
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= tar
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 8cdd477a236f..721b92a47d0c 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: gtop
-# Version required: 1.0.7
# Date created: 28 September 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= gtop-1.0.7
+PORTNAME= gtop
+PORTVERSION= 1.0.7
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gtop
diff --git a/sysutils/guitar/Makefile b/sysutils/guitar/Makefile
index c2bc4205552b..019cdd4f69fd 100644
--- a/sysutils/guitar/Makefile
+++ b/sysutils/guitar/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: guiTAR
-# Version required: 0.1.4
# Date created: Sat Aug 14 1999
# Whom: domi@saargate.de
#
# $FreeBSD$
#
-DISTNAME= guiTAR-0.1.4
+PORTNAME= guiTAR
+PORTVERSION= 0.1.4
CATEGORIES= sysutils
MASTER_SITES= http://disq.bir.net.tr/guitar/ \
http://artemis.efes.net/disq/guitar/
diff --git a/sysutils/healthd/Makefile b/sysutils/healthd/Makefile
index 4e8f452212e2..1fe2840c2290 100644
--- a/sysutils/healthd/Makefile
+++ b/sysutils/healthd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: healthd
-# Version required: 0.3
# Date created: 15 November 1999
# Whom: jim@thehousleys.net
#
# $FreeBSD$
#
-DISTNAME= healthd-0.3
+PORTNAME= healthd
+PORTVERSION= 0.3
CATEGORIES= sysutils
MASTER_SITES= http://healthd.thehousleys.net/
diff --git a/sysutils/idled/Makefile b/sysutils/idled/Makefile
index 2514b886d7ee..3fac05c720c2 100644
--- a/sysutils/idled/Makefile
+++ b/sysutils/idled/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: idled
-# Version required: 1.16
-# Date created: 12 March 1997
-# Whom: Andrew <andrew@ugh.net.au>, Iain Templeton <iain@ugh.net.au>
+# Date created: 12 March 1997
+# Whom: Andrew <andrew@ugh.net.au>, Iain Templeton <iain@ugh.net.au>
#
# $FreeBSD$
#
-DISTNAME= idled-1.16
+PORTNAME= idled
+PORTVERSION= 1.16
CATEGORIES= sysutils
MASTER_SITES= http://www.darkwing.com/idled/download/ \
- ftp://ftp.cs.hope.edu/pub/idled/
+ ftp://ftp.cs.hope.edu/pub/idled/
-MAINTAINER= andrew@ugh.net.au
+MAINTAINER= andrew@ugh.net.au
NO_CDROM= non-profit use and distribution only
MANCOMPRESSED= yes
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index 981d3202b5ad..2107ae993894 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: ipsc
-# Version required: 0.4.2
# Date created: 31 October 1999
# Whom: Jeremy Shaffner <jeremy@external.org>
#
# $FreeBSD$
#
-DISTNAME= ipsc-0.4.2-src
-PKGNAME= ipsc-0.4.2
+PORTNAME= ipsc
+PORTVERSION= 0.4.2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.interloper.net/~dan/software/dist/ipsc/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= jeremy@external.org
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index bb5154d501da..2b38b494ad78 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,13 +1,12 @@
-# Generated automatically from Makefile.in by configure.
-# New ports collection makefile for: lavaps
-# Version required: 1.8
-# Date created: 11-Oct-99
-# Whom: johnh@isi.edu
+# New ports collection makefile for: lavaps
+# Date created: 11-Oct-99
+# Whom: johnh@isi.edu
#
# $FreeBSD$
#
-DISTNAME= lavaps-1.8
+PORTNAME= lavaps
+PORTVERSION= 1.8
CATEGORIES= sysutils
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index c8f9b7789789..73f541ffa0a9 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -1,30 +1,29 @@
# New ports collection makefile for: libretto-config
-# Version required: 1.0
# Date created: 19 Nov 1998
# Whom: Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= libapm-linux-1.0beta5
-PKGNAME= ${PROGRAM_NAME}-1.0b5
+PORTNAME= libretto-config
+PORTVERSION= 1.0.b5
CATEGORIES= sysutils
MASTER_SITES= http://club.pep.ne.jp/~ishioka/Software/Linux/libapm/
+DISTNAME= libapm-linux-1.0beta5
MAINTAINER= shige@FreeBSD.org
ONLY_FOR_ARCHS= i386
WRKSRC= ${WRKDIR}/libapm
-PROGRAM_NAME= libretto-config
-DOCDIR= ${PREFIX}/share/doc/${PROGRAM_NAME}
+DOCDIR= ${PREFIX}/share/doc/${PORT_NAME}
-MAN8= ${PROGRAM_NAME}.8
+MAN8= ${PORT_NAME}.8
MANLANG= . ja
post-install:
# install japanese manpage also :-)
- @${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${PREFIX}/man/ja/man8/${PROGRAM_NAME}.8
+ @${INSTALL_MAN} ${WRKSRC}/libapm-j.man ${PREFIX}/man/ja/man8/${PORT_NAME}.8
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCDIR}
@${INSTALL_DATA} ${WRKSRC}/README-e.1st ${DOCDIR}/README.1st
diff --git a/sysutils/lmmon/Makefile b/sysutils/lmmon/Makefile
index d24525d807cc..e6a112e81e83 100644
--- a/sysutils/lmmon/Makefile
+++ b/sysutils/lmmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: lmmon
-# Version required: 0.65
# Date created: 24 September 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= lmmon-0.65
+PORTNAME= lmmon
+PORTVERSION= 0.65
CATEGORIES= sysutils
MASTER_SITES= http://www.fxp.org/~jedgar/
diff --git a/sysutils/logrotate/Makefile b/sysutils/logrotate/Makefile
index a1a0c9722a00..1d501ea188b4 100644
--- a/sysutils/logrotate/Makefile
+++ b/sysutils/logrotate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: logrotate
-# Version required: 3.3
# Date Created: 29 Dec 1999
# Whom: Yuan-Chen Cheng <ycheng@sinica.edu.tw>
#
# $FreeBSD$
#
-DISTNAME= logrotate-3.3
+PORTNAME= logrotate
+PORTVERSION= 3.3
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/current/SRPMS/SRPMS/ \
ftp://ftp.cdrom.com/pub/linux/redhat/current/SRPMS/SRPMS/
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 454610495777..ecd8f9becb39 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,14 +1,13 @@
# ex:ts=8
# Ports collection makefile for: lsof
-# Version required: 0.0
# Date created: Sat July 20, 1996
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= lsof_4.49_W
-PKGNAME= lsof-4.49
+PORTNAME= lsof
+PORTVERSION= 4.49
CATEGORIES= sysutils
MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \
ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/NEW/ \
@@ -16,6 +15,7 @@ MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \
ftp://ftp.auscert.org.au/pub/mirrors/vic.cc.purdue.edu/lsof/ \
ftp://ftp.web.ad.jp/pub/UNIX/tools/lsof/ \
ftp://ftp.sunet.se/pub/unix/admin/lsof/
+DISTNAME= ${PORTNAME}_${PORTVERSION}_W
MAINTAINER= obrien@FreeBSD.org
diff --git a/sysutils/manck/Makefile b/sysutils/manck/Makefile
index f0d610bb6465..3b45eb3f35f6 100644
--- a/sysutils/manck/Makefile
+++ b/sysutils/manck/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: manck
-# Version required: 1.0
# Date created: 10 September 1995
# Whom: joerg
#
# $FreeBSD$
#
-DISTNAME= manck-1.2
+PORTNAME= manck
+PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/sysutils/mei/Makefile b/sysutils/mei/Makefile
index 8b050bc64ce7..1895361ab71d 100644
--- a/sysutils/mei/Makefile
+++ b/sysutils/mei/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: mei
-# Version required: 1.53
# Date created: 19 Sep 1997
# Whom: itojun@itojun.org
#
# $FreeBSD$
#
-DISTNAME= mei-1.53
+PORTNAME= mei
+PORTVERSION= 1.53
CATEGORIES= sysutils
MASTER_SITES= http://www.vector.co.jp/authors/VA001240/archive/ \
http://people.FreeBSD.org/~itojun/distfiles/
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index 84629fd559a0..2df8f80a930a 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: mkisofs
-# Version required: 1.12 (from cdrecord-1.8)
# Date created: 07 Aug 1996
# Whom: jhk
#
# $FreeBSD$
#
-DISTNAME= cdrecord-1.8
-PKGNAME= mkisofs-1.12
+PORTNAME= mkisofs
+PORTVERSION= 1.12
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
+DISTNAME= cdrecord-1.8
MAINTAINER= dirk@FreeBSD.org
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 84629fd559a0..2df8f80a930a 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -1,17 +1,17 @@
# New ports collection makefile for: mkisofs
-# Version required: 1.12 (from cdrecord-1.8)
# Date created: 07 Aug 1996
# Whom: jhk
#
# $FreeBSD$
#
-DISTNAME= cdrecord-1.8
-PKGNAME= mkisofs-1.12
+PORTNAME= mkisofs
+PORTVERSION= 1.12
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
ftp://ftp.cs.tu-berlin.de/pub/misc/cdrecord/
+DISTNAME= cdrecord-1.8
MAINTAINER= dirk@FreeBSD.org
diff --git a/sysutils/muse/Makefile b/sysutils/muse/Makefile
index decc051d2bd7..fddab16909be 100644
--- a/sysutils/muse/Makefile
+++ b/sysutils/muse/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: muse
-# Version required: 0.1
# Date created: 27 December 1999
# Whom: freebsd@spatula.net
#
# $FreeBSD$
#
-DISTNAME= muse-0.1
+PORTNAME= muse
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= http://www.spatula.net/muse/
diff --git a/sysutils/no-login/Makefile b/sysutils/no-login/Makefile
index 3720af08abb9..8dc6b52efc88 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: nologin
-# Version required: 1.0
# Date created: 15 Jul 1998
# Whom: Donald Burr <dburr@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= nologin
-PKGNAME= nologin-1.0
+PORTNAME= nologin
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.xmission.com/pub/users/s/softweyr/pub/
DISTFILES= nologin.c nologin.8
diff --git a/sysutils/npadmin/Makefile b/sysutils/npadmin/Makefile
index ebfce483dd93..e37d82a6d72b 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: npadmin
-# Version required: 0.7
# Date created: 13 Nov 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= npadmin-0.7
+PORTNAME= npadmin
+PORTVERSION= 0.7
CATEGORIES= sysutils print
MASTER_SITES= ftp://ftp.penguincomputing.com/pub/prtools/
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 9ec5589782c7..463ba5b44b83 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nut
-# Version required: nut-0.43.1
# Date created: 08 Jan 2000
# Whom: Boris Popov <bp@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= nut-0.43.1
+PORTNAME= nut
+PORTVERSION= 0.43.1
CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 9ec5589782c7..463ba5b44b83 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: nut
-# Version required: nut-0.43.1
# Date created: 08 Jan 2000
# Whom: Boris Popov <bp@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= nut-0.43.1
+PORTNAME= nut
+PORTVERSION= 0.43.1
CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/
diff --git a/sysutils/obliterate/Makefile b/sysutils/obliterate/Makefile
index 4c49e51cfa49..e12af3be0cca 100644
--- a/sysutils/obliterate/Makefile
+++ b/sysutils/obliterate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: obliterate
-# Version required: 0.4
# Date created: 17 Nov 1999
# Whom: Wes Peters <wes@FreeBSD.ORG>
#
# $FreeBSD$
#
-DISTNAME= obliterate-0.4
+PORTNAME= obliterate
+PORTVERSION= 0.4
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.xmission.com/pub/users/s/softweyr/pub/
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index c6c3d843aa01..de5023584501 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: p5-SyslogScan
-# Version required: 0.32
# Date created: 26 December 1999
# Whom: Dmitry Sivachenko <dima@Chg.RU>
#
# $FreeBSD$
#
-DISTNAME= SyslogScan-0.32
-PKGNAME= p5-SyslogScan-0.32
+PORTNAME= p5-SyslogScan
+PORTVERSION= 0.32
CATEGORIES= sysutils perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= SyslogScan
+DISTNAME= SyslogScan-${PORTVERSION}
MAINTAINER= dima@Chg.RU
diff --git a/sysutils/pib/Makefile b/sysutils/pib/Makefile
index 646aa3c33cb9..f8a64d64300a 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: pib
-# Version required: 1.1
# Date created: 30 December 1996
# Whom: Mike Smith <msmith@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= pib-1.1
+PORTNAME= pib
+PORTVERSION= 1.1
CATEGORIES= sysutils tk82
MASTER_SITES= http://people.FreeBSD.org/~msmith/pib/
diff --git a/sysutils/pkg_remove/Makefile b/sysutils/pkg_remove/Makefile
index fc1ecd318a79..73bedfa93ffe 100644
--- a/sysutils/pkg_remove/Makefile
+++ b/sysutils/pkg_remove/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: pkg_remove
-# Version required: 1.0
# Date created: 8 Jan 2000
# Whom: NAKAJI Hiroyuki <nakaji@tutrp.tut.ac.jp>
#
# $FreeBSD$
#
-DISTNAME= pkg_remove
-PKGNAME= pkg_remove-1.0
+PORTNAME= pkg_remove
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= http://www.rr.iij4u.or.jp/~sada/scripts/
+DISTNAME= pkg_remove
EXTRACT_SUFX= .txt
MAINTAINER= nakaji@tutrp.tut.ac.jp
diff --git a/sysutils/prips/Makefile b/sysutils/prips/Makefile
index 89f691f8643c..4c5cb00f078e 100644
--- a/sysutils/prips/Makefile
+++ b/sysutils/prips/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: prips
-# Version required: 0.9.4
# Date created: 29 October 1999
# Whom: Jeremy Shaffner <jeremy@external.org>
#
# $FreeBSD$
#
-DISTNAME= prips-0.9.4-src
-PKGNAME= prips-0.9.4
+PORTNAME= prips
+PORTVERSION= 0.9.4
CATEGORIES= sysutils
MASTER_SITES= http://www.interloper.net/~dan/software/dist/prips/
+DISTNAME= ${PKGNAME}-src
MAINTAINER= jeremy@external.org
diff --git a/sysutils/procmap/Makefile b/sysutils/procmap/Makefile
index 9e578dbee025..9beaa0a678cc 100644
--- a/sysutils/procmap/Makefile
+++ b/sysutils/procmap/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: procmap
-# Version required: (self contained)
# Date created: 22 March 2000
# Whom: Jason Evans <jasone@freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= procmap-1.0
+PORTNAME= procmap
+PORTVERSION= 1.0
CATEGORIES= sysutils
DISTFILES= #empty
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index f6bc56c0744f..7c30b0026044 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: psmisc
-# Version required: psmisc-17
# Date created: 10 March 1998
# Whom: rantapaa@uswest.net
#
# $FreeBSD$
#
-DISTNAME= psmisc-17
+PORTNAME= psmisc
+PORTVERSION= 17
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.cdrom.com/pub/linux/slackware-3.6/source/a/procps/ \
ftp://ftp.bitcon.no/pub/linux/slackware/source/a/procps/
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 649f7db7b3a5..80c5f6c5a478 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: rdate
-# Version required: ....
# Date created: 19980128
# Whom: cracauer@cons.org "Martin Cracauer"
#
# $FreeBSD$
#
-DISTNAME= rdate-1.0
+PORTNAME= rdate
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= http://www2.cons.org:8000/freebsd-distfiles/ \
http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index b7cf9082e53c..364528817229 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -1,16 +1,16 @@
# New ports collection makefile for: roottail
-# Version required: 0.0.4b
# Date created: 30 September 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= rt-0.0.4B
-PKGNAME= roottail-0.0.4b
+PORTNAME= roottail
+PORTVERSION= 0.0.4b
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.hypertek.net/misc/ \
http://www.fxp.org/~jedgar/
+DISTNAME= rt-0.0.4B
EXTRACT_SUFX= .tgz
MAINTAINER= jedgar@fxp.org
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 32bcc3a7375a..963f88ff7516 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -1,14 +1,12 @@
# New ports collection makefile for: rtty
-# Version required: 3.2
# Date created: 24 Aug 1996
# Whom: jkh
#
-# Author: Paul Vixie / Internet Software Consortium
-#
# $FreeBSD$
#
-DISTNAME= rtty-3.2
+PORTNAME= rtty
+PORTVERSION= 3.2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.vix.com/pub/vixie/
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
index 29cf0af86db8..fb3ec7abb4f9 100644
--- a/sysutils/sarah/Makefile
+++ b/sysutils/sarah/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sarah
-# Version required: 0.3b
# Date created: 10 Jan 2000
# Whom: Matthew Pounsett <mattp@conundrum.com>
#
# $FreeBSD$
#
-DISTNAME= sarah-0.3b
+PORTNAME= sarah
+PORTVERSION= 0.3b
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.conundrum.com/pub/sarah/
diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 38fc3647b63c..8384308f0ff3 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: sdd
-# Version required: 1.22
# Date created: 1999-05-05
# Whom: Christian Weisgerber <naddy@mips.rhein-neckar.de>
#
# $FreeBSD$
#
-DISTNAME= sdd-1.22
+PORTNAME= sdd
+PORTVERSION= 1.22
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/sdd/
diff --git a/sysutils/setcdboot/Makefile b/sysutils/setcdboot/Makefile
index 3612d4b47740..2d791aad9df2 100644
--- a/sysutils/setcdboot/Makefile
+++ b/sysutils/setcdboot/Makefile
@@ -1,16 +1,16 @@
# ex:ts=8
# Ports collection makefile for: setcdboot
-# Version required: 1.0
# Date created: Mon Jan 17, 1998
# Whom: David O'Brien (obrien@NUXI.com)
#
# $FreeBSD$
#
-DISTNAME= setcdboot
-PKGNAME= setcdboot-1.0
+PORTNAME= setcdboot
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= 'part of port'
+DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .c
MAINTAINER= obrien@FreeBSD.org
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
index 8a532ea69542..308fa0373851 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: setquota
-# Version required: 0.1
# Date created: 27 September 1997
# Whom: winter@jurai.net
#
# $FreeBSD$
#
-DISTNAME= setquota-0.1
+PORTNAME= setquota
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.jurai.net/users/winter/
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index ade985c8962e..2ad9ea3f576e 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: skill
-# Version required: 3.7.9
# Date created: 20 Oct 1998
# Whom: Joao Carlos Mendes Luis <jonny@jonny.eng.br>
#
# $FreeBSD$
#
-DISTNAME= skill-3.7@P8
-PKGNAME= skill-3.7.9
+PORTNAME= skill
+PORTVERSION= 3.7.9
CATEGORIES= sysutils
MASTER_SITES= ftp://fast.cs.utah.edu/pub/skill/
+DISTNAME= ${PORTNAME}-3.7@P8
EXTRACT_SUFX= _tar.Z
MAINTAINER= jonny@jonny.eng.br
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index 3808900cb418..c136de4afeb6 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: socket
-# Version required: 1.1
# Date created: 14 August 1996
# Whom: wosch
#
# $FreeBSD$
#
-DISTNAME= socket-1.1
+PORTNAME= socket
+PORTVERSION= 1.1
CATEGORIES= sysutils net
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/sysutils/star/Makefile b/sysutils/star/Makefile
index ff4fa0de71c3..e9cd9bc162e6 100644
--- a/sysutils/star/Makefile
+++ b/sysutils/star/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: star
-# Version required: 0.0
# Date created: Thu May 1 20:28:44 CEST 1997
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= star-1.2
+PORTNAME= star
+PORTVERSION= 1.2
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/star/ \
${MASTER_SITE_SUNSITE}
diff --git a/sysutils/stat/Makefile b/sysutils/stat/Makefile
index c7bf7110a095..b58764058925 100644
--- a/sysutils/stat/Makefile
+++ b/sysutils/stat/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: stat
-# Version required: 1.3
# Date created: 16 Februar 1996
# Whom: wosch
#
# $FreeBSD$
+#
-DISTNAME= stat-1.3
+PORTNAME= stat
+PORTVERSION= 1.3
CATEGORIES= sysutils
MASTER_SITES= http://www.de.freebsd.org/~wosch/src/
diff --git a/sysutils/stmpclean/Makefile b/sysutils/stmpclean/Makefile
index f74e6c191462..7750ccd549ae 100644
--- a/sysutils/stmpclean/Makefile
+++ b/sysutils/stmpclean/Makefile
@@ -1,11 +1,12 @@
# New ports collection makefile for: stmpclean
-# Version required: 0.1
# Date created: 4 August 1999
# Whom: shalunov
#
# $FreeBSD$
+#
-DISTNAME= stmpclean-0.1
+PORTNAME= stmpclean
+PORTVERSION= 0.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.mccme.ru/users/shalunov/
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index e1b6eea2e331..53a36556ac59 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: su2
-# Version required: 1.3
# Date created: 12 Sep 1996
# Whom: gurney_j@efn.org
#
# $FreeBSD$
#
-DISTNAME= su2-1.3
+PORTNAME= su2
+PORTVERSION= 1.3
CATEGORIES= sysutils security
MASTER_SITES= ftp://ftp.ccs.neu.edu/pub/sysadmin/
diff --git a/sysutils/tcplist/Makefile b/sysutils/tcplist/Makefile
index faeb2c26faeb..2a9fe4d41150 100644
--- a/sysutils/tcplist/Makefile
+++ b/sysutils/tcplist/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: tcplist
-# Version required: 0.0
# Date created: Mon Apr 14, 1997
# Whom: David O'Brien (obrien@FreeBSD.org)
#
# $FreeBSD$
#
-DISTNAME= tcplist-2.2
+PORTNAME= tcplist
+PORTVERSION= 2.2
CATEGORIES= sysutils net
MASTER_SITES= ftp://ftp.cdf.toronto.edu/pub/jdd/tcplist/
EXTRACT_SUFX= .shar
diff --git a/sysutils/tua/Makefile b/sysutils/tua/Makefile
index 4873710df4fb..c58aa40f9f88 100644
--- a/sysutils/tua/Makefile
+++ b/sysutils/tua/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: tua
-# Version required: 4.0
# Date created: 11 Feb. 1995
# Whom: torstenb
#
# $FreeBSD$
#
-DISTNAME= tua-4.0
+PORTNAME= tua
+PORTVERSION= 4.0
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.vmunix.org/pub/misc/tua/
diff --git a/sysutils/ucspi-tcp/Makefile b/sysutils/ucspi-tcp/Makefile
index 5ef20603333a..4b8606bfe59e 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: ucspi-tcp
-# Version required: 0.84
# Date created: 12 June 1998
# Whom: Dom Mitchell <dom@myrddin.demon.co.uk>
#
# $FreeBSD$
#
-DISTNAME= ucspi-tcp-0.84
+PORTNAME= ucspi-tcp
+PORTVERSION= 0.84
CATEGORIES= sysutils net
MASTER_SITES= http://cr.yp.to/software/
diff --git a/sysutils/upsd/Makefile b/sysutils/upsd/Makefile
index 350cbc3b19a1..0b17a020917a 100644
--- a/sysutils/upsd/Makefile
+++ b/sysutils/upsd/Makefile
@@ -1,13 +1,12 @@
# New ports collection makefile for: upsd
-# Version required: 2.0.1.6
# Date created: 11 Jul 1996
# Whom: alexis
#
# $FreeBSD$
#
-DISTNAME= upsd-2.0.1.6
-PKGNAME= upsd-2.0
+PORTNAME= upsd
+PORTVERSION= 2.0.1.6
CATEGORIES= sysutils
MASTER_SITES= ftp://www.ww.net/pub/wildwind/upsd/ \
http://www.cre8tivegroup.com/ \
diff --git a/sysutils/upsmon/Makefile b/sysutils/upsmon/Makefile
index 65fdb6534b4f..29ce4165d4a4 100644
--- a/sysutils/upsmon/Makefile
+++ b/sysutils/upsmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: upsmon
-# Version required: 2.1.3
# Date created: 5 Oct 1998
# Whom: Igor Vinokurov <igor@zynaps.ru>
#
# $FreeBSD$
#
-DISTNAME= upsmon-2.1.3
+PORTNAME= upsmon
+PORTVERSION= 2.1.3
CATEGORIES= sysutils
MASTER_SITES= ftp://newcorridor.com/pub/upsmon/
diff --git a/sysutils/uwatch/Makefile b/sysutils/uwatch/Makefile
index 09462c177dba..eae35c4c9405 100644
--- a/sysutils/uwatch/Makefile
+++ b/sysutils/uwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: uwatch
-# Version required: 1.0
# Date created: 3 November 1999
# Whom: James Howard <howardjp@wam.umd.edu>
#
# $FreeBSD$
#
-DISTNAME= uwatch-1.0
+PORTNAME= uwatch
+PORTVERSION= 1.0
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.wam.umd.edu/pub/howardjp/software/uwatch/ \
http://www.wam.umd.edu/~howardjp/software/uwatch/ \
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index e5bb8bb49722..59db19d3c96c 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,31 +1,30 @@
# New ports collection makefile for: webmin
-# Version required: 0.77
# Date created: Do 19 Nov 1998 21:13:55 CET
# Whom: Andreas Klemm <andreas@klemm.gtn.com>
#
# $FreeBSD$
#
-DISTNAME= webmin-${VERSION}
+PORTNAME= webmin
+PORTVERSION= 0.77
CATEGORIES= sysutils
MASTER_SITES= http://www.webmin.com/webmin/download/
MAINTAINER= andreas@FreeBSD.org
-VERSION= 0.77
NO_BUILD= yes
IS_INTERACTIVE= yes
USE_PERL5= yes
post-patch:
- ${CP} ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.0 \
- ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.1
- ${CP} ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.0 \
- ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.2
- ${CP} ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.0 \
- ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.3
- ${CP} ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.0 \
- ${WRKDIR}/webmin-${VERSION}/bind8/config-freebsd-3.4
+ ${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
+ ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.1
+ ${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
+ ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.2
+ ${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
+ ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.3
+ ${CP} ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.0 \
+ ${WRKDIR}/webmin-${PORTVERSION}/bind8/config-freebsd-3.4
do-install:
${MKDIR} ${PREFIX}/lib/webmin
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index 06292fc09042..a093e1f3d077 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmapm
-# Version required: 3.01
# Date created: 99/07/02
# Whom: Satoshi TAOKA <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmapm-3.01
+PORTNAME= wmapm
+PORTVERSION= 3.01
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
diff --git a/sysutils/wmavgload/Makefile b/sysutils/wmavgload/Makefile
index 13006910249a..48632444df96 100644
--- a/sysutils/wmavgload/Makefile
+++ b/sysutils/wmavgload/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmavgload
-# Version required: 0.7.0
# Date created: 20 July 1998
# Whom: Vladimir Kushnir <kushn@mail.kar.net>
#
# $FreeBSD$
#
-DISTNAME= wmavgload-0.7.0
+PORTNAME= wmavgload
+PORTVERSION= 0.7.0
CATEGORIES= sysutils windowmaker
MASTER_SITES= ftp://ftp.windowmaker.org/pub/contrib/srcs/utils/
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index 61a91b88f5bf..9bd245ec3017 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmbattery
-# Version required: 1.11
# Date created: 18 Sep 1999
# Whom: Will Andrews <andrews@technologist.com>
#
# $FreeBSD$
#
-DISTNAME= wmbattery
-PKGNAME= ${DISTNAME}-1.11
+PORTNAME= wmbattery
+PORTVERSION= 1.11
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://kitenet.net/programs/code/wmbattery/
+DISTNAME= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index e8a20d6724a9..9616e1de5e57 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmfire
-# Version required: 0.0.3.9pre4
# Date created: 21 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= wmfire-0.0.3.9pre4
-PKGNAME= wmfire-0.0.3.9
+PORTNAME= wmfire
+PORTVERSION= 0.0.3.9
CATEGORIES= sysutils
MASTER_SITES= http://www.zebra.net/~dm/wmfire/
+DISTNAME= wmfire-0.0.3.9pre4
MAINTAINER= jedgar@fxp.org
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index 3ddca05325ee..8cbc5ea19aa4 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmhm
-# Version required: 1.42
# Date created: 21 September 1999
# Whom: Mike Muir <mmuir@es.co.nz>
#
# $FreeBSD$
#
-DISTNAME= wmhm-1.42
+PORTNAME= wmhm
+PORTVERSION= 1.42
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.es.co.nz/~mmuir/ \
http://muir.dhis.net/wmhm/
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index 1444e9e3c7bc..78920d06a926 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wminet
-# Version required: 2.0.2
# Date created: 23 May 1999
# Whom: Stephen Kiernan <sk-ports@vegamuse.org>
#
# $FreeBSD$
#
-DISTNAME= wminet-2.0.2
+PORTNAME= wminet
+PORTVERSION= 2.0.2
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.neotokyo.org/illusion/
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index 927e503b5ecc..deecab2207fe 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmlmmon
-# Version required: 0.60
# Date created: 24 September 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
# $FreeBSD$
#
-DISTNAME= wmlmmon-0.60
+PORTNAME= wmlmmon
+PORTVERSION= 0.60
CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.fxp.org/~jedgar/
diff --git a/sysutils/wmmon/Makefile b/sysutils/wmmon/Makefile
index f92f3511f34c..997067dc5947 100644
--- a/sysutils/wmmon/Makefile
+++ b/sysutils/wmmon/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmmon
-# Version required: 1.0b2
# Date created: 27 November 1998
# Whom: Kris Kennaway <kkennawa@physics.adelaide.edu.au>
#
# $FreeBSD$
#
-DISTNAME= wmmon-1.0b2
+PORTNAME= wmmon
+PORTVERSION= 1.0b2
CATEGORIES= sysutils windowmaker
MASTER_SITES= ftp://ftp.tecnogi.com/pub/linux/WindowMaker/ \
http://www.physics.adelaide.edu.au/~kkennawa/ \
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index 7bc295265419..cd6613c3aacf 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: wmmount
-# Version required: 1.0b1
# Date created: 04 Janyary 1999
# Whom: Sergey Osokin aka oZZ <ozz@FreeBSD.org.ru>
#
# $FreeBSD$
#
-DISTNAME= wmmount-1.0-beta1
-PKGNAME= wmmount-1.0b1
+PORTNAME= wmmount
+PORTVERSION= 1.0b1
CATEGORIES= sysutils windowmaker afterstep
MASTER_SITES= http://www.geocities.com/SiliconValley/Vista/2471/files/
+DISTNAME= wmmount-1.0-beta1
EXTRACT_SUFX= .tgz
MAINTAINER= ozz@FreeBSD.org.ru
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index 0ca15b843b92..6ea4ae52144f 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: wmpccard
-# Version required: 1.3
# Date created: 00/02/5
# Whom: Satoshi Taoka <taoka@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= wmpccard-1.3
+PORTNAME= wmpccard
+PORTVERSION= 1.3
CATEGORIES= misc windowmaker
MASTER_SITES= http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 17c3e20eef86..628c0035307b 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xbatt
-# Version required: 1.2
# Date created: 2 May 1995
# Whom: Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
#
# $FreeBSD$
#
-DISTNAME= xbatt-1.2.1
+PORTNAME= xbatt
+PORTVERSION= 1.2.1
CATEGORIES= sysutils
MASTER_SITES= http://www.clave.gr.jp/~eto/xbatt/
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index c31fb6b375f0..75eeba16f1e2 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -1,15 +1,15 @@
# New ports collection makefile for: xbattbar
-# Version required: 1.3
# Date created: Fri Feb 18 10:05:12 JST 2000
# Whom: sumikawa
#
# $FreeBSD$
#
-DISTNAME= xbattbar_1.3
-PKGNAME= xbattbar-1.3
+PORTNAME= xbattbar
+PORTVERSION= 1.3
CATEGORIES= sysutils
MASTER_SITES= http://infonet.aist-nara.ac.jp/member/suguru/
+DISTNAMe= ${PORTNAME}_${PORTVERSION}
MAINTAINER= sumikawa@FreeBSD.org
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index d1b1935381b2..7b53db893492 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: xcpustate
-# Version required: 0.0
# Date created: 31-Dec-1995
# Whom: David O'Brien <obrien@cs.ucdavis.edu>
#
# $FreeBSD$
#
-DISTNAME= xcpustate-2.5
+PORTNAME= xcpustate
+PORTVERSION= 2.5
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.cs.toronto.edu/pub/jdd/xcpustate/ \
${MASTER_SITE_XCONTRIB}
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index 321f424147c2..db50eabc661b 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xdu
-# Version required: R6 contrib tape
# Date created: 9 February 1995
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xdu-3.0
+PORTNAME= xdu
+PORTVERSION= 3.0
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.arl.mil/pub/
EXTRACT_SUFX= .tar.Z
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index 9933b30b6ea1..586a060b09b6 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xfsm
-# Version required: 1.97
# Date Created: 24 Nov 1997
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
#
-DISTNAME= xfsm-1.99
+PORTNAME= xfsm
+PORTVERSION= 1.99
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/status/xstatus
diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile
index 3b5242de4e80..73851f497f6e 100644
--- a/sysutils/xloadface/Makefile
+++ b/sysutils/xloadface/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xloadface
-# Version required: 1.6.1
# Date created: 4 February 1998
# Whom: FURUSAWA,Kazuhisa <kazu@jp.freebsd.org>
#
# $FreeBSD$
#
-DISTNAME= xloadface-1.6.1
+PORTNAME= xloadface
+PORTVERSION= 1.6.1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.waseda.ac.jp/pub/X11others/
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 8d35ed8c1ced..947e28be77e0 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xlogmaster
-# Version required: 1.6.0
# Date created: 1 August 1998
# Whom: Adrian Wontroba <aw1@stade.co.uk>
#
# $FreeBSD$
#
-DISTNAME= xlogmaster-1.6.0
+PORTNAME= xlogmaster
+PORTVERSION= 1.6.0
CATEGORIES= sysutils
MASTER_SITES= ftp://sunsite.doc.ic.ac.uk/packages/gnu/\
${MASTER_SITE_GNU}\
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index cdc8dc7ab5bd..29de89d9cdec 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,13 +1,13 @@
# ex:ts=8
# Ports collection makefile for: xosview
-# Version required: 0.0
# Date created: 19 Nov 1997
# Whom: Brian Handy <handy@physics.montana.edu>
#
# $FreeBSD$
#
-DISTNAME= xosview-1.7.3
+PORTNAME= xosview
+PORTVERSION= 1.7.3
CATEGORIES= sysutils
MASTER_SITES= http://lore.ece.utexas.edu/~bgrayson/xosview/ \
${MASTER_SITE_SUNSITE}
diff --git a/sysutils/xperfmon/Makefile b/sysutils/xperfmon/Makefile
index b11e428daba9..57f00a1194d9 100644
--- a/sysutils/xperfmon/Makefile
+++ b/sysutils/xperfmon/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for: xperfmon++ V1.40
-# Version required: 1.1
+# New ports collection makefile for: xperfmon++
# Date created: 14 March 97
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= xperfmon++v1.1
-PKGNAME= xperfmon++-2.0
+PORTNAME= xperfmon++
+PORTVERSION= 2.0
CATEGORIES= sysutils
-# In Germany try this
MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \
ftp://ftp.u-aizu.ac.jp/pub/misc/tools/xperfmon/ \
ftp://ftp.ibank.ru/pub/unix_src/benchmarks/
+DISTNAME= xperfmon++v1.1
EXTRACT_SUFX= .tar.Z
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/sysutils/xperfmon3/Makefile b/sysutils/xperfmon3/Makefile
index f4c64f52308d..28d61ac15b45 100644
--- a/sysutils/xperfmon3/Makefile
+++ b/sysutils/xperfmon3/Makefile
@@ -1,18 +1,17 @@
-# New ports collection makefile for: xperfmon++ V3.0
-#
-# Version required: 1.1
+# New ports collection makefile for: xperfmon++
# Date created: 23. Oct 1998
# Whom: Lars Koeller <Lars.Koeller@Uni-Bielefeld.DE>
#
# $FreeBSD$
#
-DISTNAME= xperfmon++
-PKGNAME= xperfmon++-3.0
+PORTNAME= xperfmon++
+PORTVERSION= 3.0
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \
ftp://ftp.u-aizu.ac.jp/pub/misc/tools/xperfmon/ \
ftp://ftp.ibank.ru/pub/unix_src/benchmarks/
+DISTNAME= xperfmon++
EXTRACT_SUFX= v1.1.tar.Z
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
diff --git a/sysutils/xsysinfo/Makefile b/sysutils/xsysinfo/Makefile
index 22eb4ca0d563..6150c121da36 100644
--- a/sysutils/xsysinfo/Makefile
+++ b/sysutils/xsysinfo/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xsysinfo
-# Version required: 1.4a
# Date created: 4 April 1996
# Whom: jdli
#
# $FreeBSD$
#
-DISTNAME= xsysinfo-1.4a
+PORTNAME= xsysinfo
+PORTVERSION= 1.4a
CATEGORIES= sysutils
MASTER_SITES= ftp://freebsd.csie.nctu.edu.tw/pub/jdli/source/
diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index 32c8d1bbfe0e..c14a752f0636 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -1,17 +1,17 @@
# ex:ts=8
# Ports collection makefile for: xsysstats
-# Version required: 0.0
# Date created: 12 December 1994
# Whom: asami
#
# $FreeBSD$
#
-DISTNAME= xsysstats1.34
-PKGNAME= xsysstats-1.34
+PORTNAME= xsysstats
+PORTVERSION= 1.34
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
+DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index 3069039481c1..db5999bb60c5 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -1,12 +1,12 @@
# New ports collection makefile for: xwatch
-# Version required: 0.1.0
# Date created: 17 July 1998
# Whom: mph
#
# $FreeBSD$
#
-DISTNAME= xwatch-0.1.0
+PORTNAME= xwatch
+PORTVERSION= 0.1.0
CATEGORIES= sysutils
MASTER_SITES= http://hem.passagen.se/osk/