author: Satoshi Asami <asami@FreeBSD.org> 2000-04-14 12:28:40 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 2000-04-14 12:28:40 +0000
commit: 2971a93e525324599461eda215641f9a624352d0 (patch)
tree: 17c2ee6d6c0d04729c11b3bc5f6921df0a881bb7 /games
parent: c99c6009443219fbcb10c1baf7b6d0c93975f58a (diff)
download: ports-2971a93e525324599461eda215641f9a624352d0.tar.gz
ports-2971a93e525324599461eda215641f9a624352d0.zip
191 files changed, 483 insertions, 495 deletions
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 37d222c38415..9f0eed45a73b 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	3Dc
-# Version required:			0.8.1
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		3Dc-0.8.1
-PKGNAME=		3dc-0.8.1
+PORTNAME=		3dc
+PORTVERSION=		0.8.1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
+DISTNAME=		3Dc-${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index 56d26e447bff..ad62e763de53 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	3dpong
-# Version required:			0.3
 # Date created:				10 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	3dpong.0.3
-PKGNAME=	3dpong-0.3
+PORTNAME=	3dpong
+PORTVERSION=	0.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/3dpong/
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/CaribbeanStud/Makefile b/games/CaribbeanStud/Makefile
index 35bab01b56b5..4e38b93bb7dc 100644
--- a/games/CaribbeanStud/Makefile
+++ b/games/CaribbeanStud/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	CaribbeanStud
-# Version required:			1.0
 # Date created:				4 July 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		CS
-PKGNAME=		CaribbeanStud-1.0
+PORTNAME=		CaribbeanStud
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
+DISTNAME=		CS
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/KnightCap/Makefile b/games/KnightCap/Makefile
index 815f65baa007..fc3d19eeb391 100644
--- a/games/KnightCap/Makefile
+++ b/games/KnightCap/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	KnightCap
-# Version required:			3.5
 # Date created:				10 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	KnightCap-3.5
-PKGNAME=	knightcap-3.5
+PORTNAME=	knightcap
+PORTVERSION=	3.5
 CATEGORIES=	games
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/KnightCap/
+DISTNAME=	KnightCap-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/ifm/Makefile b/games/ifm/Makefile
index 4bb8ba5839ce..d969f050d809 100644
--- a/games/ifm/Makefile
+++ b/games/ifm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PKGNAME=	ifm
+PORTNAME=	ifm
 PORTVERSION=	4.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.gmd.de/if-archive/mapping-tools/
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index e781d2f9b23a..ec844d599ae1 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PKGNAME=	imaze
+PORTNAME=	imaze
 PORTVERSION=	1.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/games/imaze/ \
diff --git a/games/ladder/Makefile b/games/ladder/Makefile
index 25603f34c42d..ec7093630458 100644
--- a/games/ladder/Makefile
+++ b/games/ladder/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:   ladder
-# Version required:    1
 # Date created:        18 Feb 1998
 # Whom:                Stefan Zehl <sec@42.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ladder
-PKGNAME=	ladder-1.00
+PORTNAME=	ladder
+PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	http://www.srv.net/~kth/ \
 		ftp://ftp.42.org/pub/unix/games/
-EXTRACT_SUFX=	.tar
+DISTFILES=	ladder.tar
 
 MAINTAINER=	sec@42.org
 
diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 9ce60f96756b..80476dda17d6 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	libshhcards
-# Version required:			1.0.4
 # Date created:				12 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		shhcards-1.0.4
-PKGNAME=		libshhcards-1.0.4
+PORTNAME=		libshhcards
+PORTVERSION=		1.0.4
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_SUNSITE} \
 			http://home.sol.no/~sverrehu/pub-unix/files/ \
 			http://people.FreeBSD.org/~mph/distfiles/
 MASTER_SITE_SUBDIR=	libs/ui
+DISTNAME=		shhcards-${PORTVERSION}
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 640432b2ad74..ec54f48e2243 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    lincity
-# Version required:	1.04
 # Date created:         13 Feb 1997
 # Whom:                 Julian Assange
 #
 # $FreeBSD$
 #
 
-DISTNAME=       lincity-1.11
+PORTNAME=       lincity
+PORTVERSION=	1.11
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/linux/games/
 
diff --git a/games/linuxdoom/Makefile b/games/linuxdoom/Makefile
index d75af826f68c..c56fc6b661ae 100644
--- a/games/linuxdoom/Makefile
+++ b/games/linuxdoom/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    linux doom
-# Version required:	1.8
 # Date created:         Mon Dec  9 09:42:37 CST 1996
 # Whom:                 erich@rrnet.com
 #
 # $FreeBSD$
 #
 
-DISTNAME=	doom-1.8
-PKGNAME=	linuxdoom-1.8
+PORTNAME=	linuxdoom
+PORTVERSION=	1.8
 CATEGORIES=	games linux
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/doom
+DISTNAME=	doom-${PORTVERSION}
 DISTFILES=	linux-doom-1.8.tar.gz musserver.tgz smooth-joystick4doom.tgz
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 162ffaf70786..933a85d6fe8b 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	Maelstrom
-# Version required:			3.0.1
 # Date created:				13 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		Maelstrom-3.0.1
-PKGNAME=		maelstrom-3.0.1
+PORTNAME=		maelstrom
+PORTVERSION=		3.0.1
 CATEGORIES=		games
 MASTER_SITES=		http://www.devolution.com/~slouken/projects/Maelstrom/src/
+DISTNAME=		Maelstrom-${PORTVERSION}
 
 MAINTAINER=		sobomax@altavista.net
 
diff --git a/games/mangband/Makefile b/games/mangband/Makefile
index 401b8920e005..986620f2ee74 100644
--- a/games/mangband/Makefile
+++ b/games/mangband/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:   mangband
-# Version required:    0.5.4
 # Date created:        30 Dec 1998
 #
 # $FreeBSD$
 #
 
-DISTNAME=       mangband-054
-PKGNAME=        mangband-0.5.4
+PORTNAME=       mangband
+PORTVERSION=	0.5.4
 CATEGORIES=	games
 MASTER_SITES=   http://www.umr.edu/~keldon/MAngband/
+DISTNAME=       mangband-054
 
 MAINTAINER=     ache@freebsd.org
 
diff --git a/games/merlin/Makefile b/games/merlin/Makefile
index c29d09cb5307..63126fe051a3 100644
--- a/games/merlin/Makefile
+++ b/games/merlin/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	merlin
-# Version required:			1.0
 # Date created:				12 August 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	merlin
-PKGNAME=	merlin-1.0
+PORTNAME=	merlin
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://outoften.doc.ic.ac.uk/~np2/software/download/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/mindfocus/Makefile b/games/mindfocus/Makefile
index c5c4a607be17..c4fc6ac0c917 100644
--- a/games/mindfocus/Makefile
+++ b/games/mindfocus/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   mindfocus
-# Version required:    0.86.1
 # Date created:        3 December 1998
 # Whom:                Sugimoto Sadahiro <ixtl@utmc.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mindfocus-0.86.1
+PORTNAME=	mindfocus
+PORTVERSION=	0.86.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.tk.xaxon.ne.jp/~toyoshim/mf/files/
 DISTFILES=	mindfocus-0.86.1.tar.gz mindfocus-data1.tar.gz
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index a7e9f77ffbf4..e7b0ba223813 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mirrormagic
-# Version required:			1.3
 # Date created:				1 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mirrormagic-1.3
+PORTNAME=	mirrormagic
+PORTVERSION=	1.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/miscom/Makefile b/games/miscom/Makefile
index 8c78b4b5bb9b..2946fa9d6d35 100644
--- a/games/miscom/Makefile
+++ b/games/miscom/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	miscom
-# Version required:			1.0
 # Date created:				6 August 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		miscom
-PKGNAME=		miscom-1.0
+PORTNAME=		miscom
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
+DISTNAME=		${PORTNAME}
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile
index 0311fda4e050..5a9c0b68437c 100644
--- a/games/nethack-qt/Makefile
+++ b/games/nethack-qt/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nethack-qt
-# Version required:	3.2.2
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	qt-nethack-1.0.1
+PORTNAME=	qt-nethack
+PORTVERSION=	1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
 		ftp://ftp.troll.no/contrib/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	nethack-3.2.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 79e268671a7e..afb0abd5cef4 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.2.3
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	nethack-3.2.3
+PORTNAME=	nethack
+PORTVERSION=	3.2.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
 		ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	nethack-3.2.2
 
 PATCH_SITES=	ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
 PATCHFILES=	nh-3.2.2-3.2.3.diff
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 79e268671a7e..afb0abd5cef4 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.2.3
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	nethack-3.2.3
+PORTNAME=	nethack
+PORTVERSION=	3.2.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/oldver/3.2.2/src/ \
 		ftp://ftp.wtower.com/nethack/sources/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	nethack-3.2.2
 
 PATCH_SITES=	ftp://ftp.nethack.org/pub/nethack/oldver/3.2.3/src/
 PATCHFILES=	nh-3.2.2-3.2.3.diff
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/nethack33-qt/Makefile b/games/nethack33-qt/Makefile
index 0311fda4e050..5a9c0b68437c 100644
--- a/games/nethack33-qt/Makefile
+++ b/games/nethack33-qt/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nethack-qt
-# Version required:	3.2.2
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	qt-nethack-1.0.1
+PORTNAME=	qt-nethack
+PORTVERSION=	1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
 		ftp://ftp.troll.no/contrib/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	nethack-3.2.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/nethack34-qt/Makefile b/games/nethack34-qt/Makefile
index 0311fda4e050..5a9c0b68437c 100644
--- a/games/nethack34-qt/Makefile
+++ b/games/nethack34-qt/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nethack-qt
-# Version required:	3.2.2
 # Date created:		So   6 Apr 1997 04:25:57 MET DST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	qt-nethack-1.0.1
+PORTNAME=	qt-nethack
+PORTVERSION=	1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://trolls.troll.no/warwick/nethack/ \
 		ftp://ftp.troll.no/contrib/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	nethack-3.2.2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${QT_PATCH} ${QT_SOUND}
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index d6829d93ed1a..f3cdb9061559 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.3.0
 # Date created:		27 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.3.0
+PORTNAME=	nethack
+PORTVERSION=	3.3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nethack.org/pub/nethack/src/ \
 		${MASTER_SITE_GNU}
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index 1f7875493684..8d5305e6b9b8 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:    netrek
-# Version required:     BRMH 2.2p2
 # Date created:         15 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	BRMH-2.2p2.freebsd.bin
