2 files changed, 51 insertions, 36 deletions

diff --git a/games/block/Makefile b/games/block/Makefile
index d59103e0236e..577bc00c7f2d 100644
--- a/games/block/Makefile
+++ b/games/block/Makefile
@@ -1,35 +1,34 @@
 # 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
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