Date: Tue, 8 Oct 2013 02:50:41 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/182797: games/xdeblock: Fix build with clang Message-ID: <20131008025041.77c9c6818374c3e80ccac142@yahoo.com> Resent-Message-ID: <201310071810.r97IA06m057799@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182797
>Category: ports
>Synopsis: games/xdeblock: Fix build with clang
>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 Oct 07 18:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/xdeblock/Makefile games/xdeblock/Makefile
--- /usr/ports/games/xdeblock/Makefile 2013-09-22 04:10:17.000000000 +0900
+++ games/xdeblock/Makefile 2013-10-08 00:00:00.000000000 +0900
@@ -17,14 +17,14 @@
USE_XORG= xpm
NO_INSTALL_MANPAGES= yes
-NO_STAGE= yes
post-patch:
@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/main.c
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/xdeblo ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/lib/X11/xdeblock/mapf
- ${CHMOD} 777 ${PREFIX}/lib/X11/xdeblock/mapf
- ${INSTALL_DATA} ${WRKSRC}/mapf/*.txt ${PREFIX}/lib/X11/xdeblock/mapf
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} xdeblo ${STAGEDIR}${PREFIX}/bin)
+ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
+ ${CHMOD} 777 ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf
+ (cd ${WRKSRC}/mapf && ${INSTALL_DATA} *.txt \
+ ${STAGEDIR}${PREFIX}/lib/X11/xdeblock/mapf)
.include <bsd.port.mk>
diff -urN /usr/ports/games/xdeblock/files/patch-ab games/xdeblock/files/patch-ab
--- /usr/ports/games/xdeblock/files/patch-ab 2013-06-21 03:49:04.000000000 +0900
+++ games/xdeblock/files/patch-ab 2013-10-08 00:00:00.000000000 +0900
@@ -1,5 +1,5 @@
-*** main.c.orig Sat Nov 16 14:37:16 1996
---- main.c Thu Jan 15 00:00:00 2000
+*** main.c.orig
+--- main.c
***************
*** 66,72 ****
/*** set s_map ***/
@@ -17,3 +17,37 @@
for(i =1; i < argc; i++)
{
+***************
+*** 584,590 ****
+ break;
+ case 1: /**** game continue ****/
+ if(nowDataRec.nowMap.continueCount < 0)
+! return;
+ gameMainFlg.demoFlg = False;
+ gameMainFlg.useContinue = True;
+ nowDataRec.nowMap.continueCount --;
+--- 584,590 ----
+ break;
+ case 1: /**** game continue ****/
+ if(nowDataRec.nowMap.continueCount < 0)
+! return(True);
+ gameMainFlg.demoFlg = False;
+ gameMainFlg.useContinue = True;
+ nowDataRec.nowMap.continueCount --;
+***************
+*** 855,861 ****
+ }
+
+
+! void main(argc,argv)
+ int argc;
+ char *argv[];
+ {
+--- 855,861 ----
+ }
+
+
+! int main(argc,argv)
+ int argc;
+ char *argv[];
+ {
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131008025041.77c9c6818374c3e80ccac142>