diff --git a/games/affenspiel/Makefile b/games/affenspiel/Makefile
index 9c24215709ad..f8eb514cb91f 100644
--- a/games/affenspiel/Makefile
+++ b/games/affenspiel/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	affenspiel
 # Version required:			1.0
 # Date created:				2 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		affenspiel-1.0
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	affenspiel-1.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=			${WRKDIR}/affenspiel
-USE_X_PREFIX=		yes
+WRKSRC=		${WRKDIR}/affenspiel
+USE_X_PREFIX=	yes
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/affenspiel ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/affenspiel ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/affenspiel
-	@ ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/affenspiel
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/affenspiel
+	@${MKDIR} ${PREFIX}/share/doc/affenspiel
+	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/affenspiel
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/affenspiel
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/affenspiel/files/patch-aa b/games/affenspiel/files/patch-aa
index dcd59d5f563e..5b3ff9ad4ce2 100644
--- a/games/affenspiel/files/patch-aa
+++ b/games/affenspiel/files/patch-aa
@@ -1,22 +1,25 @@
---- Makefile.orig	Mon Mar  6 04:47:27 1995
-+++ Makefile	Tue Jul 21 01:16:08 1998
-@@ -7,15 +7,15 @@
+--- Makefile.orig	Mon Mar  6 05:47:27 1995
++++ Makefile	Wed Mar 29 21:58:34 2000
+@@ -5,17 +5,17 @@
+ PROGNAME = affenspiel
+ 
  RM = rm -f
- CC = gcc
+-CC = gcc
++CC ?= gcc
  
 -FILE_CONFIG = -DSAVED_GAME_NAME=\"/tmp/affenspiel.saved\"
 +FILE_CONFIG = -DSAVED_GAME_NAME=\"affenspiel.saved\"
  
  CONFIG = $(FILE_CONFIG)
  #DEBUG = -DDEBUG -g -ansi
  #DEBUG = -DDEBUG -g -ansi -pedantic
 -DEBUG = -O2
 +#DEBUG = -O2
  
 -CFLAGS = $(DEBUG) $(CONFIG)
 -LIBS = -lX11
 +CFLAGS += $(CONFIG) -I${X11BASE}/include
 +LIBS = -L${X11BASE}/lib -lX11
  
  OBJS = das_mit_dem_affen.o
  
diff --git a/games/battalion/Makefile b/games/battalion/Makefile
index fc9ff1baf134..e456618a8666 100644
--- a/games/battalion/Makefile
+++ b/games/battalion/Makefile
@@ -1,55 +1,50 @@
 # New ports collection makefile for:	battalion
 # Version required:			1.4
 # Date created:				17 May 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 DISTNAME=	battalion-1.4
 CATEGORIES=	games
 MASTER_SITES=	http://www.evl.uic.edu/aej/
 DISTFILES=	battalionSource1.4.tar.Z battalionSUN4.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3 \
-		GLU.14:${PORTSDIR}/graphics/Mesa3
+LIB_DEPENDS=	GL.14:${PORTSDIR}/graphics/Mesa3
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/battalionSource
 
 MAN6=		battalion.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man ${PREFIX}/man/man6/battalion.6
-	@ ${MKDIR} ${PREFIX}/share/battalion
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho ${PREFIX}/share/battalion
-	@ ${MKDIR} ${PREFIX}/share/battalion/DATA
-.for file in road tank tree
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/${file}.data ${PREFIX}/share/battalion/DATA
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/MUSIC
-.for file in 1 2 3 4 5 d1 d2 d3 d4 d5
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/${file}.au ${PREFIX}/share/battalion/MUSIC
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/SOUNDS
-.for file in beam boom crash monsterbeam rocket slag tank tech
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/${file}.au ${PREFIX}/share/battalion/SOUNDS
-.endfor
-	@ ${MKDIR} ${PREFIX}/share/battalion/TEXTURES
-.for file in road screenleft screenright treewood
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/${file}.tex ${PREFIX}/share/battalion/TEXTURES
-.endfor
-
+	${INSTALL_PROGRAM} ${WRKSRC}/battalion ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKDIR}/battalionSUN4/battalion.man \
+		${PREFIX}/man/man6/battalion.6
+	@${MKDIR} ${PREFIX}/share/battalion
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/battalion.sho \
+		${PREFIX}/share/battalion
+	@${MKDIR} ${PREFIX}/share/battalion/DATA
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/DATA/*.data \
+		${PREFIX}/share/battalion/DATA
+	@${MKDIR} ${PREFIX}/share/battalion/MUSIC
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/MUSIC/*.au \
+		${PREFIX}/share/battalion/MUSIC
+	@${MKDIR} ${PREFIX}/share/battalion/SOUNDS
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/SOUNDS/*.au \
+		${PREFIX}/share/battalion/SOUNDS
+	@${MKDIR} ${PREFIX}/share/battalion/TEXTURES
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/battalion.data/TEXTURES/*.tex \
+		${PREFIX}/share/battalion/TEXTURES
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/battalion
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/battalion
-.for file in 01 02 03 04 05 06 07 08 09 10 11
-	@ ${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/bathelp${file}.gif ${PREFIX}/share/doc/battalion
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/battalion
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/battalion
+	${INSTALL_DATA} ${WRKDIR}/battalionSUN4/HELP/*.gif \
+		${PREFIX}/share/doc/battalion
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/battalion/files/patch-aa b/games/battalion/files/patch-aa
index efebb49826d4..d6684ec366d9 100644
--- a/games/battalion/files/patch-aa
+++ b/games/battalion/files/patch-aa
@@ -1,61 +1,61 @@
---- Makefile	Thu Jan 16 16:31:58 1997
-+++ /home/andy/tmp/wrk/Makefile	Sun May 17 15:46:52 1998
+--- Makefile.orig	Thu Jan 16 16:31:58 1997
++++ Makefile	Wed Mar 29 13:08:11 1998
 @@ -23,7 +23,7 @@
  # (the program should compile with no warning messages - if you
  #  see a warning message please let me know about it)
  # ------------------------------------------------------------
 -CC = CC
 +#CC = CC
  
  
  # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
 @@ -39,7 +39,7 @@
  # ------------------------------------------------------------
  #GLIB = -lMesaGL -lMesaGLU
  # or
 -GLIB =  -lGL -lGLU
 +GLIB =  -lMesaGL -lMesaGLU
  
  
  # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
 @@ -51,9 +51,9 @@
  #         with the other Makefile.)
  #
  # ------------------------------------------------------------
 -OS = -DSGIVERSION
 +#OS = -DSGIVERSION
  # or
 -#OS = -DSUNVERSION
 +OS = -DSUNVERSION
  # or
  #OS = -DLINUXVERSION
  # or
 @@ -77,8 +77,8 @@
  # in audio.c then everything works fine.
  #
  # ------------------------------------------------------------
 -AUDIOLIB = -laudio -laudiofile
 -AUDIODEF = -DSGIAUDIO
 +#AUDIOLIB = -laudio -laudiofile
 +#AUDIODEF = -DSGIAUDIO
  
  
  # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
 @@ -91,7 +91,7 @@
  
  # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
  # ------------------------------------------------------------
 -CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
-+CFLAGS+= -I${X11BASE}/include
++CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
  
  
  # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
 @@ -106,7 +106,7 @@
  TARGET 	= battalion
  
  OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
 -LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
-+LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext -lcompat
++LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
  
  all:	$(TARGET)
  
diff --git a/games/battalion/files/patch-ab b/games/battalion/files/patch-ab
index 8e702743f9bd..2cf03af86541 100644
--- a/games/battalion/files/patch-ab
+++ b/games/battalion/files/patch-ab
@@ -1,12 +1,12 @@
---- battalion.c	Thu Jan 16 16:31:59 1997
-+++ /home/andy/tmp/wrk/battalion.c	Sun May 17 15:46:57 1998
+--- battalion.c.orig	Thu Jan 16 16:31:59 1997
++++ battalion.c	Wed Mar 29 13:10:21 1998
 @@ -2867,7 +2867,8 @@
  	roadFile = fopen(fullPath, "rb");	
  #else
  
 -    dataPtr = getenv("BATTALIONDATADIR");
 +/*    dataPtr = getenv("BATTALIONDATADIR"); */
