36 files changed, 84 insertions, 85 deletions

diff --git a/games/acm/Makefile b/games/acm/Makefile
index ccefecee61b5..ddb5dca8faf7 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -6,7 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	acm-5.0
+PORTNAME=	acm
+PORTVERSION=	5.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.websimulations.com/pub/download/
 
diff --git a/games/actx/Makefile b/games/actx/Makefile
index a79f6de8b062..a91be0b135ba 100644
--- a/games/actx/Makefile
+++ b/games/actx/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:   actx
-# Version required:    0.99.2
 # Date created:        19 Feb 1999
 # Whom:                Shinya Esu <esu@yk.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	actx-0.99.2
-PKGNAME=	actx-0.99.2
+PORTNAME=	actx
+PORTVERSION=	0.99.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.astr.tohoku.ac.jp/~taji/ActX/
 
diff --git a/games/adom/Makefile b/games/adom/Makefile
index 9ed401bffe45..4333fe6abd82 100644
--- a/games/adom/Makefile
+++ b/games/adom/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    adom
-# Version required:	0.99g15
 # Date created:		22 July 1999
 # Whom:			Oleg V. Volkov <rover@lglobus.ru>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	adom-099g15-elf
-PKGNAME=	adom-0.99.g15
+PORTNAME=	adom
+PORTVERSION=	0.99.g15
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.adom.de/adom/download/linux/
+DISTNAME=	adom-099g15-elf
 
 MAINTAINER=	rover@lglobus.ru
 
diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index f8eb514cb91f..9a7c3e3ae29c 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	affenspiel
-# Version required:			1.0
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	affenspiel-1.0
+PORTNAME=	affenspiel
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/agm/Makefile b/games/agm/Makefile
index c397216d05b3..32bc4cbdfe44 100644
--- a/games/agm/Makefile
+++ b/games/agm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	agm
-# Version required:			1.4
 # Date created:				4 July 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		agm-1.4
+PORTNAME=		agm
+PORTVERSION=		1.4
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE} \
 			http://users.gtn.net/fraserm/
diff --git a/games/an/Makefile b/games/an/Makefile
index 19f5a3e48e95..d51d9a076624 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	an
-# Version required:	0.93
 # Date created:		28 Feb 1997
 # Whom:			proff
 #
 # $FreeBSD$
 #
 
-DISTNAME=	an-0.93
+PORTNAME=	an
+PORTVERSION=	0.93
 CATEGORIES=	games
 MASTER_SITES=	ftp://suburbia.net/pub/rmj/ \
 		ftp://ftp.suburbia.net/pub/rmj/
diff --git a/games/angband/Makefile b/games/angband/Makefile
index f4313e2e79ad..41ab632ac4ad 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:   angband
-# Version required:    2.8.3
 # Date created:        21 Feb 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	angband-283
-PKGNAME=	angband-2.8.3
+PORTNAME=	angband
+PORTVERSION=	2.8.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://export.andrew.cmu.edu/angband/Source/ \
 		http://people.FreeBSD.org/~mph/distfiles/
diff --git a/games/antipolix/Makefile b/games/antipolix/Makefile
index 494e237f36c7..2ac90c39fba9 100644
--- a/games/antipolix/Makefile
+++ b/games/antipolix/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	antipolix
-# Version required:		2.1
 # Date created:			2 December 1998
 # Whom:				Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		AntipoliX_2.1
-PKGNAME=		antipolix-2.1
+PORTNAME=		antipolix
+PORTVERSION=		2.1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
+DISTNAME=		AntipoliX_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index c8c6c6e2d830..d16e5b3b90e5 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   atomix
-# Version required:    0.2.0-1
 # Date created:        30 January 2000
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	atomix-0.2.0-1
-PKGNAME=	atomix-0.2.0.1
+PORTNAME=	atomix
+PORTVERSION=	0.2.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.informatik.uni-oldenburg.de/~pearl/download/
+DISTNAME=	atomix-0.2.0-1
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/games/awele/Makefile b/games/awele/Makefile
index 709e48ad0031..e12a0a86da82 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	awele
-# Version required:	1.0
 # Date created:		01 May 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	awele
