34 files changed, 88 insertions, 89 deletions

diff --git a/devel/qtarch/Makefile b/devel/qtarch/Makefile
index 971c58ea1b39..f18c71b70f4f 100644
--- a/devel/qtarch/Makefile
+++ b/devel/qtarch/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	qtarch
-# Version required:			1.4-4
 # Date created:				17 Oct 1998
 # Whom:					Frank Gruender
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qtarch-1.4-4
-PKGNAME=	qtarch-1.4.4
+PORTNAME=	qtarch
+PORTVERSION=	1.4.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.qtarch.intranova.net/
+DISTNAME=	qtarch-1.4-4
 
 MAINTAINER=	elwood@mc5sys.in-berlin.de
 
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index 994e6740e7da..e7e90a6e5200 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	qtez
-# Version required:			0.77a
 # Date created:				14 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	QtEZ.current-src
-PKGNAME=	qtez-0.77a
+PORTNAME=	qtez
+PORTVERSION=	0.77a
 CATEGORIES=	devel
 MASTER_SITES=	http://qtez.zax.net/qtez-extras/
+DISTNAME=	QtEZ.current-src
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index a6b3674e4a74..58bb99669c5e 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	QTK - QuickTk
-# Version required:	0.50
 # Date created:		10 Aug 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qtk
-PKGNAME=	qtk-0.50
+PORTNAME=	qtk
+PORTVERSION=	0.50
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.psn.net/~andrews/dist/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index bdffcce99f83..8434fcfc225d 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	re2c
-# Version required:	0.5
 # Date created:		14 May 1998
 # Whom:			Eivind Eklund <eivind@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	re2c.0.5
-PKGNAME=	re2c-0.5
+PORTNAME=	re2c
+PORTVERSION=	0.5
 CATEGORIES=	devel
 MASTER_SITES=	ftp://csg.uwaterloo.ca/pub/peter/ \
 		ftp://ftp.uni-trier.de/pub/unix/compiler-toolkit/re2c/ \
 		ftp://ftp.tut.ac.jp/.h3/UNIX/lib/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	eivind@FreeBSD.org
 
diff --git a/devel/rinfo/Makefile b/devel/rinfo/Makefile
index 46e05a882e6f..7a63e3bf9a4b 100644
--- a/devel/rinfo/Makefile
+++ b/devel/rinfo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    rinfo
-# Version required:     1.2
 # Date created:         23th March 1998
 # Whom:                 Mark Chapman <markc@ctgi.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rinfo-1.2
+PORTNAME=	rinfo
+PORTVERSION=	1.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://www.ctgi.net/pub/ctgi/
 
diff --git a/devel/robodoc/Makefile b/devel/robodoc/Makefile
index 285d7c152b10..7388e123ffff 100644
--- a/devel/robodoc/Makefile
+++ b/devel/robodoc/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	robodoc
-# Version required:			3.1e
 # Date created:				15 Dec 1999
 # Whom:					Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	robodoc
-PKGNAME=	robodoc-3.1e
+PORTNAME=	robodoc
+PORTVERSION=	3.1e
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~rfsber/Robo/
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}.tgz
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 176da5b73fcf..9ddf89a8801e 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -6,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	sdcc-2.1.9Ea
-PKGNAME=	sdcc-2.1.9
+PORTNAME=	sdcc
+PORTVERSION=	2.1.9
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.geocities.com/ResearchTriangle/Forum/1353/
+DISTNAME=	${PORTNAME}-${PORTVERSION}Ea
 
 MAINTAINER=	ambrisko@whistle.com
 
diff --git a/devel/sdl-devel/Makefile b/devel/sdl-devel/Makefile
index 00cd7379db26..0c6772f8d8d6 100644
--- a/devel/sdl-devel/Makefile
+++ b/devel/sdl-devel/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	SDL
-# Version required:			1.0.8
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-1.0.8
-PKGNAME=		sdl-1.0.8
+PORTNAME=		sdl
+PORTVERSION=		1.0.8
 CATEGORIES=		devel
 MASTER_SITES=		http://www.devolution.com/~slouken/SDL/release/
+DISTNAME=		SDL-${PORTVERSION}
 
 MAINTAINER=		sobomax@altavista.net
 
diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile
index 00cd7379db26..0c6772f8d8d6 100644
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	SDL
-# Version required:			1.0.8
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-1.0.8
-PKGNAME=		sdl-1.0.8
+PORTNAME=		sdl
+PORTVERSION=		1.0.8
 CATEGORIES=		devel
 MASTER_SITES=		http://www.devolution.com/~slouken/SDL/release/
+DISTNAME=		SDL-${PORTVERSION}
 
 MAINTAINER=		sobomax@altavista.net
 
