Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2013Q2

Browse Source
This commit is contained in:
sambuc
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games/xevil/DESCR
+6
View File
@@ -0,0 +1,6 @@
XEvil is a 3rd person, side-view, fast-action, kill-them-before-they-kill-you
game. Fight against either computer-controlled enemies, or another player.
You sinned in life. And now you must pay. Satan pits the recently deceased
against each other to fight for rank in Hell. Your skill determines your fate
for all eternity. This contest is known as XEvil.
games/xevil/Makefile
+39
View File
@@ -0,0 +1,39 @@
# $NetBSD: Makefile,v 1.22 2012/10/06 11:55:00 asau Exp $
DISTNAME= xevilsrc2.02r2
PKGNAME= xevil-2.02
PKGREVISION= 2
CATEGORIES= games x11
MASTER_SITES= http://www.xevil.com/download/stable/
EXTRACT_SUFX= .zip
MAINTAINER= snj@pobox.com
HOMEPAGE= http://www.xevil.com/
COMMENT= Side scrolling, bloody action game
MAKE_JOBS_SAFE= no
MAKE_FILE= makefile
BUILD_TARGET= pkgsrc
WRKSRC= ${WRKDIR}
MAKE_ENV+= HOSTTYPE="pkgsrc"
USE_LANGUAGES= c++
INSTALLATION_DIRS= bin
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/x11/PKGSRC/xevil ${DESTDIR}${PREFIX}/bin/xevil
${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/xevil
${INSTALL_DATA} ${WRKSRC}/instructions/* ${DESTDIR}${PREFIX}/share/doc/xevil
SUBST_CLASSES+= uname
SUBST_STAGE.uname= pre-configure
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"
games/xevil/PLIST
+8
View File
@@ -0,0 +1,8 @@
@comment $NetBSD: PLIST,v 1.3 2009/06/14 17:56:59 joerg Exp $
bin/xevil
share/doc/xevil/UNIXSetControls.gif
share/doc/xevil/UNIXShowControls.gif
share/doc/xevil/UNIXmenu.gif
share/doc/xevil/instructions.html
share/doc/xevil/keysdlg.gif
share/doc/xevil/optionsdlg.gif
games/xevil/distinfo
+30
View File
@@ -0,0 +1,30 @@
$NetBSD: distinfo,v 1.9 2012/10/26 20:21:33 joerg Exp $
SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
Size (xevilsrc2.02r2.zip) = 1857315 bytes
SHA1 (patch-aa) = 7421021c8b5f486a031959db9ac3e7a1197f7763
SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35
SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0
SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749
SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2
SHA1 (patch-ah) = b78acf6e01bd555024eb1a6a5d80ab8c393de4c5
SHA1 (patch-ai) = 8579f4f6594ff2d01c35c2becc7cf395a5195550
SHA1 (patch-aj) = 78214c3bf9d643f9f8ade8c24944eea6b976ea6c
SHA1 (patch-ak) = a83854de16104e124213e3990597555c21533411
SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
SHA1 (patch-ao) = 85f4b0f2238ea1cbfe3ed16a9cd58ed2c64a0da1
SHA1 (patch-ap) = 7fb4d991f629ee5f36718a047ce4667c563fd95b
SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983
SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903
SHA1 (patch-as) = 4c4e4ef0e626b8f04a120c996ec155cacf0c0ddf
SHA1 (patch-at) = 6344907d83f7e6ee426e60970de88a0dc1686f48
SHA1 (patch-au) = f1092ff4228d4bb6f13e6aeb0ea70a5b4b9635b6
SHA1 (patch-cmn_game.h) = 47db702d729158290118cf75a0c437362f9af1c3
SHA1 (patch-cmn_streams.cpp) = bb32e15807cc5ff2289df2e1dc1c1661c8949ad4
SHA1 (patch-cmn_world.cpp) = 7bae7dfe426bf7dcf06906d62cd60c50efe98d4f
SHA1 (patch-x11_main.cpp) = 425c3be3de05666293e47ce37ec9ff255c456c25
SHA1 (patch-x11_xdata.cpp) = 0942dda395ca3bf1038a900e985a27b3e655d484
games/xevil/patches/patch-aa
+29
View File
@@ -0,0 +1,29 @@
$NetBSD: patch-aa,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
--- config.mk.orig 2003-03-23 00:08:58.000000000 +0000
+++ config.mk 2003-08-16 11:05:41.000000000 +0000
@@ -36,7 +36,7 @@
# internally, so you do so at your own risk.
DEBUG_OPT = -O #-DNDEBUG
-LINK_OPT =
+LINK_OPT = $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
# The string that will be used for making the packaged .tar.Z file.
VERSION = 2.02r2
@@ -160,11 +160,11 @@
# The -DMSEC_PER_CLOCK=8 is kind of a hack, take it out if the game speed of
# XEvil is all screwed up.
-freebsd:
+pkgsrc:
@$(MAKE) CC="c++" \
-CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DMSEC_PER_CLOCK=8 -DUNAME_USR_BIN" \
-INCL_DIRS="-I/usr/X11R6/include" LIBS_DIRS="-L/usr/X11R6/lib" \
-OBJ_DIR=$(DEPTH)/x11/FREEBSD PCKG_NAME="freebsd" \
+CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC -DUSE_UINT_NET_LENGTH ${CFLAGS}" \
+INCL_DIRS="-I$(X11BASE)/include" LIBS_DIRS="-L$(X11BASE)/lib" \
+OBJ_DIR=$(DEPTH)/x11/PKGSRC PCKG_NAME="pkgsrc" \
LIBS="-lXpm -lX11 -lm" $(TARGETS)
games/xevil/patches/patch-ac
+16
View File
@@ -0,0 +1,16 @@
$NetBSD: patch-ac,v 1.4 2005/01/25 16:02:26 xtraeme Exp $
--- makefile.orig 2003-03-23 00:09:08.000000000 +0000
+++ makefile 2003-08-16 11:20:02.000000000 +0000
@@ -63,11 +63,6 @@
# Could also include serverping in the distribution
$(OBJ_DIR)/xevil$(VERSION).$(PCKG_NAME).tar.Z::
- cp readme.txt $(OBJ_DIR)
- cp gpl.txt $(OBJ_DIR)
- cp -r instructions $(OBJ_DIR)
- (cd $(OBJ_DIR); tar cf xevil$(VERSION).$(PCKG_NAME).tar xevil readme.txt gpl.txt instructions)
- (cd $(OBJ_DIR); $(COMPRESS) -f xevil$(VERSION).$(PCKG_NAME).tar)
## Make a distribution file.
#dist:
games/xevil/patches/patch-ad
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-ad,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
--- cmn/area.cpp.orig 2003-11-22 10:53:19.000000000 -0800
+++ cmn/area.cpp 2003-11-22 10:53:47.000000000 -0800
@@ -34,7 +34,8 @@
extern "C" {
#include <limits.h> // For INT_MAX
}
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include "utils.h"
#include "coord.h"
#include "area.h"
games/xevil/patches/patch-ae
+17
View File
@@ -0,0 +1,17 @@
$NetBSD: patch-ae,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
--- cmn/role.cpp.orig 2000-01-19 12:54:34.000000000 -0800
+++ cmn/role.cpp 2003-11-22 10:55:47.000000000 -0800
@@ -29,9 +29,10 @@
#include "stdafx.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#if X11
-#include <strstream.h>
+#include <strstream>
#include <time.h>
#endif
#if WIN32
games/xevil/patches/patch-af
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-af,v 1.2 2005/01/25 16:02:26 xtraeme Exp $
--- cmn/game_style.h.orig 2003-11-22 10:56:44.000000000 -0800
+++ cmn/game_style.h 2003-11-22 10:56:59.000000000 -0800
@@ -31,7 +31,8 @@
#endif
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#endif
#if WIN32
#include <strstrea.h>
games/xevil/patches/patch-ag
+79
View File
@@ -0,0 +1,79 @@
$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
@@ -30,18 +30,20 @@
// Include Files
#include "stdafx.h"
-#include <iostream.h>
-#include <limits.h>
-#include <string.h>
-#include <ctype.h>
-#include <fstream.h>
+#include <iostream>
+#include <climits>
+#include <cstring>
+#include <cctype>
+#include <fstream>
#if WIN32
#include <strstrea.h>
#endif
#if X11
-#include <strstream.h>
+#include <strstream>
#endif
+using namespace std;
+
#ifdef WIN32
// For file manipulation routines.
#include <direct.h>
@@ -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");
@@ -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:
private:
- Bucket* HashTable::_get(int &index,void* key);
+ Bucket* _get(int &index,void* key);
/* 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;
}
games/xevil/patches/patch-ah
+23
View File
@@ -0,0 +1,23 @@
$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 -0500
+++ cmn/actual.cpp 2008-08-17 19:09:43.000000000 -0400
@@ -32,7 +32,8 @@
// Include Files
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#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;
}
games/xevil/patches/patch-ai
+26
View File
@@ -0,0 +1,26 @@
$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 -0500
+++ cmn/xetp.cpp 2008-08-17 19:12:24.000000000 -0400
@@ -29,9 +29,10 @@
#include "stdafx.h"
-#include <iostream.h>
+#include <iostream>
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#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));
}
games/xevil/patches/patch-aj
+21
View File
@@ -0,0 +1,21 @@
$NetBSD: patch-aj,v 1.2 2011/11/27 19:43:33 joerg Exp $
--- cmn/game.cpp.orig 2003-03-22 22:20:00.000000000 +0000
+++ cmn/game.cpp
@@ -34,13 +34,14 @@ extern "C" {
}
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#endif
#if WIN32
#include <strstrea.h>
#endif
-#include <iomanip.h>
+#include <iomanip>
#include "utils.h"
#include "coord.h"
games/xevil/patches/patch-ak
+28
View File
@@ -0,0 +1,28 @@
$NetBSD: patch-ak,v 1.3 2011/11/27 19:43:33 joerg Exp $
--- cmn/physical.cpp.orig 2000-01-19 20:38:14.000000000 +0000
+++ cmn/physical.cpp
@@ -33,10 +33,12 @@
// Include Files
#include "xdata.h"
#include "physical.h"
-#include <iostream.h>
+#include <inttypes.h>
+#include <iostream>
+using namespace std;
#if X11
-#include <strstream.h>
+#include <strstream>
#endif
#if WIN32
#include <strstrea.h>
@@ -1844,7 +1846,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.
games/xevil/patches/patch-al
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: patch-al,v 1.2 2007/11/07 14:00:54 rillig Exp $
--- cmn/locator.h.orig 2003-03-22 20:35:30.000000000 +0100
+++ cmn/locator.h 2007-11-07 14:57:37.000000000 +0100
@@ -47,7 +47,8 @@ the world. */
// Include Files
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include "utils.h"
#include "coord.h"
@@ -96,6 +97,10 @@ class SoundRequest;
#define OL_RECENT_SOUNDS_MAX 30
+class OLgridEntry;
+#if X11
+class OLshadowEntry;
+#endif
// An entry for one object in the list of all objects currently in the game.
class OLentry {
games/xevil/patches/patch-am
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-am,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
--- cmn/physical.h.orig 2003-11-22 11:34:53.000000000 -0800
+++ cmn/physical.h 2003-11-22 11:35:29.000000000 -0800
@@ -93,7 +93,7 @@
CLASSNAME::CLASSNAME(InStreamP in,const CLASSNAME ## Context &cx, \
CLASSNAME ## Xdata &x_data, \
WorldP w,LocatorP l) \
- : PARENT(in,cx. ## parent ## Context,x_data,w,l)
+ : PARENT(in,cx. parent ## Context,x_data,w,l)
// Used by internal nodes and leaves.
#define DEFINE_UPDATE_FROM_STREAM(CLASSNAME,PARENT) \
games/xevil/patches/patch-an
+19
View File
@@ -0,0 +1,19 @@
$NetBSD: patch-an,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
--- cmn/intel.cpp.orig 2003-11-27 15:17:02.000000000 -0800
+++ cmn/intel.cpp 2003-11-27 15:18:12.000000000 -0800
@@ -31,11 +31,10 @@
// Include Files
#include "stdafx.h"
-extern "C" {
- #include <string.h>
-}
+#include <cstring>
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#endif
#if WIN32
#include <strstrea.h>
games/xevil/patches/patch-ao
+37
View File
@@ -0,0 +1,37 @@
$NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $
--- cmn/game_style.cpp.orig 2003-03-22 20:47:42.000000000 +0000
+++ cmn/game_style.cpp
@@ -29,19 +29,18 @@
// Include Files
#include "stdafx.h"
-extern "C" {
-#include <string.h>
-}
+#include <cstring>
#if X11
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#endif
#if WIN32
#include <strstrea.h>
#endif
-#include <iomanip.h>
+#include <iomanip>
#include "utils.h"
#include "coord.h"
#include "world.h"
@@ -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
games/xevil/patches/patch-ap
+16
View File
@@ -0,0 +1,16 @@
$NetBSD: patch-ap,v 1.2 2011/11/27 19:43:33 joerg Exp $
--- x11/panel.cpp.orig 2003-03-22 20:50:44.000000000 +0000
+++ x11/panel.cpp
@@ -31,8 +31,9 @@ extern "C" {
#include <X11/Xutil.h>
#include <X11/keysym.h>
}
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
+using namespace std;
#include "utils.h"
#include "xdata.h"
games/xevil/patches/patch-aq
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-aq,v 1.1.1.1 2005/01/25 15:59:27 xtraeme Exp $
--- x11/l_agreement_dlg.cpp.orig 2003-11-27 15:25:24.000000000 -0800
+++ x11/l_agreement_dlg.cpp 2003-11-27 15:25:39.000000000 -0800
@@ -31,7 +31,8 @@
#include <X11/Xatom.h>
}
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#include "xdata.h"
#include "panel.h"
games/xevil/patches/patch-ar
+23
View File
@@ -0,0 +1,23 @@
$NetBSD: patch-ar,v 1.2 2008/08/17 23:50:06 dholland Exp $
--- 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>
}
-#include <strstream.h>
+#include <strstream>
+using namespace std;
#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);
}
games/xevil/patches/patch-as
+133
View File
@@ -0,0 +1,133 @@
$NetBSD: patch-as,v 1.3 2011/11/27 19:43:33 joerg Exp $
--- x11/ui.cpp.orig 2003-03-19 10:05:38.000000000 +0000
+++ x11/ui.cpp
@@ -40,8 +40,9 @@ extern "C" {
#include <X11/Xatom.h>
}
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
+using namespace std;
#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:
games/xevil/patches/patch-at
+25
View File
@@ -0,0 +1,25 @@
$NetBSD: patch-at,v 1.3 2012/10/26 20:21:33 joerg Exp $
--- x11/serverping.cpp.orig 2003-03-22 21:55:12.000000000 +0000
+++ x11/serverping.cpp
@@ -25,8 +25,9 @@
// code and should be reasonably easy to compile on Windows.
-#include <iostream.h>
-#include <strstream.h>
+#include <iostream>
+#include <strstream>
+using namespace std;
#include "utils.h"
#include "streams.h"
#include "xetp_basic.h"
@@ -355,7 +356,7 @@ void ServerPing::print_results_and_exit(
-main(int argc,char** argv) {
+int main(int argc,char** argv) {
ServerPing ping(argc,argv);
ping.go();
}
games/xevil/patches/patch-au
+15
View File
@@ -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 *);
games/xevil/patches/patch-cmn_game.h
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-cmn_game.h,v 1.1 2011/11/27 19:43:33 joerg Exp $
--- cmn/game.h.orig 2011-11-27 02:22:18.000000000 +0000
+++ cmn/game.h
@@ -35,7 +35,7 @@
extern "C" {
#include <time.h>
}
-#include <iostream.h>
+#include <iostream>
#include "utils.h"
#include "ui.h"
#include "world.h"
games/xevil/patches/patch-cmn_streams.cpp
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-cmn_streams.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
--- cmn/streams.cpp.orig 2011-11-27 02:22:01.000000000 +0000
+++ cmn/streams.cpp
@@ -31,7 +31,7 @@
#include "utils.h"
#include "neth.h" // needed for recv, send, recvfrom, sendto
-#include <iostream.h>
+#include <iostream>
#include "streams.h"
#include "xetp.h" // yuck, need this for XETP::versionStr
games/xevil/patches/patch-cmn_world.cpp
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-cmn_world.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
--- cmn/world.cpp.orig 2011-11-27 02:22:11.000000000 +0000
+++ cmn/world.cpp
@@ -35,7 +35,7 @@
#endif
// Include Files.
-#include <iostream.h>
+#include <iostream>
#include "utils.h"
#include "coord.h"
games/xevil/patches/patch-x11_main.cpp
+13
View File
@@ -0,0 +1,13 @@
$NetBSD: patch-x11_main.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
--- x11/main.cpp.orig 2011-11-27 02:21:41.000000000 +0000
+++ x11/main.cpp
@@ -33,7 +33,7 @@ extern "C" {
#include <X11/Xos.h>
}
-#include <iostream.h>
+#include <iostream>
#include "utils.h"
#include "neth.h"
games/xevil/patches/patch-x11_xdata.cpp
+14
View File
@@ -0,0 +1,14 @@
$NetBSD: patch-x11_xdata.cpp,v 1.1 2011/11/27 19:43:33 joerg Exp $
--- x11/xdata.cpp.orig 2011-11-27 02:24:33.000000000 +0000
+++ x11/xdata.cpp
@@ -30,7 +30,8 @@
#include "xdata.h"
#include "area.h"
-#include <iostream.h>
+#include <iostream>
+using namespace std;
#include <X11/Xutil.h>
#include <X11/xpm.h>
#include <X11/Xatom.h>