aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjedgar <jedgar@FreeBSD.org>2000-01-28 08:45:32 +0800
committerjedgar <jedgar@FreeBSD.org>2000-01-28 08:45:32 +0800
commitcdab3a6b5b2298ef08f540473fe764c937160507 (patch)
treef2a2fe21ac746a25a8dee6aed66d3645d1a1143e
parent91f133b527a7c3a3e3c297c5018c2f0f5d0518c7 (diff)
downloadfreebsd-ports-gnome-cdab3a6b5b2298ef08f540473fe764c937160507.tar.gz
freebsd-ports-gnome-cdab3a6b5b2298ef08f540473fe764c937160507.tar.zst
freebsd-ports-gnome-cdab3a6b5b2298ef08f540473fe764c937160507.zip
Fix the new compiler problem as reported by bento.
PR: 16385 Submitted by: Maintainer With help from: Alex Langer <alex@big.endian.de>
-rw-r--r--games/xkobo/Makefile6
-rw-r--r--games/xkobo/files/patch-ae31
-rw-r--r--games/xkobo/files/patch-af20
3 files changed, 54 insertions, 3 deletions
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index b914c4d035b2..6505b7c607cf 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -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$
#
diff --git a/games/xkobo/files/patch-ae b/games/xkobo/files/patch-ae
new file mode 100644
index 000000000000..39b6e1805c34
--- /dev/null
+++ b/games/xkobo/files/patch-ae
@@ -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 --git a/games/xkobo/files/patch-af b/games/xkobo/files/patch-af
new file mode 100644
index 000000000000..1db897a8ebf4
--- /dev/null
+++ b/games/xkobo/files/patch-af
@@ -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 (;;){