Date: Wed, 31 Oct 2007 02:34:19 +0300 (MSK) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117699: [PATCH] games/blobwars: unbreak on 7.0 Message-ID: <20071030233419.3EA19406E@hades.panopticon> Resent-Message-ID: <200710302340.l9UNe4oR011953@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117699
>Category: ports
>Synopsis: [PATCH] games/blobwars: unbreak on 7.0
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 30 23:40:04 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p20 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p20 FreeBSD 6.1-RELEASE-p20 #1: Tue Oct 23 05:28:10 MSD 2007 root@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
* Trivial unbreak on 7.0
>How-To-Repeat:
>Fix:
--- blobwars.patch begins here ---
diff -ruN blobwars.orig/Makefile blobwars/Makefile
--- blobwars.orig/Makefile 2007-10-31 02:24:39.000000000 +0000
+++ blobwars/Makefile 2007-10-31 02:25:09.000000000 +0000
@@ -36,10 +36,4 @@
${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
.endif
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN blobwars.orig/files/patch-src-CFileData.h blobwars/files/patch-src-CFileData.h
--- blobwars.orig/files/patch-src-CFileData.h 1970-01-01 00:00:00.000000000 +0000
+++ blobwars/files/patch-src-CFileData.h 2007-10-31 02:26:22.000000000 +0000
@@ -0,0 +1,9 @@
+--- src/CFileData.h.orig 2005-04-25 18:25:38.000000000 +0000
++++ src/CFileData.h 2007-10-31 02:26:03.000000000 +0000
+@@ -30,5 +30,5 @@
+ FileData();
+
+ void swapEndians();
+- void FileData::set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
++ void set(char *filename, Uint32 fSize, Uint32 cSize, Uint32 location);
+ };
diff -ruN blobwars.orig/files/patch-src-CKeyboard.h blobwars/files/patch-src-CKeyboard.h
--- blobwars.orig/files/patch-src-CKeyboard.h 1970-01-01 00:00:00.000000000 +0000
+++ blobwars/files/patch-src-CKeyboard.h 2007-10-31 02:29:40.000000000 +0000
@@ -0,0 +1,10 @@
+--- src/CKeyboard.h.orig 2005-04-25 18:25:38.000000000 +0000
++++ src/CKeyboard.h 2007-10-31 02:29:26.000000000 +0000
+@@ -8,6 +8,6 @@
+
+ Keyboard();
+ void setDefaultKeys();
+- static char *Keyboard::translateKey(int value);
++ static char *translateKey(int value);
+
+ };
--- blobwars.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071030233419.3EA19406E>