And here comes the next round of Makefile updates, for games. Folks,

there are lots of broken stuff and funky Makefiles here.  Please check
your ports, and also put yourself in MAINTAINER so I know who to talk
to.  Thanks....

28 files changed, 184 insertions, 95 deletions

diff --git a/games/acm/Makefile b/games/acm/Makefile
index 21b888390b76..c034b78d3d3b 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -1,18 +1,20 @@
-# New ports collection makefile for:	acm(6)
-# Version required:	comp.sources.x/volume12
+# New ports collection makefile for:	acm
+# Version required:	comp.sources.x/volume12 (ver 2.0)
 # Date created:		5 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.4 1995/04/01 13:48:04 joerg Exp $
+# $Id: Makefile,v 1.5 1995/04/02 13:14:09 joerg Exp $
 #
 
 DISTNAME=	acm
-WRKSRC=		${WRKDIR}/acm
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/
-MASTER_SITES+=	ftp://ftp.physik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/
-MAINTAINER=	joerg@FreeBSD.org
+PKGNAME=	acm-2.0
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/ \
+		ftp://ftp.physik.tu-muenchen.de/pub/comp/usenet/comp.sources.x/acm/
 
+MAINTAINER=	joerg@FreeBSD.org
+
+WRKSRC=		${WRKDIR}/acm
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index 5348fedb1b36..e67bb33ce20c 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -1,11 +1,19 @@
+# New ports collection makefile for:    golddig
+# Version required:     2
+# Date created:         20 November 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	golddig2
-MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
+PKGNAME=	golddig-2.0
 CATEGORIES+=	games
+MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	jmz@FreeBSD.org
 
-
 pre-patch:
 	@(cd ${WRKSRC}; for i in 245 244 246 247; do \
 	    awk '{if (/^#!/) x++} {if(x) print $$0'} $$i| /bin/sh; \
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index c6215cace848..fe55f7184cb8 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -1,8 +1,18 @@
+# New ports collection makefile for:    jetpack
+# Version required:     ?
+# Date created:         21 September 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	jetpack
+PKGNAME=	jetpack-1.0
+CATEGORIES+=	games
+MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTFILES=	jetpack.tar.Z
+
 USE_IMAKE=	yes
-MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
-CATEGORIES+=	games
 MAKE_FLAGS=	PREFIX=${PREFIX} -f
 
 .include <bsd.port.mk>
diff --git a/games/nethack/Makefile b/games/nethack/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack/Makefile
+++ b/games/nethack/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack3-tty/Makefile b/games/nethack3-tty/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack3-tty/Makefile
+++ b/games/nethack3-tty/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack3/Makefile b/games/nethack3/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack3/Makefile
+++ b/games/nethack3/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack32/Makefile b/games/nethack32/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack32/Makefile
+++ b/games/nethack32/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack33-nox11/Makefile b/games/nethack33-nox11/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack33-nox11/Makefile
+++ b/games/nethack33-nox11/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack33/Makefile b/games/nethack33/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack33/Makefile
+++ b/games/nethack33/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack34-nox11/Makefile b/games/nethack34-nox11/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack34-nox11/Makefile
+++ b/games/nethack34-nox11/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/nethack34/Makefile b/games/nethack34/Makefile
index 346fcc2826ea..1aa415d65224 100644
--- a/games/nethack34/Makefile
+++ b/games/nethack34/Makefile
@@ -3,17 +3,19 @@
 # Date created:		27 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.2 1995/03/30 09:49:57 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:05 jkh Exp $
 #
 
 DISTNAME=	nethack3.1.3
-EXTRACT_SUFX=	.tar.Z
-MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+PKGNAME=	nethack-3.1.3
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.uu.net/usenet/comp.sources.games/
+EXTRACT_SUFX=	.tar.Z
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/nethack313
 USE_GMAKE=	yes
-PKGNAME=	nethack-3.1.3
 SHELL=		/bin/sh
 
 pre-configure:
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 6fffb0bb935e..74dfb7d50fbe 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -3,14 +3,16 @@
 # Date created:		5 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/03/24 11:08:36 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:45:06 jkh Exp $
 #
 
 DISTNAME=	oneko-1.1b
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 WRKSRC=		${WRKDIR}/oneko
+USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 1e7c3c532d4a..1fe9dc5c2b2b 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -1,17 +1,20 @@
 # New ports collection makefile for:    xasteroids
+# Version required:	5
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1995/02/11 13:49:06 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:45:08 jkh Exp $
 #
 
 DISTNAME=       xasteroids
