diff -urN /usr/ports/games/connect4/Makefile games/connect4/Makefile
--- /usr/ports/games/connect4/Makefile	Mon Oct 30 23:36:19 2000
+++ games/connect4/Makefile	Fri Nov  3 05:23:26 2000
@@ -7,29 +7,28 @@
 
 PORTNAME=	connect4
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.gu.kiev.ua/pub/cdrom5/games/volume6/ \
-		ftp://scitsc.wlv.ac.uk/pub/infomagic/usenet/games/volume6/
+MASTER_SITES=	${MASTER_SITE_COMP_SOURCES}
+MASTER_SITE_SUBDIR=	games/volume6
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	""
+EXTRACT_SUFX=	.Z
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=		gunshar:${PORTSDIR}/archivers/gshar+gunshar
+BUILD_DEPENDS=	gunshar:${PORTS}/archivers/gshar+gunshar
 
-EXTRACT_CMD=		gunshar
+EXTRACT_CMD=		${GZCAT}
 EXTRACT_BEFORE_ARGS=	# empty
-EXTRACT_AFTER_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	| gunshar
+
 NO_WRKSUBDIR=	yes
 MAN6=		connect4.6
 
-MANDIR=		${PREFIX}/man/man
-LIBDIR=		${PREFIX}/lib
-
 do-install:
-		${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/c4 ${PREFIX}/bin/connect4
-		${MKDIR} ${LIBDIR}/connect4
-		${INSTALL_DATA} -m 664 -o root -g games /dev/null ${LIBDIR}/connect4/scores
-		${INSTALL_MAN} ${FILESDIR}/connect4.6 ${MANDIR}6/
+	${INSTALL_PROGRAM} -m 2755 -o root -g games ${WRKSRC}/c4 ${PREFIX}/bin/connect4
+	@${MKDIR} ${PREFIX}/share/connect4
+	${INSTALL_DATA} -m 664 -o root -g games /dev/null ${PREFIX}/share/connect4/scores
+	${INSTALL_MAN} ${FILESDIR}/connect4.6 ${MANPREFIX}/man/man6
 
 .include <bsd.port.mk>
diff -urN /usr/ports/games/connect4/distinfo games/connect4/distinfo
--- /usr/ports/games/connect4/distinfo	Wed Jun  4 12:21:12 1997
+++ games/connect4/distinfo	Fri Nov  3 02:20:29 2000
@@ -1 +1 @@
-MD5 (connect4) = d09ae9fc10591b6c0f021f38c129d90f
+MD5 (connect4.Z) = ee55cb506ef69154099b881dd5b30679
diff -urN /usr/ports/games/connect4/files/patch-aa games/connect4/files/patch-aa
--- /usr/ports/games/connect4/files/patch-aa	Wed Jun  4 12:21:13 1997
+++ games/connect4/files/patch-aa	Fri Nov  3 02:24:51 2000
@@ -1,24 +1,30 @@
-*** Makefile.orig	Tue Apr 15 21:55:19 1997
---- Makefile	Tue Apr 15 21:57:58 1997
+*** Makefile.orig	Fri Nov  3 02:23:51 2000
+--- Makefile	Fri Nov  3 02:24:41 2000
 ***************
-*** 1,7 ****
+*** 1,10 ****
   # Makefile for c4
   
 ! CFLAGS = -g #-DSCOREFILE=\"/usr/games/lib/c4.scores\" 
   CURSES = -lcurses -ltermcap
   
   c4 : c4.o screen.o c4.h tables.h types.h
-  	cc $(CFLAGS) -o c4 c4.o screen.o $(CURSES)
---- 1,12 ----
+! 	cc $(CFLAGS) -o c4 c4.o screen.o $(CURSES)
+  
+  screen.o : c4.h
+  
+--- 1,15 ----
   # Makefile for c4
 + # Patched for FreeBSD 2.1.5R by 
 + # Joel Sutton <suttonj@interconnect.com.au>
 + # 15th April, 1997
   
-! CFLAGS = -O -g -DSCOREFILE=\"/usr/local/lib/connect4/scores\" 
+! CFLAGS += -DSCOREFILE=\"$(PREFIX)/share/connect4/scores\" 
   CURSES = -lcurses -ltermcap
-+ 
-+ all:	c4
   
++ all:	c4
++ 
   c4 : c4.o screen.o c4.h tables.h types.h
-  	cc $(CFLAGS) -o c4 c4.o screen.o $(CURSES)
+! 	$(CC) $(CFLAGS) -o c4 c4.o screen.o $(CURSES)
+  
+  screen.o : c4.h
+  
diff -urN /usr/ports/games/connect4/pkg-plist games/connect4/pkg-plist
--- /usr/ports/games/connect4/pkg-plist	Mon Sep 28 11:34:27 1998
+++ games/connect4/pkg-plist	Fri Nov  3 02:26:28 2000
@@ -1,3 +1,3 @@
 bin/connect4
-lib/connect4/scores
-@dirrm lib/connect4
+share/connect4/scores
+@dirrm share/connect4