fix compilation under NetBSD 2.0beta (UP redefined)

6 files changed, 111 insertions, 1 deletions

diff --git a/games/hugo/distinfo b/games/hugo/distinfo
index f2c9f6f69fd..155cbf58096 100644
--- a/games/hugo/distinfo
+++ b/games/hugo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/05/22 23:37:06 dillo Exp $
+$NetBSD: distinfo,v 1.2 2004/05/28 14:24:04 dillo Exp $
 
 SHA1 (hugo-3.0.07/hugov30_unix_source.tar.gz) = 4b3afc3b4f03ff23643460321d76127980184ec0
 Size (hugo-3.0.07/hugov30_unix_source.tar.gz) = 213002 bytes
@@ -6,3 +6,8 @@ SHA1 (hugo-3.0.07/hugolib.zip) = 76b5580461a6c6f15780f554d2e23574ef78e24d
 Size (hugo-3.0.07/hugolib.zip) = 67669 bytes
 SHA1 (patch-aa) = 841a92743e3b6db56d79806bde2687d30019570b
 SHA1 (patch-ab) = a2e5b86d69aefb0be46b69c91b08a4335bc81637
+SHA1 (patch-ac) = 43df8bc8b35cb5525f582a6d11eba89d063fbe76
+SHA1 (patch-ad) = 454c364a4fe45d1fc94b768db85443fcc8ef8204
+SHA1 (patch-ae) = ce4dc59544819330f1f8eeb45100e871c3aa0b3d
+SHA1 (patch-af) = d97e6efb61472637f8680bf9cd94a1541ab2eb14
+SHA1 (patch-ag) = 5ad2dad3afa263160d5d70431dc7a7e1bd542969
diff --git a/games/hugo/patches/patch-ac b/games/hugo/patches/patch-ac
new file mode 100644
index 00000000000..9ffc2aa0ee2
--- /dev/null
+++ b/games/hugo/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2004/05/28 14:24:04 dillo Exp $
+
+--- source/hdinter.h.orig	2004-01-05 20:22:00.000000000 +0100
++++ source/hdinter.h
+@@ -63,7 +63,7 @@ enum D_ACTION_TYPE

+ /* ...and (some) object types */

+ enum D_OBJECT_TYPE

+ {

+-	UP = 1, DOWN, LEFT, RIGHT, PAGEUP, PAGEDOWN,

++	EV_UP = 1, DOWN, LEFT, RIGHT, PAGEUP, PAGEDOWN,

+ 

+ 	/* START and FINISH are used to move to the very top or bottom,

+ 	   while HOME and END generally refer to the start and end of

diff --git a/games/hugo/patches/patch-ad b/games/hugo/patches/patch-ad
new file mode 100644
index 00000000000..ac4b693cbab
--- /dev/null
+++ b/games/hugo/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2004/05/28 14:24:04 dillo Exp $
+
+--- source/hdtools.c.orig	2004-01-05 20:21:48.000000000 +0100
++++ source/hdtools.c
+@@ -147,7 +147,7 @@ void DrawBranch(int obj)

+ 	/* Scroll the window up a line if necessary */

+ 	if (tree_lines>=D_SCREENHEIGHT-1)

+ 	{

+-		debug_windowscroll(1, 1, D_SCREENWIDTH, D_SCREENHEIGHT-1, UP, 1);

++		debug_windowscroll(1, 1, D_SCREENWIDTH, D_SCREENHEIGHT-1, EV_UP, 1);

+ 		debug_settextpos(1, D_SCREENHEIGHT-1);

+ 	}

+ 

diff --git a/games/hugo/patches/patch-ae b/games/hugo/patches/patch-ae
new file mode 100644
index 00000000000..7d1b536fd87
--- /dev/null
+++ b/games/hugo/patches/patch-ae
@@ -0,0 +1,35 @@
+$NetBSD: patch-ae,v 1.1 2004/05/28 14:24:04 dillo Exp $
+
+--- source/hdupdate.c.orig	2004-01-05 20:22:00.000000000 +0100
++++ source/hdupdate.c
+@@ -235,10 +235,10 @@ void Navigate(void)

+ 	{

+ 	  switch (event.object)

+ 	  {

+-		case UP:

++		case EV_UP:

+ 		case DOWN:

+ 		{

+-			if (event.object==UP && win->selected > 0)

++			if (event.object==EV_UP && win->selected > 0)

+ 			{

+ 				if (--new_selected < win->first)

+ 				{

+@@ -252,7 +252,7 @@ void Navigate(void)

+ 			{

+ 				if (++new_selected > win->first+win->height-1)

+ 				{

+-					debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, UP, 1);

++					debug_windowscroll(2, win->top, D_SCREENWIDTH-1, win->top+win->height-1, EV_UP, 1);

+ 					win->first++;

+ 				}

+ 			}

+@@ -828,7 +828,7 @@ void UpdateCodeWindow(void)

+ 			amount_to_scroll = buffered_code_lines;

+ 

+ 		debug_windowscroll(2, win->top, 

+-			D_SCREENWIDTH-1, win->top+win->height-1, UP, amount_to_scroll);

++			D_SCREENWIDTH-1, win->top+win->height-1, EV_UP, amount_to_scroll);

+ 

+ 		win->first += amount_to_scroll;

+ 	}

diff --git a/games/hugo/patches/patch-af b/games/hugo/patches/patch-af
new file mode 100644
index 00000000000..68c1d707dc2
--- /dev/null
+++ b/games/hugo/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2004/05/28 14:24:04 dillo Exp $
+
+--- source/hdwindow.c.orig	2004-01-05 20:22:00.000000000 +0100
++++ source/hdwindow.c
+@@ -349,7 +349,7 @@ SelectThisItem:

+ 

+ 				switch (event.object)

+ 				{

+-					case UP:

++					case EV_UP:

+ 					{

+ 						/* if previous item is a separator */

+ 	                                        if (menu[m][--selection][0]=='-')

+@@ -920,7 +920,7 @@ PrintChoices:

+ 			{

+ 				switch (event.object)

+ 				{

+-					case UP:

++					case EV_UP:

+ 					{

+ 						if (this==1) break;

+ 						if (--this < first) first--;

diff --git a/games/hugo/patches/patch-ag b/games/hugo/patches/patch-ag
new file mode 100644
index 00000000000..7a33ebcbe26
--- /dev/null
+++ b/games/hugo/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1 2004/05/28 14:24:04 dillo Exp $
+
+--- gcc/hdgcc.c.orig	2002-08-08 13:28:19.000000000 +0200
++++ gcc/hdgcc.c
+@@ -193,7 +193,7 @@ GetNewEvent:
+ 			return;
+ 		}
+ 		case UP_ARROW:
+-			{event.action = MOVE; event.object = UP; break;}
++			{event.action = MOVE; event.object = EV_UP; break;}
+ 		case DOWN_ARROW:
+ 			{event.action = MOVE; event.object = DOWN; break;}
+ 		case RIGHT_ARROW:
+@@ -821,7 +821,7 @@ void debug_windowscroll(int left, int to
+ 	{
+ 	  switch (param)
+ 	  {
+-		case UP:
++		case EV_UP:
+ 			for (y=top+1; y<=bottom; y++)
+ 			for (x=left; x<=right; x++)
+ 			{