107 files changed, 134 insertions, 165 deletions

diff --git a/archivers/gtar/Makefile b/archivers/gtar/Makefile
index 622ca86f0a38..c78d987c28ed 100644
--- a/archivers/gtar/Makefile
+++ b/archivers/gtar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION= 	1.13
+PORTVERSION=	1.13
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	tar
diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index e9cd9bc162e6..82d61af82320 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		star
-PORTVERSION= 		1.2
+PORTVERSION=		1.2
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.fokus.gmd.de/pub/unix/star/ \
 			${MASTER_SITE_SUNSITE}
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index e9cd9bc162e6..82d61af82320 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		star
-PORTVERSION= 		1.2
+PORTVERSION=		1.2
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.fokus.gmd.de/pub/unix/star/ \
 			${MASTER_SITE_SUNSITE}
diff --git a/ports-mgmt/pib/Makefile b/ports-mgmt/pib/Makefile
index f8a64d64300a..56097d1ecbc2 100644
--- a/ports-mgmt/pib/Makefile
+++ b/ports-mgmt/pib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pib
-PORTVERSION= 	1.1
+PORTVERSION=	1.1
 CATEGORIES=	sysutils tk82
 MASTER_SITES=	http://people.FreeBSD.org/~msmith/pib/
 
diff --git a/ports-mgmt/pkg_remove/Makefile b/ports-mgmt/pkg_remove/Makefile
index 73bedfa93ffe..ba8fbb637e1b 100644
--- a/ports-mgmt/pkg_remove/Makefile
+++ b/ports-mgmt/pkg_remove/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pkg_remove
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rr.iij4u.or.jp/~sada/scripts/
 DISTNAME=	pkg_remove
diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index d958d2e7fd49..6e050feb18e0 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	afio
-PORTVERSION= 	2.4.6
-CATEGORIES=     sysutils
+PORTVERSION=	2.4.6
+CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/backup
-EXTRACT_SUFX=   .tgz
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nox@jelal.hb.north.de
 
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile
index 82e95f4a9600..7bcc9cda2528 100644
--- a/sysutils/asapm/Makefile
+++ b/sysutils/asapm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asapm
-PORTVERSION= 	2.7
+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 1534dde6bf24..1cebbe9eed62 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ascpu
-PORTVERSION= 	1.8
+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/asmon/Makefile b/sysutils/asmon/Makefile
index 85e08af76ba4..82b58d7edc57 100644
--- a/sysutils/asmon/Makefile
+++ b/sysutils/asmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asmon
-PORTVERSION= 	0.60
+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 348c10a4a067..7d736019274d 100644
--- a/sysutils/asrpages/Makefile
+++ b/sysutils/asrpages/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asrpages
-PORTVERSION= 	0.1
+PORTVERSION=	0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.winternet.com/users/eric/
 DISTNAME=	asr.pages
diff --git a/sysutils/bchunk/Makefile b/sysutils/bchunk/Makefile
index f11e0914af60..6d46749d4411 100644
--- a/sysutils/bchunk/Makefile
+++ b/sysutils/bchunk/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bchunk
-PORTVERSION= 	1.0.0
+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 4f565bed3314..2ffb0b058ed7 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bkpupsd
-PORTVERSION= 	1.0a
+PORTVERSION=	1.0a
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://edu1.tokyo-med.ac.jp/pub/contrib/bkpupsd/
 
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index bf86998d5622..45f30de7ee2d 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cd-write
-PORTVERSION= 	1.4.1
-CATEGORIES=     sysutils
-MASTER_SITES=   http://people.FreeBSD.org/~jmz/
+PORTVERSION=	1.4.1
+CATEGORIES=	sysutils
+MASTER_SITES=	http://people.FreeBSD.org/~jmz/
 