-PKGNAME=	netrek-BRMH-2.2p2
+PORTNAME=	netrek-BRMH
+PORTVERSION=	2.2.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.solace.mh.se/pub/netrek/clients/bsd/
-EXTRACT_SUFX=	.gz
+DISTFILES=	BRMH-2.2p2.freebsd.bin.gz
 
 MAINTAINER=	dburr@FreeBSD.org
 
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index ca6e81a6b77d..43dcc1bd8d93 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:    netrek
-# Version required:     COW 3.00pl0
 # Date created:         15 Mar 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	COW.3.00pl0.FreeBSD
-PKGNAME=	netrek-COW-3.00p0
+PORTNAME=	netrek-COW
+PORTVERSION=	3.00.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://bigbang.astro.indiana.edu/pub/netrek/COW/COW-bin/
-EXTRACT_SUFX=	.gz
+DISTFILES=	COW.3.00pl0.FreeBSD.gz
 
 MAINTAINER=	dburr@FreeBSD.org
 
@@ -20,7 +19,7 @@ NO_WRKSUBDIR=		YES
 
 do-extract:
 	${MKDIR} ${WRKDIR}
-	${GUNZIP_CMD} < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} > ${WRKDIR}/netrek
+	${GUNZIP_CMD} < ${DISTDIR}/${DISTFILES} > ${WRKDIR}/netrek
 
 do-install:
 	${INSTALL} -c -o root -g wheel -m 555 ${WRKDIR}/netrek ${PREFIX}/bin
diff --git a/games/netris/Makefile b/games/netris/Makefile
index e6c5ac6d6662..42e115325a8b 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	netris
-# Version required:	0.5
 # Date created:	1 August 1996
 # Whom:	desmo
 #
 # $FreeBSD$
 #
 
-DISTNAME=		netris-0.5
+PORTNAME=		netris
+PORTVERSION=		0.5
 CATEGORIES=		games ipv6
 MASTER_SITES=		ftp://ftp.netris.org/pub/netris/
 
diff --git a/games/omega/Makefile b/games/omega/Makefile
index ec29443aabba..c1faf2cb116e 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	omega
-# Version required:			0.90.4
 # Date created:				14 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	omega-0.90-pa4
-PKGNAME=	omega-0.90.4
+PORTNAME=	omega
+PORTVERSION=	0.90.4
 CATEGORIES=	games
 MASTER_SITES=	http://dolphin.openprojects.net/Omega/Downloads/Prealphas/
+DISTNAME=	omega-0.90-pa4
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/oneko-sakura/Makefile b/games/oneko-sakura/Makefile
index b777da98100e..1467fc32e6f4 100644
--- a/games/oneko-sakura/Makefile
+++ b/games/oneko-sakura/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	oneko-sakura
-# Version required:	1.2
 # Date created:		25 May 1999
 # Whom:			HOTARU-YA <hotaru@tail.net>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	oneko-1.2
-PKGNAME=	oneko-sakura3-1.2
+PORTNAME=	oneko
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cin.nihon-u.ac.jp/pub/Linux/PJE/PJE-0.1.2/sources/xclt/ \
 		http://hp.vector.co.jp/authors/VA004959/oneko/
+PKGNAMESUFFIX=	-sakura3
 
 PATCH_SITES=	ftp://aptiva.mp.es.osaka-u.ac.jp/pub/oneko-sakura/
 PATCHFILES=	oneko-1.2.sakura.3.diff.gz
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index ee1e09936273..0963f15b81ea 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	oneko
-# Version required:	1.2
 # Date created:		5 December 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	oneko-1.2
+PORTNAME=	oneko
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cin.nihon-u.ac.jp/pub/Linux/PJE/PJE-0.1.5/sources/xclt/oneko/ \
 		http://hp.vector.co.jp/authors/VA004959/oneko/
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index d6c5377ea814..601bcfe2941b 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:  oonsoo
-# Version required:	1.2
 # Date created:		23rd June, 1997
 # Whom:			Joel Sutton <jsutton@bbcon.com.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	oonsoo-1.2
+PORTNAME=	oonsoo
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.eos.ncsu.edu/pub/bsvc/rohan/
 EXTRACT_SUFX=	.tgz
diff --git a/games/phalanx/Makefile b/games/phalanx/Makefile
index 218b0948779e..5b0724e09eb1 100644
--- a/games/phalanx/Makefile
+++ b/games/phalanx/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	phalanx
-# Version required:			22
 # Date created:				2 May 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	phalanx-22
+PORTNAME=	phalanx
+PORTVERSION=	22
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.math.muni.cz/pub/math/people/Dobes/ \
 		http://www.crosswinds.net/~dobes/phalanx/
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 645182a409fb..268fa2ec669e 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -1,22 +1,20 @@
 # New ports collection makefile for:   games/pmars
-# Version required:    pmars v0.8
 # Date created:        15 Feb 1999
 # Whom:                gmarco@giovannelli.it
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pmars08s
-PKGNAME=	pmars-0.8
+PORTNAME=	pmars
+PORTVERSION=	0.8
 CATEGORIES=	games
 MASTER_SITES=	http://www.koth.org/pmars/ \
 		http://www.giovannelli.it/~gmarco/files/
-EXTRACT_SUFX=	.tar.Z
+DISTFILES=	pmars08s.tar.Z
 
 MAINTAINER=	gmarco@giovannelli.it
 
 USE_XLIB=	yes
-NO_WRKSUBDIR=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	pmars
 MAN6=		pmars.6
diff --git a/games/powerpak/Makefile b/games/powerpak/Makefile
index 8b8da25989bb..8fba8f21f937 100644
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	PowerPak
-# Version required:			991203
 # Date created:				19 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	PowerPak
-PKGNAME=	powerpak-991203
+PORTNAME=	powerpak
+PORTVERSION=	991203
 CATEGORIES= 	games
 MASTER_SITES=	http://www.angelfire.com/va/powerpakgsdk/
+DISTNAME=	PowerPak
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/pp/Makefile b/games/pp/Makefile
index 9203dd615c60..eafc537c9b60 100644
--- a/games/pp/Makefile
+++ b/games/pp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pp
-# Version required:			0.01
 # Date created:				21 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pp-0.01
+PORTNAME=	pp
+PORTVERSION=	0.01
 CATEGORIES=	games
 MASTER_SITES=	ftp://www.mps.de/pub/unix/ \
 		http://www.nectar.com/distfiles/
diff --git a/games/ptkei/Makefile b/games/ptkei/Makefile
index dd11f0aa401d..444f23b00c3d 100644
--- a/games/ptkei/Makefile
+++ b/games/ptkei/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ptkei
-# Version required:                     1.10
 # Date created:                         26 October 1999
 # Whom:                                 Daniel O'Connor <darius@dons.net.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptkei-1.10
+PORTNAME=	ptkei
+PORTVERSION=	1.10
 CATEGORIES=	games
 MASTER_SITES=	http://www.cse.buffalo.edu/~koconnor/ptkei/download/
 
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 8b47122a0832..fe35ad40cb10 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    PySol
-# Version required:     3.40
 # Date created:         11 September 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       pysol-3.40
+PORTNAME=       pysol
+PORTVERSION=	3.40
 CATEGORIES=	games
 MASTER_SITES=	http://wildsau.idv.uni-linz.ac.at/mfx/download/pysol/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${CARDSETS}${EXTRACT_SUFX}
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index 07febfbdadb1..b735d388026c 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:		qcc
-# Version required:				1.01
 # Date created:					October 25th 1996
 # Whom:						jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qcc
-PKGNAME=	qcc-1.01
+PORTNAME=	qcc
+PORTVERSION=	1.01
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	jfitz@freebsd.org
 
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index e106578fb2b3..ada23196eecf 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   qstat
-# Version required:    2.3g
 # Date created:        28 May 1998
 # Whom:                Daniel O'Connor <darius@dons.net.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qstat23g
-PKGNAME=	qstat-2.3g
+PORTNAME=	qstat
+PORTVERSION=	2.3g
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.activesw.com/pub/quake/
+DISTNAME=	qstat23g
 
 MAINTAINER=	darius@dons.net.au
 
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 62e78dcbdfea..010b8caca134 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	QuakeForge
-# Version required:	0.10.0
 # Date created:		4 January 2000
 # Whom:			darius@dons.net.au
 #
 # $FreeBSD$
 #
 
-DISTNAME=	quakeforge
-PKGNAME=	QuakeForge-0.10.0pre
+PORTNAME=	QuakeForge
+PORTVERSION=	0.10.0p
 CATEGORIES=	games
 # ${MASTER_SITES} is only for if CVS won't work, period.
 MASTER_SITES=	http://www.gsoft.com.au/~doconnor/
+DISTNAME=	quakeforge
 
 MAINTAINER=	darius@dons.net.au
 
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index 89e92e4a7088..e9945f5895f7 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	quakeserver
-# Version required:			0.991
 # Date created:				October 26th 1996
 # Whom:					jfitz@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	quakeserver-1.0
+PORTNAME=	quakeserver
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/quake/planetquake/threewave/unix/ \
 		ftp://ftp.idsoftware.com/idstuff/quake/
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index f739d015ef09..f4659461402d 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	rocksndiamonds
-# Version required:	1.4.0
 # Date created:		27 May 1999
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rocksndiamonds-1.4.0
+PORTNAME=	rocksndiamonds
+PORTVERSION=	1.4.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/rocksndiamonds/RELEASES/ \
 		${MASTER_SITE_XCONTRIB}
diff --git a/games/rollemup/Makefile b/games/rollemup/Makefile
index e62879b1f984..2496dd5575ae 100644
--- a/games/rollemup/Makefile
+++ b/games/rollemup/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Rollemup
-# Version required:	1.0
 # Date created:		22 October 1999
 # Whom:			Kazuki Sakamoto <sakamoto@netbsd.org>
 #
@@ -7,10 +6,11 @@
 # $NetBSD: Makefile,v 1.4 1999/11/23 16:54:40 hubertf Exp $
 #
 
-DISTNAME=	Rollemup
-PKGNAME=	rollemup-1.0
+PORTNAME=	rollemup
+PORTVERSION=	1.0
 CATEGORIES=	games linux
 MASTER_SITES=	ftp://usa.lostboys.nl/pub/medialab/rollemup/Linux/
+DISTNAME=	Rollemup
 
 MAINTAINER=	sanpei@jp.FreeBSD.org
 
diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index 794592d76110..ba1685cab1c7 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	rubix
-# Version required:	1.0.1
 # Date created:		19 Nov 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rubix-1.0.1
+PORTNAME=	rubix
+PORTVERSION=	1.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/
 
