pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/games/xevil Fix broken build on amd64. Also combine tw...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8bf1c2c4f128
branches: trunk
changeset: 545971:8bf1c2c4f128
user: dholland <dholland%pkgsrc.org@localhost>
date: Sun Aug 17 23:50:06 2008 +0000
description:
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++.
diffstat:
games/xevil/Makefile | 5 +-
games/xevil/distinfo | 18 +++---
games/xevil/patches/patch-ab | 17 -----
games/xevil/patches/patch-ag | 38 +++++++++++-
games/xevil/patches/patch-ah | 15 ++++-
games/xevil/patches/patch-ai | 15 ++++-
games/xevil/patches/patch-ak | 15 ++++-
games/xevil/patches/patch-ao | 15 ++++-
games/xevil/patches/patch-ar | 17 ++++-
games/xevil/patches/patch-as | 125 +++++++++++++++++++++++++++++++++++++++++-
games/xevil/patches/patch-au | 15 +++++
11 files changed, 243 insertions(+), 52 deletions(-)
diffs (truncated from 434 to 300 lines):
diff -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/Makefile
--- a/games/xevil/Makefile Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/Makefile Sun Aug 17 23:50:06 2008 +0000
@@ -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_SED.uname= -e 's,@UNAME@,${UNAME},g'
.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/distinfo
--- a/games/xevil/distinfo Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/distinfo Sun Aug 17 23:50:06 2008 +0000
@@ -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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ab
--- a/games/xevil/patches/patch-ab Sun Aug 17 23:05:06 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ag
--- a/games/xevil/patches/patch-ag Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ag Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 @@
/* 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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ah
--- a/games/xevil/patches/patch-ah Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ah Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ai
--- a/games/xevil/patches/patch-ai Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ai Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ak
--- a/games/xevil/patches/patch-ak Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ak Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ao
--- a/games/xevil/patches/patch-ao Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ao Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-ar
--- a/games/xevil/patches/patch-ar Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-ar Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#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 -r 46ef15e46b53 -r 8bf1c2c4f128 games/xevil/patches/patch-as
--- a/games/xevil/patches/patch-as Sun Aug 17 23:05:06 2008 +0000
+++ b/games/xevil/patches/patch-as Sun Aug 17 23:50:06 2008 +0000
@@ -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 @@
#include "coord.h"
#include "area.h"
+@@ -930,7 +931,7 @@ void Ui::menu_enemies_refill_CB(void* va
+ UiP ui = (UiP)closure;
Home |
Main Index |
Thread Index |
Old Index