-PKGNAME=	awele-1.0
+PORTNAME=	awele
+PORTVERSION=	1.0
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www-air.inria.fr/ftp/Jean-Paul/
-EXTRACT_SUFX=	1.0.tgz
+DISTNAME=	${PORTNAME}${PORTVERSION}
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tg@FreeBSD.org
 
diff --git a/games/baduki/Makefile b/games/baduki/Makefile
index 91e3fcadfceb..7fc323b3c713 100644
--- a/games/baduki/Makefile
+++ b/games/baduki/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   baduki
-# Version required:    0.2.9
 # Date created:        11 December 1999
 # Whom:                spcoltri@unm.edu
 #
 # $FreeBSD$
 #
 
-DISTNAME=	baduki-0.2.9
+PORTNAME=	baduki
+PORTVERSION=	0.2.9
 CATEGORIES=	games
 MASTER_SITES=	http://soback.kornet21.net/~artist/baduk/
 
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index e456618a8666..7716295edcc8 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	battalion
-# Version required:			1.4
 # Date created:				17 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	battalion-1.4
+PORTNAME=	battalion
+PORTVERSION=	1.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.evl.uic.edu/aej/
 DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
diff --git a/games/battleball/Makefile b/games/battleball/Makefile
index f7f1d76b7f38..8c4af5378c5f 100644
--- a/games/battleball/Makefile
+++ b/games/battleball/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	battleball
-# Version required:			2.0
 # Date created:				18 December 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	battleball.20.src
-PKGNAME=	battleball-2.0
+PORTNAME=	battleball
+PORTVERSION=	2.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.cs.utexas.edu/users/pahardin/
+DISTNAME=	${PORTNAME}.${PORTVERSION:S/.//}.src
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/games/biorythm/Makefile b/games/biorythm/Makefile
index b5feded2822b..b14adb6d1981 100644
--- a/games/biorythm/Makefile
+++ b/games/biorythm/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	biorythm
-# Version required:			1.1.1
 # Date created:				4 May 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		biorythm-1.1.1
+PORTNAME=		biorythm
+PORTVERSION=		1.1.1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE} \
 			http://home.sol.no/~sverrehu/pub-unix/files/
diff --git a/games/blackjack/Makefile b/games/blackjack/Makefile
index 656acbc5b41e..ea1b7a8d06af 100644
--- a/games/blackjack/Makefile
+++ b/games/blackjack/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	acm
-# Version required:	1.0
 # Date created:		23 February 1998
 # Whom:			Peter Mutsaers
 #
 # $FreeBSD$
 #
 
-DISTNAME=	blackjack-1.1
+PORTNAME=	blackjack
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/block/Makefile b/games/block/Makefile
index 577bc00c7f2d..bd58ba9e365c 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	block
-# Version required:			0.6
 # Date created:				10 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	block-0.6
+PORTNAME=	block
+PORTVERSION=	0.6
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/blockade/Makefile b/games/blockade/Makefile
index 0c4049f1fd0a..21eb7b8fc3d9 100644
--- a/games/blockade/Makefile
+++ b/games/blockade/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	blockade
-# Version required:	1.00
 # Date created:		29 May 1999
 # Whom:			Chris Piazza <cpiazza@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	blockade-1_00-linux
-PKGNAME=	blockade-1.00
+PORTNAME=	blockade
+PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	http://www.geocities.com/TimesSquare/Zone/5267/
+DISTNAME=	blockade-1_00-linux
 
 MAINTAINER=	cpiazza@FreeBSD.org
 
diff --git a/games/blue/Makefile b/games/blue/Makefile
index e16d8f83d4d5..82dd45007264 100644
--- a/games/blue/Makefile
+++ b/games/blue/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	blue
-# Version required:			2.4
 # Date created:				6 June 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	blue-2.4
+PORTNAME=	blue
+PORTVERSION=	2.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
diff --git a/games/bnetd/Makefile b/games/bnetd/Makefile
index 0b26838cd59c..a73fc13a43a6 100644
--- a/games/bnetd/Makefile
+++ b/games/bnetd/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	bnetd
-# Version required:	0.4.21
 # Date created:		24 April 1999
 # Whom:			Ying-Chieh Liao <ijliao@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bnetd-0.4.21