-MASTER_SITES=	ftp://calypso-2.oit.unc.edu/pub/X11/contrib/
+PKGNAME=	xasteroids-5.0
 CATEGORIES+=	games
+MASTER_SITES=	ftp://calypso-2.oit.unc.edu/pub/X11/contrib/
 EXTRACT_SUFX=	.sh.Z
-EXTRACT_CMD=	( cd ${WRKDIR}; zcat | sh -s )
-EXTRACT_ARGS= <
+
 USE_IMAKE=	yes
 NO_WRKSUBDIR=	yes
+EXTRACT_CMD=	( cd ${WRKDIR}; zcat | sh -s )
+EXTRACT_ARGS=	<
 
 .include <bsd.port.mk>
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index c903245196da..fcde304c715f 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -3,12 +3,14 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/02/13 19:17:17 ats Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:09 jkh Exp $
 #
 
 DISTNAME=       xboard-3.2.pl0
-MASTER_SITES=	ftp://ftp.x.org/contrib/games/
+PKGNAME=	xboard-3.2.0
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.x.org/contrib/games/
+
 HAS_CONFIGURE=  yes
 STRIP=
 CONFIGURE_ARGS= --prefix=${PREFIX}
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 21aacbdca4ea..89c8f9a23176 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -3,19 +3,22 @@
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.1.1.1 1995/01/04 08:59:25 swallace Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:15 jkh Exp $
 #
 
 DISTNAME=       xchomp
-USE_IMAKE=	yes
-NO_INSTALL_MANPAGES= yes
-
-#Original sources in multi-part compressed shell archive
+PKGNAME=	xchomp-1.1
+CATEGORIES+=	games
+#
+# Original sources in multi-part compressed shell archive
+#
 #DISTFILES=	part01.Z part02.Z part03.Z part04.Z part05.Z patch1.Z
 #MASTER_SITES=	ftp://ftp.wustl.edu/usenet/comp.sources.x/volume06
-CATEGORIES+=	games
 
-#Change -DFRAME_DELAY=40000 in patchfile/Imakefile value to adjust
-#speed of play depending on X server.
+# Change -DFRAME_DELAY=40000 in patchfile/Imakefile value to adjust
+# speed of play depending on X server.
+
+USE_IMAKE=	yes
+NO_INSTALL_MANPAGES= yes
 
 .include <bsd.port.mk>
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 5b09e451989a..41a1f8bef8c5 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -3,16 +3,19 @@
 # Date created:         22 Mar 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.6 1995/03/28 09:20:05 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/01 12:45:17 jkh Exp $
 #
 
 DISTNAME=       xemeraldia-0.3
-DISTFILES=	271.gz
-MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
+DISTFILES=	271.gz
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 USE_IMAKE=      yes
 NO_INSTALL_MANPAGES=	yes
+
 EXTRACT_COOKIE?=	${.CURDIR}/work/.extract_done
 
 extract: fetch ${EXTRACT_COOKIE}
diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 9e714aee18da..2417c9548584 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -3,12 +3,14 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1995/03/28 04:13:27 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:45:18 jkh Exp $
 #
 
 DISTNAME=       xinvaders
-MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/Linux/sunsite/games/x11/action/
+PKGNAME=	xinvaders-1.1
 CATEGORIES+=	games
+MASTER_SITES=	ftp://romulus.ucs.uoknor.edu/Linux/sunsite/games/x11/action/
+
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index de0e0f8615e5..089a8913811d 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -1,7 +1,16 @@
+# New ports collection makefile for:    xjewel
+# Version required:     1.6
+# Date created:         22 November 1994
+# Whom:                 jmz
+#
+# $Id$
+#
+
 DISTNAME=	xjewel-1.6
-DISTFILES=	xjewel-1.6.tar.z
-MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
+DISTFILES=	xjewel-1.6.tar.z
+
 USE_IMAKE=	yes
 
 pre-install:
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index b6d665029469..6d17f82e009e 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -3,16 +3,18 @@
 # Date created:         15 March 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:08:48 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:21 jkh Exp $
 #
 
 DISTNAME=       xlife
-MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11/R5-contrib/
+PKGNAME=	xlife-3.0
 CATEGORIES+=	games
-MAINTAINER=	asami@FreeBSD.ORG
+MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11/R5-contrib/
 EXTRACT_SUFX=	.tar.Z
+
+MAINTAINER=	asami@FreeBSD.ORG
+
 USE_IMAKE=      yes
-PKGNAME=	xlife-3.0
 
 pre-install:
 	@(cd ${WRKSRC}; make install.patterns)
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index baf31337581b..07fd452e7144 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -3,14 +3,16 @@
 # Date created:         30 Dec 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/02/11 13:49:12 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:23 jkh Exp $
 #
 
 DISTNAME=       xmille
