From b4d5b934dc13c29d4507b7109d318f07891f6d68 Mon Sep 17 00:00:00 2001
From: Kirill Ponomarev <krion@FreeBSD.org>
Date: Mon, 3 Nov 2003 18:43:09 +0000
Subject: - Fix build on -current

PR:		58875
Submitted by:	Ports Fury
---
 games/xdeblock/Makefile               | 12 ++++-------
 games/xdeblock/files/patch-gamemain.c | 40 +++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 games/xdeblock/files/patch-gamemain.c

(limited to 'games/xdeblock')

diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index 8e614f40a90a..d10ed27c5e9e 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -15,18 +15,14 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Block action game
 
 WRKSRC=		${WRKDIR}/xdeblo_v1.0
+
 USE_IMAKE=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes
 NO_INSTALL_MANPAGES=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
-
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdeblo ${PREFIX}/bin
@@ -34,4 +30,4 @@ do-install:
 	${CHMOD} 777 ${PREFIX}/lib/X11/xdeblock/mapf
 	${INSTALL_DATA} ${WRKSRC}/mapf/*.txt ${PREFIX}/lib/X11/xdeblock/mapf
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/xdeblock/files/patch-gamemain.c b/games/xdeblock/files/patch-gamemain.c
new file mode 100644
index 000000000000..9c2137f7f662
--- /dev/null
+++ b/games/xdeblock/files/patch-gamemain.c
@@ -0,0 +1,40 @@
+--- gamemain.c.orig	Sat Nov 16 14:37:16 1996
++++ gamemain.c	Mon Nov  3 15:30:25 2003
+@@ -793,14 +793,13 @@
+ void openingString(void)
+ {
+   XRectangle   	tempRect;
+-  register	tempNum,maps,i,x;
++  register	tempNum,_maps,i,x;
+   struct timeval    time;
+   char          text[32];
+-    
+ 
+-  maps = nowDataRec.nowMap.mapNum;
++  _maps = nowDataRec.nowMap.mapNum;
+ 
+-  if(nowMapFile->stageData[maps].minTime == 0)
++  if(nowMapFile->stageData[_maps].minTime == 0)
+     {
+       /**  not yet clear map  **/
+       drawShadowText(display,mWin,120,300,
+@@ -812,15 +811,15 @@
+ 
+       x = 120;
+       drawShadowText(display,mWin,x,300,
+-		     nowMapFile->stageData[maps].minTimeName,white.pixel);
++		     nowMapFile->stageData[_maps].minTimeName,white.pixel);
+ 
+-      x += XTextWidth(xfont,nowMapFile->stageData[maps].minTimeName,
+-		      strlen(nowMapFile->stageData[maps].minTimeName));
++      x += XTextWidth(xfont,nowMapFile->stageData[_maps].minTimeName,
++		      strlen(nowMapFile->stageData[_maps].minTimeName));
+       drawShadowText(display,mWin,x,300,
+ 		     " has the fastest time.",white.pixel);
+ 
+ 	
+-      long2time(nowMapFile->stageData[maps].minTime,&time);
++      long2time(nowMapFile->stageData[_maps].minTime,&time);
+ 
+       x = 250;
+       sprintf(text,"%d",time.tv_sec);
-- 
cgit v1.2.3