-MAINTAINER=     jmz@FreeBSD.org
+MAINTAINER=	jmz@FreeBSD.org
 
 LIB_DEPENDS=	tixsam4182.1:${PORTSDIR}/x11-toolkits/tix
 
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index 0213a799fb4e..848b3bbd4348 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdrecord
-PORTVERSION= 	1.8
+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 0213a799fb4e..848b3bbd4348 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdrecord
-PORTVERSION= 	1.8
+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 0213a799fb4e..848b3bbd4348 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cdrecord
-PORTVERSION= 	1.8
+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 e1221de7ef5b..281731ff1b1e 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION= 	1.5.3
+PORTVERSION=	1.5.3
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	cfengine
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index e1221de7ef5b..281731ff1b1e 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION= 	1.5.3
+PORTVERSION=	1.5.3
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	cfengine
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index e1221de7ef5b..281731ff1b1e 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION= 	1.5.3
+PORTVERSION=	1.5.3
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	cfengine
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index e1221de7ef5b..281731ff1b1e 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	cfengine
-PORTVERSION= 	1.5.3
+PORTVERSION=	1.5.3
 CATEGORIES=	sysutils
-MASTER_SITES=   ${MASTER_SITE_GNU}
+MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	cfengine
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/sysutils/consolehm/Makefile b/sysutils/consolehm/Makefile
index 8a2ebf65873e..529315278d38 100644
--- a/sysutils/consolehm/Makefile
+++ b/sysutils/consolehm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	consolehm
-PORTVERSION= 	1.2
+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 074b64838cab..101449d5d03f 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	contool
-PORTVERSION= 	3.3a
+PORTVERSION=	3.3a
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.kfu.com/pub/
 
diff --git a/sysutils/copytape/Makefile b/sysutils/copytape/Makefile
index 74a3a0df2f76..0611cdf95a9e 100644
--- a/sysutils/copytape/Makefile
+++ b/sysutils/copytape/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		copytape
-PORTVERSION= 		1.0
+PORTVERSION=		1.0
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_COMP_SOURCES}
 MASTER_SITE_SUBDIR=	unix/volume10
diff --git a/sysutils/cpdup/Makefile b/sysutils/cpdup/Makefile
index 1e5683c25428..a1dc3cfe2834 100644
--- a/sysutils/cpdup/Makefile
+++ b/sysutils/cpdup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cpdup
-PORTVERSION= 	1.02
+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 174f863b560f..8d612c934252 100644
--- a/sysutils/cronolog/Makefile
+++ b/sysutils/cronolog/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cronolog
-PORTVERSION= 	1.6.1
+PORTVERSION=	1.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ford-mason.co.uk/resources/cronolog/
 
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 8a8f5fb552ae..21e1d4d6502c 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	daemontools
-PORTVERSION= 	0.53
+PORTVERSION=	0.53
 CATEGORIES=	sysutils
-MASTER_SITES=   ftp://koobera.math.uic.edu/www/software/
+MASTER_SITES=	ftp://koobera.math.uic.edu/www/software/
 
 MAINTAINER=	dom@myrddin.demon.co.uk
 
@@ -20,7 +20,7 @@ INSTALL_TARGET=	setup
 SCRIPTS_ENV=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" BINMODE="${BINMODE}" \
 		MANMODE="${MANMODE}" CFLAGS="${CFLAGS}"
 
-MAN1= accustamp.1 cyclog.1 errorsto.1 fifo.1 setuser.1 supervise.1 svc.1 \
-	svstat.1 tailocal.1 testfilelock.1 usually.1
+MAN1=		accustamp.1 cyclog.1 errorsto.1 fifo.1 setuser.1 supervise.1 \
+		svc.1 svstat.1 tailocal.1 testfilelock.1 usually.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/detach/Makefile b/sysutils/detach/Makefile
index e3794b663c31..4fc96d8a2174 100644
--- a/sysutils/detach/Makefile
+++ b/sysutils/detach/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	detach
-PORTVERSION= 	1.3
+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 4d822a963e69..190b71c12b46 100644
--- a/sysutils/diskusage/Makefile
+++ b/sysutils/diskusage/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	diskusage
-PORTVERSION= 	1.01
+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 47cf7ea460f6..203af4653e48 100644
--- a/sysutils/doconfig/Makefile
+++ b/sysutils/doconfig/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		doconfig
-PORTVERSION= 		1.1
+PORTVERSION=		1.1
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://ftp.cold.org/pub/brandon/
 