diff --git a/games/seabattle/Makefile b/games/seabattle/Makefile
index d91f6613466c..a4005b564f9b 100644
--- a/games/seabattle/Makefile
+++ b/games/seabattle/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	seabattle
-# Version required:			1.0
 # Date created:				6 June 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		seabattle-1.0
+PORTNAME=		seabattle
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index 0d4dcea5e224..cd55a0911c49 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    seahaven
-# Version required:     1.04
 # Date created:         23 Dec 1998
 # Whom:                 imp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	seahaven-1.41
+PORTNAME=	seahaven
+PORTVERSION=	1.41
 CATEGORIES=	games
 MASTER_SITES=	http://www.cinenet.net/users/spitzak/seahaven/
 EXTRACT_SUFX=	.tgz
diff --git a/games/sl/Makefile b/games/sl/Makefile
index 1f7654ec98c0..0f97ef91792b 100644
--- a/games/sl/Makefile
+++ b/games/sl/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    sl
-# Version required:    3.03
 # Date created:                17 Sep 1999
 # Whom:                        HIYAMA Takeshi <th@cis.ibaraki.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=      sl
-PKGNAME=       sl-3.03
-CATEGORIES=    games
-MASTER_SITES=  http://www.is.titech.ac.jp/~toyoda/sl/
-EXTRACT_SUFX=  .tar
+PORTNAME=	sl
+PORTVERSION=	3.03
+CATEGORIES=	games
+MASTER_SITES=	http://www.is.titech.ac.jp/~toyoda/sl/
+DISTNAME=	${PORTNAME}
+EXTRACT_SUFX=	.tar
 
 MAINTAINER=    th@cis.ibaraki.ac.jp
 
diff --git a/games/sokoban/Makefile b/games/sokoban/Makefile
index a3634e276aa9..ba898f311bba 100644
--- a/games/sokoban/Makefile
+++ b/games/sokoban/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	sokoban
-# Version required:			1.0 
 # Date created:				2 July 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		sokoban-src
-PKGNAME=		sokoban-1.0
+PORTNAME=		sokoban
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
+DISTFILES=		${PORTNAME}-src${EXTRACT_SUFX}
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/sol/Makefile b/games/sol/Makefile
index 5143d7251be4..ed97790c8f1e 100644
--- a/games/sol/Makefile
+++ b/games/sol/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	sol
-# Version required:			1.0.6
 # Date created:				12 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sol-1.0.6
+PORTNAME=	sol
+PORTVERSION=	1.0.6
 CATEGORIES=	games
 MASTER_SITES=	http://home.sol.no/~sverrehu/pub-unix/files/
 
diff --git a/games/speak/Makefile b/games/speak/Makefile
index 80a618a38acd..7d08aed94d41 100644
--- a/games/speak/Makefile
+++ b/games/speak/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: speak
-# Version required:	1.2
 # Date created:		18 January 2000
 # Whom:			freebsd@spatula.net
 #
 # $FreeBSD$
 #
 
-DISTNAME=	speak-1.2
+PORTNAME=	speak
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.spatula.net/software/speak/
 
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 02047f7be4ac..b8175f5cf9a3 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	spellcast
-# Version required:			1.1
 # Date created:				28 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	spellcast-1.1
+PORTNAME=	spellcast
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		http://www.macula.net/lightside/
diff --git a/games/speyes/Makefile b/games/speyes/Makefile
index 50a61ce3d6a4..1cc50d087de4 100644
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	speyes
-# Version required:			1.2.0
 # Date created:				03 November 1999
 # Whom:					Chris D. Faulhaber <jedgar@fxp.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	speyes-1.2.0
+PORTNAME=	speyes
+PORTVERSION=	1.2.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.halcyon.com/amalmin/speyes/
 
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 9dff072499a1..7863490fc95c 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    spider
-# Version required:     1.1
 # Date created:         2 Oct 1995
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
-DISTNAME=	spider
-PKGNAME=	spider-1.1
+PORTNAME=	spider
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/starlanes/Makefile b/games/starlanes/Makefile
index 2197d2ca18e6..6f3b3c8b86b7 100644
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	starlanes
-# Version required:			1.2.2
 # Date created:				7 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	starlanes-1.2.2
+PORTNAME=	starlanes
+PORTVERSION=	1.2.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/sxsame/Makefile b/games/sxsame/Makefile
index a1065ef76ad7..5562ef479945 100644
--- a/games/sxsame/Makefile
+++ b/games/sxsame/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    sxsame
-# Version required:     3.02
 # Date created:         11 December 1999
 # Whom:                 Yuichi Narahara
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sxsame-3.02
+PORTNAME=	sxsame
+PORTVERSION=	3.02
 CATEGORIES=	games
 MASTER_SITES=	ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/\
 		ftp://jg.cc.hit-u.ac.jp/pub/JG/JG-0.9.1/sources/\
diff --git a/games/tank/Makefile b/games/tank/Makefile
index 4199a0b1f62b..8ddf22023f82 100644
--- a/games/tank/Makefile
+++ b/games/tank/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    tank
-# Version required:     0.4a
 # Date created:         4 Mar 1998
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tank-0.4a-src
-PKGNAME=	tank-0.4a
+PORTNAME=	tank
+PORTVERSION=	0.4a
 CATEGORIES=	games
 MASTER_SITES=	http://step.polymtl.ca/~coyote/tank/
+DISTNAME=	${PKGNAME}-src
 
 MAINTAINER=	dburr@FreeBSD.org
 
diff --git a/games/tetrinet-x/Makefile b/games/tetrinet-x/Makefile
index a019c816630b..f6a7cc3624be 100644
--- a/games/tetrinet-x/Makefile
+++ b/games/tetrinet-x/Makefile
@@ -1,19 +1,21 @@
 # New ports collection makefile for:   tetrinet-x-1.13.16
-# Version required:    1.13.16
 # Date created:        11 Apr 1999
 # Whom:                gmarco@giovannelli.it
 #
 # $FreeBSD$
 #
 
-DISTNAME= tetrinet-x.1.13.16
-CATEGORIES= games
-MASTER_SITES= http://www.giovannelli.it/~gmarco/files/ \
-	      ftp://ftp.dementia.nu/tetrinet/servers/tetrix/
-EXTRACT_SUFX= .tgz
+PORTNAME=	tetrinet-x
+PORTVERSION=	1.13.16
+CATEGORIES=	games
+MASTER_SITES=	http://www.giovannelli.it/~gmarco/files/ \
+	     	ftp://ftp.dementia.nu/tetrinet/servers/tetrix/
+DISTFILES=	${PORTNAME}.${PORTVERSION}.tgz
 
 MAINTAINER= gmarco@giovannelli.it
 
+WRKSRC=		${WRKDIR}/tetrinetx-${PORTVERSION}
+
 INSTALLDIR= ${PREFIX}/tetrinet-x
 
 do-build:
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 59c90e9bc01c..f6ab33b1ceaf 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: TinyMUX
-# Version required:	1.4p13
 # Date created:		1998/05/28
 # Whom:			cjohnson
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tinymux-1.6p0
+PORTNAME=	tinymux
+PORTVERSION=	1.6p0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.digex.net/pub/mud/tinymux/
 
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 8e2cc1e77cb2..6d685b4925d6 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tkMOO
-# Version required:	0.3.23
 # Date created:		20 Jan 2000
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkMOO-light-0.3.23
-PKGNAME=	tkmoo-0.3.23
+PORTNAME=	tkmoo
+PORTVERSION=	0.3.23
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www.awns.com/tkMOO-light/Source/
+DISTNAME=	tkMOO-light-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index e30da487d821..057a6781da45 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    tksol
-# Version required:     1.0
 # Date created:         26 June 1995
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       tksol-1.0
+PORTNAME=       tksol
+PORTVERSION=	1.0
 CATEGORIES=	games tk82
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
 EXTRACT_SUFX=	.tar.Z
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index 89addc832f67..28de3ff19b24 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	tvp
-# Version Required:	0.9.7.1
 # Date Created:		3 Jul 1996
 # Whom:			Tim Vanderhoek <ac199@hwcn.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tvp-0.9.7.1
+PORTNAME=	tvp
+PORTVERSION=	0.9.7.1
 CATEGORIES=	games tk82
 MASTER_SITES=	http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
 
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index 5600f4367af6..1ca93cf1e4e4 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    uox3
-# Version required:     0.69.02
 # Date created:         24 Feb 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	uox3v6902-linux
-PKGNAME=	uox3-0.69.02
+PORTNAME=	uox3
+PORTVERSION=	0.69.02
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.borg-cube.com/pub/uox3/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} tqpsworld${EXTRACT_SUFX}
+DISTNAME=	uox3v6902-linux
 
 MAINTAINER=	dburr@FreeBSD.org
 
diff --git a/games/wmeyes/Makefile b/games/wmeyes/Makefile
index 29f27e2c9ab4..2099adc477ab 100644
--- a/games/wmeyes/Makefile
+++ b/games/wmeyes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: wmeyes
-# Version required:    1.0
 # Date created:        18 March 1999
 # Whom:                Zenin <zenin@archive.rhps.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wmeyes-1.0
+PORTNAME=	wmeyes
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://thrush.omix.com/pub/misc/
 
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index cc9553d2decc..de884c74f594 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	(wm)miniCHESS
-# Version required:	0.8
 # Date created:		24 Sep 1999
 # Whom:			Will Andrews <andrews@technologist.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	miniCHESS-0.8
-PKGNAME=	wmminichess-0.8
+PORTNAME=	wmminichess
+PORTVERSION=	0.8
 CATEGORIES=	games
 MASTER_SITES=	http://www.electricrain.com/edavis/miniCHESS/