-MASTER_SITES=	ftp://gatekeeper.dec.com/.b/X11-contrib/
+PKGNAME=	2.0
 CATEGORIES+=	games
-USE_IMAKE=      yes
+MASTER_SITES=	ftp://gatekeeper.dec.com/.b/X11-contrib/
 EXTRACT_SUFX=   .tar.Z
+
+USE_IMAKE=      yes
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index c1360a69828c..38d300363ff4 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -1,16 +1,19 @@
-# New ports collection makefile for:	xmine(1)
+# New ports collection makefile for:	xmine
 # Version required:	1.0.3 / Athena
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.5 1995/04/01 12:45:25 jkh Exp $
+# $Id: Makefile,v 1.6 1995/04/01 13:48:45 joerg Exp $
 #
 
 DISTNAME=	xmine-1.0.3-Xaw
+PKGNAME=	xmine-1.0.3
 CATEGORIES+=	games
-USE_IMAKE=      yes
+
 MAINTAINER=	joerg@FreeBSD.org
 
 LIB_DEPENDS=        Xaw3d\\.:${PORTSDIR}/x11/Xaw3d
 
+USE_IMAKE=      yes
+
 .include <bsd.port.mk>
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index a1aad731f7f0..302be4ccb5c0 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -3,11 +3,15 @@
 # Date created:		31 Januar 1995
 # Whom:			janek
 #
+# $Id$
+#
 
 DISTNAME=	xminesweep3.0
+PKGNAME=	xminesweep-3.0
+CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/games/
 EXTRACT_SUFX=	.tar.Z
+
 USE_IMAKE=	yes
-MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/games/
-CATEGORIES+=	games
 
 .include <bsd.port.mk>
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index fc07dd39b9ca..aee9f7d5a606 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -1,13 +1,15 @@
 # New ports collection makefile for:    xmj
+# Version required:	?
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/01/04 06:29:36 swallace Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:29 jkh Exp $
 #
 
 DISTNAME=       xmj
-MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/demos/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/demos/
+
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES= yes
 
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index e6af52ba968a..dfa96613c794 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -1,9 +1,19 @@
+# New ports collection makefile for:    xmris
+# Version required:     4.02
+# Date created:         21 September 1994
+# Whom:                 jmz
+#
+# $Id$
+
 DISTNAME=	xmris.4.02
-USE_GMAKE=	yes
-USE_IMAKE=      yes
+PKGNAME=	xmris-4.02
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 CATEGORIES+=	games
-MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
+
 MAINTAINER=	jmz@FreeBSD.org
 
+USE_GMAKE=	yes
+USE_IMAKE=      yes
+MAKE_FLAGS=	XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
+
 .include <bsd.port.mk>
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index 1976a44f6d47..2f65f8a481ac 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -1,14 +1,16 @@
 # New ports collection makefile for:    xpipeman
+# Version required:	?
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/02/11 13:49:19 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:33 jkh Exp $
 #
 
 DISTNAME=       xpipeman
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/
 EXTRACT_SUFX=	.tar.Z
+
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 097f44c2a548..0dca3fa2c81b 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -1,14 +1,14 @@
-# New ports collection makefile for:    xchomp
-# Version required:     1.1
+# New ports collection makefile for:    xrisk
+# Version required:     2.13
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.1.1.1 1995/02/05 09:40:08 jmacd Exp $
+# $Id: Makefile,v 1.2 1995/04/01 12:45:35 jkh Exp $
 #
 
 DISTNAME=       xrisk-2.13
-MASTER_SITES=   ftp://geocub.greco-prog.fr/pub/Games/
 CATEGORIES+=	games
+MASTER_SITES=   ftp://geocub.greco-prog.fr/pub/Games/
 EXTRACT_SUFX=   .tar.Z
 
 .include <bsd.port.mk>
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index e5894109114e..409b10c22589 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -1,13 +1,15 @@
 # New ports collection makefile for:    xrobots
+# Version required:	?
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.2 1995/02/11 13:49:25 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:45:37 jkh Exp $
 #
 
 DISTNAME=       xrobots
-MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/games/
 CATEGORIES+=	games
+MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/games/
+
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index 23ecae61df98..e32f6dd0ad2c 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -3,12 +3,14 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.3 1995/03/28 04:18:16 gpalmer Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:45:38 jkh Exp $
 #
 
 DISTNAME=       xsol-new
-MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/games/
+PKGNAME=	xsol-2.1.1
 CATEGORIES+=	games
+MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/games/
+
 USE_IMAKE=      yes
 
 .include <bsd.port.mk>