diff --git a/sysutils/eject/Makefile b/sysutils/eject/Makefile
index 75dd844683da..d3611d476746 100644
--- a/sysutils/eject/Makefile
+++ b/sysutils/eject/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eject
-PORTVERSION= 	1.4
+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 d0635fe6d0cd..26ce46774930 100644
--- a/sysutils/ffsrecov/Makefile
+++ b/sysutils/ffsrecov/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ffsrecov
-PORTVERSION= 	0.1
+PORTVERSION=	0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.FreeBSD.org/~jmg/
 DISTNAME=	ffsrecov
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index d96723748233..296a215cc034 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	flexbackup
-PORTVERSION= 	0.9.8
+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 bf23701e7583..eecf7f74389d 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gcombust
-PORTVERSION= 	0.1.28
+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 f8a631f5c025..0b38fe21a62c 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION= 	0.9.8
+PORTVERSION=	0.9.8
 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 f8a631f5c025..0b38fe21a62c 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gkrellm
-PORTVERSION= 	0.9.8
+PORTVERSION=	0.9.8
 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 5d89f56a51c4..ad6d41cd3ce1 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glload
-PORTVERSION= 	0.4.0
+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 cdbf15ed2add..59d72d7693ea 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION= 	1.0.53
+PORTVERSION=	1.0.53
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index cdbf15ed2add..59d72d7693ea 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION= 	1.0.53
+PORTVERSION=	1.0.53
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 721b92a47d0c..98adf74d6ec7 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION= 	1.0.7
+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 cdbf15ed2add..59d72d7693ea 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION= 	1.0.53
+PORTVERSION=	1.0.53
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index cdbf15ed2add..59d72d7693ea 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter
-PORTVERSION= 	1.0.53
+PORTVERSION=	1.0.53
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/control-center
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 721b92a47d0c..98adf74d6ec7 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION= 	1.0.7
+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 919fa3a44458..5a1e7e55ecaf 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gpart
-PORTVERSION= 	0.1f
+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 622ca86f0a38..c78d987c28ed 100644
--- a/sysutils/gtar/Makefile
+++ b/sysutils/gtar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tar
-PORTVERSION= 	1.13
+PORTVERSION=	1.13
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	tar
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 721b92a47d0c..98adf74d6ec7 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtop
-PORTVERSION= 	1.0.7
+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 019cdd4f69fd..fcdca695ebf5 100644
--- a/sysutils/guitar/Makefile
+++ b/sysutils/guitar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	guiTAR
-PORTVERSION= 	0.1.4
+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 1fe2840c2290..c8cb9a9b88e6 100644
--- a/sysutils/healthd/Makefile
+++ b/sysutils/healthd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	healthd
-PORTVERSION= 	0.3
+PORTVERSION=	0.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://healthd.thehousleys.net/
 
@@ -15,7 +15,7 @@ MAINTAINER=	jim@thehousleys.net
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
-MAN8= healthd.8
+MAN8=		healthd.8
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/healthd.sh ]; then \
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index 646f9c702b2e..d8c01b738dfe 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ipsc
-PORTVERSION= 	0.4.2
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.interloper.net/~dan/software/dist/ipsc/
 DISTNAME=	${PKGNAME}-src
@@ -31,7 +31,7 @@ post-extract:
 pre-build:
 .if defined(WITH_GNOME)
 PLIST=		${PKGDIR}/PLIST.gnome
-ALL_TARGET=     all
+ALL_TARGET=	all
 .else
 ALL_TARGET=	ipsc
 .endif