+DISTNAME=	miniCHESS-${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 6ac051cb0a3c..d68f034c617c 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	wmtictactoe
-# Version required:		1.1-1
 # Date created:			28 Apr 1999
 # Whom:				Jim Mock <jim@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	wmtictactoe-1.1-1
-PKGNAME=	wmtictactoe-1.1
+PORTNAME=	wmtictactoe
+PORTVERSION=	1.1
 CATEGORIES=	games windowmaker afterstep
 MASTER_SITES=	http://atlas.ucpel.tche.br/~acamargo/ \
 		http://people.FreeBSD.org/~jim/distfiles/
+DISTNAME=	wmtictactoe-1.1-1
 
 MAINTAINER=	jim@FreeBSD.org
 
diff --git a/games/wmtimebomb/Makefile b/games/wmtimebomb/Makefile
index a8a6b3e46739..1026053aad86 100644
--- a/games/wmtimebomb/Makefile
+++ b/games/wmtimebomb/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	wmtimebomb
-# Version required:	0.2.0
 # Date created:		10 August 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 
-DISTNAME=	wmtimebomb.20
-PKGNAME=	wmtimebomb-0.2.0
+PORTNAME=	wmtimebomb
+PORTVERSION=	0.2.0
 CATEGORIES=	games windowmaker
 MASTER_SITES=	ftp://ftp.netmug.org/pub/FreeBSD/distfiles/
+DISTNAME=	wmtimebomb.20
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/wolfpack/Makefile b/games/wolfpack/Makefile
index c84da4527ac4..29e2be6d2294 100644
--- a/games/wolfpack/Makefile
+++ b/games/wolfpack/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    wolfpack
-# Version required:                     4.2.6
 # Date created:                         26 October 1999
 # Whom:                                 Daniel O'Connor <darius@dons.net.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	empire4.2.6
-PKGNAME=	wolfpack-4.2.6
+PORTNAME=	wolfpack
+PORTVERSION=	4.2.6
 CATEGORIES=	games
 MASTER_SITES=	ftp://empire.idlpaper.com/pub/empire/server/
+DISTNAME=	empire${PORTVERSION}
 
 MAINTAINER=	darius@dons.net.au
 
diff --git a/games/x3eyes/Makefile b/games/x3eyes/Makefile
index dc4722300f69..f57916225fc1 100644
--- a/games/x3eyes/Makefile
+++ b/games/x3eyes/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   x3eyes
-# Version required:	1.0
 # Date created:		18 Aug 1999
 # Whom:			HIYAMA Takeshi <th@cis.ibaraki.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	x3eyes
-PKGNAME=	x3eyes-1.0
+PORTNAME=	x3eyes
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://puma.cis.ibaraki.ac.jp/~th/pub/X11/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xabacus/Makefile b/games/xabacus/Makefile
index 6c6827e7166c..481776d0ae79 100644
--- a/games/xabacus/Makefile
+++ b/games/xabacus/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xabacus
-# Version required:			5.5.2
 # Date created:				3 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xabacus-5.5.2
+PORTNAME=	xabacus
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.tux.org/pub/tux/bagleyd/xabacus/
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 9479aea47e7a..ff5e36507b7f 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:    xasteroids
-# Version required:	5
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xasteroids
-PKGNAME=	xasteroids-5.0
+PORTNAME=	xasteroids
+PORTVERSION=	5.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/X11/R5contrib/ \
 		ftp://ftp.belgium.eu.net/pub/X11/R5contrib/
-EXTRACT_SUFX=	.sh.Z
+DISTFILES=       xasteroids.sh.Z
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/games/xataxx/Makefile b/games/xataxx/Makefile
index 6253c0fb6171..6368cf81a5b2 100644
--- a/games/xataxx/Makefile
+++ b/games/xataxx/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xataxx
-# Version required:			1.0
 # Date created:				4 July 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xataxx
-PKGNAME=	xataxx-1.0
+PORTNAME=	xataxx
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xbaby/Makefile b/games/xbaby/Makefile
index b9e7748a87f2..4753ba544dad 100644
--- a/games/xbaby/Makefile
+++ b/games/xbaby/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	xbaby
-# Version required:		1.2
 # Date created:			21 January 2000
 # Whom:				HIYAMA Takeshi <th@cis.ibaraki.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xbaby-pl2
+PORTNAME=	xbaby
+PORTVERSION=	pl2
 CATEGORIES=	games
-MASTER_SITES=  ftp://ftp.inria.fr/X/contrib-R5/games/
+MASTER_SITES=	ftp://ftp.inria.fr/X/contrib-R5/games/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	th@cis.ibaraki.ac.jp
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index e667b383e8d2..1f41a521953d 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   xbat
-# Version required:    1.11
 # Date created:        30 January 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xev111
-PKGNAME=	xbat-1.11
+PORTNAME=	xbat
+PORTVERSION=	1.11
 CATEGORIES=	games
 MASTER_SITES=	http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
+DISTNAME=	xev111
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/games/xbattle/Makefile b/games/xbattle/Makefile
index 56845fe78dcf..023aab7be008 100644
--- a/games/xbattle/Makefile
+++ b/games/xbattle/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xbattle
-# Version required:     15.4.1
 # Date created:         6 Apr 97
 # Whom:                 Pedro Giffuni
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xbattle-5.4.1
+PORTNAME=	xbattle
+PORTVERSION=	5.4.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://cns-ftp.bu.edu/pub/xbattle/
 
diff --git a/games/xbill/Makefile b/games/xbill/Makefile
index 6ac6f47272c4..4ab08af045c7 100644
--- a/games/xbill/Makefile
+++ b/games/xbill/Makefile
@@ -1,13 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:  xbill
-# Version required: 0.0
 # Date created:			  12 September 1995
 # Whom:				  asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xbill-2.0
+PORTNAME=	xbill
+PORTVERSION=	2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 90312a78fb2f..fbcf7ed0d0d9 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xbl
-# Version required:	1.0j
 # Date created:		May 25 1997
 # Whom:			pgs (original)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xbl-1.0j
+PORTNAME=	xbl
+PORTVERSION=	1.0j
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp710.univ-lyon1.fr/pub/xbl/
 EXTRACT_SUFX=	.tar.Z
diff --git a/games/xblackjack/Makefile b/games/xblackjack/Makefile
index 24a6d2cfd6de..ae135ee5640b 100644
--- a/games/xblackjack/Makefile
+++ b/games/xblackjack/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xblackjack
-# Version required:     2.2
 # Date created:         8/16/1996
 # Whom:                 erich@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xblackjack-2.2
+PORTNAME=	xblackjack
+PORTVERSION=	2.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index f944b21d93cc..45a194e22c95 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    xblast
-# Version required:     2.6
 # Date created:         Sat Nov 08 09:47:12 CET 1997
 # Whom:                 se
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xblast-2.6.beta
-PKGNAME=	xblast-2.6b
+PORTNAME=	xblast
+PORTVERSION=	2.6b
 CATEGORIES=	games
 # after end of beta test period:
 # MASTER_SITES= ${MASTER_SITE_XCONTRIB}
 # MASTER_SITE_SUBDIR= games/multiplayer
 # but right now only available from:
 MASTER_SITES=	http://www.ikp.uni-koeln.de/~vogel/archive/
+DISTNAME=       xblast-2.6.beta
 
 MAINTAINER=	se@FreeBSD.org
 
diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index 169aa51723e2..3324d2a8fe08 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   XBlood
-# Version required:    1.0
 # Date created:        27 Jun 1999
 # Whom:                Sakai Hiroaki <sakai@miya.ee.kagu.sut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xblood-1.0
+PORTNAME=	xblood
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://wwwmiya.ee.kagu.sut.ac.jp/~sakai/
 
diff --git a/games/xbloody/Makefile b/games/xbloody/Makefile
index 9a1254aebb81..eb40de4ff632 100644
--- a/games/xbloody/Makefile
+++ b/games/xbloody/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	xbloody
-# Version required:	1.00
 # Date created:		10 February 1998
 # Whom:			FURUSAWA,Kazuhisa <kazu@jp.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xbloody
-PKGNAME=	xbloody-1.00
+PORTNAME=	xbloody
+PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1994/oct/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	kazu@jp.freebsd.org
 
-WRKSRC=		${WRKDIR}
+NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES= yes
 
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index deba88576474..bed798adf853 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xboard
-# Version required:     4.0.7
 # Date created:         5 Jan 1997
 # Whom:                 xaa@stack.nl
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xboard-4.0.7
+PORTNAME=       xboard
+PORTVERSION=	4.0.7
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.gnu.org/gnu/xboard/ \
 		http://www.research.compaq.com/SRC/personal/Tim_Mann/xboard/
diff --git a/games/xboing/Makefile b/games/xboing/Makefile
index 787f562efd28..93fc0d6d5a8c 100644
--- a/games/xboing/Makefile
+++ b/games/xboing/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xboing
-# Version required:	2.4
 # Date created:		31 January 1995
 # Whom:			janek
 #
 # $FreeBSD$
 
-DISTNAME=	xboing2.4
-PKGNAME=	xboing-2.4
+PORTNAME=	xboing
+PORTVERSION=	2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	janek@gaja.ipan.lublin.pl
 
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index fbcfbd383248..d5a756ddadbf 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xbomb
-# Version required:     2.1a
 # Date created:         20 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xbomb-2.1a
+PORTNAME=       xbomb
+PORTVERSION=	2.1a
 CATEGORIES=	games
 MASTER_SITES=	http://www.gedanken.demon.co.uk/download-xbomb/
 EXTRACT_SUFX=	.tgz
diff --git a/games/xbomber/Makefile b/games/xbomber/Makefile
index 9402d2ae7daf..9532d13d2e08 100644
--- a/games/xbomber/Makefile
+++ b/games/xbomber/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   xbomber
-# Version required:    0.8
 # Date created:        28 June 1998
 # Whom:                marcus
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xbomber.0.8
-PKGNAME=	xbomber-0.8
+PORTNAME=	xbomber
+PORTVERSION=	0.8
 CATEGORIES=     games
 MASTER_SITES=   ftp://ftp.sonic.net/pub/users/nbs/unix/x/xbomber/
+DISTNAME=       ${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=     jclarke@cisco.com
 
diff --git a/games/xchadance/Makefile b/games/xchadance/Makefile
index 9daeb6960f29..826d0b88f7dc 100644
--- a/games/xchadance/Makefile
+++ b/games/xchadance/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	xchadance
-# Version required:	1.0
 # Date created:		21 August 1998
 # Whom:			issei <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xchada01
-PKGNAME=	xchadance-1.0
+PORTNAME=	xchadance
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://home.jp.FreeBSD.org/~issei/LOCAL_PORTS/
-EXTRACT_SUFX=	.lzh
+DISTFILES=	xchada01.lzh
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
diff --git a/games/xchain/Makefile b/games/xchain/Makefile
index 57205a84eaa6..bcf58f2b7c60 100644
--- a/games/xchain/Makefile
+++ b/games/xchain/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xchain
-# Version required:			1.0.2
 # Date created:				13 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xchain_1.0-2
-PKGNAME=	xchain-1.0.2
+PORTNAME=	xchain
+PORTVERSION=	1.0.2
 CATEGORIES=	games
 MASTER_SITES=	http://thor.cam.ac.uk/~ac212/xchain/
+DISTNAME=	xchain_1.0-2
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 5f3aa4e744e1..4e5f37dd1546 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xchomp
-# Version required:     pl1
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xchomp-pl1
+PORTNAME=       xchomp
+PORTVERSION=	pl1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	../R5contrib
diff --git a/games/xcogitate/Makefile b/games/xcogitate/Makefile
index 3991f660cd94..c730a4b63725 100644
--- a/games/xcogitate/Makefile
+++ b/games/xcogitate/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcogitate
-# Version required:			1.02
 # Date created:				15 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcogitate-1.02
+PORTNAME=	xcogitate
+PORTVERSION=	1.02
 CATEGORIES=	games
 MASTER_SITES=	http://people.FreeBSD.org/~mph/distfiles/
 
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 0f301a18129f..86f561a8f82f 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xconq
-# Version required:     7.2.2
 # Date created:         2 Jun 1998
 # Whom:                 Don Croyle <croyle@gelemna.ft-wayne.in.us>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xconq-7.2.2
+PORTNAME=	xconq
+PORTVERSION=	7.2.2
 CATEGORIES=	games
 MASTER_SITES=	ftp://sourceware.cygnus.com/pub/xconq/
 
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index 027df3167875..5b9751dc9f09 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xcubes
-# Version required:	5.5.2
 # Date created:		12 October 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xcubes-5.5.2
+PORTNAME=	xcubes
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index ef5a8d654475..460a8af608e8 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	xdeblock
-# Version required:	1.0
 # Date created:		28 December 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xdeblock
-PKGNAME=	xdeblock-1.0
+PORTNAME=	xdeblock
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/game/action/block/
-EXTRACT_SUFX=	.tgz
+DISTFILES=	${PORTNAME}.tgz
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/games/xdemineur/Makefile b/games/xdemineur/Makefile
index f67b6e00aa5f..25170fdcf169 100644
--- a/games/xdemineur/Makefile
+++ b/games/xdemineur/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xdemineur
-# Version required:     2.1.1
 # Date created:         13 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xdemineur-2.1.1
+PORTNAME=       xdemineur
+PORTVERSION=	2.1.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.babafou.eu.org/pub/babafou/
 
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index cb123baa37c3..2fdedd90e472 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xdigger
-# Version required:			1.0.10
 # Date created:				29 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xdigger-1.0.10
+PORTNAME=	xdigger
+PORTVERSION=	1.0.10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index cc68315fa8f1..b938058131be 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xdino
-# Version required:	5.5.2
 # Date created:		12 October 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xdino-5.5.2
+PORTNAME=	xdino
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xeji/Makefile b/games/xeji/Makefile
index 2b52d0b1c9b5..aa151dd8b1e7 100644
--- a/games/xeji/Makefile
+++ b/games/xeji/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xeji
-# Version required:	1.2
 # Date created:		10 Aug 1999
 # Whom:			HIYAMA Takeshi <th@cis.ibaraki.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xeji1.2
-PKGNAME=	xeji-1.2
+PORTNAME=	xeji
+PORTVERSION=	1.2
 CATEGORIES=	games
 MASTER_SITES=	http://yindy1.aist-nara.ac.jp/~tetu-s/sofken/software/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	th@cis.ibaraki.ac.jp
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 4a7a5ac6a1f4..8a1886e1da41 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xemeraldia
-# Version required:	0.31
 # Date created:		22 Mar 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xemeraldia-0.3
-PKGNAME=	xemeraldia-0.31
+PORTNAME=	xemeraldia
+PORTVERSION=	0.31
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/mar/
+DISTNAME=	xemeraldia-0.3
 
 PATCH_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/apr/
 PATCHFILES=	xemeraldia-0.3to0.31.patch.gz
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 3caad5bb0d8c..b801f19c1d0e 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,24 +1,22 @@
 # New ports collection makefile for:    xevil
-# Version required:     1.5
 # Date created:         6 May 1995
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xevil1.5
-PKGNAME=	xevil-1.5
+PORTNAME=	xevil
+PORTVERSION=	1.5
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games/xevil1.5
-EXTRACT_SUFX=	.tar.Z
+MASTER_SITE_SUBDIR=	games/${PORTNAME}${PORTVERSION}
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_XLIB=	yes
 MAN6=		xevil.6
 MANCOMPRESSED=	yes
-
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index e7682b6be89c..9ff05da9bbfe 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xeyes+
-# Version required:     2.01
 # Date created:         20 Oct 1996
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xeyes+2.01
-PKGNAME=	xeyes+-2.01
+PORTNAME=	xeyes+
+PORTVERSION=	2.01
 CATEGORIES=	games
 MASTER_SITES=	http://yindy1.aist-nara.ac.jp/~tetu-s/sofken/software/
+DISTNAME=	xeyes+${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	nakai@FreeBSD.org
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index 164db98b9c40..ce1770bf3dc8 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   XFlame
-# Version required:    1.1.1
 # Date created:        2 January 1999
 # Whom:                Kris Kennaway <kkennawa@physics.adelaide.edu.au>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xflame-1.1.1
+PORTNAME=	xflame
+PORTVERSION=	1.1.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.owlnet.rice.edu/~rahul/
 
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 820861aed574..e9c389934b28 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   xfrisk
-# Version required:    1.00
 # Date created:        20 April 1997
 # Whom:                Matthew Hunt <mph@pobox.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	XFrisk-1.00
-PKGNAME=	xfrisk-1.00
+PORTNAME=	xfrisk
+PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	$(MASTER_SITE_XCONTRIB)
 MASTER_SITE_SUBDIR=	games/multiplayer
+DISTNAME=	XFrisk-${PORTVERSION}
 
 MAINTAINER=	mph@freebsd.org
 
diff --git a/games/xgalaga/Makefile b/games/xgalaga/Makefile
index aa3984fca299..0d2888c5eef6 100644
--- a/games/xgalaga/Makefile
+++ b/games/xgalaga/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xgalaga
-# Version required:	2.0
 # Date created:		27 August 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xgalaga-2.0
+PORTNAME=	xgalaga
+PORTVERSION=	2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index 4a2e0898fc9a..c62d230ec4ef 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -6,7 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xgammon-0.98
+PORTNAME=	xgammon
+PORTVERSION=	0.98
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.redhat.com/pub/redhat/current/SRPMS/SRPMS/ \
 		ftp://ftp.mpi-sb.mpg.de/pub/linux/mirror/ftp.redhat.com/redhat/current/SRPMS/SRPMS/ \
diff --git a/games/xgolgo/Makefile b/games/xgolgo/Makefile
index dc2ab0745988..9590785dc9e4 100644
--- a/games/xgolgo/Makefile
+++ b/games/xgolgo/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   xgolgo
-# Version required:    1.0
 # Date created:        1 July 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xeyes-g
-PKGNAME=	xgolgo-1.0
+PORTNAME=	xgolgo
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/X11/misc/
+DISTNAME=	xeyes-g
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/games/xhexagons/Makefile b/games/xhexagons/Makefile
index 1beb33cd86ac..f1b659858a71 100644
--- a/games/xhexagons/Makefile
+++ b/games/xhexagons/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xhexagons
-# Version required:			5.5.2
 # Date created:				20 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xhexagons-5.5.2
+PORTNAME=	xhexagons
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index d87f31509830..b2d8f0e3ec94 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -1,16 +1,15 @@
 # ports collection makefile for:   xhime
-# Version required:    1.51
 # Date created:        25 August 1998
 # Whom:                Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xhime151
-PKGNAME=	xhime-1.51
+PORTNAME=	xhime
+PORTVERSION=	1.51
 CATEGORIES=	games
 MASTER_SITES=	http://www.tcp-ip.or.jp/~shochan/linux/
-EXTRACT_SUFX=	.tgz
+DISTFILES=	xhime151.tgz
 
 MAINTAINER=	flathill@FreeBSD.org
 
diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index 650d856e4344..99db54569b0e 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	xinfocom
-# Version required:			1.8m
 # Date created:				7 May 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		unix8m
-PKGNAME=		xinfocom-1.8m
+PORTNAME=		xinfocom
+PORTVERSION=		1.8m
 CATEGORIES=		games
 MASTER_SITES=   	http://people.FreeBSD.org/~mph/distfiles/
-EXTRACT_SUFX=		.tgz
+DISTFILES=		unix8m.tgz
 
 MAINTAINER=		mph@freebsd.org
 
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 4a31cd1702f8..7b8ca24371b5 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    xinvaders
-# Version required:     1.1
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xinvaders
-PKGNAME=	xinvaders-1.1
+PORTNAME=	xinvaders
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade/invaders
+DISTNAME=       ${PORTNAME}
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index 6f124317fbe5..564d6c207024 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xinv3d
-# Version required:			1.31
 # Date created:				21 January 2000
 # Whom:					Chris D. Faulhaber <jedgar@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xinv3d.src
-PKGNAME=	xinvaders3d-1.31
+PORTNAME=	xinvaders3d
+PORTVERSION=	1.31
 CATEGORIES=	games
 MASTER_SITES= 	http://www.fiu.edu/~dllopi01/
+DISTNAME=	xinv3d.src
 
 MAINTAINER=	jedgar@FreeBSD.org
 
diff --git a/games/xisola/Makefile b/games/xisola/Makefile
index 2a8635586474..deeb8baeb327 100644
--- a/games/xisola/Makefile
+++ b/games/xisola/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xisola
-# Version required:			1.0
 # Date created:				9 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xisola-1.0
+PORTNAME=		xisola
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 490956c7a101..6f8960f3b675 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xjewel
-# Version required:     1.6
 # Date created:         22 November 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xjewel-1.6
+PORTNAME=	xjewel
+PORTVERSION=	1.6
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/ \
 		ftp://ftp.x.org/R5contrib/ \
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index e5ed08090d56..c6363035c089 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xjig
-# Version required:	2.4
 # Date Created:		17 Sep 1997
 # Whom:			Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xjig-2.4
+PORTNAME=	xjig
+PORTVERSION=	2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xjumpjump/Makefile b/games/xjumpjump/Makefile
index d204da6e61b6..eb2189d1ce8e 100644
--- a/games/xjumpjump/Makefile
+++ b/games/xjumpjump/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xjumpjump
-# Version required:			0.12
 # Date created:				9 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xjumpjump
-PKGNAME=	xjumpjump-0.12
+PORTNAME=	xjumpjump
+PORTVERSION=	0.12
 CATEGORIES=	games
 MASTER_SITES=	http://makosteszta.sote.hu/linux/jumpjump/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 2826b4b5a1d1..fcbac6235d05 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xkobo
-# Version required:	1.11
 # Date created:		18 Jul 1995
 # Whom:			jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xkobo-1.11
+PORTNAME=       xkobo
+PORTVERSION=	1.11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://ftp.uoknor.edu/mirrors/X/contrib/games/
diff --git a/games/xkoules/Makefile b/games/xkoules/Makefile
index 479dcbf469e0..8ad6eb18dbf1 100644
--- a/games/xkoules/Makefile
+++ b/games/xkoules/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	xkoules
-# Version required:			1.4
 # Date created:				11 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	koules1.4-src
-PKGNAME=	xkoules-1.4
+PORTNAME=	xkoules
+PORTVERSION=	1.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.paru.cas.cz/~hubicka/koules/packages/ \
 		${MASTER_SITE_SUNSITE}
+DISTNAME=	koules${PORTVERSION}
+EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -19,7 +20,6 @@ PLIST=		${PKGDIR}/PLIST.alpha
 .endif
 
 USE_IMAKE=	yes
-WRKSRC=		${WRKDIR}/koules1.4
 MAN6=		xkoules.6
 MANCOMPRESSED=	no
 
diff --git a/games/xlaby/Makefile b/games/xlaby/Makefile
index 9b2507ed333d..74c3eb8a9ff1 100644
--- a/games/xlaby/Makefile
+++ b/games/xlaby/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xlaby
-# Version required:			2.0.1
 # Date created:				3 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xlaby-2.0.1
+PORTNAME=		xlaby
+PORTVERSION=		2.0.1
 CATEGORIES=		games
 MASTER_SITES=		http://www.eleves.ens.fr:8080/home/madore/ \
 			${MASTER_SITE_SUNSITE}
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 8f459dd2bbb7..aa358fe600e1 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xlife
-# Version required:	3.0
 # Date created:		15 March 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xlife
-PKGNAME=	xlife-3.0
+PORTNAME=	xlife
+PORTVERSION=	3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
+DISTNAME=	xlife
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xlifegame/Makefile b/games/xlifegame/Makefile
index 5fdc67c8a946..c38ba430eccd 100644
--- a/games/xlifegame/Makefile
+++ b/games/xlifegame/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xlifegame
-# Version required:	1.1
 # Date created:		11 January 2000
 # Whom:			HIYAMA Takeshi <th@cis.ibaraki.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xlifegame-1.1
+PORTNAME=	xlifegame
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	http://puma.cis.ibaraki.ac.jp/~th/pub/X11/ \
 		http://nadja.cis.ibaraki.ac.jp/pub/X11/
diff --git a/games/xlines/Makefile b/games/xlines/Makefile
index 0e1dbc5d110e..c1696ceb0369 100644
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xlines
-# Version required:			1.0
 # Date created:				11 February 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xlines
-PKGNAME=	xlines-1.0
+PORTNAME=	xlines
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://risq.belcaf.minsk.by/pub/genie/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 660c28119cc9..59232d544853 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmahjongg
-# Version required:	3.2
 # Date created:		16 Aug 1996
 # Whom:			joerg@freebsd.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmahjongg-3.2
+PORTNAME=	xmahjongg
+PORTVERSION=	3.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.lcdf.org/xmahjongg/
 
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 442e08f2d596..75d34d4f8147 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmastermind
-# Version required:			0.1
 # Date created:				23 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xmastermind-0.1
+PORTNAME=		xmastermind
+PORTVERSION=		0.1
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
diff --git a/games/xmball/Makefile b/games/xmball/Makefile
index 194434193424..b78a28389ec4 100644
--- a/games/xmball/Makefile
+++ b/games/xmball/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmball
-# Version required:			5.5.2
 # Date created:				21 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmball-5.5.2
+PORTNAME=	xmball
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xmemory/Makefile b/games/xmemory/Makefile
index fa87f934b7aa..71d9f4527206 100644
--- a/games/xmemory/Makefile
+++ b/games/xmemory/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmemory
-# Version required:	3.7
 # Date Created:		Sat Feb  7 21:37:09 EST 1998
 # Whom:			Dave Chapeskie <dchapes@ddm.on.ca>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmemory-3.7
+PORTNAME=	xmemory
+PORTVERSION=	3.7
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/multiplayer
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 76a714623fc1..3d14dcfd4faf 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:    xmille
-# Version required:     2.0
 # Date created:         30 Dec 1994
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xmille
-PKGNAME=	xmille-2.0
+PORTNAME=	xmille
+PORTVERSION=	2.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}  \
 		ftp://gatekeeper.dec.com/pub/X11-contrib/
 MASTER_SITE_SUBDIR=	games
-EXTRACT_SUFX=   .tar.Z
+DISTFILES=       xmille.tar.Z
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 046dc53f7e8e..20746a387dce 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -6,11 +6,12 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xmine-1.0.3-Xaw
-PKGNAME=	xmine-1.0.3
+PORTNAME=	xmine
+PORTVERSION=	1.0.3
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sw.ru/pub/x11/ \
 		${MASTER_SITE_LOCAL}
+DISTNAME=	${PKGNAME}-Xaw
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 6657aa3d3124..32e86f400ca9 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xminehunter
-# Version required:	0.4
 # Date created:		09 January 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xminehunter-0.4
+PORTNAME=	xminehunter
+PORTVERSION=	0.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xmines/Makefile b/games/xmines/Makefile
index 4331bdc61c6c..cc5a45699625 100644
--- a/games/xmines/Makefile
+++ b/games/xmines/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xmines
-# Version required:			1.0
 # Date created:				18 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xmines
-PKGNAME=		xmines-1.0
+PORTNAME=		xmines
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
+DISTNAME=		${PORTNAME}
 
 MAINTAINER=		ports@FreeBSD.org
 
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index 3d3061c321f3..11d167413186 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	xminesweep
-# Version required:	3.0
 # Date created:		31 Januar 1995
 # Whom:			janek
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xminesweep3.0
-PKGNAME=	xminesweep-3.0
+PORTNAME=	xminesweep
+PORTVERSION=	3.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.netlab.is.tsukuba.ac.jp/pub/X/our_collections/games/ \
 		ftp://ftp.uni-halle.de/pub/X11/contrib/games/ \
 		ftp://ftp.warwick.ac.uk/pub/x11/ \
 		ftp://ftp.eunet.ch/software/X/games/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	janek@gaja.ipan.lublin.pl
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index af5c1914cb83..ffe27bcc17cf 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xmj
-# Version required:	?
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xmj
-PKGNAME=	xmj-1.0
+PORTNAME=	xmj
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://forte.mathematik.uni-bremen.de/pub/comp/X11/
+DISTNAME=       ${PORTVERSION}
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/games/xmlink/Makefile b/games/xmlink/Makefile
index 68317f418a9e..7ae0bcd78d71 100644
--- a/games/xmlink/Makefile
+++ b/games/xmlink/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xmlink
-# Version required:			5.5.2
 # Date created:				19 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmlink-5.5.2
+PORTNAME=	xmlink
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 1d9f73c69fa3..9be090667931 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xmris
-# Version required:     4.02
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
 # $FreeBSD$
 
-DISTNAME=	xmris.4.04
-PKGNAME=	xmris-4.04
+PORTNAME=	xmris
+PORTVERSION=	4.04
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
+DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/games/xmulti/Makefile b/games/xmulti/Makefile
index 821959375a00..229282a43067 100644
--- a/games/xmulti/Makefile
+++ b/games/xmulti/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:   xmulti
-# Version required:    2.00b4
 # Date created:        4 Jun 1998
 # Whom:                Toru YANO <toru@s-fine.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmul200b4
-PKGNAME=	xmulti-2.00b4
+PORTNAME=	xmulti
+PORTVERSION=	2.00b4
 CATEGORIES=	games
 MASTER_SITES=	http://www.denpa.org/~go/xmulti/
-EXTRACT_SUFX=	.tgz
+DISTFILES=	xmul200b4.tgz
 
 MAINTAINER=	toru@tenchi.ne.jp
 
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 0f15319481d9..072ce747e346 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xneko
-# Version required:	4.4BSD-Lite
 # Date created:		22 December 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xneko
-PKGNAME=	xneko-4.4
+PORTNAME=	xneko
+PORTVERSION=	4.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index b6a164df5fa5..b5bb1b7fb912 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xnibbles
-# Version required:			1.0b3
 # Date created:				2 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xnibbles-1.0BETA3
-PKGNAME=	xnibbles-1.0b3
+PORTNAME=	xnibbles
+PORTVERSION=	1.0.b3
 CATEGORIES=	games
 MASTER_SITES=	http://www.tjhsst.edu/xnibbles/
+DISTNAME=	xnibbles-1.0BETA3
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/games/xoct/Makefile b/games/xoct/Makefile
index 68cd59911cdc..e99447242e2f 100644
--- a/games/xoct/Makefile
+++ b/games/xoct/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xoct
-# Version required:			5.5.2
 # Date created:				28 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xoct-5.5.2
+PORTNAME=	xoct
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xoids/Makefile b/games/xoids/Makefile
index 9c3d71869155..5834e2d2ec65 100644
--- a/games/xoids/Makefile
+++ b/games/xoids/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xoids
-# Version required:			1.5
 # Date created:				16 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xoids-1.5
+PORTNAME=		xoids
+PORTVERSION=		1.5
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xoj/Makefile b/games/xoj/Makefile
index 628e35475b09..a5d80a092986 100644
--- a/games/xoj/Makefile
+++ b/games/xoj/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xoj
-# Version required:			1.0
 # Date created:				30 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xoj-1.0
+PORTNAME=		xoj
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/demos
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index e7214005a94e..51cf3bb986b8 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xonix
-# Version required:	1.4
 # Date created:		3 May 1995
 # Whom:			joerg
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xonix-1.4
+PORTNAME=	xonix
+PORTVERSION=	1.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.interface-business.de/pub/outgoing/
 
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index f743d5321398..7adac0a2cd3e 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -1,15 +1,15 @@
 # ports collection makefile for:   xosmulti
-# Version required:    1.00
 # Date created:        17 February 1999
 # Whom:                Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xosmulti_1.00_tar
-PKGNAME=	xosmulti-1.00
+PORTNAME=	xosmulti
+PORTVERSION=	1.00
 CATEGORIES=	games
 MASTER_SITES=	http://www01.u-page.so-net.ne.jp/ka2/nakanita/multi/
+DISTNAME=	${PORTNAME}_${PORTVERSION}_tar
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	flathill@FreeBSD.org
diff --git a/games/xothello/Makefile b/games/xothello/Makefile
index 608677261ae0..237fce3682a1 100644
--- a/games/xothello/Makefile
+++ b/games/xothello/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xothello
-# Version required:			0.01
 # Date created:				31 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xothello
-PKGNAME=	xothello-0.01
+PORTNAME=	xothello
+PORTVERSION=	0.01
 CATEGORIES=	games
 MASTER_SITES=	http://makosteszta.sote.hu/linux/othello/
+DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index 2912c4597762..bb8e9278a692 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xpacman
-# Version required:     1.0
 # Date created:         19 Aug 1995
 # Whom:                 joerg
 #
 # $FreeBSD$
 #
 
-DISTNAME=       pacman10
-PKGNAME=	xpacman-1.0
+PORTNAME=	xpacman
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nvg.unit.no/pub/pacman/
+DISTNAME=       pacman10
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/games/xpanex/Makefile b/games/xpanex/Makefile
index 2ddbeb73923e..57bd35ba1461 100644
--- a/games/xpanex/Makefile
+++ b/games/xpanex/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpanex
-# Version required:			5.5.2
 # Date created:				27 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpanex-5.5.2
+PORTNAME=	xpanex
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 227d135fae70..0133ff84579e 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: xpat2
-# Version required:	1.06
 # Date created:		5 March 1997
 # Whom:			Matthew Hunt <mph@pobox.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpat2-1.06
+PORTNAME=	xpat2
+PORTVERSION=	1.06
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/solitaires
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index 8248e84a869e..47656e2d9427 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xphotohunter
-# Version required:	1.4
 # Date created:		12 Aug 1999
 # Whom:			clive
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xphotohunter-1.4
+PORTNAME=	xphotohunter
+PORTVERSION=	1.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.oz.nthu.edu.tw/~u860905/Xphotohunter/
 
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index 2cdc19c6c011..c1a80f7d962d 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xpilot
-# Version required:	4.1.0
 # Date created:         18 July 1995
 # Whom:                 jmacd
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xpilot-4.1.0
+PORTNAME=       xpilot
+PORTVERSION=	4.1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.xpilot.org/pub/xpilot/ \
 		${MASTER_SITE_XCONTRIB}
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index a07a9ce36ea9..819760fc942b 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -6,11 +6,12 @@
 # $FreeBSD$
 #
 
-DISTNAME=       xpipeman
-PKGNAME=        xpipeman-1.0
+PORTNAME=       xpipeman
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
+DISTNAME=       ${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jseger@FreeBSD.org
diff --git a/games/xpuyo/Makefile b/games/xpuyo/Makefile
index c304f64780b2..0f29bd2b0680 100644
--- a/games/xpuyo/Makefile
+++ b/games/xpuyo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpuyo
-# Version required:	0.1
 # Date created:		12 October 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpuyo-0.1
+PORTNAME=	xpuyo
+PORTVERSION=	0.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.meme.hokudai.ac.jp/pub/games/
 
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index e1e3345e8d8c..50c331c03a60 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpuyopuyo
-# Version required:	0.2.7
 # Date created:		19 Sep 1999
 # Whom:			Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpuyopuyo-0.3.4
+PORTNAME=	xpuyopuyo
+PORTVERSION=	0.3.4
 CATEGORIES=	games
 MASTER_SITES=	http://chaos2.org/xpuyopuyo/ \
 		http://lenin.dabney.caltech.edu/~justins/xpuyopuyo/
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index 536cd644eafc..ee02f06959fc 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpuzzletama
-# Version required:	1.5b
 # Date created:		18 January 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpuzzletama-1.5b
+PORTNAME=	xpuzzletama
+PORTVERSION=	1.5b
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/os/linux/JG/JG-0.9.1/sources/
 
diff --git a/games/xpyraminx/Makefile b/games/xpyraminx/Makefile
index 33980e5aa5e1..44f68c11d6c1 100644
--- a/games/xpyraminx/Makefile
+++ b/games/xpyraminx/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpyraminx
-# Version required:			5.5.2
 # Date created:				26 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xpyraminx-5.5.2
+PORTNAME=	xpyraminx
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xqf/Makefile b/games/xqf/Makefile
index 323c5f578db0..c17554563e90 100644
--- a/games/xqf/Makefile
+++ b/games/xqf/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xqf
-# Version required:			0.9.0
 # Date created:				08 February 1999
 # Whom:					steve farrell
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xqf-0.9.1
+PORTNAME=	xqf
+PORTVERSION=	0.9.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.linuxgames.com/xqf/
 
diff --git a/games/xquarto/Makefile b/games/xquarto/Makefile
index 16acee08d0a5..67ff4ce2466b 100644
--- a/games/xquarto/Makefile
+++ b/games/xquarto/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xquarto
-# Version required:			1.0
 # Date created:				9 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xquarto-1.0
+PORTNAME=	xquarto
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.math.lsa.umich.edu/~mattiasj/games/xquarto/
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index b00bdb31f7cc..51a32793daef 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xracer
-# Version required:		 	0.94
 # Date created:				Nov 6th 1999
 # Whom:					troll
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xracer-0.94
+PORTNAME=		xracer
+PORTVERSION=		0.94
 CATEGORIES=		games
 MASTER_SITES=		http://xracer.annexia.org/
 DISTFILES=		xracer-0.94.tar.gz xracer-data.tar.gz
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index c2c251560337..cfdca4b38506 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -6,8 +6,8 @@
 # $FreeBSD$
 #
 
-DISTNAME=	xripple
-PKGNAME=	xripple-1.0
+PORTNAME=	xripple
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
 		ftp://ftp.cin.nihon-u.ac.jp/pub/X11/enlightenment/misc/ \
@@ -17,6 +17,7 @@ MASTER_SITES=	ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
 		ftp://ftp.gui.uva.es/pub/linux.new/software/X11/winman/enlightenment/ \
 		ftp://ftp.gwdg.de/pub/linux/tux/x/enlightenment/enlightenment/misc/ \
 		ftp://ftp.pconline.com/users/gjerde/enlightenment/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	oly@world.std.com
 
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 61f528982e87..3d97718a2f1a 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xrisk
-# Version required:     2.13
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xrisk-2.13
+PORTNAME=       xrisk
+PORTVERSION=	2.13
 CATEGORIES=	games
 MASTER_SITES=   ftp://geocub.greco-prog.fr/pub/Games/
 EXTRACT_SUFX=   .tar.Z
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 6be26139afd9..960da0613eb1 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xroach
-# Version required:	4.4BSD-Lite
 # Date created:		22 December 1995
 # Whom:			markm
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xroach
-PKGNAME=	xroach-4.4
+PORTNAME=	xroach
+PORTVERSION=	4.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	markm@FreeBSD.org
 
diff --git a/games/xroads/Makefile b/games/xroads/Makefile
index 50c6bd20fc51..c4a68426c875 100644
--- a/games/xroads/Makefile
+++ b/games/xroads/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	xroads
-# Version required:			0.3
 # Date created:				21 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xroads-v0.3
-PKGNAME=	xroads-0.3
+PORTNAME=	xroads
+PORTVERSION=	0.3
 CATEGORIES=	games
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Way/1795/ \
 		http://www.autobahn.mb.ca/~foxtrot/ \
 		http://supernova.dyn.ml.org/
+DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
 MAINTAINER=	will@FreeBSD.org
 
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index 7bab771d4a57..01142d1edece 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:    xrobots
-# Version required:	1.0
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xrobots-1.0-ss-10.20
-PKGNAME=        xrobots-1.0
+PORTNAME=       xrobots
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://hpux.csc.liv.ac.uk/hpux/Games/Arcade/xrobots-1.0/
+DISTNAME=       ${PKGNAME}-ss-10.20
 
 MAINTAINER=	jseger@FreeBSD.org
 
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index 5f9c17b7bb6c..1ae1c2b5bfec 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xrubik
-# Version required:	5.5.2
 # Date created:		20 October 1996
 # Whom:			Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xrubik-5.5.2
+PORTNAME=	xrubik
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index 64334316c59f..aca33e399598 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xscavenger
-# Version required:	1.3
 # Date created:		19 Feb 1998
 # Whom:			eivind
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xscavenger-135
-PKGNAME=	xscavenger-1.3.5
+PORTNAME=	xscavenger
+PORTVERSION=	1.3.5
 CATEGORIES=	games
 MASTER_SITES=	http://www.xdr.com/dash/
+DISTNAME=	xscavenger-135
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	eivind@FreeBSD.org
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index c59055c0236f..fb5e4cdf0201 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xscrabble
-# Version required:	1.0
 # Date created:		27 July 1997
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xscrabble
-PKGNAME=	xscrabble-1.0
+PORTNAME=	xscrabble
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.belgarath.demon.co.uk/programs/ \
 		http://people.FreeBSD.org/~mph/distfiles/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xsheep/Makefile b/games/xsheep/Makefile
index 1cba5866009e..307413e7b23f 100644
--- a/games/xsheep/Makefile
+++ b/games/xsheep/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   xsheep
-# Version required:    0.0.1
 # Date created:        Mar  6 22:07:42 EST 2000
 # Whom:                billf
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xsheep-0.0.1
+PORTNAME=	xsheep
+PORTVERSION=	0.0.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/xsheep/
 
diff --git a/games/xshipwars-client/Makefile b/games/xshipwars-client/Makefile
index 72dc58d69cb9..c90cf642729c 100644
--- a/games/xshipwars-client/Makefile
+++ b/games/xshipwars-client/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	XShipWars-Game-Client
-# Version required:		 	1.23
 # Date created:				Nov 7th 1999
 # Whom:					troll
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xshipwars-client-1.23
+PORTNAME=	xshipwars-client
+PORTVERSION=	1.23
 CATEGORIES=	games
 MASTER_SITES=	ftp://fox.mit.edu/pub/xsw/
 DISTFILES=	xsw1.23.tgz stimages1.3.tgz
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index e8efa2fbf922..31ca682ec390 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   xshisen
-# Version required:           1.36
 # Date created:               9 Oct 1996
 # Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xshisen-1.36
+PORTNAME=	xshisen
+PORTVERSION=	1.36
 CATEGORIES=	games
 MASTER_SITES=	http://www.techfirm.co.jp/~masaoki/
 
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index bbfce129f643..ff2f6ca946fc 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:   xshogi 
-# Version required:    1.2p03
 # Date created:        20 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xshogi-1.2p03
-PKGNAME=	xshogi-1.2.3
+PORTNAME=	xshogi
+PORTVERSION=	1.2.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	xshogi
+DISTNAME=	xshogi-1.2p03
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 3cb651790d37..3578bc73646a 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xskat
-# Version required:	3.1
 # Date created:		27 Apr 1996
 # Whom:			Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xskat-3.2
+PORTNAME=	xskat
+PORTVERSION=	3.2
 CATEGORIES=	games
 MASTER_SITES=	http://www.gulu.net/xskat/
 
diff --git a/games/xskewb/Makefile b/games/xskewb/Makefile
index 3fe7702b0821..2c198a9811e9 100644
--- a/games/xskewb/Makefile
+++ b/games/xskewb/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xskewb
-# Version required:			5.5.2
 # Date created:				25 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xskewb-5.5.2
+PORTNAME=	xskewb
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xsok/Makefile b/games/xsok/Makefile
index aa41534b3431..e9c7d1fcc616 100644
--- a/games/xsok/Makefile
+++ b/games/xsok/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xsok
-# Version required:     1.02
 # Date created:         07 Feb 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xsok-1.02
+PORTNAME=       xsok
+PORTVERSION=	1.02
 CATEGORIES=	games
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin.X11/ \
 		ftp://sunsite.cnlab-switch.ch/mirror/linux/tsx-11/sources/usr.bin.X11/ \
diff --git a/games/xsokoban/Makefile b/games/xsokoban/Makefile
index bc301db8a35b..73f36ee7daf1 100644
--- a/games/xsokoban/Makefile
+++ b/games/xsokoban/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xsokoban
-# Version required:	3.3c
 # Date created:		16 November 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xsokoban-3.3c
+PORTNAME=	xsokoban
+PORTVERSION=	3.3c
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.pmg.lcs.mit.edu/pub/xsokoban/
 
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index fa7a1def79a0..3e43d83f0891 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    xsol
-# Version required:     2.1.1
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xsol-new
-PKGNAME=	xsol-2.1.1
+PORTNAME=	xsol
+PORTVERSION=	2.1.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
 		http://ftp.tu-clausthal.de/pub/unix.new/games/ \
 		ftp://ftp.tu-clausthal.de/pub/unix.new/games/
+DISTNAME=       xsol-new
 
 MAINTAINER=	swallace@FreeBSD.org
 
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index b73676c1dce8..5553e0d5e0c1 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xsoldier
-# Version required:	0.96
 # Date created:		22 January 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xsoldier-0.96
+PORTNAME=	xsoldier
+PORTVERSION=	0.96
 CATEGORIES=	games
 MASTER_SITES=	http://www.surfline.ne.jp/hachi/xsoldier/
 
diff --git a/games/xspacewarp/Makefile b/games/xspacewarp/Makefile
index d157f60b1d7a..11c7feb96f80 100644
--- a/games/xspacewarp/Makefile
+++ b/games/xspacewarp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xspacewarp
-# Version required:			1.2
 # Date created:				16 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xspacewarp-1.2
+PORTNAME=		xspacewarp
+PORTVERSION=		1.2
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 68e609afc120..224da5531640 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -1,12 +1,12 @@
 # Ports collection makefile for:	xspringies
-# Version required:			1.1
 # Date created:				12 January 1997
 # Whom:					jkh
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xspringies-1.1
+PORTNAME=	xspringies
+PORTVERSION=	1.1
 CATEGORIES=	games
 MASTER_SITES=	http://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
 DISTFILES=	xspringies.1.1.tar.Z
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 28ead917ffc5..1b4308404d6f 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   xteddy
-# Version required:    1.0
 # Date created:        3 June 1998
 # Whom:                Eckart "Isegrim" Hofmann
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xteddy-1.0
+PORTNAME=	xteddy
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/usenet/comp.sources.x/xteddy/
 
diff --git a/games/xtet42/Makefile b/games/xtet42/Makefile
index b15f87bb137e..957e171dee09 100644
--- a/games/xtet42/Makefile
+++ b/games/xtet42/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:   xtet42
-# Version required:    2.21
 # Date created:        14 Feb 1999
 # Whom:                gmarco@giovannelli.it
 #
 # $FreeBSD$
 #
 
-DISTNAME= 	xtet42-2.21
+PORTNAME= 	xtet42
+PORTVERSION=	2.21
 CATEGORIES=	games
 MASTER_SITES=	http://www.pvv.ntnu.no/~oyvindmo/xtet42/
 
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index e6aeb7e09db6..03d76583f59f 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    xtic
-# Version required:     1.12
 # Date created:         22 June 1995
 # Whom:                 asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xtic1.12
-PKGNAME=	xtic-1.12
+PORTNAME=	xtic
+PORTVERSION=	1.12
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index 33d49763f50b..b8bf07b1a538 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xtriangles
-# Version required:	5.5.2
 # Date created:		12 October 1996
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xtriangles-5.5.2
+PORTNAME=	xtriangles
+PORTVERSION=	5.5.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games/xpuzzles
diff --git a/games/xtris/Makefile b/games/xtris/Makefile
index fc42e54e58ec..7510cabbe850 100644
--- a/games/xtris/Makefile
+++ b/games/xtris/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    xtris
-# Version required:     1.15
 # Date created:         24. Sep 97
 # Whom:                 sec@42.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xtris-1.15
+PORTNAME=       xtris
+PORTVERSION=	1.15
 CATEGORIES=	games ipv6
 MASTER_SITES=	http://www.iagora.com/~espel/xtris/
 
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index f5875cbfcdb8..2b574896c607 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xtron
-# Version required:			1.1a
 # Date created:				29 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xtron-1.1a
+PORTNAME=	xtron
+PORTVERSION=	1.1a
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index 377e3bbd9261..005de6ba8a74 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	xtruco
-# Version required:			1.0
 # Date created:				14 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xtruco
-PKGNAME=	xtruco-1.0
+PORTNAME=	xtruco
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 356ad30019b5..ba4bfbc543fa 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	xvier
-# Version required:			1.0
 # Date created:				17 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xvier
-PKGNAME=	xvier-1.0
+PORTNAME=	xvier
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-EXTRACT_SUFX=	.tar.Z
+DISTFILES=	xvier.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xvmahjongg/Makefile b/games/xvmahjongg/Makefile
index 2d752d8a9d43..8002f4c4d4cd 100644
--- a/games/xvmahjongg/Makefile
+++ b/games/xvmahjongg/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	xvmahjongg
-# Version required:			2.0
 # Date created:				21 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xvmahjongg2.1
-PKGNAME=	xvmahjongg-2.1
+PORTNAME=	xvmahjongg
+PORTVERSION=	2.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/ \
 		ftp://ftp.freesoftware.com/pub/X11/R5contrib/
-EXTRACT_SUFX=	.tar.Z
+DISTFILES=	${PORTNAME}${PORTVERSION}.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xvmines/Makefile b/games/xvmines/Makefile
index 9cf4e2d71b20..c055b87a4b36 100644
--- a/games/xvmines/Makefile
+++ b/games/xvmines/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xvmines
-# Version required:			1.0
 # Date created:				18 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xvmines-1.0
+PORTNAME=	xvmines
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.csd.uch.gr/pub/X11/games/ \
 		ftp://ftp.x.org/R5contrib/ \
diff --git a/games/xworm/Makefile b/games/xworm/Makefile
index 43ebf61352ec..4101ce273f0a 100644
--- a/games/xworm/Makefile
+++ b/games/xworm/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	xworm
-# Version required:			1.02
 # Date created:				18 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xworm102
-PKGNAME=	xworm-1.02
+PORTNAME=	xworm
+PORTVERSION=	1.02
 CATEGORIES=	games
 MASTER_SITES=	http://www.ekran.no/archive/x/
+DISTNAME=	xworm102
 
 MAINTAINER=	ports@FreeBSD.org
 
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index a03a983cd748..1f8b19e6fcb0 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	xzip
-# Version required:			1.8.1
 # Date created:				28 June 1998
 # Whom:					Matthew Hunt <mph@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xzip181
-PKGNAME=		xzip-1.8.1
+PORTNAME=		xzip
+PORTVERSION=		1.8.1
 CATEGORIES=		games
 MASTER_SITES=   	ftp://ftp.gmd.de/if-archive/infocom/interpreters/zip/
-EXTRACT_SUFX=		.tar.Z
+DISTFILES=		xzip181.tar.Z
 
 MAINTAINER=		mph@freebsd.org
 
diff --git a/games/yahtzee/Makefile b/games/yahtzee/Makefile
index 08a9401a0333..26cf6e0207ce 100644
--- a/games/yahtzee/Makefile
+++ b/games/yahtzee/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:  yahtzee 
-# Version required:	1.0
 # Date created:		Friday 4th July, 1997
 # Whom:			Joel Sutton <sutton@aardvark.apana.org.au>
 # FreeBSD Version:	2.2.1-RELEASE
@@ -7,12 +6,12 @@
 # $FreeBSD$
 #
 
-DISTNAME=		yahtzee-src
-PKGNAME=		yahtzee-1.0
+PORTNAME=		yahtzee
+PORTVERSION=		1.0
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-EXTRACT_SUFX=		.tar.Z
+DISTFILES=		yahtzee-src.tar.Z
 
 MAINTAINER=	jsutton@bbcon.com.au
 
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index 6328e760f0ec..d616f092181d 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	yamsweeper
-# Version required:	1.9
 # Date created:		14 Sep 1996
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	yamsweeper-1.9
+PORTNAME=	yamsweeper
+PORTVERSION=	1.9
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/os/linux/JG/JG-0.9.1/sources/
 EXTRACT_SUFX=	.taz
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index 39a2c267243a..92db22fdfd16 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	znibbles
-# Version required:	0.0.7
 # Date created:		21 Aug 1999
 # Whom:			Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	znibbles-0.0.7
+PORTNAME=	znibbles
+PORTVERSION=	0.0.7
 CATEGORIES=	games
 MASTER_SITES=	ftp://koala.inria.fr/pub/games/znibbles/
 
diff --git a/games/ztrack/Makefile b/games/ztrack/Makefile
index 88841daf9c37..66bc773b63c0 100644
--- a/games/ztrack/Makefile
+++ b/games/ztrack/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	ztrack
-# Version required:			1.0
 # Date created:				1 May 1997
 # Whom: Andrey Zakhvatov <andy@icc.surw.chel.su>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ztrack-1.0
+PORTNAME=	ztrack
+PORTVERSION=	1.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
author	Satoshi Asami <asami@FreeBSD.org>	2000-04-14 12:28:40 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	2000-04-14 12:28:40 +0000
commit	2971a93e525324599461eda215641f9a624352d0 (patch)
tree	17c2ee6d6c0d04729c11b3bc5f6921df0a881bb7 /games
parent	c99c6009443219fbcb10c1baf7b6d0c93975f58a (diff)
download	ports-2971a93e525324599461eda215641f9a624352d0.tar.gz ports-2971a93e525324599461eda215641f9a624352d0.zip