diff --git a/devel/sdl10/Makefile b/devel/sdl10/Makefile
index 00cd7379db26..0c6772f8d8d6 100644
--- a/devel/sdl10/Makefile
+++ b/devel/sdl10/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	SDL
-# Version required:			1.0.8
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-1.0.8
-PKGNAME=		sdl-1.0.8
+PORTNAME=		sdl
+PORTVERSION=		1.0.8
 CATEGORIES=		devel
 MASTER_SITES=		http://www.devolution.com/~slouken/SDL/release/
+DISTNAME=		SDL-${PORTVERSION}
 
 MAINTAINER=		sobomax@altavista.net
 
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 00cd7379db26..0c6772f8d8d6 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	SDL
-# Version required:			1.0.8
 # Date created:				8 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		SDL-1.0.8
-PKGNAME=		sdl-1.0.8
+PORTNAME=		sdl
+PORTVERSION=		1.0.8
 CATEGORIES=		devel
 MASTER_SITES=		http://www.devolution.com/~slouken/SDL/release/
+DISTNAME=		SDL-${PORTVERSION}
 
 MAINTAINER=		sobomax@altavista.net
 
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index cd4c5d095c3e..f501958bf9a0 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,18 +1,17 @@
 # ex:ts=8
 # Ports collection makefile for:  sfio
-# Version required: 0.0
 # Date created:			  8 November 1997
 # Whom:				  jraynard
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sfio_1999
-PKGNAME=	sfio-1999
+PORTNAME=	sfio
+PORTVERSION=	1999
 CATEGORIES=	devel
 #Users must register with AT&T before downloading tarball.
 #MASTER_SITES=	http://www.research.att.com/sw/tools/sfio/
-EXTRACT_SUFX=	.src.unix.cpio
+DISTFILES=	${PORTNAME}_${PORTVERSION}.src.unix.cpio
 
 MAINTAINER=	obrien@FreeBSD.org
 
@@ -24,7 +23,7 @@ IS_INTERACTIVE=	yes
 MAN1=		iffe.1
 MAN3=		sfio.3
 
-RESTRICTED=	Requires user to register with AT&T.
+RESTRICTED=	Requires user to register with AT\&T
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
diff --git a/devel/shtool/Makefile b/devel/shtool/Makefile
index 2a35f4414bf5..2d44ac991422 100644
--- a/devel/shtool/Makefile
+++ b/devel/shtool/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	shtool
-# Version required:		1.4.8
 # Date created:			26-Apr-1999
 # Whom:				Ralf S. Engelschall
 #
 # $FreeBSD$
 #
 
-DISTNAME=	shtool-1.4.8
+PORTNAME=	shtool
+PORTVERSION=	1.4.8
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.engelschall.com/sw/shtool/
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 7a141d24ef97..7127efdddbb9 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,17 +1,17 @@
 # ex:ts=8
 # Ports collection makefile for:  stlport
-# Version required: 0.0
 # Date Created:			  2 December 1998
 # Whom:				  Josh Gilliam <josh@quick.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	STLport-3.01
-PKGNAME=	stlport-3.01
+PORTNAME=	stlport
+PORTVERSION=	3.01
 CATEGORIES=	devel
 MASTER_SITES=	http://corp.metabyte.com/~fbp/stl/ \
 		ftp://maroon.webmaster.com/pub/STLport/
+DISTNAME=	STLport-${PORTVERSION}
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/devel/str/Makefile b/devel/str/Makefile
index b0e3f5eda75c..45d67cc3f2cf 100644
--- a/devel/str/Makefile
+++ b/devel/str/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	str
-# Version required:		0.9.3
 # Date Created:			09 Jan 2000
 # Whom:				Ralf S. Engelschall
 #
 # $FreeBSD$
 #
 
-DISTNAME=	str-0.9.3
+PORTNAME=	str
+PORTVERSION=	0.9.3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.engelschall.com/sw/str/ \
 		ftp://ftp.engelschall.com/sw/str/
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 355c51fb3541..e98b51af516d 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	swarm
-# Version required:	1.4.1
 # Date created:		26 June 1998
 # Whom:			Horance C.H Chou <horance@freedom.ie.cycu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	swarm-1.4.1
+PORTNAME=	swarm
+PORTVERSION=	1.4.1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.santafe.edu/pub/swarm/
 
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 6ef3a8e6af1c..83f5e565c191 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	libt1
-# Version required:		1.0
 # Date created:			13, May, 1999
 # Whom:				Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	t1lib-1.0
+PORTNAME=	t1lib
+PORTVERSION=	1.0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	libs/graphics
diff --git a/devel/tclcheck/Makefile b/devel/tclcheck/Makefile
index b95c02753c51..7fabbaad3e9a 100644
--- a/devel/tclcheck/Makefile
+++ b/devel/tclcheck/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	TclCheck
-# Version required:		1.1.11
 # Date created:			28 June 1997
 # Whom:				Sander Vesik <sander@haldjas.folklore.ee>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclCheck-1.1.11