+PORTNAME=	bnetd
+PORTVERSION=	0.4.21
 CATEGORIES=	games net
 MASTER_SITES=	http://www.bnetd.org/files/
 
diff --git a/games/bogged/Makefile b/games/bogged/Makefile
index 6afc871e98ef..8120ce854c29 100644
--- a/games/bogged/Makefile
+++ b/games/bogged/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	bogged
-# Version required:			1.0.0
 # Date created:				18 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		bogged-1.0.0
+PORTNAME=		bogged
+PORTVERSION=		1.0.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/bs/Makefile b/games/bs/Makefile
index 49c99b917ac7..3054c3d54d4f 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	bs
-# Version required:			2.2
 # Date created:				11 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bs-2.2
+PORTNAME=	bs
+PORTVERSION=	2.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
diff --git a/games/bugsx/Makefile b/games/bugsx/Makefile
index 8cb93231c5bb..35c4a4c76eb8 100644
--- a/games/bugsx/Makefile
+++ b/games/bugsx/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:  bugsx
-# Version required:  1.08
 # Date created:  7 December 1997
 # Whom:  Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bugsx108
-PKGNAME=	bugsx-1.08
+PORTNAME=	bugsx
+PORTVERSION=	1.08
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
+DISTNAME=	bugsx108
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	croyle@gelemna.ft-wayne.in.us
diff --git a/games/cgoban/Makefile b/games/cgoban/Makefile
index d0ee471fd521..95e23d0e3cf7 100644
--- a/games/cgoban/Makefile
+++ b/games/cgoban/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   cgoban
-# Version required:    1.9.10
 # Date created:        28 October 1996
 # Whom:                simonm@dcs.gla.ac.uk
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cgoban-1.9.10
+PORTNAME=	cgoban
+PORTVERSION=	1.9.10
 CATEGORIES=	games
 MASTER_SITES=	http://www.inetarena.com/~wms/comp/cgoban/
 
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 2e8358203b98..03c476295024 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	columns
-# Version required:			1.1
 # Date created:				26 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	columns-1.1
+PORTNAME=	columns
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.phreax.net/
 
diff --git a/games/connect4/Makefile b/games/connect4/Makefile
index 9ac2d481d9af..00d097d624f6 100644
--- a/games/connect4/Makefile
+++ b/games/connect4/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:  connect4
-# Version required:	3.2
 # Date created:		Thu May  8 16:41:01 EST 1997
 # Whom:			Joel Sutton <jsutton@bbcon.com.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	connect4
-PKGNAME=	connect4-3.2
+PORTNAME=	connect4
+PORTVERSION=	3.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.gu.kiev.ua/pub/cdrom5/games/volume6/ \
 		ftp://scitsc.wlv.ac.uk/pub/infomagic/usenet/games/volume6/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	""
 
 MAINTAINER=	jsutton@bbcon.com.au
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 85d484be2da2..9061b6fc52a4 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	corewars
-# Version required:		0.9.10
 # Date created:			29 February 2000
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	corewars-0.9.10
+PORTNAME=	corewars
+PORTVERSION=	0.9.10
 CATEGORIES=	games
 MASTER_SITES=	http://download.sourceforge.net/corewars/
 
diff --git a/games/cosmo/Makefile b/games/cosmo/Makefile
index 4e9680123928..b41551c7bddb 100644
--- a/games/cosmo/Makefile
+++ b/games/cosmo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	cosmo
-# Version required:	2.0.4
 # Date created:		28 December 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cosmo-2.0.4
+PORTNAME=	cosmo
+PORTVERSION=	2.0.4
 CATEGORIES=	games
 MASTER_SITES=	http://taraco.u-aizu.ac.jp/~eiju/cosmo/ \
 		ftp://ftp.jinr.ru/pub/PD/cosmo/
