Fix broken build on amd64. Also combine two patches that were to the same

file, don't include the SUBST results in the patch, and add a missing dep
on libX11. PKGREVISION++.

11 files changed, 243 insertions, 52 deletions

diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 8722a90ea45..a1fd325c35f 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/03/04 06:59:06 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2008/08/17 23:50:06 dholland Exp $
 
 DISTNAME=	xevilsrc2.02r2
 PKGNAME=	xevil-2.02
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.xevil.com/download/stable/
 EXTRACT_SUFX=	.zip
@@ -35,4 +35,5 @@ SUBST_FILES.uname=	cmn/utils.cpp
 SUBST_SED.uname=	-e 's,@UNAME@,${UNAME},g'
 
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/xevil/distinfo b/games/xevil/distinfo
index bf4bd6676a5..d29d2bb7008 100644
--- a/games/xevil/distinfo
+++ b/games/xevil/distinfo
@@ -1,25 +1,25 @@
-$NetBSD: distinfo,v 1.6 2007/11/07 14:00:54 rillig Exp $
+$NetBSD: distinfo,v 1.7 2008/08/17 23:50:06 dholland Exp $
 
 SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
 RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
 Size (xevilsrc2.02r2.zip) = 1857315 bytes
 SHA1 (patch-aa) = 7421021c8b5f486a031959db9ac3e7a1197f7763
-SHA1 (patch-ab) = 10416465eb62f034b111971530f6c1897bce3266
 SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35
 SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0
 SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749
 SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
-SHA1 (patch-ag) = e39e51242b77aeb79e40ecf37fdae492d7427aff
-SHA1 (patch-ah) = 4417e17e9e924a8d0c04565b8c731abc78c0bf7b
-SHA1 (patch-ai) = ed5d1660d59835de2b0cae8ebe65432351d0751b
+SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2
+SHA1 (patch-ah) = b78acf6e01bd555024eb1a6a5d80ab8c393de4c5
+SHA1 (patch-ai) = 8579f4f6594ff2d01c35c2becc7cf395a5195550
 SHA1 (patch-aj) = e7ec143b757de6f07693bc6e192f6d9e913ce252
-SHA1 (patch-ak) = 48f2a6c563a5e51ff28da4f5715a56276dbd63a7
+SHA1 (patch-ak) = 28afd60df44748a759fbce3a989d3b44b5cf63f4
 SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
 SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
 SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
-SHA1 (patch-ao) = 894c12c2012bfbd2273bfdd82a09b417fd0e9682
+SHA1 (patch-ao) = 6ded6c8cc125765928b363dda435c14a3f58fd1c
 SHA1 (patch-ap) = a4e4ab0655c218c18d195964ed65db2e1487c895
 SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983
-SHA1 (patch-ar) = 69e9198268259cb5df1e7b2a08472c403e89ff5d
-SHA1 (patch-as) = f44ccd51c55d89bd3cd04c480ff8cd902da62e50
+SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903
+SHA1 (patch-as) = 8220ca95a190cc40eab516a8f3bc47491a4c9874
 SHA1 (patch-at) = 308f449ad894daba7da6ad6e6c2239e2d713b660
+SHA1 (patch-au) = f1092ff4228d4bb6f13e6aeb0ea70a5b4b9635b6
diff --git a/games/xevil/patches/patch-ab b/games/xevil/patches/patch-ab
deleted file mode 100644
index b06632152c6..00000000000
--- a/games/xevil/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
-
---- cmn/utils.cpp.orig	Sun Apr 13 15:11:54 2003
-+++ cmn/utils.cpp	Sun Apr 13 15:12:19 2003
-@@ -483,11 +483,7 @@
- #endif
- 
- 
--#ifdef UNAME_USR_BIN
--#define UNAME_PATH "/usr/bin/uname"
--#else
--#define UNAME_PATH "/bin/uname"
--#endif
-+#define UNAME_PATH "@UNAME@"
- 
- #ifdef X11
-   FILE* fp = popen(UNAME_PATH " -a","r");
diff --git a/games/xevil/patches/patch-ag b/games/xevil/patches/patch-ag
index d6489dafed9..2d945275e30 100644
--- a/games/xevil/patches/patch-ag
+++ b/games/xevil/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2007/11/07 14:00:54 rillig Exp $
+$NetBSD: patch-ag,v 1.3 2008/08/17 23:50:06 dholland Exp $
 
 --- cmn/utils.cpp.orig	2007-11-07 14:55:38.000000000 +0100
 +++ cmn/utils.cpp	2007-11-07 14:57:57.000000000 +0100