diff --git a/sysutils/lmmon/Makefile b/sysutils/lmmon/Makefile
index e6a112e81e83..72014ecdf543 100644
--- a/sysutils/lmmon/Makefile
+++ b/sysutils/lmmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lmmon
-PORTVERSION= 	0.65
+PORTVERSION=	0.65
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.fxp.org/~jedgar/
 
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index ecd8f9becb39..6502920b6cb1 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	lsof
-PORTVERSION= 	4.49
+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/ \
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/${SRCBALL_NAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
-CONFIGURE_ENV= LSOF_CC=${CC}
+CONFIGURE_ENV=	LSOF_CC=${CC}
 MAN8=		lsof.8
 
 .if defined(PACKAGE_BUILDING)
diff --git a/sysutils/manck/Makefile b/sysutils/manck/Makefile
index 3b45eb3f35f6..ded9520f303d 100644
--- a/sysutils/manck/Makefile
+++ b/sysutils/manck/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	manck
-PORTVERSION= 	1.2
+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 1895361ab71d..49c8bc994843 100644
--- a/sysutils/mei/Makefile
+++ b/sysutils/mei/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mei
-PORTVERSION= 	1.53
+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 2df8f80a930a..6b36cc007443 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mkisofs
-PORTVERSION= 	1.12
+PORTVERSION=	1.12
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index 2df8f80a930a..6b36cc007443 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mkisofs
-PORTVERSION= 	1.12
+PORTVERSION=	1.12
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/cdrecord/ \
 		ftp://ftp.gwdg.de/pub/linux/misc/cdrecord/ \
diff --git a/sysutils/muse/Makefile b/sysutils/muse/Makefile
index fddab16909be..c5f167e19c49 100644
--- a/sysutils/muse/Makefile
+++ b/sysutils/muse/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	muse
-PORTVERSION= 	0.1
+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 8dc6b52efc88..ce363f50f6cd 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nologin
-PORTVERSION= 	1.0
+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 e37d82a6d72b..2b63bbf79e09 100644
--- a/sysutils/npadmin/Makefile
+++ b/sysutils/npadmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	npadmin
-PORTVERSION= 	0.7
+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 463ba5b44b83..cac1cbf3d0d0 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION= 	0.43.1
+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 463ba5b44b83..cac1cbf3d0d0 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nut
-PORTVERSION= 	0.43.1
+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 e12af3be0cca..c7cb0b68dc9d 100644
--- a/sysutils/obliterate/Makefile
+++ b/sysutils/obliterate/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	obliterate
-PORTVERSION= 	0.4
+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 de5023584501..6a48f198513b 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	p5-SyslogScan
-PORTVERSION= 	0.32
+PORTVERSION=	0.32
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	SyslogScan
diff --git a/sysutils/pib/Makefile b/sysutils/pib/Makefile
index f8a64d64300a..56097d1ecbc2 100644
--- a/sysutils/pib/Makefile
+++ b/sysutils/pib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pib
-PORTVERSION= 	1.1
+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 73bedfa93ffe..ba8fbb637e1b 100644
--- a/sysutils/pkg_remove/Makefile
+++ b/sysutils/pkg_remove/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pkg_remove
-PORTVERSION= 	1.0
+PORTVERSION=	1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rr.iij4u.or.jp/~sada/scripts/
 DISTNAME=	pkg_remove
diff --git a/sysutils/prips/Makefile b/sysutils/prips/Makefile
index 4c5cb00f078e..4e3cc1f61751 100644
--- a/sysutils/prips/Makefile
+++ b/sysutils/prips/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prips
-PORTVERSION= 	0.9.4
+PORTVERSION=	0.9.4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.interloper.net/~dan/software/dist/prips/
 DISTNAME=	${PKGNAME}-src
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile
index 7c30b0026044..c3b378228d0a 100644
--- a/sysutils/psmisc/Makefile
+++ b/sysutils/psmisc/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	psmisc
-PORTVERSION= 	17
-CATEGORIES=     sysutils
-MASTER_SITES=   ftp://ftp.cdrom.com/pub/linux/slackware-3.6/source/a/procps/ \
+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/
 
-MAINTAINER=     rantapaa@uswest.net
+MAINTAINER=	rantapaa@uswest.net
 
-INSTALL_TARGET= install-all
+INSTALL_TARGET=	install-all
 MAN1=		pidof.1 pstree.1 killall.1
 WRKSRC=		${WRKDIR}/psmisc
 
diff --git a/sysutils/rdate/Makefile b/sysutils/rdate/Makefile
index 80c5f6c5a478..18e217b331be 100644
--- a/sysutils/rdate/Makefile
+++ b/sysutils/rdate/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	rdate
-PORTVERSION= 	1.0
-CATEGORIES=     sysutils
-MASTER_SITES=   http://www2.cons.org:8000/freebsd-distfiles/ \
+PORTVERSION=	1.0
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www2.cons.org:8000/freebsd-distfiles/ \
 		http://people.FreeBSD.org/~cracauer/freebsd-distfiles/
 
 MAINTAINER=	cracauer@cons.org
@@ -16,7 +16,7 @@ MAINTAINER=	cracauer@cons.org
 MAN8=		rdate.8
 
 post-install:
-	$(INSTALL_PROGRAM) $(WRKSRC)/rdate $(PREFIX)/sbin/.
-	$(INSTALL_MAN) $(WRKSRC)/rdate.8 $(PREFIX)/man/man8/.
+	${INSTALL_PROGRAM} ${WRKSRC}/rdate ${PREFIX}/sbin/.
+	${INSTALL_MAN} ${WRKSRC}/rdate.8 ${PREFIX}/man/man8/.
 
 .include <bsd.port.mk>
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index 364528817229..a9aa7a39b786 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	roottail
-PORTVERSION= 	0.0.4b
+PORTVERSION=	0.0.4b
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.hypertek.net/misc/ \
 		http://www.fxp.org/~jedgar/
diff --git a/sysutils/rtty/Makefile b/sysutils/rtty/Makefile
index 963f88ff7516..cab07a466a83 100644
--- a/sysutils/rtty/Makefile
+++ b/sysutils/rtty/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rtty
-PORTVERSION= 	3.2
+PORTVERSION=	3.2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.vix.com/pub/vixie/
 
diff --git a/sysutils/sdd/Makefile b/sysutils/sdd/Makefile
index 8384308f0ff3..76e4e3b3c748 100644
--- a/sysutils/sdd/Makefile
+++ b/sysutils/sdd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdd
-PORTVERSION= 	1.22
+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 2d791aad9df2..e1bbc25e0736 100644
--- a/sysutils/setcdboot/Makefile
+++ b/sysutils/setcdboot/Makefile
@@ -9,11 +9,11 @@
 PORTNAME=	setcdboot
 PORTVERSION=	1.0
 CATEGORIES=	sysutils
-MASTER_SITES=	'part of port'
+MASTER_SITES=	# part of port
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.c
 
-MAINTAINER=     obrien@FreeBSD.org
+MAINTAINER=	obrien@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 DISTDIR=	${FILESDIR}
diff --git a/sysutils/setquota/Makefile b/sysutils/setquota/Makefile
index 308fa0373851..745ce99b9c65 100644
--- a/sysutils/setquota/Makefile
+++ b/sysutils/setquota/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	setquota
-PORTVERSION= 	0.1
+PORTVERSION=	0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.jurai.net/users/winter/
 
-MAINTAINER=     winter@jurai.net
+MAINTAINER=	winter@jurai.net
 
 WRKSRC=		${WRKDIR}/setquota/
 
diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile
index 2ad9ea3f576e..1cea3747d098 100644
--- a/sysutils/skill/Makefile
+++ b/sysutils/skill/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	skill
-PORTVERSION= 	3.7.9
+PORTVERSION=	3.7.9
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://fast.cs.utah.edu/pub/skill/
 DISTNAME=	${PORTNAME}-3.7@P8
diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile
index c136de4afeb6..fbe8345b7e9d 100644
--- a/sysutils/socket/Makefile
+++ b/sysutils/socket/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	socket
-PORTVERSION= 	1.1
+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 e9cd9bc162e6..82d61af82320 100644
--- a/sysutils/star/Makefile
+++ b/sysutils/star/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		star
-PORTVERSION= 		1.2
+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 b58764058925..1e33d4b7bb19 100644
--- a/sysutils/stat/Makefile
+++ b/sysutils/stat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stat
-PORTVERSION= 	1.3
+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 7750ccd549ae..580e7672aeb8 100644
--- a/sysutils/stmpclean/Makefile
+++ b/sysutils/stmpclean/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	stmpclean
-PORTVERSION= 	0.1
+PORTVERSION=	0.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.mccme.ru/users/shalunov/
 
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index 53a36556ac59..d7f5abf75534 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	su2
-PORTVERSION= 	1.3
+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 2a9fe4d41150..8ef6e4a8f77b 100644
--- a/sysutils/tcplist/Makefile
+++ b/sysutils/tcplist/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	tcplist
-PORTVERSION= 	2.2
+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 c58aa40f9f88..0788eb982ae3 100644
--- a/sysutils/tua/Makefile
+++ b/sysutils/tua/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tua
-PORTVERSION= 	4.0
+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 4b8606bfe59e..6d94910b2b65 100644
--- a/sysutils/ucspi-tcp/Makefile
+++ b/sysutils/ucspi-tcp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ucspi-tcp
-PORTVERSION= 	0.84
+PORTVERSION=	0.84
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cr.yp.to/software/
 
diff --git a/sysutils/upsmon/Makefile b/sysutils/upsmon/Makefile
index 29ce4165d4a4..4e29692597b3 100644
--- a/sysutils/upsmon/Makefile
+++ b/sysutils/upsmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	upsmon
-PORTVERSION= 	2.1.3
+PORTVERSION=	2.1.3
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://newcorridor.com/pub/upsmon/
 
diff --git a/sysutils/uwatch/Makefile b/sysutils/uwatch/Makefile
index eae35c4c9405..5df446b0d136 100644
--- a/sysutils/uwatch/Makefile
+++ b/sysutils/uwatch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uwatch
-PORTVERSION= 	1.0
+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 cbc51c841f17..dc833e36201b 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	webmin
-PORTVERSION= 	0.79
+PORTVERSION=	0.79
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/webmin/download/
 
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index a093e1f3d077..f699a746ba9d 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmapm
-PORTVERSION= 	3.01
+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 48632444df96..4a920938e82a 100644
--- a/sysutils/wmavgload/Makefile
+++ b/sysutils/wmavgload/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmavgload
-PORTVERSION= 	0.7.0
+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 9bd245ec3017..ff74a40aca42 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmbattery
-PORTVERSION= 	1.11
+PORTVERSION=	1.11
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://kitenet.net/programs/code/wmbattery/
 DISTNAME=	${PORTNAME}
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 9616e1de5e57..60a79224e639 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmfire
-PORTVERSION= 	0.0.3.9
+PORTVERSION=	0.0.3.9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.zebra.net/~dm/wmfire/
 DISTNAME=	wmfire-0.0.3.9pre4
diff --git a/sysutils/wmhm/Makefile b/sysutils/wmhm/Makefile
index 8cbc5ea19aa4..d23222048cfc 100644
--- a/sysutils/wmhm/Makefile
+++ b/sysutils/wmhm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmhm
-PORTVERSION= 	1.42
+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 78920d06a926..ef7c16ebc929 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wminet
-PORTVERSION= 	2.0.2
+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 deecab2207fe..d0c45f2e9956 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmlmmon
-PORTVERSION= 	0.60
+PORTVERSION=	0.60
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	http://www.fxp.org/~jedgar/
 
diff --git a/sysutils/wmmon/Makefile b/sysutils/wmmon/Makefile
index 997067dc5947..bb012d36f941 100644
--- a/sysutils/wmmon/Makefile
+++ b/sysutils/wmmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmmon
-PORTVERSION= 	1.0b2
+PORTVERSION=	1.0b2
 CATEGORIES=	sysutils windowmaker
 MASTER_SITES=	ftp://ftp.tecnogi.com/pub/linux/WindowMaker/ \
 		http://www.physics.adelaide.edu.au/~kkennawa/ \
@@ -16,7 +16,7 @@ MAINTAINER=	sk-ports@vegamuse.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_X_PREFIX=   yes
+USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/wmmon.app/wmmon
 
diff --git a/sysutils/wmmount/Makefile b/sysutils/wmmount/Makefile
index cd6613c3aacf..f075f2aa9821 100644
--- a/sysutils/wmmount/Makefile
+++ b/sysutils/wmmount/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmmount
-PORTVERSION= 	1.0b1
+PORTVERSION=	1.0b1
 CATEGORIES=	sysutils windowmaker afterstep
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Vista/2471/files/
 DISTNAME=	wmmount-1.0-beta1
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index 6ea4ae52144f..4d57cbac7aa5 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wmpccard
-PORTVERSION= 	1.3
+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 628c0035307b..33f52f884ad2 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xbatt
-PORTVERSION= 	1.2.1
+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 8b4feaf475b6..6c7e08958358 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xbattbar
-PORTVERSION= 	1.3
+PORTVERSION=	1.3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://infonet.aist-nara.ac.jp/member/suguru/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index 7b53db893492..48358605d6bb 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xcpustate
-PORTVERSION= 	2.5
+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 db50eabc661b..9963af069f0a 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xdu
-PORTVERSION= 	3.0
+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 586a060b09b6..082e057632b2 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xfsm
-PORTVERSION= 	1.99
+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 73851f497f6e..8250eb91585a 100644
--- a/sysutils/xloadface/Makefile
+++ b/sysutils/xloadface/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xloadface
-PORTVERSION= 	1.6.1
+PORTVERSION=	1.6.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.waseda.ac.jp/pub/X11others/
 
@@ -14,7 +14,7 @@ MAINTAINER=	kazu@jp.freebsd.org
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
-PATCH_STRIP= 	-p1
+PATCH_STRIP=	-p1
 USE_IMAKE=	yes
 XLOADFACEDIR=	$(X11BASE)/lib/X11/xloadface
 
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index 947e28be77e0..15c628693e48 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xlogmaster
-PORTVERSION= 	1.6.0
+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 29de89d9cdec..0ffb5339b329 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xosview
-PORTVERSION= 	1.7.3
+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 57f00a1194d9..225911b50162 100644
--- a/sysutils/xperfmon/Makefile
+++ b/sysutils/xperfmon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xperfmon++
 PORTVERSION=	2.0
-CATEGORIES=     sysutils
+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/
diff --git a/sysutils/xperfmon/pkg-descr b/sysutils/xperfmon/pkg-descr
index 34dcd3d4a811..2067974cc5e9 100644
--- a/sysutils/xperfmon/pkg-descr
+++ b/sysutils/xperfmon/pkg-descr
@@ -1,38 +1,7 @@
-This package contains the binary release of xperfmon++ V2.0 a X based
-system performance meter for several systems, ported to FreeBSD 2.2.X
-and FreeBSD-3.X.
+This package contains xperfmon++ V2.0 a X based system performance meter.
 
 The program monitors:
   system load, user-, nice-, system-, interrupt-, idle-cputime,
   free swap, disk io, number of interrupts,
   network-input, -output, -collision packets and
   NFS client and server activity.
-
-Please send BUGS and annotations to: Lars.Koeller@Uni-Bielefeld.DE
-
-Major changes in xperfmon++ V1.3 due to xperfmon++ V1.1:
-
-	- Clean fix of the -geometry option bug, now there is only
-	  a MIN_WIDTH of 185 pixels. The MIN_HEIGTH is calculated
-	  dynamically out of the number of active graphs.
-	- Display 'Free Swap' in percent without resizing of the graph
-	- Close some memory leaks
-	- Display unit of graph in label field.
-
-Changes from xperfmon++ V1.3 to xperfmon++ V1.33:
-
-	- Fix event bug when resizing or moving the window.
-	  (High cpu consumption when running xperfmon++ with mwm)
-	- Changes in get_swapspace to compile with FreeBSD 2.2 (-current)
-
-Changes from xperfmon++ V1.33 to xperfmon++ V1.40:
-
-	- Fix -geometry option. Changing the size of the window now wokes
-	  well. The start frame of the window has the correct size.
-	- Changes in freebsd_system.c to compile with FreeBSD 30-current.
-	- Clean the FreeBSD version number #if's
-
-Changes from xperfmon++ V1.40 to xperfmon++ V2.0:
-
-	- Add System Load graph
-	- Add Nice and Interrupt CPU percentage graph
diff --git a/sysutils/xperfmon3/Makefile b/sysutils/xperfmon3/Makefile
index 28d61ac15b45..b3f9aa249b80 100644
--- a/sysutils/xperfmon3/Makefile
+++ b/sysutils/xperfmon3/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xperfmon++
 PORTVERSION=	3.0
-CATEGORIES=     sysutils
+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/
diff --git a/sysutils/xsysinfo/Makefile b/sysutils/xsysinfo/Makefile
index 6150c121da36..0b362a34497f 100644
--- a/sysutils/xsysinfo/Makefile
+++ b/sysutils/xsysinfo/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xsysinfo
-PORTVERSION= 	1.4a
+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 c14a752f0636..8d612c6ddf5f 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xsysstats
-PORTVERSION= 	1.34
+PORTVERSION=	1.34
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index db5999bb60c5..b1f0827bd3a1 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xwatch
-PORTVERSION= 	0.1.0
+PORTVERSION=	0.1.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://hem.passagen.se/osk/