diff --git a/games/crafty-open-large/Makefile b/games/crafty-open-large/Makefile
index 8a99ded0128e..2f99e26eca38 100644
--- a/games/crafty-open-large/Makefile
+++ b/games/crafty-open-large/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crafty-open-large
-# Version required:			10 September 1996
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	crafty-open-large-19960910
+PORTNAME=	crafty-open-large
+PORTVERSION=	19960910
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/
 DISTFILES=	large1.zip large2.zip large3.zip large4.zip
diff --git a/games/crafty-open-medium/Makefile b/games/crafty-open-medium/Makefile
index 88c85777c8fc..7a3112e3dc3a 100644
--- a/games/crafty-open-medium/Makefile
+++ b/games/crafty-open-medium/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	crafty-open-medium
-# Version required:			10 September 1996
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	medium
-PKGNAME=	crafty-open-medium-19960910
+PORTNAME=	crafty-open-medium
+PORTVERSION=	19960910
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/
+DISTNAME=	medium
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
diff --git a/games/crafty-open-rock/Makefile b/games/crafty-open-rock/Makefile
index ee069e9307ed..3690a154ac2d 100644
--- a/games/crafty-open-rock/Makefile
+++ b/games/crafty-open-rock/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	crafty-open-rock
-# Version required:			7 July 1998
 # Date created:				28 December 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 # Based on ports by:			Stefan Eggers <seggers@semyam.dinoco.de>
@@ -7,7 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	crafty-open-rock-19980707
+PORTNAME=	crafty-open-rock
+PORTVERSION=	19980707
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/rock/
 DISTFILES=	rock.01 rock.02 rock.03 rock.04 rock.05 rock.06 rock.07 \
diff --git a/games/crafty-open-small/Makefile b/games/crafty-open-small/Makefile
index c17c1360c41e..bca5284981b5 100644
--- a/games/crafty-open-small/Makefile
+++ b/games/crafty-open-small/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	crafty-open-small
-# Version required:			1 March 1997
 # Date created:				1 June 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	small
-PKGNAME=	crafty-open-small-19970301
+PORTNAME=	crafty-open-small
+PORTVERSION=	19970301
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/common/
+DISTNAME=	small
 
 MAINTAINER=	seggers@semyam.dinoco.de
 
diff --git a/games/crafty/Makefile b/games/crafty/Makefile
index 89bc53254757..f65224a6aca8 100644
--- a/games/crafty/Makefile
+++ b/games/crafty/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crafty
-# Version required:			17.6
 # Date created:				31 May 1998
 # Whom:					Stefan Eggers <seggers@semyam.dinoco.de>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	crafty-17.6
+PORTNAME=	crafty
+PORTVERSION=	17.6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cis.uab.edu/pub/hyatt/ \
 		ftp://ftp.cis.uab.edu/pub/hyatt/common/ \
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index c0102c1d6a07..35f2b5e140f0 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crossfire
-# Version required:     0.93.0
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
+PORTNAME=	crossfire
+PORTVERSION=	${MAJ}.${MIN}.${PL}
 CATEGORIES=	games
 MASTER_SITES=	http://people.FreeBSD.org/~andreas/download/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index c0102c1d6a07..35f2b5e140f0 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crossfire
-# Version required:     0.93.0
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
+PORTNAME=	crossfire
+PORTVERSION=	${MAJ}.${MIN}.${PL}
 CATEGORIES=	games
 MASTER_SITES=	http://people.FreeBSD.org/~andreas/download/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index c0102c1d6a07..35f2b5e140f0 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	crossfire
-# Version required:     0.93.0
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	crossfire-${MAJ}.${MIN}.${PL}
+PORTNAME=	crossfire
+PORTVERSION=	${MAJ}.${MIN}.${PL}
 CATEGORIES=	games
 MASTER_SITES=	http://people.FreeBSD.org/~andreas/download/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/cursive/Makefile b/games/cursive/Makefile
index 129dce83e496..057c1b24e7a7 100644
--- a/games/cursive/Makefile
+++ b/games/cursive/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	cursive
-# Version required:	1.0
 # Date created:		4 December 1999
 # Whom:			James Howard <howardj@wam.umd.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cursive
-PKGNAME=	cursive-1.0
+PORTNAME=	cursive
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://puck.nether.net/pub/janc/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	howardjp@wam.umd.edu