@@ -29,15 +29,36 @@ $NetBSD: patch-ag,v 1.2 2007/11/07 14:00:54 rillig Exp $
  #ifdef WIN32
  // For file manipulation routines.
  #include <direct.h>
-@@ -475,7 +477,7 @@ char* Utils::get_OS_info() {
+@@ -483,11 +483,7 @@
  #endif
  
  
--#define UNAME_PATH "@UNAME@"
-+#define UNAME_PATH "/usr/bin/uname"
+-#ifdef UNAME_USR_BIN
+-#define UNAME_PATH "/usr/bin/uname"
+-#else
+-#define UNAME_PATH "/bin/uname"
+-#endif
++#define UNAME_PATH "@UNAME@"
  
  #ifdef X11
    FILE* fp = popen(UNAME_PATH " -a","r");
+@@ -596,7 +598,7 @@
+ }
+ 
+ 
+-
++#if 0 /* unused and broken */
+ void PtrList::write(OutStreamP out) const{
+   // Not tested.
+   out->write_int(len);
+@@ -604,6 +606,7 @@
+     out->write_int((int)data[n]);
+   }
+ }
++#endif
+ 
+ 
+ 
 @@ -757,7 +759,7 @@ public:
  
  
@@ -47,3 +68,12 @@ $NetBSD: patch-ag,v 1.2 2007/11/07 14:00:54 rillig Exp $
    /* MODIFIES: index */
    /* EFFECTS: Internal helper function.  Return the Bucket containing key
       or NULL if not found.  Set index to the bucket list for key whether
+@@ -942,7 +942,7 @@
+ // Pretty crappy hash function, I know.
+ // Careful if bucketsNum is a power of 2.
+ int HashTable::defaultHash(void* key,int bucketsNum) {
+-  return ((unsigned int)key) % bucketsNum;
++  return ((unsigned long)key) % bucketsNum;
+ }
+ 
+ 
diff --git a/games/xevil/patches/patch-ah b/games/xevil/patches/patch-ah
index 786c40a6896..bb3e3ff8e92 100644
--- a/games/xevil/patches/patch-ah
+++ b/games/xevil/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ah,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- cmn/actual.cpp.orig	2000-01-19 12:54:36.000000000 -0800
-+++ cmn/actual.cpp	2003-11-22 11:18:19.000000000 -0800
+--- cmn/actual.cpp.orig	2000-01-19 12:54:36.000000000 -0500
++++ cmn/actual.cpp	2008-08-17 19:09:43.000000000 -0400
 @@ -32,7 +32,8 @@
  
  // Include Files
@@ -12,3 +12,12 @@ $NetBSD: patch-ah,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
+@@ -1534,7 +1535,7 @@ Boolean Transmogifier::transmogify_targe
+                                                  void *closure) {
+   // notThis is used to prevent transmogifying into the same class an object
+   // already is.
+-  ClassId notThis = (ClassId)closure;
++  ClassId notThis = (ClassId)(intptr_t)closure;
+   if (pc->classId == notThis) {
+     return False;
+   }
diff --git a/games/xevil/patches/patch-ai b/games/xevil/patches/patch-ai
index 42aaa4c6017..66dc7a1089c 100644
--- a/games/xevil/patches/patch-ai
+++ b/games/xevil/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ai,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- cmn/xetp.cpp.orig	2000-01-19 12:54:30.000000000 -0800
-+++ cmn/xetp.cpp	2003-11-22 11:24:52.000000000 -0800
+--- cmn/xetp.cpp.orig	2000-01-19 12:54:30.000000000 -0500
++++ cmn/xetp.cpp	2008-08-17 19:12:24.000000000 -0400
 @@ -29,9 +29,10 @@
  
  #include "stdafx.h"
@@ -15,3 +15,12 @@ $NetBSD: patch-ai,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
+@@ -159,7 +160,7 @@ void XETP::send_objects(OutStreamP out,c
+   for (n = 0; n < physicals.length(); n++) {
+     PhysicalP p = (PhysicalP)physicals.get(n);
+     // computing object_length twice, but who cares.
+-    _send_object(out,p,turn,(TickType)tickTypes.get(n),
++    _send_object(out,p,turn,(TickType)(intptr_t)tickTypes.get(n),
+                  compute_object_length(p));
+   }
+   
diff --git a/games/xevil/patches/patch-ak b/games/xevil/patches/patch-ak
index 55e77647912..aa3eb68676c 100644
--- a/games/xevil/patches/patch-ak
+++ b/games/xevil/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ak,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- cmn/physical.cpp.orig	2000-01-19 20:38:14.000000000 -0800
-+++ cmn/physical.cpp	2003-11-22 11:29:34.000000000 -0800
+--- cmn/physical.cpp.orig	2000-01-19 20:38:14.000000000 -0500
++++ cmn/physical.cpp	2008-08-17 19:15:00.000000000 -0400
 @@ -33,10 +33,11 @@
  // Include Files
  #include "xdata.h"
@@ -16,3 +16,12 @@ $NetBSD: patch-ak,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #endif
  #if WIN32
  #include <strstrea.h>
+@@ -1844,7 +1845,7 @@ void* Moving::compute_key(Dir dir,int an
+   }
+ 
+   // Use the pixmap resource id as the base.
+-  u_int cmnBitsId = (unsigned int)mc->pixmapBits[baseDir][animNum];
++  u_int cmnBitsId = (unsigned int)(uintptr_t)mc->pixmapBits[baseDir][animNum];
+ 
+   // It is ok to call OneTransform::compute_key() even if there is no 
+   // transformation, will just return 0x0.  
diff --git a/games/xevil/patches/patch-ao b/games/xevil/patches/patch-ao
index 472076fb8ac..d56f53cc8e6 100644
--- a/games/xevil/patches/patch-ao
+++ b/games/xevil/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ao,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- cmn/game_style.cpp.orig	2003-11-27 15:21:04.000000000 -0800
-+++ cmn/game_style.cpp	2003-11-27 15:21:34.000000000 -0800
+--- cmn/game_style.cpp.orig	2003-03-22 20:47:42.000000000 -0500
++++ cmn/game_style.cpp	2008-08-17 19:16:52.000000000 -0400
 @@ -29,12 +29,11 @@
  
  // Include Files
@@ -18,3 +18,12 @@ $NetBSD: patch-ao,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  #endif
  
  #if WIN32
+@@ -2680,7 +2679,7 @@ int ZigZag::new_level_check(int,WorldP w
+     HumanP human = locator->get_human(n);
+     if (human) {
+       // previous depth
+-      int depthOld = (int)human->get_data();
++      int depthOld = (int)(intptr_t)human->get_data();
+       Id id = human->get_id();
+ 
+       // Get physical for intelligence
diff --git a/games/xevil/patches/patch-ar b/games/xevil/patches/patch-ar
index 5111d30c73e..05e2cf4f663 100644
--- a/games/xevil/patches/patch-ar
+++ b/games/xevil/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-ar,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- x11/viewport.cpp.orig	2003-11-27 15:28:43.000000000 -0800
-+++ x11/viewport.cpp	2003-11-27 15:28:54.000000000 -0800
-@@ -44,7 +44,8 @@
+--- x11/viewport.cpp.orig	2000-01-19 12:54:14.000000000 -0500
++++ x11/viewport.cpp	2008-08-17 19:18:13.000000000 -0400
+@@ -44,7 +44,8 @@ extern "C" {
  #include <X11/Xos.h>
  #include <X11/keysym.h>
  }
@@ -12,3 +12,12 @@ $NetBSD: patch-ar,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  
  
  #define TICK_BORDER_WIDTH 5 // border width big enough for a tick mark.
+@@ -1632,7 +1633,7 @@ void Viewport::panel_callback(Panel* pan
+   // Would be much better to put the radio-button logic in the Panel classes.
+   if (pClosure->radio) {
+     // SGI compiler says you can't cast void* to Boolean.
+-    Boolean bValue = (Boolean)(int)value;
++    Boolean bValue = (Boolean)(intptr_t)value;
+     if (!bValue) {
+       ((TogglePanel*)panel)->set_value(True);
+     }
diff --git a/games/xevil/patches/patch-as b/games/xevil/patches/patch-as
index 120e40d8647..232d8ed3bf3 100644
--- a/games/xevil/patches/patch-as
+++ b/games/xevil/patches/patch-as
@@ -1,8 +1,8 @@
-$NetBSD: patch-as,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
+$NetBSD: patch-as,v 1.2 2008/08/17 23:50:06 dholland Exp $
 
---- x11/ui.cpp.orig	2003-11-27 15:30:46.000000000 -0800
-+++ x11/ui.cpp	2003-11-27 15:30:57.000000000 -0800
-@@ -41,7 +41,8 @@
+--- x11/ui.cpp.orig	2003-03-19 10:05:38.000000000 -0500
++++ x11/ui.cpp	2008-08-17 19:20:26.000000000 -0400
+@@ -41,7 +41,8 @@ extern "C" {
  }
  
  #include <iostream.h>
@@ -12,3 +12,120 @@ $NetBSD: patch-as,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
  
  #include "coord.h"
  #include "area.h"
+@@ -930,7 +931,7 @@ void Ui::menu_enemies_refill_CB(void* va
+   UiP ui = (UiP)closure;
+   ui->settingsChanges |= UIenemiesRefill;
+   // SGI compiler says you can't cast void* to Boolean.
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   ui->settings.enemiesRefill = val;
+ }
+ 
+@@ -939,7 +940,7 @@ void Ui::menu_enemies_refill_CB(void* va
+ void Ui::menu_controls_CB(void* value,Viewport* vPort,void* closure) {
+   UiP ui = (UiP)closure;
+   int dpyNum = vPort->get_dpy_num();
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.controls[dpyNum]);
+   }
+@@ -955,7 +956,7 @@ void Ui::menu_learn_controls_CB(void* va
+                                 Viewport* vPort,void* closure) {
+   UiP ui = (UiP)closure;
+   int dpyNum = vPort->get_dpy_num();
+-  Boolean active = (Boolean)(int)value;
++  Boolean active = (Boolean)(intptr_t)value;
+ 
+   if (active) {
+     ui->lControls[dpyNum].input = ui->lControls[dpyNum].key = 
+@@ -994,7 +995,7 @@ void Ui::menu_learn_controls_CB(void* va
+ 
+ void Ui::menu_scenarios_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = SCENARIOS;
+@@ -1005,7 +1006,7 @@ void Ui::menu_scenarios_CB(void* value,V
+ 
+ void Ui::menu_levels_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = LEVELS;
+@@ -1016,7 +1017,7 @@ void Ui::menu_levels_CB(void* value,View
+ 
+ void Ui::menu_kill_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = KILL;
+@@ -1027,7 +1028,7 @@ void Ui::menu_kill_CB(void* value,Viewpo
+ 
+ void Ui::menu_duel_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = DUEL;
+@@ -1038,7 +1039,7 @@ void Ui::menu_duel_CB(void* value,Viewpo
+ 
+ void Ui::menu_extended_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = EXTENDED;
+@@ -1049,7 +1050,7 @@ void Ui::menu_extended_CB(void* value,Vi
+ 
+ void Ui::menu_training_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   if (val) {
+     ui->settingsChanges |= UIstyle;
+     ui->settings.style = TRAINING;
+@@ -1070,7 +1071,7 @@ void Ui::menu_quanta_CB(void* value,View
+ void Ui::menu_cooperative_CB(void* value,Viewport*,void* closure) {
+   UiP ui = (UiP)closure;
+   ui->settingsChanges |= UIcooperative;
+-  Boolean val = (Boolean)(int)value;
++  Boolean val = (Boolean)(intptr_t)value;
+   ui->settings.cooperative = val;
+ }
+ 
+@@ -1079,7 +1080,7 @@ void Ui::menu_cooperative_CB(void* value
+ void Ui::menu_help_CB(void* value,Viewport* vPort,void* closure) {
+   UiP ui = (UiP)closure;
+   int dpyNum = vPort->get_dpy_num();
+-  Boolean active = (Boolean)(int)value;
++  Boolean active = (Boolean)(intptr_t)value;
+ 
+   if (active) {
+     XMapWindow(ui->xvars.dpy[dpyNum],ui->xdata.help[dpyNum]);
+@@ -1094,7 +1095,7 @@ void Ui::menu_help_CB(void* value,Viewpo
+ void Ui::status_weapon_CB(void* value,Viewport* vPort,void*) {
+   // Some mouse controls.
+   //  UiP ui = (UiP)closure;
+-  int button = (int)value;
++  int button = (int)(intptr_t)value;
+ 
+   switch (button) {
+   case Button1:
+@@ -1113,7 +1114,7 @@ void Ui::status_weapon_CB(void* value,Vi
+ 
+ void Ui::status_item_CB(void* value,Viewport* vPort,void*) {
+   //  UiP ui = (UiP)closure;
+-  int button = (int)value;
++  int button = (int)(intptr_t)value;
+ 
+   switch (button) {
+   case Button1:
diff --git a/games/xevil/patches/patch-au b/games/xevil/patches/patch-au
new file mode 100644
index 00000000000..f709316702d
--- /dev/null
+++ b/games/xevil/patches/patch-au
@@ -0,0 +1,15 @@
+$NetBSD: patch-au,v 1.1 2008/08/17 23:50:06 dholland Exp $
+
+--- cmn/utils.h~	2003-03-19 10:03:50.000000000 -0500
++++ cmn/utils.h	2008-08-17 19:21:44.000000000 -0400
+@@ -376,8 +376,10 @@ public:
+   int get_write_length() const {return get_write_length(len);}
+   /* EFFECTS: write_length of this list */
+ 
++#if 0 /* unused and broken */
+   void write(OutStreamP) const;
+   /* EFFECTS: Write to stream. */  
++#endif
+   
+ 
+   void add(void *);