Date: Wed, 26 Jan 2000 11:44:46 -0500 (EST) From: Will Andrews <andrews@technologist.com> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/16385: update port: games/xkobo ; [PATCH] Message-ID: <20000126164446.391D3199A@argon.blackdawn.com>
next in thread | raw e-mail | index | archive | help
>Number: 16385
>Category: ports
>Synopsis: update port: games/xkobo ; [PATCH]
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jan 26 08:50:02 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Will Andrews
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
none
>Environment:
FreeBSD argon.blackdawn.com 4.0-CURRENT FreeBSD 4.0-CURRENT #0: Tue Jan 18 13:57:34 EST 2000 root@argon.blackdawn.com:/usr/src/sys/compile/KRYPTON i386
>Description:
This will fix the new compiler problem reported by
bento for xkobo 1.11. I would like to thank Alex
for fixing one of my favorite games. Sorry I took
so long to actually look at the patches! :-P
On another note, I changed the spaces in the Makefile
to tabs. Might as well, this is trivial enough.
Submitted by: Alex Langer <alex@big.endian.de>
>How-To-Repeat:
Apply the patch against the current port.
>Fix:
diff -urN xkobo/Makefile xkobo.new/Makefile
--- xkobo/Makefile Wed Aug 25 02:05:25 1999
+++ xkobo.new/Makefile Wed Jan 26 11:40:06 2000
@@ -1,7 +1,7 @@
# New ports collection makefile for: xkobo
-# Version required: 1.11
-# Date created: 18 Jul 1995
-# Whom: jkh
+# Version required: 1.11
+# Date created: 18 Jul 1995
+# Whom: jkh
#
# $FreeBSD: ports/games/xkobo/Makefile,v 1.14 1999/08/25 06:05:25 obrien Exp $
#
diff -urN xkobo/patches/patch-ae xkobo.new/patches/patch-ae
--- xkobo/patches/patch-ae Wed Dec 31 19:00:00 1969
+++ xkobo.new/patches/patch-ae Wed Jan 26 11:35:12 2000
@@ -0,0 +1,31 @@
+--- map.h.orig Wed Apr 3 23:58:52 1996
++++ map.h Tue Jan 18 19:15:44 2000
+@@ -38,14 +38,14 @@
+ #define HIT_MASK (CORE | U_MASK | R_MASK | D_MASK | L_MASK)
+
+ class _map{
+- const int sx_log2 = MAP_SIZEX_LOG2;
+- const int sy_log2 = MAP_SIZEY_LOG2;
+- const int sx = 1 << sx_log2;
+- const int sy = 1 << sy_log2;
++ int sx_log2;
++ int sy_log2;
++ int sx;
++ int sy;
+ int sitex[SITE_MAX];
+ int sitey[SITE_MAX];
+ int site_max;
+- char data[1 << (sx_log2 + sy_log2)];
++ char data[1 << (MAP_SIZEX_LOG2 + MAP_SIZEY_LOG2)];
+ int maze_pop();
+ void maze_push(int x, int y);
+ void maze_move_and_push(int x, int y, int d);
+@@ -54,7 +54,7 @@
+ void init();
+ void make_maze(int x, int y, int difx, int dify);
+ void convert(int ratio); /* ratio < 64 */
+- inline char& pos(int x, int y){ return data[(y<<sx_log2) + x];}
++ inline char& pos(int x, int y){ return data[(y<<MAP_SIZEY_LOG2) + x];}
+ };
+
+
diff -urN xkobo/patches/patch-af xkobo.new/patches/patch-af
--- xkobo/patches/patch-af Wed Dec 31 19:00:00 1969
+++ xkobo.new/patches/patch-af Wed Jan 26 11:35:19 2000
@@ -0,0 +1,20 @@
+--- file.C.old Tue Jan 18 19:16:42 2000
++++ file.C Tue Jan 18 19:17:07 2000
+@@ -42,7 +42,7 @@
+ ret = -2;
+ break;
+ }
+- t += i;
++ t = (void *) ((int) t + i);
+ len -= i;
+ } while (len > 0);
+ for (;;){
+@@ -68,7 +68,7 @@
+ ret = -2;
+ break;
+ }
+- t += i;
++ t = (void *) ((int) t + i);
+ len -= i;
+ } while (len > 0);
+ for (;;){
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000126164446.391D3199A>