Date: Tue, 4 Nov 2003 00:15:07 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58875: Update port: games/xdeblock Message-ID: <20031104001507.45d4c144.tkato@prontomail.com> Resent-Message-ID: <200311031520.hA3FKG10059664@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 58875
>Category: ports
>Synopsis: Update port: games/xdeblock
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 03 07:20:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix build on -current
New file:
files/patch-gamemain.c
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xdeblock/Makefile games/xdeblock/Makefile
--- /usr/ports/games/xdeblock/Makefile Mon Nov 3 14:24:35 2003
+++ games/xdeblock/Makefile Mon Nov 3 15:25:08 2003
@@ -15,18 +15,14 @@
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 @@
${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 -urN /usr/ports/games/xdeblock/files/patch-gamemain.c games/xdeblock/files/patch-gamemain.c
--- /usr/ports/games/xdeblock/files/patch-gamemain.c Thu Jan 1 09:00:00 1970
+++ games/xdeblock/files/patch-gamemain.c Mon Nov 3 15:30:50 2003
@@ -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);
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031104001507.45d4c144.tkato>