-PKGNAME=	tclcheck-1.1.11
+PORTNAME=	tclcheck
+PORTVERSION=	1.1.11
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/sorted/devel/
+DISTNAME=	tclCheck-${PORTVERSION}
 
 MAINTAINER=	sander@haldjas.folklore.ee
 
diff --git a/devel/tclcl/Makefile b/devel/tclcl/Makefile
index 7f0aaff2e5e5..0f9e832a7ece 100644
--- a/devel/tclcl/Makefile
+++ b/devel/tclcl/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: tclcl
-# Version required:	1.0b9
 # Date created:		23 April 1999
 # Whom:			obonilla
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclcl-src-1.0b9
-PKGNAME=	tclcl-1.0b9
+PORTNAME=	tclcl
+PORTVERSION=	1.0b9
 CATEGORIES=	devel
 MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/
+DISTNAME=	tclcl-src-1.0b9
 
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
diff --git a/devel/tclgetopts/Makefile b/devel/tclgetopts/Makefile
index 3419ef903fd8..6e1962e3c472 100644
--- a/devel/tclgetopts/Makefile
+++ b/devel/tclgetopts/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	tcl-getopt
-# Version required:			1.0
 # Date created:				Mar 18, 1999
 # Whom:					mi
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclGetOpts
-PKGNAME=	tclGetOpts-1.0
+PORTNAME=	tclGetOpts
+PORTVERSION=	1.0
 CATEGORIES=	devel tcl76 tcl80 tcl82
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/alcatel/code/ \
 		http://www.neosoft.com/tcl/ftparchive/alcatel/code/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	mi@aldan.algebra.com
 
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index bfaeba879b55..0181694e9ee4 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tclreadline
-# Version required:	1.0.3
 # Date created:		21 September 1999
 # Whom:			darius@dons.net.au
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tclreadline-1.0.3
+PORTNAME=	tclreadline
+PORTVERSION=	1.0.3
 CATEGORIES=	tcl80 tcl82
 MASTER_SITES=	http://www.zellner.org/tclreadline/download/
 
diff --git a/devel/templ/Makefile b/devel/templ/Makefile
index 4fee26a2eaae..1fbefc41d4b3 100644
--- a/devel/templ/Makefile
+++ b/devel/templ/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    templ
-# Version required:     0.2
 # Date created:         14 Jun 1999
 # Whom:                 Oh Junseon <hollywar@mail.holywar.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME= 	templ-0.2
+PORTNAME= 	templ
+PORTVERSION=	0.2
 CATEGORIES= 	devel
 MASTER_SITES= 	ftp://ftp.holywar.net/pub/templ/ \
 		ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index 7f9fcd8ebd19..182254784e76 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tkcon
-# Version required:     1.6
 # Date created:         28 Jun 1999
 # Whom:                 wghicks@bellsouth.net
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkcon-1.6
+PORTNAME=	tkcon
+PORTVERSION=	1.6
 CATEGORIES=	devel tk82
 MASTER_SITES=	ftp://ftp.neosoft.com/languages/tcl/sorted/packages-8.0/devel/
 
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index cc6c41c42747..b513f43261a2 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tkcvs
-# Version required:     6.0
 # Date created:         02 Aug 1996
 # Whom:                 shanee@augusta.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkcvs-6.0
+PORTNAME=	tkcvs
+PORTVERSION=	6.0
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://www.neosoft.com/tcl/ftparchive/sorted/apps/tkcvs-6.0/ \
 		http://ftp.sunet.se/pub/lang/tcl/sorted/apps/tkcvs-6.0/
diff --git a/devel/tkref/Makefile b/devel/tkref/Makefile
index 49b95cf12dfe..35ac71a8e9c8 100644
--- a/devel/tkref/Makefile
+++ b/devel/tkref/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    TkRef
-# Version required:     1.01
 # Date created:         3 August 1997
 # Whom:                 Bruce Gingery <bgingery@gtcs.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkref-1.01