-+    dataPtr = "/usr/X11R6/share/battalion";
++    dataPtr = PREFIX "/share/battalion";
      if (dataPtr != NULL)
  	{
  	strcpy(dataPath, dataPtr);
diff --git a/games/battalion/files/patch-ac b/games/battalion/files/patch-ac
new file mode 100644
index 000000000000..add8c0d83324
--- /dev/null
+++ b/games/battalion/files/patch-ac
@@ -0,0 +1,12 @@
+--- battalion.h.orig	Fri Jan 17 01:31:59 1997
++++ battalion.h	Sat Apr  1 00:37:23 2000
+@@ -59,7 +59,9 @@
+ #endif
+ 
+ #ifndef MACVERSION
++#ifndef __STDC__
+ #include <malloc.h>
++#endif
+ #include <pwd.h>
+ #endif
+ 
diff --git a/games/block/Makefile b/games/block/Makefile
index d59103e0236e..577bc00c7f2d 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -1,37 +1,36 @@
 # New ports collection makefile for:	block
-# Version required:			0.5
+# Version required:			0.6
 # Date created:				10 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		block-0.6
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	block-0.6
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-BROKEN=			"Segmentation fault (core dumped)"
-WRKSRC=			${WRKDIR}/blocks
-MAKEFILE=		makefile
-ALL_TARGET=		block bed
-MAN6=			block.6 bed.6
+WRKSRC=		${WRKDIR}/blocks
+MAKEFILE=	makefile
+ALL_TARGET=	block bed
+MAN6=		block.6 bed.6
 
-pre-build:
-	@${RM} ${WRKSRC}/block
-	@${RM} ${WRKSRC}/bed
+post-extract:
+	@${RM} -f ${WRKSRC}/block
+	@${RM} -f ${WRKSRC}/bed
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/block ${PREFIX}/bin/block
-	${INSTALL_PROGRAM} ${WRKSRC}/bed ${PREFIX}/bin/bed
+	${INSTALL_PROGRAM} ${WRKSRC}/block ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bed ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/block.6 ${PREFIX}/man/man6
 	${INSTALL_MAN} ${WRKSRC}/bed.6 ${PREFIX}/man/man6
-	${MKDIR} ${PREFIX}/share/block
+	@${MKDIR} ${PREFIX}/share/block
 .for file in 1 2 3 4 5 6
 	${INSTALL_DATA} ${WRKSRC}/${file}.block ${PREFIX}/share/block/${file}.block
 .endfor
 
 .include <bsd.port.mk>
diff --git a/games/block/files/patch-aa b/games/block/files/patch-aa
index 22c48551dd81..c1b13efaf017 100644
--- a/games/block/files/patch-aa
+++ b/games/block/files/patch-aa
@@ -1,19 +1,35 @@
-*** makefile	Tue Nov 28 03:47:05 1995
---- /home/andy/tmp/wrk/Makefile	Sat May 10 20:47:07 1997
-***************
-*** 13,19 ****
-  
-  #makes the game - this is default (has colors and keyboard flushing) 
-  block  : block.c
-! 	$(CC) $(INCLUDE) -DUCOL -DNEW -s -o block block.c $(LL)
-  
-  #make the editor
-  bed    : bed.c
---- 13,19 ----
-  
-  #makes the game - this is default (has colors and keyboard flushing) 
-  block  : block.c
-! 	$(CC) $(INCLUDE) -DUCOL -DNEW -DPREFIX=\"$(PREFIX)\" -s -o block block.c $(LL)
-  
-  #make the editor
-  bed    : bed.c
+--- makefile.orig	Wed Mar 24 18:39:36 1999
++++ makefile	Wed Mar 29 22:32:43 2000
+@@ -6,26 +6,26 @@
+ 
+ #the various flags and options
+ INCLUDE= -I/usr/include/ncurses/
+-CC= gcc
+-CFLAGS= -$(INCLUDE) -Wall
++CC?= gcc
++CFLAGS?= -$(INCLUDE) -Wall
+ LL= -lncurses -ltermcap
+ CLL= -lcurses -ltermcap
+ 
+ #makes the game - this is default (has colors and keyboard flushing) 
+ block  : block.c
+-	$(CC) $(INCLUDE) -DUCOL -DNEW -s -o block block.c $(LL)
++	$(CC) $(CFLAGS) -DUCOL -DNEW -DPREFIX=\"$(PREFIX)\" -s -o block block.c $(LL)
+ 
+ #make the editor
+ bed    : bed.c
+-	$(CC) $(INCLUDE) -s -o bed bed.c $(LL)
++	$(CC) $(CFLAGS) -s -o bed bed.c $(LL)
+ 
+ #makes the game, leaving out the newer ncurses options (keyboard) and colors
+ old    : block.c
+-	$(CC) $(INCLUDE) -s -o block block.c $(LL)
++	$(CC) $(CFLAGS) -s -o block block.c $(LL)
+ 
+ #makes the game, with no color  
+ nocolor: block.c
+-	$(CC) $(INCLUDE) -DNEW -s -o block block.c $(LL)
++	$(CC) $(CFLAGS) -DNEW -s -o block block.c $(LL)
+ 
+ #makes the game, using curses instead of ncurses
+ cblock : block.c
diff --git a/games/blue/Makefile b/games/blue/Makefile
index 518541bb2714..e16d8f83d4d5 100644
--- a/games/blue/Makefile
+++ b/games/blue/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	blue
 # Version required:			2.4
 # Date created:				6 June 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		blue-2.4
-CATEGORIES=		games
-MASTER_SITES=		ftp://locke.ccil.org/pub/esr/
+DISTNAME=	blue-2.4
+CATEGORIES=	games
+MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
-MAN6=			blue.6
+ALL_TARGET=	# empty
+MAN6=		blue.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/blue ${PREFIX}/bin/blue
-	@ ${INSTALL_MAN} ${WRKSRC}/blue.6 ${PREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/blue ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/blue.6 ${PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/blue/files/patch-ac b/games/blue/files/patch-ac
new file mode 100644
index 000000000000..38eb4c77202a
--- /dev/null
+++ b/games/blue/files/patch-ac
@@ -0,0 +1,16 @@
+--- Makefile.orig	Wed Mar 29 22:20:16 2000
++++ Makefile	Wed Mar 29 22:21:26 2000
+@@ -7,10 +7,11 @@
+ 
+ SOURCES = READ.ME Makefile blue.c blue.c.orig blue.6 blue.lsm *.spec
+ 
+-CFLAGS=-O
++CC?=cc
++CFLAGS?=-O
+ 
+ blue: blue.c
+-	cc $(CFLAGS) -DVERSION=\"$(V)\" blue.c -lncurses -o blue
++	$(CC) $(CFLAGS) -DVERSION=\"$(V)\" blue.c -lncurses -o blue
+ 
+ blue-$(V).tar.gz: $(SOURCES)
+ 	@ls $(SOURCES) | sed s:^:blue-$(V)/: >MANIFEST
diff --git a/games/blue/pkg-descr b/games/blue/pkg-descr
index 4954d5ea8d24..c7ff565b04aa 100644
--- a/games/blue/pkg-descr
+++ b/games/blue/pkg-descr
@@ -1,4 +1,6 @@
 				Blue Moon
 			by Tim Lister and Eric S. Raymond
 
 This simple game includes complete instructions on the game screen.
+
+WWW: http://www.tuxedo.org/~esr/software.html
diff --git a/games/bs/Makefile b/games/bs/Makefile
index c6c821863bd4..49c99b917ac7 100644
--- a/games/bs/Makefile
+++ b/games/bs/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	bs
 # Version required:			2.2
 # Date created:				11 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		bs-2.2
-CATEGORIES=		games
-MASTER_SITES=		ftp://locke.ccil.org/pub/esr/
+DISTNAME=	bs-2.2
+CATEGORIES=	games
+MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
-MAN6=			bs.6
+ALL_TARGET=	# empty
+MAN6=		bs.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/bs ${PREFIX}/bin/bs
-	@ ${INSTALL_MAN} ${WRKSRC}/bs.6 ${PREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/bs ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/bs.6 ${PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/bs/pkg-descr b/games/bs/pkg-descr
index dd41afef3916..362751323444 100644
--- a/games/bs/pkg-descr
+++ b/games/bs/pkg-descr
@@ -1,2 +1,4 @@
 Battleships solitaire game with a color point-and-shoot
 interface in the style of blue and galaxis games (for console).
+
+WWW: http://www.tuxedo.org/~esr/software.html
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 5ca1b3f29248..2e8358203b98 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -1,34 +1,32 @@
 # New ports collection makefile for:	columns
 # Version required:			1.1
 # Date created:				26 August 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 DISTNAME=	columns-1.1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.phreax.net/
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
 
-ALL_TARGET=
+ALL_TARGET=	# empty
 
 USE_X_PREFIX=	yes
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/columns ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/columns
-	@ ${INSTALL_DATA} ${WRKSRC}/*.bmp ${PREFIX}/share/columns
-	@ ${INSTALL_DATA} ${WRKSRC}/*.ofn ${PREFIX}/share/columns
-	@ ${INSTALL_DATA} ${WRKSRC}/*.wav ${PREFIX}/share/columns
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/columns ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/columns
+	${INSTALL_DATA} ${WRKSRC}/*.bmp ${PREFIX}/share/columns
+	${INSTALL_DATA} ${WRKSRC}/*.ofn ${PREFIX}/share/columns
+	${INSTALL_DATA} ${WRKSRC}/*.wav ${PREFIX}/share/columns
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/columns
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/columns
+	@${MKDIR} ${PREFIX}/share/doc/columns
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/columns
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/empire/Makefile b/games/empire/Makefile
index 4ea1d48fca8d..ec0a5a462648 100644
--- a/games/empire/Makefile
+++ b/games/empire/Makefile
@@ -1,27 +1,29 @@
 # New ports collection makefile for:	empire
 # Version required:			1.1
 # Date created:				13 May 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		empire
-PKGNAME=		empire-1.1
-CATEGORIES=		games
-MASTER_SITES=		ftp://locke.ccil.org/pub/esr/
+DISTNAME=	empire
+PKGNAME=	empire-1.1
+CATEGORIES=	games
+MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=			${WRKDIR}/empire-1.1
-MAN6=			empire.6
+WRKSRC=		${WRKDIR}/empire-1.1
+MAN6=		empire.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/empire ${PREFIX}/bin/empire
-	@ ${INSTALL_MAN} ${WRKSRC}/empire.6 ${PREFIX}/man/man6
-	@ ${MKDIR} ${PREFIX}/share/doc/empire
-.for file in BUGS COPYING READ.ME
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/empire/${file}
+	${INSTALL_PROGRAM} ${WRKSRC}/empire ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/empire.6 ${PREFIX}/man/man6
+.if !defined(NOPORTDOCS)
+.for file in BUGS READ.ME
+	@${MKDIR} ${PREFIX}/share/doc/empire
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/empire
 .endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/empire/pkg-descr b/games/empire/pkg-descr
index 552bd0e949c7..c3a28d2bd941 100644
--- a/games/empire/pkg-descr
+++ b/games/empire/pkg-descr
@@ -1,8 +1,10 @@
-	Apparently, this game was originally written outside of Digital,
-	probably at a university.  The game was ported to DEC's VAX/VMS
-	from the TOPS-10/20 FORTRAN sources available around fall 1979.
-	Ed James got hold of the sources at Berkeley and converted
-	portions of the code to C, mostly to use curses for the screen
-	handling.  He published his modified sources on the net in
-	December 1986.  Because this game ran on VMS machines for so
-        long, a previous version is known as VMS Empire.
+Apparently, this game was originally written outside of Digital,
+probably at a university.  The game was ported to DEC's VAX/VMS
+from the TOPS-10/20 FORTRAN sources available around fall 1979.
+Ed James got hold of the sources at Berkeley and converted
+portions of the code to C, mostly to use curses for the screen
+handling.  He published his modified sources on the net in
+December 1986.  Because this game ran on VMS machines for so
+long, a previous version is known as VMS Empire.
+
+WWW: http://www.tuxedo.org/~esr/software.html
diff --git a/games/empire/pkg-plist b/games/empire/pkg-plist
index 6a3ccfa9073d..ae877d0e2a3e 100644
--- a/games/empire/pkg-plist
+++ b/games/empire/pkg-plist
@@ -1,5 +1,4 @@
 bin/empire
 share/doc/empire/BUGS
-share/doc/empire/COPYING
 share/doc/empire/READ.ME
 @dirrm share/doc/empire
diff --git a/games/freesweep/Makefile b/games/freesweep/Makefile
index fdf01629bba8..7456d8ba9fb2 100644
--- a/games/freesweep/Makefile
+++ b/games/freesweep/Makefile
@@ -1,32 +1,37 @@
 # New ports collection makefile for:	freesweep
-# Version required:			0.86
+# Version required:			0.87
 # Date created:				25 July 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	freesweep-0.86
+DISTNAME=	freesweep
+PKGNAME=	freesweep-0.87
 CATEGORIES=	games
 MASTER_SITES=	http://www.upl.cs.wisc.edu/~hartmann/sweep/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
-GNU_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-prefsdir=${PREFIX}/share/freesweep \
+		--with-scoresdir=${PREFIX}/share/freesweep \
+		--disable-debug-log
+ALL_TARGET=	# empty
 
 MAN6=		freesweep.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/freesweep ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/freesweep.6 ${PREFIX}/man/man6
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/freesweep ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/freesweep.6 ${PREFIX}/man/man6
+	@${MKDIR} ${PREFIX}/share/freesweep
+	${INSTALL_DATA} ${WRKSRC}/sweeprc ${PREFIX}/share/freesweep
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/freesweep
-	@ ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/freesweep
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/freesweep
+	@${MKDIR} ${PREFIX}/share/doc/freesweep
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/freesweep
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/freesweep
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/freesweep/distinfo b/games/freesweep/distinfo
index 72874c8a3898..ed4b2b5208f4 100644
--- a/games/freesweep/distinfo
+++ b/games/freesweep/distinfo
@@ -1 +1 @@
-MD5 (freesweep-0.86.tar.gz) = df49495b8fb807e55febc0553e0cd704
+MD5 (freesweep.tar.gz) = 3d728a53a831d0fe386e6b14bdd3cddd
diff --git a/games/freesweep/files/patch-aa b/games/freesweep/files/patch-aa
index dc2ad652e39d..a61099736cbc 100644
--- a/games/freesweep/files/patch-aa
+++ b/games/freesweep/files/patch-aa
@@ -1,11 +1,11 @@
---- sweep.h.in	Sun Jul 25 03:39:50 1999
-+++ /home/andy/tmp/wrk/sweep.h.in	Sun Jul 25 17:51:44 1999
+--- sweep.h.in.orig	Wed Mar 29 23:08:32 2000
++++ sweep.h.in	Wed Mar 29 23:09:50 2000
 @@ -36,7 +36,7 @@
  #include <signal.h>
  
  #ifdef HAVE_LIBNCURSES
 -#include "@NCURSES_HINT@/include/curses.h"
 +#include <ncurses.h>
+ #define DEFAULT_LINEDRAW 1
  #else /* HAVE_LIBNCURSES */
  #include <curses.h>
- #endif /* HAVE_LIBNCURSES */
diff --git a/games/freesweep/pkg-plist b/games/freesweep/pkg-plist
index 0e3ff5ee7166..79ccd6f57887 100644
--- a/games/freesweep/pkg-plist
+++ b/games/freesweep/pkg-plist
@@ -1,4 +1,6 @@
 bin/freesweep
 share/doc/freesweep/CHANGES
 share/doc/freesweep/README
+share/freesweep/sweeprc
+@dirrm share/freesweep
 @dirrm share/doc/freesweep
diff --git a/games/galaxis/Makefile b/games/galaxis/Makefile
index 2a0b700eca73..058874d039d8 100644
--- a/games/galaxis/Makefile
+++ b/games/galaxis/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	galaxis
 # Version required:			1.1
 # Date created:				30 June 1997
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		galaxis-1.1
-CATEGORIES=		games
-MASTER_SITES=		ftp://locke.ccil.org/pub/esr/
+DISTNAME=	galaxis-1.1
+CATEGORIES=	games
+MASTER_SITES=	ftp://locke.ccil.org/pub/esr/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
-MAN6=			galaxis.6
+ALL_TARGET=	# empty
+MAN6=		galaxis.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/galaxis ${PREFIX}/bin/galaxis
-	@ ${INSTALL_MAN} ${WRKSRC}/galaxis.6 ${PREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/galaxis ${PREFIX}/bin/galaxis
+	${INSTALL_MAN} ${WRKSRC}/galaxis.6 ${PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/galaxis/files/patch-aa b/games/galaxis/files/patch-aa
index feeb48673418..8c039369236e 100644
--- a/games/galaxis/files/patch-aa
+++ b/games/galaxis/files/patch-aa
@@ -1,21 +1,23 @@
-*** Makefile	Wed Dec  6 13:56:38 1995
---- /home/andy/tmp/wrk/Makefile	Mon Jun 30 08:44:56 1997
+*** Makefile.orig	Wed Dec  6 22:56:38 1995
+--- Makefile	Wed Mar 29 20:36:09 2000
 ***************
-*** 6,13 ****
+*** 6,14 ****
   V=1.1
   
   # Flags for use with the Linux ncurses package (recommended)
 ! CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
 ! TERMLIB = -lncurses
-  CC = gcc
+! CC = gcc
   
   # Flags for use with stock curses
---- 6,13 ----
+  #CFLAGS = -DNDEBUG
+--- 6,14 ----
   V=1.1
   
   # Flags for use with the Linux ncurses package (recommended)
 ! #CFLAGS = -g -DNDEBUG  # -I/usr/local/include -L/usr/local/lib
 ! TERMLIB = -lncurses -lmytinfo
-  CC = gcc
+! #CC = gcc
   
   # Flags for use with stock curses
+  #CFLAGS = -DNDEBUG
diff --git a/games/galaxis/pkg-descr b/games/galaxis/pkg-descr
index 65cbe56abc73..20e6321fcbb3 100644
--- a/games/galaxis/pkg-descr
+++ b/games/galaxis/pkg-descr
@@ -1,8 +1,7 @@
 			GALAXIS for UNIX
 	   by Eric S. Raymond <esr@snark.thyrsus.com>
 
 This directory contains curses-based clone of the nifty little Macintosh
 freeware game Galaxis.
 
-Send bug reports to esr@snark.thyrsus.com.  Also, see my WWW home page
-at http://www.ccil.org/~esr/home.html for updates and other resources.
+WWW: http://www.tuxedo.org/~esr/software.html
diff --git a/games/garith/Makefile b/games/garith/Makefile
index 75ac9ca80297..7a5113f6bab9 100644
--- a/games/garith/Makefile
+++ b/games/garith/Makefile
@@ -1,30 +1,33 @@
 # New ports collection makefile for:	garith
 # Version required:			2.1
 # Date created:				5 August 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 DISTNAME=	garith-2.1
 CATEGORIES=	games
 MASTER_SITES=	http://www.cnm-vra.com/micah/garith/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	gdk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-ALL_TARGET=
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 WRKSRC=		${WRKDIR}/garith
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/garith ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/garith ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/garith
+	@${MKDIR} ${PREFIX}/share/doc/garith
 .for file in BUGS COPYING HISTORY README TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/garith
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/garith
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/garith/files/patch-aa b/games/garith/files/patch-aa
index 8b3b5747dcae..19fb332dadd4 100644
--- a/games/garith/files/patch-aa
+++ b/games/garith/files/patch-aa
@@ -1,35 +1,26 @@
 --- Makefile.orig	Thu Sep 18 13:03:00 1997
-+++ Makefile	Fri Mar 19 18:15:00 1999
-@@ -1,26 +1,22 @@
++++ Makefile	Wed Mar 29 21:49:16 2000
+@@ -1,16 +1,16 @@
  # Makefile adapted from that in the GMix distribution, thanks.
- CC=gcc
-+GTK_FLAGS=`gtk12-config --cflags` `gtk12-config  --libs` 
- LINK=gcc
- INCDIR=
- LIBDIR=-L/usr/X11R6/lib
+-CC=gcc
+-LINK=gcc
+-INCDIR=
+-LIBDIR=-L/usr/X11R6/lib
 -LDLIBS=-lgnome -lgnomeui -lgdk -lgtk -lglib -lm
 -OPTFLAGS= -m486 -O2 -Wall
++CC?=gcc
++LINK=$(CC)
++INCDIR=`${GTK_CONFIG} --cflags`
++LIBDIR=`${GTK_CONFIG} --libs`
 +#LDLIBS=-lgnome -lgnomeui -lgdk -lgtk -lglib -lm
 +#OPTFLAGS= -m486 -O2 -Wall
  DEST=garith
  
  OBJS=garith.o
  SRCS=garith.c
  
 -CFLAGS=  $(OPTFLAGS) $(DEFINES) $(INCDIR)
-+CFLAGS=  $(OPTFLAGS) $(DEFINES) $(INCDIR) $(GTK_FLAGS)
++CFLAGS+=  $(OPTFLAGS) $(DEFINES) $(INCDIR)
  LFLAGS= $(LIBDIR) $(LDLIBS)
  
--$(DEST) : $(OBJS)
--	$(LINK) $(CFLAGS) -o $@ $(OBJS) $(LFLAGS)
-+$(DEST) : garith.c
-+	$(CC) -Wall $(GTK_FLAGS) garith.c -o garith ${CFLAGS}
- 
- clean:
- 	rm -f *~
- 	rm -f *.o $(DEST)
--
--.c.o:
--	$(CC) $(CFLAGS) -c $<
--
--garith.o: garith.c
+ $(DEST) : $(OBJS)
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 1c42f8addfaf..e076fe244fb1 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,32 +1,33 @@
 # New ports collection makefile for:	gemdropx
-# Version required:			0.4
+# Version required:			0.7
 # Date created:				9 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gemdropx.0.4
-PKGNAME=	gemdropx-0.4
+DISTNAME=	gemdropx-0.7
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	gemdropx
-MAKEFILE=	makefile
+LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
+
+USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/gemdropx
+ALL_TARGET=	nosound
+MAKE_ARGS=	JOY=NO DATA_PREFIX=${PREFIX}/share/gemdropx -f
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/gemdropx/gfx
-	@ ${INSTALL_DATA} ${WRKSRC}/gfx/* ${PREFIX}/share/gemdropx/gfx
-	@ ${MKDIR} ${PREFIX}/share/gemdropx/sounds
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/share/gemdropx/sounds
+	${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/gemdropx/images
+	${INSTALL_DATA} ${WRKSRC}/data/images/* ${PREFIX}/share/gemdropx/images
+	@${MKDIR} ${PREFIX}/share/gemdropx/sounds
+	${INSTALL_DATA} ${WRKSRC}/data/sounds/* ${PREFIX}/share/gemdropx/sounds
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/gemdropx
-	@ ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gemdropx
+	@${MKDIR} ${PREFIX}/share/doc/gemdropx
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/gemdropx
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/gemdropx/distinfo b/games/gemdropx/distinfo
index ece26e01c5b3..102fc26985d7 100644
--- a/games/gemdropx/distinfo
+++ b/games/gemdropx/distinfo
@@ -1 +1 @@
-MD5 (gemdropx.0.4.tar.gz) = 06b07dd55aa315fd4b77adb990ef8986
+MD5 (gemdropx-0.7.tar.gz) = 9364e9da54939f95d3f5bd58119455a3
diff --git a/games/gemdropx/files/patch-aa b/games/gemdropx/files/patch-aa
index aea0be5db8b0..183ed83f1087 100644
--- a/games/gemdropx/files/patch-aa
+++ b/games/gemdropx/files/patch-aa
@@ -1,23 +1,20 @@
---- makefile	Thu Jul 30 19:53:32 1998
-+++ /home/andy/tmp/wrk/makefile	Mon Aug 10 18:03:04 1998
-@@ -11,14 +11,16 @@
- # X Window Updates: July 29, 1998- July 29, 1998
+--- Makefile.orig	Tue Dec 28 17:33:54 1999
++++ Makefile	Thu Mar 30 00:18:17 2000
+@@ -22,7 +22,7 @@
+ JOYFLAG=$(JOY)JOYSTICK
  
  
--CC=gcc
-+CC?=gcc
-+PREFIX?=/usr/X11R6
-+X11BASE?=/usr/X11R6
+-CFLAGS=-Wall $(SDL_CFLAGS) \
++CFLAGS+=$(SDL_CFLAGS) \
+ 	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG)
+ SDL_LIB=$(MIXER) $(SDL_LDFLAGS)
  
--INSTALLROOT= $(PREFIX)
-+INSTALLROOT= $(PREFIX)/share/gemdropx
- GFX= $(INSTALLROOT)/gfx
- SOUNDS= $(INSTALLROOT)/sounds
+@@ -30,7 +30,7 @@
+ all:	gemdropx
  
--XLIB= $(RPATH) -L$(PREFIX)/lib -lX11 -lm
--XINC= -I$(PREFIX)/include
-+XLIB= $(RPATH) -L$(X11BASE)/lib -lX11 -lm
-+XINC= -I$(X11BASE)/include
- CFLAGS= $(XINC) -DSOUNDS=\"$(SOUNDS)\" -DGFX=\"$(GFX)\"
+ nosound:
+-	make MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
++	$(MAKE) MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
  
- all:	gemdropx
+ clean:
+ 	-rm gemdropx
diff --git a/games/gemdropx/files/patch-ab b/games/gemdropx/files/patch-ab
new file mode 100644
index 000000000000..7e58af38b3d0
--- /dev/null
+++ b/games/gemdropx/files/patch-ab
@@ -0,0 +1,14 @@
+--- gemdropx.c.orig	Tue Dec 28 18:54:17 1999
++++ gemdropx.c	Thu Mar 30 00:25:25 2000
+@@ -2231,9 +2231,11 @@
+ 		 (JS_VERSION & 0x0000FF));
+ #endif
+ 
++#ifndef NOSOUND
+ 	  SDL_VERSION(&sdlver);
+ 	  printf("SDL version %d.%d.%d\n\n", sdlver.major,
+ 		 sdlver.minor, sdlver.patch);
++#endif
+ 
+ 	  exit(0);
+ 	}
diff --git a/games/gemdropx/pkg-descr b/games/gemdropx/pkg-descr
index 43d35e8cf642..b44545d28a24 100644
--- a/games/gemdropx/pkg-descr
+++ b/games/gemdropx/pkg-descr
@@ -1,20 +1,20 @@
   Gem Drop X is an interesting one-player puzzle game for X-Window.
 
   Gem Drop X  is  a  direct  port  of Gem Drop, an Atari 8-bit game
 written in Action! (a very fast C and Pascal-like compiled language
 for the Atari).  The concept of the game Gem Drop is based directly
 on an arcade game for the NeoGeo system called "Magical Drop III"
 by SNK.
 
   If you're familiar  with  games like Jewels, Klax, Bust-A-Move or 
 Tetris, this game is similar to them all.  I consider it closest to
 Klax. (Jewels is like a combination of Klax and Tetris. Bust-A-Move
 is the  least  similar, in  my  opinion, but everyone seems to have 
 heard of it more than the others (except Tetris, of course!))
 
   The game is played  with YOU at the bottom of the screen.  At the
 top is a random assortment of colored shapes ("gems"). As time goes
 on, more  gems  appear at the very  top of the  screen, pushing the
 rest downwards.  The game is over when the gems reach the bottom.
 
-WWW: http://www.sonic.net/~nbs/unix/x/gemdropx/
+WWW: http://www.newbreedsoftware.com/gemdropx/
diff --git a/games/gemdropx/pkg-plist b/games/gemdropx/pkg-plist
index 8f1595e7e0bb..0385f4a8b991 100644
--- a/games/gemdropx/pkg-plist
+++ b/games/gemdropx/pkg-plist
@@ -1,37 +1,70 @@
 bin/gemdropx
 share/doc/gemdropx/README.txt
-share/gemdropx/gfx/author.ppm
-share/gemdropx/gfx/block.ppm
-share/gemdropx/gfx/bomb.ppm
-share/gemdropx/gfx/brick.ppm
-share/gemdropx/gfx/diamond.ppm
-share/gemdropx/gfx/disc.ppm
-share/gemdropx/gfx/dot.ppm
-share/gemdropx/gfx/explode0.ppm
-share/gemdropx/gfx/explode1.ppm
-share/gemdropx/gfx/explode2.ppm
-share/gemdropx/gfx/explode3.ppm
-share/gemdropx/gfx/face.ppm
-share/gemdropx/gfx/fuji.ppm
-share/gemdropx/gfx/happy.ppm
-share/gemdropx/gfx/sad.ppm
-share/gemdropx/gfx/star.ppm
-share/gemdropx/gfx/stopwatch.ppm
-share/gemdropx/gfx/title.ppm
-share/gemdropx/gfx/triangle.ppm
-share/gemdropx/gfx/warning.ppm
-share/gemdropx/gfx/wildcard.ppm
-share/gemdropx/gfx/win1.ppm
-share/gemdropx/gfx/win2.ppm
-share/gemdropx/sounds/begin.au
-share/gemdropx/sounds/bomb.au
-share/gemdropx/sounds/clock.au
-share/gemdropx/sounds/gameover.au
-share/gemdropx/sounds/got.au
-share/gemdropx/sounds/levelselect.au
-share/gemdropx/sounds/wildcard.au
-share/gemdropx/sounds/win.au
-@dirrm share/doc/gemdropx
-@dirrm share/gemdropx/gfx
+share/gemdropx/images/README
+share/gemdropx/images/action-mask.xbm
+share/gemdropx/images/action.xbm
+share/gemdropx/images/author.bmp
+share/gemdropx/images/block.bmp
+share/gemdropx/images/bluegem.bmp
+share/gemdropx/images/bomb.bmp
+share/gemdropx/images/brick.bmp
+share/gemdropx/images/congratulations.bmp
+share/gemdropx/images/credits.bmp
+share/gemdropx/images/diamond.bmp
+share/gemdropx/images/disc.bmp
+share/gemdropx/images/dot.bmp
+share/gemdropx/images/explode0.bmp
+share/gemdropx/images/explode1.bmp
+share/gemdropx/images/explode2.bmp
+share/gemdropx/images/explode3.bmp
+share/gemdropx/images/fuji.bmp
+share/gemdropx/images/gemdropx-icon.xpm
+share/gemdropx/images/happy.bmp
+share/gemdropx/images/left-mask.xbm
+share/gemdropx/images/left.xbm
+share/gemdropx/images/level.bmp
+share/gemdropx/images/lines.bmp
+share/gemdropx/images/need.bmp
+share/gemdropx/images/nothing-mask.xbm
+share/gemdropx/images/nothing.xbm
+share/gemdropx/images/numbers.bmp
+share/gemdropx/images/patience.bmp
+share/gemdropx/images/paused.bmp
+share/gemdropx/images/right-mask.xbm
+share/gemdropx/images/right.xbm
+share/gemdropx/images/sad.bmp
+share/gemdropx/images/score.bmp
+share/gemdropx/images/stopwatch.bmp
+share/gemdropx/images/title.bmp
+share/gemdropx/images/triangle.bmp
+share/gemdropx/images/uhoh.bmp
+share/gemdropx/images/warning.bmp
+share/gemdropx/images/warning1.bmp
+share/gemdropx/images/warning2.bmp
+share/gemdropx/images/warning3.bmp
+share/gemdropx/images/warning4.bmp
+share/gemdropx/images/wildcard.bmp
+share/gemdropx/images/win1.bmp
+share/gemdropx/images/win2.bmp
+share/gemdropx/images/yellowgem.bmp
+share/gemdropx/sounds/22drops.mod
+share/gemdropx/sounds/2force.xm
+share/gemdropx/sounds/README
+share/gemdropx/sounds/applause.wav
+share/gemdropx/sounds/begin.wav
+share/gemdropx/sounds/bomb.wav
+share/gemdropx/sounds/buzzer.wav
+share/gemdropx/sounds/citron.mod
+share/gemdropx/sounds/clock.wav
+share/gemdropx/sounds/gameover.wav
+share/gemdropx/sounds/got.wav
+share/gemdropx/sounds/grab.wav
+share/gemdropx/sounds/hr_suds.xm
+share/gemdropx/sounds/levelselect.wav
+share/gemdropx/sounds/throw.wav
+share/gemdropx/sounds/wildcard.wav
+share/gemdropx/sounds/win.wav
 @dirrm share/gemdropx/sounds
+@dirrm share/gemdropx/images
 @dirrm share/gemdropx
+@dirrm share/doc/gemdropx
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 3c5751316c85..b3cd7961694a 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,36 +1,39 @@
 # New ports collection makefile for:	gtkballs
 # Version required:			1.04
 # Date created:				11 November 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		gtkballs-1.04
-CATEGORIES=		games
-MASTER_SITES=		ftp://lucifer.dorms.spbu.ru/pub/Linux/games/ \
-			http://lucifer.dorms.spbu.ru/gtkballs/ \
-			${MASTER_SITE_SUNSITE}
+DISTNAME=	gtkballs-1.04
+CATEGORIES=	games
+MASTER_SITES=	ftp://lucifer.dorms.spbu.ru/pub/Linux/games/ \
+		http://lucifer.dorms.spbu.ru/gtkballs/ \
+		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-MAN6=			gtkballs.6
+GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+
+MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
+MAN6=		gtkballs.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/gtkballs ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/gtkballs.6 ${PREFIX}/man/man6
-	@ ${MKDIR} ${PREFIX}/share/gtkballs
-	@ ${INSTALL_DATA} ${WRKSRC}/gtkballs-data/*.xpm ${PREFIX}/share/gtkballs
-	@ ${INSTALL_DATA} ${WRKSRC}/score ${PREFIX}/share/gtkballs/score
-	@ ${CHMOD} a+rw ${PREFIX}/share/gtkballs/score
+	${INSTALL_PROGRAM} ${WRKSRC}/gtkballs ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/gtkballs.6 ${PREFIX}/man/man6
+	@${MKDIR} ${PREFIX}/share/gtkballs
+	${INSTALL_DATA} ${WRKSRC}/gtkballs-data/*.xpm ${PREFIX}/share/gtkballs
+	${INSTALL_DATA} ${WRKSRC}/score ${PREFIX}/share/gtkballs/score
+	@${CHMOD} a+rw ${PREFIX}/share/gtkballs/score
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/gtkballs
-.for file in COPYING README README.russian TODO
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtkballs
+	@${MKDIR} ${PREFIX}/share/doc/gtkballs
+.for file in README README.russian TODO
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gtkballs
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/gtkballs/files/patch-aa b/games/gtkballs/files/patch-aa
index d75b3f13ca75..61497e164496 100644
--- a/games/gtkballs/files/patch-aa
+++ b/games/gtkballs/files/patch-aa
@@ -1,21 +1,21 @@
---- Makefile.orig	Thu Apr 29 12:32:03 1999
-+++ Makefile	Thu Apr 29 12:32:30 1999
+--- Makefile.orig	Tue Mar 30 21:30:09 1999
++++ Makefile	Wed Mar 29 21:10:12 2000
 @@ -6,15 +6,14 @@
  #
  # Installation prefix
  #
 -PREFIX=/usr/local
 +PREFIX?=/usr/local
  
  #
  # C options
  #
 -CFLAGS = -Wall -pedantic -g
  CFLAGS+= -DPREFIX=\"$(PREFIX)\"
 -CFLAGS+= `gtk-config --cflags` 
 -CLIBS= `gtk-config --libs`
-+CFLAGS+= `gtk12-config --cflags` 
-+CLIBS= `gtk12-config --libs`
++CFLAGS+= `${GTK_CONFIG} --cflags` 
++CLIBS= `${GTK_CONFIG} --libs`
  
  RM=rm -f
  PROGS=gtkballs
diff --git a/games/gtkballs/pkg-plist b/games/gtkballs/pkg-plist
index ab9254fa161f..3c15fb7af68d 100644
--- a/games/gtkballs/pkg-plist
+++ b/games/gtkballs/pkg-plist
@@ -1,35 +1,32 @@
 bin/gtkballs
-share/doc/gtkballs/COPYING
 share/doc/gtkballs/README
 share/doc/gtkballs/README.russian
 share/doc/gtkballs/TODO
 share/gtkballs/blue_ball.xpm
 share/gtkballs/brown_ball.xpm
 share/gtkballs/cyan_ball.xpm
 share/gtkballs/empty_cell.xpm
 share/gtkballs/green_ball.xpm
 share/gtkballs/gtkballs.xpm
 share/gtkballs/gtkballs_about.xpm
 share/gtkballs/paw_down_1.xpm
 share/gtkballs/paw_down_2.xpm
 share/gtkballs/paw_left_1.xpm
 share/gtkballs/paw_left_2.xpm
 share/gtkballs/paw_right_1.xpm
 share/gtkballs/paw_right_2.xpm
 share/gtkballs/paw_up_1.xpm
 share/gtkballs/paw_up_2.xpm
 share/gtkballs/pink_ball.xpm
 share/gtkballs/red_ball.xpm
-@mode 666
 share/gtkballs/score
-@mode
 share/gtkballs/small_blue_ball.xpm
 share/gtkballs/small_brown_ball.xpm
 share/gtkballs/small_cyan_ball.xpm
 share/gtkballs/small_green_ball.xpm
 share/gtkballs/small_pink_ball.xpm
 share/gtkballs/small_red_ball.xpm
 share/gtkballs/small_yellow_ball.xpm
 share/gtkballs/yellow_ball.xpm
 @dirrm share/doc/gtkballs
 @dirrm share/gtkballs
diff --git a/games/icbm3d/Makefile b/games/icbm3d/Makefile
index 085f2953853a..e97594312a33 100644
--- a/games/icbm3d/Makefile
+++ b/games/icbm3d/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	icbm3d
 # Version required:			0.4
 # Date created:				20 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
 DISTNAME=	icbm3d.0.4
 PKGNAME=	icbm3d-0.4
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/icbm3d/
 
 MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=	icbm3d
-MAKEFILE=	makefile
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/icbm3d
+USE_X_PREFIX=	yes
+MAKEFILE=	makefile
+ALL_TARGET=	icbm3d
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/icbm3d ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/icbm3d ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/icbm3d
-	@ ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d
+	@${MKDIR} ${PREFIX}/share/doc/icbm3d
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/icbm3d
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/icbm3d/pkg-descr b/games/icbm3d/pkg-descr
index 4741fd475542..ff564a544312 100644
--- a/games/icbm3d/pkg-descr
+++ b/games/icbm3d/pkg-descr
@@ -1,14 +1,14 @@
    Like the original "Missile Command" and its clones, this game
 places  you  in  control  of  Anti-ICBM weapons which you use to 
 destroy  an  onslaught of missiles (and other nasties) which are 
 dropping onto your nation.
    The game ends when your cities have all  been  destroyed. You 
 only   gain   replacement   cities  by  acheiving  certain score
 thresholds during each attack (level).
    The main difference between this game and  Missile Command is
 that ICBM3D, as the name  suggests,  provides  a 3D perspective. 
 You take advantage of X-Window's  3-button mouse to control your
 firing  sight  ("cross-hair")  in  3-dimensions, and change your 
 viewpoint.
 
-WWW: http://www.sonic.net/~nbs/unix/x/icbm3d/
+WWW: http://www.newbreedsoftware.com/icbm3d/
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index 53425d8a240c..a7e9f77ffbf4 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,42 +1,42 @@
 # New ports collection makefile for:	mirrormagic
 # Version required:			1.3
 # Date created:				1 April 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		mirrormagic-1.3
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+DISTNAME=	mirrormagic-1.3
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_X_PREFIX=		yes
+USE_X_PREFIX=	yes
 
-pre-build:
+post-extract:
 .for file in DoubleRayDoor DoubleRayFont DoubleRayFont2 DoubleRayScreen
-	@ ${GUNZIP_CMD} ${WRKSRC}/graphics/${file}.xpm
+	@${GUNZIP_CMD} ${WRKSRC}/graphics/${file}.xpm
 .endfor
-	@ (cd ${WRKDIR}; ${CP} ${FILESDIR}/RAY.* .; uudecode *.uu; ${RM} *.uu)
+	@(cd ${WRKDIR}; ${CP} ${FILESDIR}/RAY.* .; uudecode *.uu; ${RM} *.uu)
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/graphics
-	@ ${INSTALL_DATA} ${WRKSRC}/graphics/* ${PREFIX}/share/mirrormagic/graphics
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/sounds
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/*.8svx ${PREFIX}/share/mirrormagic/sounds
-	@ ${MKDIR} ${PREFIX}/share/mirrormagic/data
-	@ ${INSTALL_DATA} ${WRKSRC}/RAY.level ${PREFIX}/share/mirrormagic/data
-	@ ${INSTALL_DATA} ${WRKDIR}/RAY.* ${PREFIX}/share/mirrormagic/data
-	@ ${MKDIR} ${PREFIX}/share/doc/mirrormagic
+	${INSTALL_PROGRAM} ${WRKSRC}/mirrormagic ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/mirrormagic/graphics
+	${INSTALL_DATA} ${WRKSRC}/graphics/* ${PREFIX}/share/mirrormagic/graphics
+	@${MKDIR} ${PREFIX}/share/mirrormagic/sounds
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.8svx ${PREFIX}/share/mirrormagic/sounds
+	@${MKDIR} ${PREFIX}/share/mirrormagic/data
+	${INSTALL_DATA} ${WRKSRC}/RAY.level ${PREFIX}/share/mirrormagic/data
+	${INSTALL_DATA} ${WRKDIR}/RAY.* ${PREFIX}/share/mirrormagic/data
+	@${MKDIR} ${PREFIX}/share/doc/mirrormagic
 .for file in CHANGES COPYRIGHT DISCLAIMER README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mirrormagic
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/mirrormagic
 .endfor
-#	@ ${CHMOD} a=rwx ${PREFIX}/share/mirrormagic/data
-	@ ${CHMOD} a=rw  ${PREFIX}/share/mirrormagic/data/RAY.*
+#	@${CHMOD} a=rwx ${PREFIX}/share/mirrormagic/data
+	@${CHMOD} a=rw  ${PREFIX}/share/mirrormagic/data/RAY.*
 
 .include <bsd.port.mk>
diff --git a/games/mirrormagic/files/patch-aa b/games/mirrormagic/files/patch-aa
index ddcc59f7d645..9ef3d983f05f 100644
--- a/games/mirrormagic/files/patch-aa
+++ b/games/mirrormagic/files/patch-aa
@@ -1,48 +1,52 @@
---- Makefile	Wed Sep  6 11:56:17 1995
-+++ /home/andy/tmp/wrk/Makefile	Tue Mar 31 23:07:25 1998
-@@ -8,11 +8,17 @@
- CC = gcc
+--- Makefile.orig	Wed Sep  6 20:56:17 1995
++++ Makefile	Thu Mar 30 01:11:44 2000
+@@ -5,14 +5,20 @@
+ PROGNAME = mirrormagic
+ 
+ RM = rm -f
+-CC = gcc
++CC ?= gcc
  # CC = cc				# for HP-UX and others
  
 -GFX_PATH = -DGFX_PATH=\"./graphics\"	# path where the graphics are
 -SND_PATH = -DSND_PATH=\"./sounds\"	# path where the sounds are
 -LEVEL_PATH = -DLEVEL_PATH=\".\"		# path where the level file is
 -SCORE_PATH = -DSCORE_PATH=\".\"		# path where the score file is
 -NAMES_PATH = -DNAMES_PATH=\".\"		# path where the names file is
 +.ifndef PREFIX
 +ROOT=	.
 +.else
 +ROOT=${PREFIX}/share/mirrormagic
 +.endif
 +
 +GFX_PATH = -DGFX_PATH=\"${ROOT}/graphics\"	# path where the graphics are
 +SND_PATH = -DSND_PATH=\"${ROOT}/sounds\"	# path where the sounds are
 +LEVEL_PATH = -DLEVEL_PATH=\"${ROOT}/data\"	# path where the level file is
 +SCORE_PATH = -DSCORE_PATH=\"${ROOT}/data\"	# path where the score file is
 +NAMES_PATH = -DNAMES_PATH=\"${ROOT}/data\"	# path where the names file is
  # SOUNDS = -DNO_SOUNDS			# don't play any sounds
  # SCORE_ENTRIES = -DONE_PER_NAME	# only one score entry per name
  SCORE_ENTRIES = -DMANY_PER_NAME		# many score entries per name
 @@ -26,7 +32,7 @@
  
  # DEBUG = -DDEBUG -g -ansi -pedantic -Wall
  # DEBUG = -DDEBUG -g -Wall
 -DEBUG = -O6
 +# DEBUG = -O6
  
  # SYSTEM = -Aa -D_HPUX_SOURCE -Dhpux	# for HP-UX (obsolete)
  # SYSTEM = -DSYSV -Ae			# for HP-UX
 @@ -34,10 +40,11 @@
  # INCL = -I/usr/include/X11R5		# for HP-UX and others
  # LIBS = -lXpm -lX11 -lm
  # LIBS = -L/usr/lib/X11R5 -lXpm -lX11 -lm # for HP-UX and others
 -LIBS = -lXpm -lXpm -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
-+INCL = -I/usr/X11R6/include
-+LIBS = -L/usr/X11R6/lib -lXpm -lX11 -lm	# triple "-lXpm" because of Xpm error
++INCL = -I${X11BASE}/include
++LIBS = -L${X11BASE}/lib -lXpm -lX11 -lm
  
  # CFLAGS = -O2 $(CONFIG) $(SYSTEM)
 -CFLAGS = $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
 +CFLAGS+= $(DEBUG) $(CONFIG) $(SYSTEM) $(INCL)
  
  OBJS =	main.o \
  	init.o \
diff --git a/games/phalanx/Makefile b/games/phalanx/Makefile
index 1099c3ec1c86..218b0948779e 100644
--- a/games/phalanx/Makefile
+++ b/games/phalanx/Makefile
@@ -1,37 +1,33 @@
 # New ports collection makefile for:	phalanx
-# Version required:			21
+# Version required:			22
 # Date created:				2 May 1999
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		phalanx-21
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE} \
-			ftp://ftp.math.muni.cz/pub/math/people/Dobes/
-MASTER_SITE_SUBDIR=	games/strategy
+DISTNAME=	phalanx-22
+CATEGORIES=	games
+MASTER_SITES=	ftp://ftp.math.muni.cz/pub/math/people/Dobes/ \
+		http://www.crosswinds.net/~dobes/phalanx/
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
+LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
-WRKSRC=			${WRKDIR}/Phalanx-XXI
-USE_GMAKE=		yes
-ALL_TARGET=
-MAKEFILE=		makefile
+WRKSRC=		${WRKDIR}/Phalanx-XXII
+USE_GMAKE=	yes
+ALL_TARGET=	# empty
+MAKEFILE=	makefile
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/phalanx ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/phalanx
-	@ ${INSTALL_DATA} ${WRKSRC}/pbook.phalanx ${PREFIX}/share/phalanx
-	@ ${INSTALL_DATA} ${WRKSRC}/sbook.phalanx ${PREFIX}/share/phalanx
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/phalanx ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/phalanx
+	${INSTALL_DATA} ${WRKSRC}/pbook.phalanx ${PREFIX}/share/phalanx
+	${INSTALL_DATA} ${WRKSRC}/sbook.phalanx ${PREFIX}/share/phalanx
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/phalanx
-	@ ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/phalanx
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/phalanx
+	@${MKDIR} ${PREFIX}/share/doc/phalanx
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/phalanx
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/phalanx/distinfo b/games/phalanx/distinfo
index 7bb6e46b7f19..e8d671e62b5f 100644
--- a/games/phalanx/distinfo
+++ b/games/phalanx/distinfo
@@ -1 +1 @@
-MD5 (phalanx-21.tar.gz) = ab1ae987833c25cf8ce00ca8cf2b5b8c
+MD5 (phalanx-22.tar.gz) = 8120f6383bb6d19e0c06ea47f69c2bda
diff --git a/games/phalanx/files/patch-aa b/games/phalanx/files/patch-aa
index ce2d009e2c83..c512328124cb 100644
--- a/games/phalanx/files/patch-aa
+++ b/games/phalanx/files/patch-aa
@@ -1,33 +1,23 @@
---- makefile	Sat Jan 30 00:26:13 1999
-+++ /home/andy/tmp/wrk/makefile	Sun May  2 16:46:44 1999
-@@ -1,9 +1,10 @@
+--- makefile.orig	Mon Jan 17 06:30:49 2000
++++ makefile	Thu Mar 30 01:42:40 2000
+@@ -1,9 +1,9 @@
  
 -CC = gcc
-+#CC = gcc
++CC ?= gcc
  
  ####### choose the line that makes the binary faster on your machine
  # CFLAGS = -O3 -Wall -fomit-frame-pointer -funroll-loops
--CFLAGS = -O -fomit-frame-pointer
-+#CFLAGS = -O -fomit-frame-pointer
-+CFLAGS+= -I${LOCALBASE}/include
+-CFLAGS = -O -Wall -fomit-frame-pointer
++CFLAGS += -I${LOCALBASE}/include
  
  ####### debug/tuning options for developers
  # CFLAGS = -O -Wall -g3 -static
-@@ -20,7 +21,7 @@
- ### -DLEARN_DIR=\"/var/local/lib\"
+@@ -21,7 +21,7 @@
  ### -DQCAPSONLY
  
--DEFINES = -DGNUFUN
-+DEFINES = -DGNUFUN -DPBOOK_DIR=\"${PREFIX}/share/phalanx\" -DSBOOK_DIR=\"${PREFIX}/share/phalanx\"
- LDFLAGS =
+ DEFINES = -DGNUFUN
+-LDFLAGS =
++LDFLAGS = -L${LOCALBASE}/lib -lgnugetopt
  
  OBJ = .o/phalanx.o .o/bcreate.o .o/search.o .o/io.o .o/data.o \
-@@ -28,7 +29,7 @@
-       .o/levels.o .o/book.o .o/killers.o .o/endgame.o .o/learn.o
- 
- phalanx: .o $(OBJ)
--	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJ) -o phalanx
-+	$(CC) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJ) -o phalanx -L${LOCALBASE}/lib -lgnugetopt
- 	strip phalanx
- 
- .o/%.o: makefile %.c
+       .o/evaluate.o .o/genmoves.o .o/moving.o .o/hash.o .o/static.o \
diff --git a/games/phalanx/pkg-descr b/games/phalanx/pkg-descr
index 7c42d3f7fec1..445e6841963f 100644
--- a/games/phalanx/pkg-descr
+++ b/games/phalanx/pkg-descr
@@ -1,11 +1,13 @@
    Phalanx is a chess playing program.  Phalanx is xboard compatible.
 Running with xboard: 'xboard -fcp phalanx'.  Note that permanent brain
 (pondering) is off by default.  Newer versions of xboard set it on with
 the 'hard' command.  If this does not work, try 'xboard -fcp "phalanx -p+"'
 or (for <4.0.0 versions of xboard) change your initString (see Xboard
 documentation for details).  It's better to stop permanent brain in both
 programs, when playing Phalanx against another program on a machine with
 one CPU.
    It's also possible to run phalanx without xboard. Do "phalanx -h" to get
 a list of command line options. One important command of phalanx's ASCII
 interface is "help".
+
+WWW: http://www.crosswinds.net/~dobes/phalanx/
diff --git a/games/phalanx/pkg-plist b/games/phalanx/pkg-plist
index 087358edc4f7..309dd924ecdf 100644
--- a/games/phalanx/pkg-plist
+++ b/games/phalanx/pkg-plist
@@ -1,7 +1,6 @@
 bin/phalanx
-share/doc/phalanx/COPYING
 share/doc/phalanx/README
 share/phalanx/pbook.phalanx
 share/phalanx/sbook.phalanx
 @dirrm share/doc/phalanx
 @dirrm share/phalanx
diff --git a/games/spellcast/Makefile b/games/spellcast/Makefile
index 6b8dcb850522..02047f7be4ac 100644
--- a/games/spellcast/Makefile
+++ b/games/spellcast/Makefile
@@ -1,30 +1,30 @@
 # New ports collection makefile for:	spellcast
 # Version required:			1.1
 # Date created:				28 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		spellcast-1.1
-CATEGORIES=		games
-MASTER_SITES=		http://www.redestb.es/personal/ragnar/ \
-			${MASTER_SITE_SUNSITE}
+DISTNAME=	spellcast-1.1
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE} \
+		http://www.macula.net/lightside/
 MASTER_SITE_SUBDIR=	games/multiplayer
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_X_PREFIX=		yes
-MAN6=			spellcast.6
+USE_X_PREFIX=	yes
+MAN6=		spellcast.6
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/spellcast ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/spellcast.6 ${PREFIX}/man/man6
+	${INSTALL_PROGRAM} ${WRKSRC}/spellcast ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/spellcast.6 ${PREFIX}/man/man6
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/spellcast
-.for file in License README.1 README.2 spelllist.ps
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/spellcast
+	@${MKDIR} ${PREFIX}/share/doc/spellcast
+.for file in README.1 README.2 spelllist.ps
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/spellcast
 .endfor
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/spellcast/files/patch-aa b/games/spellcast/files/patch-aa
index 7bd834ede1c4..f417e336892a 100644
--- a/games/spellcast/files/patch-aa
+++ b/games/spellcast/files/patch-aa
@@ -1,16 +1,17 @@
---- Makefile	Sat Sep 13 05:44:20 1997
-+++ /home/andy/tmp/wrk/Makefile	Mon Jun 29 12:08:54 1998
+--- Makefile.orig	Sat Sep 13 14:44:20 1997
++++ Makefile	Thu Mar 30 01:49:24 2000
 @@ -24,11 +24,11 @@
  # all the time, try uncommenting the next line.
  #OTHERLIBS = -lbsdmalloc
  
 -CFLAGS = -g0 -O2 -Wall -Wno-implicit -I/usr/local/include -I./bitmaps -DBODYFONT=$(FONT1) \
 +CFLAGS+= -I${X11BASE}/include -I./bitmaps -DBODYFONT=$(FONT1) \
  	-DBODYFONT_ALT=$(FONT2) -DBODYFONT_ALT2=$(FONT3) -DTRANSCRIPTDIR=$(LOGDIR)
- LFLAGS = -g0 -Wall -Wno-implicit
+-LFLAGS = -g0 -Wall -Wno-implicit
++#LFLAGS = -g0 -Wall -Wno-implicit
  
 -XLIB = -L/usr/local/lib -L/usr/X11/lib -lX11
 +XLIB = -L${X11BASE}/lib -lX11
  
  OBJS = engine.o espells.o execute.o execute2.o emonster.o etran.o
  XOBJS = main.o xtext.o xquery.o xloop.o xgest.o xbutton.o xtalk.o
diff --git a/games/spellcast/pkg-descr b/games/spellcast/pkg-descr
index 74f733d193d3..5f49af9771f8 100644
--- a/games/spellcast/pkg-descr
+++ b/games/spellcast/pkg-descr
@@ -1,12 +1,14 @@
 This is a game concerning the imaginary conflict between two or more
 powerful wizards in a duel of sorcery. The opponents perform magical
 gestures with their hands to create their supernatural weapons --
 spells. Some are so potent as to be able to blind a man, call forth
 terrifying creatures, or even kill the unfortunate victim instantly.
 Consequently each wizard must rely on his own cunning to be able to
 time enough defensive spells to avoid the brunt of his adversary's
 attack, yet force in sufficient offensive spells of his own to crack
 the magical armour of his opponent, and kill the wizard outright. The
 inventor wishes to state that he has never been involved in a magical
 duel but would be interested to discover how realistic the game is for
 those who have...
+
+WWW: http://www.macula.net/lightside/ftp.html
diff --git a/games/spellcast/pkg-plist b/games/spellcast/pkg-plist
index e75efabf8b98..c034f0b93ac8 100644
--- a/games/spellcast/pkg-plist
+++ b/games/spellcast/pkg-plist
@@ -1,6 +1,5 @@
 bin/spellcast
-share/doc/spellcast/License
 share/doc/spellcast/README.1
 share/doc/spellcast/README.2
 share/doc/spellcast/spelllist.ps
 @dirrm share/doc/spellcast
diff --git a/games/starlanes/Makefile b/games/starlanes/Makefile
index 20c4bbee21bf..2197d2ca18e6 100644
--- a/games/starlanes/Makefile
+++ b/games/starlanes/Makefile
@@ -1,29 +1,22 @@
 # 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
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	starlanes-1.2.2
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-ALL_TARGET=
-MAN6=			starlanes.6
+ALL_TARGET=	# empty
+MAN6=		starlanes.6
 
-pre-build:
-	@ ${RM} ${WRKSRC}/starlanes
-
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/starlanes ${PREFIX}/bin/starlanes
-	@ ${INSTALL_MAN} ${WRKSRC}/starlanes.6 ${PREFIX}/man/man6
-	@ ${MKDIR} ${PREFIX}/share/doc/starlanes
-	@ ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/starlanes/COPYING
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/starlanes/README
+post-extract:
+	@${RM} ${WRKSRC}/starlanes
 
 .include <bsd.port.mk>
diff --git a/games/starlanes/files/patch-ab b/games/starlanes/files/patch-ab
index 57a417f3d47c..c9412b003c60 100644
--- a/games/starlanes/files/patch-ab
+++ b/games/starlanes/files/patch-ab
@@ -1,11 +1,29 @@
---- ./Makefile.org	Sat Mar 29 16:36:44 1997
-+++ ./Makefile	Tue Jun 10 02:44:54 1997
-@@ -3,7 +3,7 @@
+--- Makefile.orig	Sun Mar 30 09:36:44 1997
++++ Makefile	Thu Mar 30 01:54:39 2000
+@@ -2,21 +2,17 @@
+ # Makefile for Starlanes
  #
  
- CC=gcc
+-CC=gcc
 -CCOPTS=-Wall
-+CCOPTS=-Wall ${CFLAGS}
++CC?=gcc
++CCOPTS=${CFLAGS}
  CURSESLIB=ncurses
- INSTALLDIR=/usr/local
+-INSTALLDIR=/usr/local
++INSTALLDIR=${PREFIX}
  
+ starlanes: starlanes.c
+ 	$(CC) $(CCOPTS) -o starlanes starlanes.c -l$(CURSESLIB)
+ 
+ install:
+-	cp starlanes $(INSTALLDIR)/games
+-	cp starlanes.6 $(INSTALLDIR)/man/man6
+-	chown bin:bin $(INSTALLDIR)/games/starlanes
+-	chown root:root $(INSTALLDIR)/man/man6/starlanes.6
+-	chmod 755 $(INSTALLDIR)/games/starlanes
+-	chmod 444 $(INSTALLDIR)/man/man6/starlanes.6
++	${BSD_INSTALL_PROGRAM} starlanes $(INSTALLDIR)/bin
++	${BSD_INSTALL_MAN} starlanes.6 $(INSTALLDIR)/man/man6
+ 
+ # fakeinstall just echos the install commands:
+ fakeinstall:
diff --git a/games/starlanes/pkg-plist b/games/starlanes/pkg-plist
index 892d4bc0f9e0..996c6e146517 100644
--- a/games/starlanes/pkg-plist
+++ b/games/starlanes/pkg-plist
@@ -1,4 +1 @@
 bin/starlanes
-share/doc/starlanes/COPYING
-share/doc/starlanes/README
-@dirrm share/doc/starlanes
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 5b14ec784978..cb123baa37c3 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -1,38 +1,38 @@
 # New ports collection makefile for:	xdigger
-# Version required:			1.0.9
+# Version required:			1.0.10
 # Date created:				29 June 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xdigger-1.0.9
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	xdigger-1.0.10
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_IMAKE=		yes
-MAN6=			xdigger.6
-MANCOMPRESSED=		no
+USE_IMAKE=	yes
+MAN6=		xdigger.6
+MANCOMPRESSED=	no
+
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xdigger ${PREFIX}/bin
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.man ${PREFIX}/man/man6/xdigger.6
-	@ ${MKDIR} ${PREFIX}/share/xdigger
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.hiscore ${PREFIX}/share/xdigger
-	@ ${INSTALL_DATA} ${WRKSRC}/xdigger.level ${PREFIX}/share/xdigger
-.for file in diamond.au step.au stone.au
-	@ ${INSTALL_DATA} ${WRKSRC}/audio/${file} ${PREFIX}/share/xdigger
-.endfor
-	@ ${CHMOD} a+rw ${PREFIX}/share/xdigger/xdigger.hiscore
+	${INSTALL_PROGRAM} ${WRKSRC}/xdigger ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/xdigger.man ${PREFIX}/man/man6/xdigger.6
+	@${MKDIR} ${PREFIX}/share/xdigger
+	${INSTALL_DATA} ${WRKSRC}/xdigger.level ${PREFIX}/share/xdigger
+	${INSTALL_DATA} ${WRKSRC}/audio/*.au ${PREFIX}/share/xdigger
+	@${TOUCH} ${PREFIX}/share/xdigger/xdigger.hiscore
+	@${CHMOD} a+rw ${PREFIX}/share/xdigger/xdigger.hiscore
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xdigger
-.for file in COPYING ChangeLog README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xdigger
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/xdigger
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/xdigger
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xdigger
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/xdigger/distinfo b/games/xdigger/distinfo
index 0e44540d1605..4c8c22da5eea 100644
--- a/games/xdigger/distinfo
+++ b/games/xdigger/distinfo
@@ -1 +1 @@
-MD5 (xdigger-1.0.9.tgz) = 4579ac31a83f8868290dbfa2ad988c9a
+MD5 (xdigger-1.0.10.tgz) = 74959b5c3f0ba47d1f25f515438c86ab
diff --git a/games/xdigger/files/patch-aa b/games/xdigger/files/patch-aa
index 13e59245dc1d..119e40e9fbec 100644
--- a/games/xdigger/files/patch-aa
+++ b/games/xdigger/files/patch-aa
@@ -1,16 +1,16 @@
---- configure.h	Thu Jan  1 00:06:00 1998
-+++ /home/andy/tmp/wrk/configure.h	Sat Jun 29 23:18:58 1996
+--- configure.h.orig	Thu Jan  1 00:06:00 1998
++++ configure.h	Thu Mar 30 03:40:23 2000
 @@ -19,8 +19,13 @@
  #define _CONFIGURE_H
  
  /* Directories */
 +#ifdef __FreeBSD__
-+#define XDIGGER_LIB_DIR     "/usr/X11R6/share/xdigger"
-+#define XDIGGER_HISCORE_DIR "/usr/X11R6/share/xdigger"
++#define XDIGGER_LIB_DIR     "%%PREFIX%%/share/xdigger"
++#define XDIGGER_HISCORE_DIR "%%PREFIX%%/share/xdigger"
 +#else
  #define XDIGGER_LIB_DIR     "/usr/lib/X11/xdigger"
  #define XDIGGER_HISCORE_DIR "/var/X11R6/scores"
 +#endif
  
  #define SOUND_DSP_AUDIO
  
diff --git a/games/xdigger/files/patch-ad b/games/xdigger/files/patch-ad
new file mode 100644
index 000000000000..05c4033ad37d
--- /dev/null
+++ b/games/xdigger/files/patch-ad
@@ -0,0 +1,18 @@
+--- Imakefile.orig	Sun Jul  4 18:47:11 1999
++++ Imakefile	Thu Mar 30 03:59:25 2000
+@@ -1,12 +1,12 @@
+ #include "configure.h"
+ 
+-BINDIR=/usr/bin/X11
++#BINDIR=/usr/bin/X11
+ MANDIR=$(MANSOURCEPATH)6
+ MANSUFFIX=6
+-ICONDIR=/usr/include/X11/pixmaps
++ICONDIR=$(INCDIR)/X11/pixmaps
+ 
+ # Flags
+-CDEBUGFLAGS = -Wall
++#CDEBUGFLAGS = -Wall
+ 
+ #ifdef SOUND_RPLAY
+ RPLAYLIB = -lrplay
diff --git a/games/xdigger/files/patch-ae b/games/xdigger/files/patch-ae
new file mode 100644
index 000000000000..e5268927ead0
--- /dev/null
+++ b/games/xdigger/files/patch-ae
@@ -0,0 +1,14 @@
+--- drawpixmaps.c.orig	Sun Jul  4 18:50:44 1999
++++ drawpixmaps.c	Thu Mar 30 04:00:13 2000
+@@ -14,7 +14,11 @@
+ along with this program; see the file COPYING.  If not, write to
+ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+ 
++#ifndef __STDC__
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+ #include <stdio.h>
+ #include <string.h>
+ #include <X11/Xlib.h>
diff --git a/games/xdigger/pkg-plist b/games/xdigger/pkg-plist
index 5a7b124803e4..79489911f50a 100644
--- a/games/xdigger/pkg-plist
+++ b/games/xdigger/pkg-plist
@@ -1,11 +1,10 @@
 bin/xdigger
-share/doc/xdigger/COPYING
 share/doc/xdigger/ChangeLog
 share/doc/xdigger/README
 share/xdigger/diamond.au
 share/xdigger/step.au
 share/xdigger/stone.au
 share/xdigger/xdigger.hiscore
 share/xdigger/xdigger.level
 @dirrm share/doc/xdigger
 @dirrm share/xdigger
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index 447dfd1ae1c1..f5875cbfcdb8 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -1,35 +1,35 @@
 # New ports collection makefile for:	xtron
 # Version required:			1.1a
 # Date created:				29 March 1998
 # Whom:					Andrey Zakhvatov
 #
 # $FreeBSD$
 #
 
-DISTNAME=		xtron-1.1a
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	xtron-1.1a
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/arcade
-EXTRACT_SUFX=		.tgz
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_X_PREFIX=		yes
+USE_X_PREFIX=	yes
 
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xtron ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/xtron
-	@ ${INSTALL_DATA} ${WRKSRC}/pixmaps/* ${PREFIX}/share/xtron
-	@ ${INSTALL_DATA} ${WRKSRC}/xtronrc ${PREFIX}/lib/X11/app-defaults/Tron
-	@ ${MKDIR} ${PREFIX}/share/doc/xtron
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc
 
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xtron ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/share/xtron
+	${INSTALL_DATA} ${WRKSRC}/pixmaps/* ${PREFIX}/share/xtron
+	${INSTALL_DATA} ${WRKSRC}/xtronrc ${PREFIX}/lib/X11/app-defaults/Tron
 .if !defined(NOPORTDOCS)
-post-install:
-.for file in CHANGES COPYING README
-	@ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xtron
-.endfor
+	@${MKDIR} ${PREFIX}/share/doc/xtron
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/xtron
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xtron
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/xtron/files/patch-aa b/games/xtron/files/patch-aa
index 98a0da60f8b6..d86897fc09cd 100644
--- a/games/xtron/files/patch-aa
+++ b/games/xtron/files/patch-aa
@@ -1,13 +1,18 @@
---- Makefile	Sun Apr 16 13:26:00 1995
-+++ /home/andy/tmp/wrk/Makefile	Sun Mar 29 23:08:24 1998
-@@ -20,8 +20,8 @@
+--- Makefile.orig	Sun Apr 16 22:26:00 1995
++++ Makefile	Fri Mar 31 22:59:19 2000
+@@ -18,10 +18,11 @@
  #
- CC=		gcc
- CFLAGS=		-O4 -Wall
+ #  Last Modified: 16/4/95
+ #
+-CC=		gcc
+-CFLAGS=		-O4 -Wall
 -INCLUDES=	-I/usr/X386/include/X11 -I/usr/include
 -LIBS=		-L/usr/X386/lib
-+INCLUDES=	-I/usr/X11R6/include -I/usr/X11R6/include/X11
-+LIBS=		-L/usr/X11R6/lib
++CC?=		gcc
++CFLAGS?=		-O4 -Wall
++DEFINES=	-DPREFIX=\"${PREFIX}\"
++INCLUDES=	-I${X11BASE}/include -I${X11BASE}/include/X11
++LIBS=		-L${X11BASE}/lib
  LDLIBS=		-lXpm -lX11
  DEPEND=		makedepend
  OBJS=		wintype.o xtron.o main.o xpm2pixmap.o resource.o
diff --git a/games/xtron/files/patch-ab b/games/xtron/files/patch-ab
index 8e1a62beba1a..ce4873e8b973 100644
--- a/games/xtron/files/patch-ab
+++ b/games/xtron/files/patch-ab
@@ -1,11 +1,13 @@
---- resource.c	Sun Apr 23 22:39:03 1995
-+++ /home/andy/tmp/wrk/resource.c	Sun Mar 29 23:05:40 1998
-@@ -101,7 +101,7 @@
+--- resource.c.orig	Mon Apr 24 07:39:03 1995
++++ resource.c	Fri Mar 31 23:09:37 2000
+@@ -101,8 +101,8 @@
        if ((XTRONresources = XrmGetFileDatabase("./.xtronrc")) == NULL)  {
  	 if ((XTRONresources = XrmGetFileDatabase("$HOME/xtronrc")) == NULL)  {
  	    if ((XTRONresources = XrmGetFileDatabase("$HOME/.xtronrc")) == NULL)  {
 -	       if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/xtronrc")) == NULL)  {
-+	       if ((XTRONresources = XrmGetFileDatabase("/usr/X11R6/lib/X11/app-defaults/Tron")) == NULL)  {
- 		  if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/.xtronrc")) == NULL)  {
+-		  if ((XTRONresources = XrmGetFileDatabase("/usr/X11/lib/X11/app-defaults/.xtronrc")) == NULL)  {
++	       if ((XTRONresources = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Tron")) == NULL)  {
++		  if ((XTRONresources = XrmGetFileDatabase(PREFIX "/share/xtron/xtronrc")) == NULL)  {
  		     fprintf(stderr,"error: unable to open/read resource file xtronrc\n");
  		     return(0);
+ 		  }
diff --git a/games/xtron/files/patch-ac b/games/xtron/files/patch-ac
index 90a09bf15c97..d188ebe12a0f 100644
--- a/games/xtron/files/patch-ac
+++ b/games/xtron/files/patch-ac
@@ -1,11 +1,11 @@
---- xtronrc	Sun Apr 23 22:53:22 1995
-+++ /home/andy/tmp/wrk/xtronrc	Sun Mar 29 23:27:25 1998
+--- xtronrc.orig	Mon Apr 24 07:53:22 1995
++++ xtronrc	Fri Mar 31 05:16:36 2000
 @@ -3,7 +3,7 @@
  # in the user's home directory or in /usr/X11/lib/X11/app-defaults.
  # you can also rename it .xtronrc if you prefer it to be hidden
  # make sure that the pixmaps directory has a trailing / at the end
 -xtron.PixmapsDIR:             ./pixmaps/
-+xtron.PixmapsDIR:             /usr/X11R6/share/xtron/
++xtron.PixmapsDIR:             %%PREFIX%%/share/xtron/
  
  # change these key settings for player 1 [RED]
  xtron.player1UP:              w
diff --git a/games/xtron/pkg-plist b/games/xtron/pkg-plist
index 6524b8a2f179..dc2711997a11 100644
--- a/games/xtron/pkg-plist
+++ b/games/xtron/pkg-plist
@@ -1,24 +1,23 @@
 bin/xtron
 lib/X11/app-defaults/Tron
 share/doc/xtron/CHANGES
-share/doc/xtron/COPYING
 share/doc/xtron/README
 share/xtron/Xtron_icon.xpm
 share/xtron/again.xpm
 share/xtron/againr.xpm
 share/xtron/back.xpm
 share/xtron/comprr.xpm
 share/xtron/computer.xpm
 share/xtron/human.xpm
 share/xtron/humanr.xpm
 share/xtron/p1.xpm
 share/xtron/p2.xpm
 share/xtron/p3.xpm
 share/xtron/pause.xpm
 share/xtron/pauser.xpm
 share/xtron/quit.xpm
 share/xtron/quitr.xpm
 share/xtron/score.xpm
 share/xtron/scorer.xpm
-@dirrm share/doc/xtron
 @dirrm share/xtron
+@dirrm share/doc/xtron
diff --git a/games/xtruco/Makefile b/games/xtruco/Makefile
index 42e364a1eb60..377e3bbd9261 100644
--- a/games/xtruco/Makefile
+++ b/games/xtruco/Makefile
@@ -1,22 +1,22 @@
 # 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
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+DISTNAME=	xtruco
+PKGNAME=	xtruco-1.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	games
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-USE_X_PREFIX=		yes
+USE_X_PREFIX=	yes
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xtruco ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/games/xtruco/files/patch-aa b/games/xtruco/files/patch-aa
index 9fc59b65d658..fad5bbb28e4d 100644
--- a/games/xtruco/files/patch-aa
+++ b/games/xtruco/files/patch-aa
@@ -1,32 +1,33 @@
---- Makefile	Mon Oct 21 19:18:27 1996
-+++ /home/andy/tmp/wrk/Makefile	Sat Mar 14 20:08:33 1998
-@@ -6,17 +6,17 @@
+--- Makefile.orig	Tue Oct 22 04:18:27 1996
++++ Makefile	Fri Mar 31 05:23:20 2000
+@@ -6,17 +6,18 @@
  #                              #
  ################################
  
 -INCLUDES	= -I/usr/X11/include
-+INCLUDES	= -I/usr/X11R6/include
++INCLUDES	= -I${X11BASE}/include
  
  # Remove '-DIPC_OK' if you have problems with 'shared-memory' (IPC routines)
  OPC		= -DIPC_OK
  
 -LIBRARIES	= -lX11 -L/usr/X11/lib
-+LIBRARIES	= -lX11 -L/usr/X11R6/lib
++LIBRARIES	= -lX11 -L${X11BASE}/lib
  
  CFILES		= xtruco.c bitmap.c cursor.c display.c event.c gc.c pixmap.c\
  		  topwind.c window.c color.c button.c font.c read.c
  
 -CC		= gcc -O2 -g -Dlinux -DX11R6 $(INCLUDES) $(OPC)
-+CC		= gcc -DX11R6 $(INCLUDES) $(OPC)
++CC		?= gcc
++CFLAGS		+= -DX11R6 $(INCLUDES) $(OPC)
  
  PROG=xtruco
  
-@@ -25,7 +25,7 @@
+@@ -25,7 +26,7 @@
  OBJS=$(CFILES:.c=.o)
  
  all:	$(OBJS)
 -	$(CC) -o $(PROG) $(LIBRARIES) $(OBJS)
-+	$(CC) ${CFLAGS} -o $(PROG) $(LIBRARIES) $(OBJS)
++	$(CC) $(CFLAGS) -o $(PROG) $(LIBRARIES) $(OBJS)
  #	strip ${PROG}
  
  clean:
diff --git a/games/xvier/Makefile b/games/xvier/Makefile
index 3be83d5216bf..356ad30019b5 100644
--- a/games/xvier/Makefile
+++ b/games/xvier/Makefile
@@ -1,30 +1,32 @@
 # 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
-CATEGORIES=		games
-MASTER_SITES=		${MASTER_SITE_SUNSITE}
+DISTNAME=	xvier
+PKGNAME=	xvier-1.0
+CATEGORIES=	games
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	games/strategy
-EXTRACT_SUFX=		.tar.Z
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-WRKSRC=			${WRKDIR}/${PKGNAME}
-USE_IMAKE=		yes
-MAN6=			xvier.6
-MANCOMPRESSED=		no
+WRKSRC=		${WRKDIR}/${PKGNAME}
+USE_IMAKE=	yes
+MAN6=		xvier.6
+MANCOMPRESSED=	no
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xvier ${PREFIX}/bin
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xvier_prog ${PREFIX}/libexec
-	@ ${INSTALL_DATA} ${WRKSRC}/xvier.man ${PREFIX}/man/man6/xvier.6
-	@ ${MKDIR} ${PREFIX}/share/doc/xvier
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xvier
+	${INSTALL_PROGRAM} ${WRKSRC}/xvier ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/xvier_prog ${PREFIX}/libexec
+	${INSTALL_MAN} ${WRKSRC}/xvier.man ${PREFIX}/man/man6/xvier.6
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/xvier
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xvier
+.endif
 
 .include <bsd.port.mk>
diff --git a/games/xvier/files/patch-aa b/games/xvier/files/patch-aa
index bb88b36371ad..2a9f54d5916d 100644
--- a/games/xvier/files/patch-aa
+++ b/games/xvier/files/patch-aa
@@ -1,11 +1,11 @@
---- Imakefile	Wed Jul 29 00:07:09 1992
-+++ /home/andy/tmp/wrk/Imakefile	Wed Mar 18 00:09:33 1998
+--- Imakefile.orig	Wed Jul 29 09:07:09 1992
++++ Imakefile	Fri Mar 31 05:52:10 2000
 @@ -13,7 +13,7 @@
  #NO_GETDTABSIZE = -DNO_GETDTABSIZE
  
  #PROGNAME	= $(LIBDIR)$(PATHSEP)xvier_prog
 -PROGNAME	= /usr/games/lib/xvier_prog
-+PROGNAME	= /usr/X11R6/libexec/xvier_prog
++PROGNAME	= $(PROJECTROOT)/libexec/xvier_prog
  DEFINES		= $(XVIER_ASPECT) $(NO_FD_SET) $(NO_SELECT) \
  			$(NO_GETDTABSIZE) -DPROGNAME=\"$(PROGNAME)\"