+PORTNAME=	tkref
+PORTVERSION=	1.01
 CATEGORIES=	devel tk82
 MASTER_SITES=	http://gtcs.com/softdist/ \
 		${MASTER_SITE_LOCAL}
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index 74693a62c7da..1939ff24711c 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tmake
-# Version required:			1.3
 # Date created:				8 March 2000
 # Whom:					jesse@cs.uni-magdeburg.de
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tmake-1.3
+PORTNAME=	tmake
+PORTVERSION=	1.3
 CATEGORIES=	devel perl5
 MASTER_SITES=	ftp://ftp.troll.no/freebies/tmake/
 
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index d8d8f0143921..f300021f7ddb 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tvision
-# Version required:			0.7
 # Date created:				16 February 1997
 # Whom:					Sandro Sigala
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tvision-0.7
+PORTNAME=	tvision
+PORTVERSION=	0.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	devel/lang/c++
diff --git a/devel/uclmmbase/Makefile b/devel/uclmmbase/Makefile
index 683d39fbddb1..61f5d81cc9be 100644
--- a/devel/uclmmbase/Makefile
+++ b/devel/uclmmbase/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	uclmmbase
-# Version required:			1.1.2
 # Date created:				Thanksgiving Day, 1999
 # Whom:	      				Garrett Wollman <wollman@lcs.mit.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	common-1.1.2
-PKGNAME=	uclmmbase-1.1.2
+PORTNAME=	uclmmbase
+PORTVERSION=	1.1.2
 CATEGORIES=	devel
 MASTER_SITES=	http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
+DISTNAME=	common-${PORTVERSION}
 
 MAINTAINER=	fenner@FreeBSD.org
 
diff --git a/devel/ups-debug/Makefile b/devel/ups-debug/Makefile
index e89008bee9c8..5f7cd61fca60 100644
--- a/devel/ups-debug/Makefile
+++ b/devel/ups-debug/Makefile
@@ -1,19 +1,19 @@
 # ex:ts=8
 # Ports collection makefile for:  UPS
-# Version required: 0.0
 # Date created:			  Mon Feb 03, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ups-3.34beta
-PKGNAME=	ups-3.34b
+PORTNAME=	ups
+PORTVERSION=	3.34b
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://unix.hensa.ac.uk/pub/misc/unix/ups/  \
 		http://www.concerto.demon.co.uk/UPS/
 MASTER_SITE_SUBDIR= utilities
+DISTNAME=	ups-3.34beta
 
 MAINTAINER=	obrien@FreeBSD.org
 
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index ede945c72e7b..1c309ce56b16 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	vtcl
-# Version required:	1.2.0
 # Date Created:		29 May 1997
 # Whom:			Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	vtcl-1.2.0
+PORTNAME=	vtcl
+PORTVERSION=	1.2.0
 CATEGORIES=	devel tk82
 MASTER_SITES=	ftp://ftp.neuron.com/pub/vtcl/development/1.2/
 
diff --git a/devel/xmake/Makefile b/devel/xmake/Makefile
index 7e009c165041..b15bf3744dd3 100644
--- a/devel/xmake/Makefile
+++ b/devel/xmake/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmake	
-# Version required:	1.05
 # Date created:		28 March 1997
 # Whom:			dlowe
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmake-1.05
+PORTNAME=	xmake
+PORTVERSION=	1.05
 CATEGORIES=	devel
 MASTER_SITES=	http://www.backplane.com/xmake/ \
 		ftp://atari.saturn5.com/pub/dlowe/
diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile
index 4c062055d389..562f3ed58f5d 100644
--- a/devel/xwpe/Makefile
+++ b/devel/xwpe/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  xwpe
-# Version required: 0.0
 # Date created:			  Fri Jan 24, 1997
 # Whom:				  David O'Brien (obrien@FreeBSD.org)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xwpe-1.5.22a
+PORTNAME=	xwpe
+PORTVERSION=	1.5.22a
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.identicalsoftware.com/xwpe/ \
diff --git a/devel/xxgdb/Makefile b/devel/xxgdb/Makefile
index ac73d81b4c2c..1427362e63b6 100644
--- a/devel/xxgdb/Makefile
+++ b/devel/xxgdb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xxgdb
-# Version required:     1.12
 # Date created:		2 May 1995
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xxgdb-1.12
+PORTNAME=	xxgdb
+PORTVERSION=	1.12
 CATEGORIES=	devel
 MASTER_SITES=   ${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
diff --git a/devel/yacl/Makefile b/devel/yacl/Makefile
index 4f309ec3f0be..11b4af416ab3 100644
--- a/devel/yacl/Makefile
+++ b/devel/yacl/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	YACL
-# Version required:     1.7-beta
 # Date created:		6 March 1998
 # Whom:			Jeroen Hogeveen <albast@xs4all.nl>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		yacl-0170-beta
-PKGNAME=		yacl-1.7b
+PORTNAME=		yacl
+PORTVERSION=		1.7b
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.cs.sc.edu/pub/yacl/
+DISTNAME=		yacl-0170-beta
 
 MAINTAINER=		albast@xs4all.nl
 
 USE_ZIP=		yes
 WRKSRC=			${WRKDIR}
-MAKE_ENV+=		YACLPATH=${WRKDIR}
+MAKE_ENV=		YACLPATH=${WRKDIR}
 
 MAKEFILE=		gnuc.mak
 ALL_TARGET=		yacl