xshipwars is gone

9 files changed, 0 insertions, 1278 deletions

diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog
deleted file mode 100644
index e926cdab06b0..000000000000
--- a/games-action/xshipwars/ChangeLog
+++ /dev/null
@@ -1,123 +0,0 @@
-# ChangeLog for games-action/xshipwars
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.27 2010/10/09 06:55:29 tove Exp $
-
-  08 Oct 2010; Tupone Alfredo <tupone@gentoo.org> xshipwars-2.6.1.ebuild,
-  +files/xshipwars-2.6.1-ldflags.patch:
-  Respect LDFLAGS. Bug #336822 by flameeyes@gentoo.org
-
-*xshipwars-2.6.1 (31 Dec 2009)
-
-  31 Dec 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  +xshipwars-2.6.1.ebuild, +files/xshipwars-2.6.1-64bit.patch,
-  +files/xshipwars-2.6.1-build.patch:
-  version bump (bug #292052)
-
-  06 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  xshipwars-2.5.5.ebuild:
-  EAPI=2; update HOMEPAGE
-
-  04 Nov 2009; Michael Sterrett <mr_bones_@gentoo.org>
-  xshipwars-2.5.5.ebuild:
-  esd is deprecated
-
-  30 Nov 2008; Tupone Alfredo <tupone@gentoo.org>
-  -files/xshipwars-2.5.5-64bit.patch, xshipwars-2.5.5.ebuild:
-  Big file in FILESDIR. Bug #248973 by <flameeyes@gentoo.org>
-
-  07 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  xshipwars-2.5.5.ebuild:
-  QA cleanup: Fix quoting.
-
-  06 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  xshipwars-2.5.5.ebuild:
-  Shorten DESCRIPTION by removing extraneous text.
-
-  06 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
-  -files/xshipwars-1.34.0-gcc3.patch, -files/xshipwars-1.34.0-gcc33.patch,
-  -xshipwars-1.34.0.ebuild, xshipwars-2.5.5.ebuild:
-  Stable on ppc/x86 and removing older versions.
-
-  06 Jul 2007; Tupone Alfredo <tupone@gentoo.org>
-  files/xshipwars-2.5.5-build.patch, xshipwars-2.5.5.ebuild:
-  Fix bad data path: bug #184363 by Ken Rushia
-
-  31 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-  +files/xshipwars-2.5.5-64bit.patch, xshipwars-2.5.5.ebuild:
-  Added patch from OKUMURA N. Shin-ya <oku.ns@dream.com> for 64-bit
-  compatibility and closing bug #147037.
-
-  01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  xshipwars-1.34.0.ebuild, xshipwars-2.5.5.ebuild:
-  Removing old virtual/x11 dependency.
-
-  07 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  -xshipwars-2.4.7.ebuild, -xshipwars-2.5.4.ebuild:
-  Removed older versions.
-
-*xshipwars-2.5.5 (08 Sep 2006)
-
-  08 Sep 2006; <tupone@gentoo.org> +files/xshipwars-2.5.5-build.patch,
-  +xshipwars-2.5.5.ebuild:
-  Version bump to 2.5.5. Bug #132884 by Toffanin [WiredTEK]
-
-  27 Apr 2006; Marien Zwart <marienz@gentoo.org>
-  files/digest-xshipwars-1.34.0, files/digest-xshipwars-2.4.7, Manifest:
-  Fixing SHA256 digest, pass four
-
-*xshipwars-2.5.4 (22 Mar 2006)
-
-  22 Mar 2006; <Tupone@gentoo.org> +files/xshipwars-2.5.4-build.patch,
-  +xshipwars-2.5.4.ebuild:
-  Version bump, bug #125277 by Toffanin [WiredTEK]
-
-  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
-  xshipwars-1.34.0.ebuild, xshipwars-2.4.7.ebuild:
-  Add modular X dependencies.
-
-*xshipwars-2.4.7 (08 Nov 2005)
-
-  08 Nov 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/xshipwars-2.4.7-64bit-warnings.patch,
-  +files/xshipwars-2.4.7-build.patch, +xshipwars-2.4.7.ebuild:
-  Version bump.
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
-  xshipwars-1.34.0.ebuild:
-  Stable on ppc.
-
-  03 May 2005; David Holm <dholm@gentoo.org> xshipwars-1.34.0.ebuild:
-  Added to ~ppc.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  02 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  xshipwars-1.34.0.ebuild:
-  die backticks
-
-  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  xshipwars-1.34.0.ebuild:
-  IUSE; virtual/x11
-
-  22 Feb 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  xshipwars-1.34.0.ebuild:
-  more instructions for post-install (bug #42383)
-
-*xshipwars-1.34.0 (01 Feb 2002)
-
-  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Added CFLAGS fix #11406.
-
-  01 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
-  Added a patch for #9093, added games eclass support, added server install
-
-  17 jul 2002; Jose Alberto Suárez López <bass@gentoo.org> xshipwars-1.34.0.ebuild :
-  Added KEYWORDS.
-
-  01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/games-action/xshipwars/Manifest b/games-action/xshipwars/Manifest
deleted file mode 100644
index 70820482ba68..000000000000
--- a/games-action/xshipwars/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
-AUX xshipwars-2.5.5-build.patch 2762 RMD160 9bd78b0a69632d7e9ef9eced56e27e1fc8c92ec8 SHA1 6ea95ee9b42cc093a1f4b6615dd77eb1291dcea7 SHA256 d674f734a836ba67ea1b7a5ba56020382a348c2d57cf6d620bda727b1d427ce3
-AUX xshipwars-2.6.1-64bit.patch 22830 RMD160 676f4f6cc19f94b825d855d60a197b8f05ba3554 SHA1 23c12899a28814a60e00984653ef73d466f801d3 SHA256 4f79bfe50f5ab627e932bd753f021ebe331635a33c44e93f594f43944171333b
-AUX xshipwars-2.6.1-build.patch 2762 RMD160 9bd78b0a69632d7e9ef9eced56e27e1fc8c92ec8 SHA1 6ea95ee9b42cc093a1f4b6615dd77eb1291dcea7 SHA256 d674f734a836ba67ea1b7a5ba56020382a348c2d57cf6d620bda727b1d427ce3
-AUX xshipwars-2.6.1-ldflags.patch 2991 RMD160 a1d327c0cbaab1f1a3b55c98f1c689f6ac08b1ed SHA1 4773eaa87837d5c9504ff29516ae65b13d90eae2 SHA256 c3e1fb6daf370a1c74e61fc0532268ff7a00d31620f9e7913428611c44fbb2ea
-DIST stimages-1.11.1.tar.bz2 9707377 RMD160 79130ccaeb3458576d04b15fb82e81776cb0ab93 SHA1 a104bfec0ca56b57d130036c5f223fc4be679977 SHA256 deb34a3e0c7cfd16a1be105039f80a31d1bfd4fc9ed01d43d04e9f5ecd4c4e50
-DIST stsounds-1.6.4.tar.bz2 853101 RMD160 1ab068596d52d9b3a21ad29da0e648cd1b74e3f9 SHA1 34cd0700fd854bfd487d91fcdbafabd3a2bfef63 SHA256 e355ad53103a8094d0a12b5955ef0c70cd181ee740ee8d13e9edf7480594cff4
-DIST xshipwars-2.5.5-64bit.patch.gz 3623 RMD160 3fb05011d3bcb1f8522f32fe6d5d5909e0539042 SHA1 0c9009e5ca6c522fd37ca5033b4ac6ef794ea3ec SHA256 50805e10896b3dc76679eb995b08471d3d796501bc050ef5e9021b62b5abe88d
-DIST xsw-2.5.5.tar.bz2 1172378 RMD160 d5e7bda32658bcfeb600eec25c052cabc6f170d1 SHA1 5335fef8cc29ce7b934ca3be8f2ba0625a81a184 SHA256 293e62806eaf73ca272fbd9e74a302a18469b60ef15ea29c7dd574534a3dc47d
-DIST xsw-2.6.1.tar.bz2 1155612 RMD160 101dc721dde0d8b1cdb9814c3a18585879db8f25 SHA1 f223f64ba247f7d5ed687a873cf6dafd20fd1658 SHA256 121d8b9863f82df6b379359af09d28ef17ef37f849d774739235564a5b7ca794
-DIST xsw-data-2.5.5.tar.bz2 2638302 RMD160 914ca9feba23cacfde14aac621a0e70f2adb882b SHA1 b436615af4e14584dd1a8ed03663323af4c8a605 SHA256 7222e1c6fe67d59141484f4e327be3c56cf7422d14e0f029caa689145b37e35e
-DIST xsw-data-2.6.1.tar.bz2 2638283 RMD160 3e3c3581e8c14b8e5b2e0c905cdc1baf316e69d3 SHA1 c152d7bdc4da3c6e3ea5cfadc203f3d29dd95c1a SHA256 a290a78535861b11de544fa28b9309252362391d2c49fcc2d6590dfd413c64bc
-EBUILD xshipwars-2.5.5.ebuild 2748 RMD160 7dade403e20fa5435225d2b120f2d4e21edfee32 SHA1 6d485b8d4710db58b0216524f227f68dcf907a72 SHA256 09eec3f6819f83adfac44554aeabecfe10c4970c208a9e4f702dc2a1246323e1
-EBUILD xshipwars-2.6.1.ebuild 2657 RMD160 a51007ca9719bd4dbc2c684a603e3010a740abd2 SHA1 b914006e8f532bfa33968be7fdb7af16f1ec0bb1 SHA256 4c213c7c01d9d8b07702b76bda925974d0b15d82e4560e359870d1bed899781f
-MISC ChangeLog 4406 RMD160 5b5463018693a1ef3bcedf30f6b3b1a104c0bbfc SHA1 971191fc7cd218b9e326b6f35453d07b09eb2a77 SHA256 148dac2ddfe3d7a0ed38b94b0348e1532b4a650a7f13737db9ad990f8f02d42b
-MISC metadata.xml 244 RMD160 e30605cf095da3c9b5bf528cf0189d22a5f8ec48 SHA1 9a953d8c75da7e8883af2f24958761a711e3cf09 SHA256 1d86602725a3aa33f1c6cef1ae3ef8d7975f774de9af049753c773c63a5bde6f
diff --git a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch b/games-action/xshipwars/files/xshipwars-2.5.5-build.patch
deleted file mode 100644
index 60316cd34350..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.5.5-build.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- client/Makefile.install.UNIX
-+++ client/Makefile.install.UNIX
-@@ -11,9 +11,9 @@
- #
- 
- INSTALL      = install
--INSTBINFLAGS = -m 0755 -s
-+INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
--INSTLIBFLAGS = -m 0755 -s
-+INSTLIBFLAGS = -m 0755
- INSTINCFLAGS = -m 0644
- INSTMANFLAGS = -m 0644
- INSTCFGFLAGS = -m 0644
-@@ -26,8 +26,10 @@
- MKDIRFLAGS = -p
- 
- 
--GAMES_DIR   = $(PREFIX)/games
--XSW_DIR     = $(PREFIX)/share/games/xshipwars
-+BINDIR      = $(PREFIX)/games
-+GAMES_DIR   = $(DESTDIR)$(BINDIR)
-+DATADIR     = $(PREFIX)/share/games
-+XSW_DIR     = $(DESTDIR)$(DATADIR)/xshipwars
- XSW_ETC_DIR = $(XSW_DIR)/etc
- 
- XSW_CFG_FILE   = xsw.ini
---- monitor/Makefile.install.UNIX
-+++ monitor/Makefile.install.UNIX
-@@ -27,8 +27,10 @@
- MKDIR      = mkdir
- MKDIRFLAGS = -p
- 
--GAMES_DIR          = $(PREFIX)/games
--XSW_DIR            = $(PREFIX)/share/games/xshipwars
-+BINDIR             = $(PREFIX)/games
-+GAMES_DIR          = $(DESTDIR)$(BINDIR)
-+DATADIR            = $(PREFIX)/share/games
-+XSW_DIR            = $(DESTDIR)$(DATADIR)/xshipwars
- MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
- 
- HR = "-------------------------------------------------------------------------"
---- server/Makefile.install.UNIX
-+++ server/Makefile.install.UNIX
-@@ -29,7 +29,7 @@
- MKDIRFLAGS = -p
- 
- 
--SWSERV_BASE_DIR = $(PREFIX)/swserv
-+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
- 
- SWSERV_BIN_DIR  = $(SWSERV_BASE_DIR)/bin
- SWSERV_DB_DIR   = $(SWSERV_BASE_DIR)/db
---- unvedit/Makefile.install.UNIX
-+++ unvedit/Makefile.install.UNIX
-@@ -26,8 +26,10 @@
- MKDIR      = mkdir
- MKDIRFLAGS = -p
- 
--GAMES_BIN_DIR      = $(PREFIX)/games
--XSW_DATA_DIR       = $(PREFIX)/share/games/xshipwars
-+BINDIR             = $(PREFIX)/games
-+GAMES_BIN_DIR      = $(DESTDIR)$(BINDIR)
-+DATADIR            = $(PREFIX)/share/games
-+XSW_DATA_DIR       = $(DESTDIR)$(DATADIR)/xshipwars
- UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
- 
- HR = "-------------------------------------------------------------------------"
---- client/xsw.h.old	2007-07-06 08:02:07.000000000 +0200
-+++ client/xsw.h	2007-07-06 08:04:05.000000000 +0200
-@@ -135,10 +135,10 @@
- #define XSW_DEF_SW_SERVER_DIR		CWD_STR
- #else
- #define XSW_DEF_LOCAL_DATA_DIR		".shipwars"
--#define XSW_DEF_GLOBAL_DATA_DIR		PREFIX "/share/games/xshipwars"
--#define XSW_DEF_GLOBAL_IMAGES_DIR	PREFIX "/share/games/xshipwars/images"
--#define XSW_DEF_GLOBAL_SOUNDS_DIR	PREFIX "/share/games/xshipwars/sounds"
--#define XSW_DEF_GLOBAL_ETC_DIR		PREFIX "/share/games/xshipwars/etc"
-+#define XSW_DEF_GLOBAL_DATA_DIR		"@GENTOO_DATADIR@"
-+#define XSW_DEF_GLOBAL_IMAGES_DIR	"@GENTOO_DATADIR@/images"
-+#define XSW_DEF_GLOBAL_SOUNDS_DIR	"@GENTOO_DATADIR@/sounds"
-+#define XSW_DEF_GLOBAL_ETC_DIR		"@GENTOO_DATADIR@/etc"
- #define XSW_DEF_SW_SERVER_DIR		"/home/swserv"
- #endif
- 
diff --git a/games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch b/games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch
deleted file mode 100644
index 2a6d826fa5bc..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.6.1-64bit.patch
+++ /dev/null
@@ -1,668 +0,0 @@
-diff -ru xsw-2.6.1.orig/client/keymapwin.cpp xsw-2.6.1/client/keymapwin.cpp
---- xsw-2.6.1.orig/client/keymapwin.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/keymapwin.cpp	2009-12-30 21:30:58.651780783 -0500
-@@ -683,7 +683,7 @@
-  */
- static void KeymapWinDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	xsw_keymap_win_struct *kmw = XSW_KEYMAP_WIN(widget);
- 	if(kmw == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/sound.cpp xsw-2.6.1/client/sound.cpp
---- xsw-2.6.1.orig/client/sound.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/sound.cpp	2009-12-30 21:34:44.306792788 -0500
-@@ -90,7 +90,7 @@
- #ifdef ESD_H
- 	    /* Connect to the sound server */
- 	    snd->con_data = (void *)esd_open_sound(NULL);
--	    if((int)snd->con_data < 0)
-+	    if((int)(size_t)snd->con_data < 0)
- 	    {
- 		snd->con_data = NULL;
- 		return(-1);
-@@ -287,14 +287,14 @@
- 		"xsw:%s",
- 		path
- 	    );
--	    id = esd_sample_getid((int)snd->con_data, esd_sndobj_path);
-+	    id = esd_sample_getid((int)(size_t)snd->con_data, esd_sndobj_path);
- 	    free(esd_sndobj_path);
- 
- 	    if(id < 0)
- 	    {
- 		fprintf(stderr,"(CACHING NOW)\n");
- 		id = esd_file_cache(
--		    (int)snd->con_data,
-+		    (int)(size_t)snd->con_data,
- 		    "xsw",
- 		    path
- 		);
-@@ -309,11 +309,11 @@
- 	    if(id > -1)
- 	    {
- 		/* Stop the existing play (if any) */
--		esd_sample_stop((int)snd->con_data, id);
-+		esd_sample_stop((int)(size_t)snd->con_data, id);
- 
- 		/* Set the volume */
- 		if(esd_set_default_sample_pan(
--		    (int)snd->con_data,
-+		    (int)(size_t)snd->con_data,
- 		    id,
- 		    (int)(vol_left * ESD_VOLUME_BASE),
- 		    (int)(vol_right * ESD_VOLUME_BASE)
-@@ -322,7 +322,7 @@
- 		    fprintf(stderr, "esd_set_default_sample_pan() failed\n");
- 
- 		/* Start playing */
--		if(esd_sample_play((int)snd->con_data, id) < 0)
-+		if(esd_sample_play((int)(size_t)snd->con_data, id) < 0)
- 		{
- 		    fprintf(stderr, "esd_sample_play() failed\n");
- 		}
-@@ -378,7 +378,7 @@
- 
- 	  case SOUND_SERVER_TYPE_ESOUND:
- #ifdef ESD_H
--	    esd_sample_stop((int)snd->con_data, (int)playid);
-+	    esd_sample_stop((int)(size_t)snd->con_data, (int)playid);
- #endif	/* ESD_H */
- 	    break;
- 
-@@ -467,7 +467,7 @@
- 
- 	  case SOUND_SERVER_TYPE_ESOUND:
- #ifdef ESD_H
--	    id = esd_file_cache((int)snd->con_data, "xsw", path);
-+	    id = esd_file_cache((int)(size_t)snd->con_data, "xsw", path);
- 	    if(id < 0)
- 	    {
- 		fprintf(stderr, "esd_file_cache() failed\n");
-@@ -481,8 +481,8 @@
- 		// (int)snd->bg_music_playid = id;  // Dan S: forbidden in ansi c++. Cast rvalue not lvalue.
- 		snd->bg_music_playid = (void *)(&id);
- 		if(esd_sample_loop(
--		    (int)snd->con_data,
--		    (int)snd->bg_music_playid)
-+		    (int)(size_t)snd->con_data,
-+		    (int)(size_t)snd->bg_music_playid)
- 		   < 0
- 		)
- 		{
-@@ -540,14 +540,14 @@
- 	    if(snd->bg_music_playid != NULL)
- 	    {
- 		if(esd_sample_stop(
--		    (int)snd->con_data,
--		    (int)snd->bg_music_playid)
-+		    (int)(size_t)snd->con_data,
-+		    (int)(size_t)snd->bg_music_playid)
- 		    < 0
- 		)
- 		    fprintf(stderr, "esd_sample_stop() failed\n");
- 		if(esd_sample_free(
--		    (int)snd->con_data,
--		    (int)snd->bg_music_playid)
-+		    (int)(size_t)snd->con_data,
-+		    (int)(size_t)snd->bg_music_playid)
- 		    < 0
- 		)
- 		    fprintf(stderr, "esd_sample_stop() failed\n");
-@@ -688,7 +688,7 @@
- 	    if(snd->con_data != NULL)
- 	    {
- 		SoundStopBackgroundMusic(snd);
--		esd_close((int)snd->con_data);
-+		esd_close((int)(size_t)snd->con_data);
- 		snd->con_data = NULL;
- 	    }
- #endif  /* ESD_H */
-diff -ru xsw-2.6.1.orig/client/vsmenuwin.cpp xsw-2.6.1/client/vsmenuwin.cpp
---- xsw-2.6.1.orig/client/vsmenuwin.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/vsmenuwin.cpp	2009-12-30 21:35:47.549785477 -0500
-@@ -377,13 +377,13 @@
- 	vsmw->freeze_count++;
- 
- 	pulist = &vsmw->type_pulist;
--	item->type = (int)PUListItemGetData(
-+	item->type = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
- 
- 	pulist = &vsmw->action_pulist;
--	item->action = (int)PUListItemGetData(
-+	item->action = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -564,7 +564,7 @@
-  */
- static void VSMWDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	xsw_vsmenu_win_struct *vsmw = XSW_VSMENU_WIN(widget);
- 	if(vsmw == NULL)
- 	    return;
-@@ -592,7 +592,7 @@
- 	if(vsmw->freeze_count > 0)
- 	    return;
- 
--	action = (int)PUListItemGetData(pulist, item_num);
-+	action = (int)(size_t)PUListItemGetData(pulist, item_num);
- 	for(i = 0; i < n; i++)
- 	{
- 	    v = &(vlist[i]);
-diff -ru xsw-2.6.1.orig/client/wcheckbutton.cpp xsw-2.6.1/client/wcheckbutton.cpp
---- xsw-2.6.1.orig/client/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
-@@ -63,7 +63,7 @@
-  */
- static void CBtnDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	check_button_struct *cb = (check_button_struct *)widget;
- 	if(cb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/wclist.cpp xsw-2.6.1/client/wclist.cpp
---- xsw-2.6.1.orig/client/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
-@@ -180,7 +180,7 @@
-  */
- static void CListDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	clist_struct *clist = (clist_struct *)widget;
- 	if(clist == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/wfilebrowser.cpp xsw-2.6.1/client/wfilebrowser.cpp
---- xsw-2.6.1.orig/client/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
-@@ -590,7 +590,7 @@
-  */
- static void FBrowserDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	fb_struct *fb = (fb_struct *)widget;
- 	if(fb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/wpopuplist.cpp xsw-2.6.1/client/wpopuplist.cpp
---- xsw-2.6.1.orig/client/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
-@@ -311,7 +311,7 @@
-  */
- static void PUListDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	popup_list_struct *list = (popup_list_struct *)widget;
- 	if(list == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/wprompt.cpp xsw-2.6.1/client/wprompt.cpp
---- xsw-2.6.1.orig/client/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
-@@ -157,7 +157,7 @@
-  */
- static void PromptDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	prompt_struct *prompt = (prompt_struct *)widget;
- 	if(prompt == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/client/wscrollbar.cpp xsw-2.6.1/client/wscrollbar.cpp
---- xsw-2.6.1.orig/client/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/client/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
-@@ -130,7 +130,7 @@
- static void SBarScrollTimeoutCB(void *widget, void *data)
- {
- 	int prev_x_pos, prev_y_pos;
--	int op = (int)data;
-+	int op = (int)(size_t)data;
- 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
- 	if(sb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/mon.cpp xsw-2.6.1/monitor/mon.cpp
---- xsw-2.6.1.orig/monitor/mon.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/mon.cpp	2009-12-30 22:26:15.505784790 -0500
-@@ -286,7 +286,7 @@
- 
- static void MonDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	monitor_struct *m = MONITOR(widget);
- 	if(m == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wcheckbutton.cpp xsw-2.6.1/monitor/wcheckbutton.cpp
---- xsw-2.6.1.orig/monitor/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
-@@ -63,7 +63,7 @@
-  */
- static void CBtnDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	check_button_struct *cb = (check_button_struct *)widget;
- 	if(cb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wclist.cpp xsw-2.6.1/monitor/wclist.cpp
---- xsw-2.6.1.orig/monitor/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
-@@ -180,7 +180,7 @@
-  */
- static void CListDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	clist_struct *clist = (clist_struct *)widget;
- 	if(clist == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wfilebrowser.cpp xsw-2.6.1/monitor/wfilebrowser.cpp
---- xsw-2.6.1.orig/monitor/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
-@@ -590,7 +590,7 @@
-  */
- static void FBrowserDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	fb_struct *fb = (fb_struct *)widget;
- 	if(fb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wpopuplist.cpp xsw-2.6.1/monitor/wpopuplist.cpp
---- xsw-2.6.1.orig/monitor/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
-@@ -311,7 +311,7 @@
-  */
- static void PUListDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	popup_list_struct *list = (popup_list_struct *)widget;
- 	if(list == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wprompt.cpp xsw-2.6.1/monitor/wprompt.cpp
---- xsw-2.6.1.orig/monitor/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
-@@ -157,7 +157,7 @@
-  */
- static void PromptDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	prompt_struct *prompt = (prompt_struct *)widget;
- 	if(prompt == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/monitor/wscrollbar.cpp xsw-2.6.1/monitor/wscrollbar.cpp
---- xsw-2.6.1.orig/monitor/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/monitor/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
-@@ -130,7 +130,7 @@
- static void SBarScrollTimeoutCB(void *widget, void *data)
- {
- 	int prev_x_pos, prev_y_pos;
--	int op = (int)data;
-+	int op = (int)(size_t)data;
- 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
- 	if(sb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/ecow.cpp xsw-2.6.1/unvedit/ecow.cpp
---- xsw-2.6.1.orig/unvedit/ecow.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/ecow.cpp	2009-12-30 22:26:04.514785056 -0500
-@@ -428,7 +428,7 @@
- 	    strncpy(prod->name, s, sizeof(prod->name));
- 	    prod->name[sizeof(prod->name) - 1] = '\0';
- 	}
--	prod->ocs_code = (int)PUListItemGetData(pulist, i);
-+	prod->ocs_code = (int)(size_t)PUListItemGetData(pulist, i);
- 	prod->sell_price = PromptGetF(&ecow->prod_sell_prompt);
- 	prod->buy_price = PromptGetF(&ecow->prod_buy_prompt);
- 	prod->amount = PromptGetF(&ecow->prod_amount_prompt);
-@@ -448,7 +448,7 @@
-  */
- static void EcoWDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	ecow_struct *ecow = ECOW(widget);
- 	if(ecow == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/optwin.cpp xsw-2.6.1/unvedit/optwin.cpp
---- xsw-2.6.1.orig/unvedit/optwin.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/optwin.cpp	2009-12-30 22:23:40.975781529 -0500
-@@ -261,7 +261,7 @@
-  */
- static void OptWinDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	optwin_struct *ow = OPTWIN(widget);
- 	if(ow == NULL)
- 	    return;
-@@ -590,7 +590,7 @@
- 	clist = &ow->keymaps_list;
- 	n = MIN(clist->total_rows, UE_TOTAL_KEYMAPS);
- 	for(i = 0; i < n; i++)
--	    keymap[i].keycode = (keycode_t)CListRowGetData(clist, i);
-+	    keymap[i].keycode = (keycode_t)(size_t)CListRowGetData(clist, i);
- 
- 	/* Reset has changes mark */
- 	ow->has_changes = False;
-diff -ru xsw-2.6.1.orig/unvedit/printdlg.cpp xsw-2.6.1/unvedit/printdlg.cpp
---- xsw-2.6.1.orig/unvedit/printdlg.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/printdlg.cpp	2009-12-30 22:22:54.616785444 -0500
-@@ -833,7 +833,7 @@
-  */
- static void PrintDlgDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	print_dlg_struct *pw = PRINT_DLG(widget);
- 	if(pw == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/propdlg.cpp xsw-2.6.1/unvedit/propdlg.cpp
---- xsw-2.6.1.orig/unvedit/propdlg.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/propdlg.cpp	2009-12-30 22:22:33.892785842 -0500
-@@ -335,7 +335,7 @@
- }
- 	SET_STRING(obj->name, &d->name_prompt);
- 	pulist = &d->type_pulist;
--	obj->type = (int)PUListItemGetData(
-+	obj->type = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -480,7 +480,7 @@
- 	obj->scanner_range = MAX(PromptGetF(&d->scanner_range_prompt), 0.0f);
- 
- 	pulist = &d->engine_pulist;
--	obj->engine_state = (int)PUListItemGetData(
-+	obj->engine_state = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -502,12 +502,12 @@
- 	);
- 
- 	pulist = &d->shields_pulist;
--	obj->shield_state = (int)PUListItemGetData(
-+	obj->shield_state = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
- 	pulist = &d->cloak_pulist;
--	obj->cloak_state = (int)PUListItemGetData(
-+	obj->cloak_state = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -543,7 +543,7 @@
- 
- 
- 	pulist = &d->imgrefs_pulist;
--	obj->imgref = (int)PUListItemGetData(
-+	obj->imgref = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -651,7 +651,7 @@
-  */
- static void PropDlgDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	prop_dlg_struct *d = PROP_DLG(widget);
- 	if(d == NULL)
- 	    return;
-@@ -693,7 +693,7 @@
- 	if(d->freeze_count > 0)
- 	    return;
- 
--	imgref_num = (int)PUListItemGetData(
-+	imgref_num = (int)(size_t)PUListItemGetData(
- 	    pulist, sel_item
- 	);
- 
-@@ -1637,7 +1637,7 @@
- 	    pixmap = d->object_display_buf;
- 
- 	    /* Get the currently displayed imgref */
--	    imgref_num = (int)PUListItemGetData(
-+	    imgref_num = (int)(size_t)PUListItemGetData(
- 		pulist,
- 		PUListGetSelItem(pulist)
- 	    );
-@@ -1858,7 +1858,7 @@
- 	d->freeze_count++;
- 
- 	pulist = &d->type_pulist;
--	type = (int)PUListItemGetData(
-+	type = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-diff -ru xsw-2.6.1.orig/unvedit/uew.cpp xsw-2.6.1/unvedit/uew.cpp
---- xsw-2.6.1.orig/unvedit/uew.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/uew.cpp	2009-12-30 22:20:44.340788956 -0500
-@@ -142,7 +142,7 @@
-  */
- static void UEWDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	uew_struct *uew = UEW(widget);
- 	if(uew == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/uewcb.cpp xsw-2.6.1/unvedit/uewcb.cpp
---- xsw-2.6.1.orig/unvedit/uewcb.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/uewcb.cpp	2009-12-30 22:20:28.738858297 -0500
-@@ -548,7 +548,7 @@
- 	    return;
- 
- 	/* Get the selected imgref */
--	imgref_num = (int)PUListItemGetData(pulist, sel_item);
-+	imgref_num = (int)(size_t)PUListItemGetData(pulist, sel_item);
- 
- 	/* Set the object's current property values */
- 	UEWPropsDoSetValues(uew, obj_num);
-diff -ru xsw-2.6.1.orig/unvedit/uhw.cpp xsw-2.6.1/unvedit/uhw.cpp
---- xsw-2.6.1.orig/unvedit/uhw.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/uhw.cpp	2009-12-30 22:20:13.045780838 -0500
-@@ -546,7 +546,7 @@
-  */
- static void UHWDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	uhw_struct *uhw = UHW(widget);
- 	if(uhw == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wcheckbutton.cpp xsw-2.6.1/unvedit/wcheckbutton.cpp
---- xsw-2.6.1.orig/unvedit/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
-@@ -63,7 +63,7 @@
-  */
- static void CBtnDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	check_button_struct *cb = (check_button_struct *)widget;
- 	if(cb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wclist.cpp xsw-2.6.1/unvedit/wclist.cpp
---- xsw-2.6.1.orig/unvedit/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
-@@ -180,7 +180,7 @@
-  */
- static void CListDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	clist_struct *clist = (clist_struct *)widget;
- 	if(clist == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wepw.cpp xsw-2.6.1/unvedit/wepw.cpp
---- xsw-2.6.1.orig/unvedit/wepw.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wepw.cpp	2009-12-30 22:19:54.179785141 -0500
-@@ -486,7 +486,7 @@
- 	{
- 	    const char *name = pulist_item->text;
- 
--	    wep->ocs_code = (int)PUListItemGetData(pulist, i);
-+	    wep->ocs_code = (int)(size_t)PUListItemGetData(pulist, i);
- 
- 	    if(!STRISEMPTY(name))
- 	    {
-@@ -528,7 +528,7 @@
- 	wep->create_power = PromptGetF(&wepw->create_power_prompt);
- 	wep->delay = PromptGetL(&wepw->delay_prompt);
- 	pulist = &wepw->fire_sndref_pulist;
--	wep->fire_sndref = (int)PUListItemGetData(
-+	wep->fire_sndref = (int)(size_t)PUListItemGetData(
- 	    pulist,
- 	    PUListGetSelItem(pulist)
- 	);
-@@ -561,7 +561,7 @@
-  */
- static void WepWDrawCB(void *widget, void *data)
- {
--	const int amount = (int)data;
-+	const int amount = (int)(size_t)data;
- 	wepw_struct *wepw = WEPW(widget);        
- 	if(wepw == NULL)
- 	    return;
-@@ -927,7 +927,7 @@
- 	/* Weapons list */
- 	clist = &wepw->list;
- 	width = (unsigned int)MAX(
--	    (int)wepw->width - WEPW_BUTTON_WIDTH -
-+	    (int)(size_t)wepw->width - WEPW_BUTTON_WIDTH -
- 	    (2 * WEPW_MARGIN) - 5,
- 	    100
- 	);
-diff -ru xsw-2.6.1.orig/unvedit/wfilebrowser.cpp xsw-2.6.1/unvedit/wfilebrowser.cpp
---- xsw-2.6.1.orig/unvedit/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
-@@ -590,7 +590,7 @@
-  */
- static void FBrowserDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	fb_struct *fb = (fb_struct *)widget;
- 	if(fb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wpopuplist.cpp xsw-2.6.1/unvedit/wpopuplist.cpp
---- xsw-2.6.1.orig/unvedit/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
-@@ -311,7 +311,7 @@
-  */
- static void PUListDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	popup_list_struct *list = (popup_list_struct *)widget;
- 	if(list == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wprompt.cpp xsw-2.6.1/unvedit/wprompt.cpp
---- xsw-2.6.1.orig/unvedit/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
-@@ -157,7 +157,7 @@
-  */
- static void PromptDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	prompt_struct *prompt = (prompt_struct *)widget;
- 	if(prompt == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/unvedit/wscrollbar.cpp xsw-2.6.1/unvedit/wscrollbar.cpp
---- xsw-2.6.1.orig/unvedit/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/unvedit/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
-@@ -130,7 +130,7 @@
- static void SBarScrollTimeoutCB(void *widget, void *data)
- {
- 	int prev_x_pos, prev_y_pos;
--	int op = (int)data;
-+	int op = (int)(size_t)data;
- 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
- 	if(sb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wcheckbutton.cpp xsw-2.6.1/widgets/wcheckbutton.cpp
---- xsw-2.6.1.orig/widgets/wcheckbutton.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wcheckbutton.cpp	2009-12-30 21:36:00.024941571 -0500
-@@ -63,7 +63,7 @@
-  */
- static void CBtnDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	check_button_struct *cb = (check_button_struct *)widget;
- 	if(cb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wclist.cpp xsw-2.6.1/widgets/wclist.cpp
---- xsw-2.6.1.orig/widgets/wclist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wclist.cpp	2009-12-30 21:36:19.867780925 -0500
-@@ -180,7 +180,7 @@
-  */
- static void CListDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	clist_struct *clist = (clist_struct *)widget;
- 	if(clist == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wfilebrowser.cpp xsw-2.6.1/widgets/wfilebrowser.cpp
---- xsw-2.6.1.orig/widgets/wfilebrowser.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wfilebrowser.cpp	2009-12-30 21:48:53.840781232 -0500
-@@ -590,7 +590,7 @@
-  */
- static void FBrowserDrawCB(void *widget, void *data)
- {
--	int draw_amount = (int)data;
-+	int draw_amount = (int)(size_t)data;
- 	fb_struct *fb = (fb_struct *)widget;
- 	if(fb == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wpopuplist.cpp xsw-2.6.1/widgets/wpopuplist.cpp
---- xsw-2.6.1.orig/widgets/wpopuplist.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wpopuplist.cpp	2009-12-30 21:52:55.864780577 -0500
-@@ -311,7 +311,7 @@
-  */
- static void PUListDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	popup_list_struct *list = (popup_list_struct *)widget;
- 	if(list == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wprompt.cpp xsw-2.6.1/widgets/wprompt.cpp
---- xsw-2.6.1.orig/widgets/wprompt.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wprompt.cpp	2009-12-30 21:53:13.222906280 -0500
-@@ -157,7 +157,7 @@
-  */
- static void PromptDrawCB(void *widget, void *data)
- {
--	int amount = (int)data;
-+	int amount = (int)(size_t)data;
- 	prompt_struct *prompt = (prompt_struct *)widget;
- 	if(prompt == NULL)
- 	    return;
-diff -ru xsw-2.6.1.orig/widgets/wscrollbar.cpp xsw-2.6.1/widgets/wscrollbar.cpp
---- xsw-2.6.1.orig/widgets/wscrollbar.cpp	2008-06-23 19:00:00.000000000 -0400
-+++ xsw-2.6.1/widgets/wscrollbar.cpp	2009-12-30 21:53:42.093781356 -0500
-@@ -130,7 +130,7 @@
- static void SBarScrollTimeoutCB(void *widget, void *data)
- {
- 	int prev_x_pos, prev_y_pos;
--	int op = (int)data;
-+	int op = (int)(size_t)data;
- 	scroll_bar_struct *sb = (scroll_bar_struct *)widget;
- 	if(sb == NULL)
- 	    return;
diff --git a/games-action/xshipwars/files/xshipwars-2.6.1-build.patch b/games-action/xshipwars/files/xshipwars-2.6.1-build.patch
deleted file mode 100644
index 60316cd34350..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.6.1-build.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- client/Makefile.install.UNIX
-+++ client/Makefile.install.UNIX
-@@ -11,9 +11,9 @@
- #
- 
- INSTALL      = install
--INSTBINFLAGS = -m 0755 -s
-+INSTBINFLAGS = -m 0755
- INSTUIDFLAGS = -m 4755
--INSTLIBFLAGS = -m 0755 -s
-+INSTLIBFLAGS = -m 0755
- INSTINCFLAGS = -m 0644
- INSTMANFLAGS = -m 0644
- INSTCFGFLAGS = -m 0644
-@@ -26,8 +26,10 @@
- MKDIRFLAGS = -p
- 
- 
--GAMES_DIR   = $(PREFIX)/games
--XSW_DIR     = $(PREFIX)/share/games/xshipwars
-+BINDIR      = $(PREFIX)/games
-+GAMES_DIR   = $(DESTDIR)$(BINDIR)
-+DATADIR     = $(PREFIX)/share/games
-+XSW_DIR     = $(DESTDIR)$(DATADIR)/xshipwars
- XSW_ETC_DIR = $(XSW_DIR)/etc
- 
- XSW_CFG_FILE   = xsw.ini
---- monitor/Makefile.install.UNIX
-+++ monitor/Makefile.install.UNIX
-@@ -27,8 +27,10 @@
- MKDIR      = mkdir
- MKDIRFLAGS = -p
- 
--GAMES_DIR          = $(PREFIX)/games
--XSW_DIR            = $(PREFIX)/share/games/xshipwars
-+BINDIR             = $(PREFIX)/games
-+GAMES_DIR          = $(DESTDIR)$(BINDIR)
-+DATADIR            = $(PREFIX)/share/games
-+XSW_DIR            = $(DESTDIR)$(DATADIR)/xshipwars
- MONITOR_IMAGES_DIR = $(XSW_DIR)/images/monitor
- 
- HR = "-------------------------------------------------------------------------"
---- server/Makefile.install.UNIX
-+++ server/Makefile.install.UNIX
-@@ -29,7 +29,7 @@
- MKDIRFLAGS = -p
- 
- 
--SWSERV_BASE_DIR = $(PREFIX)/swserv
-+SWSERV_BASE_DIR = $(DESTDIR)$(PREFIX)/swserv
- 
- SWSERV_BIN_DIR  = $(SWSERV_BASE_DIR)/bin
- SWSERV_DB_DIR   = $(SWSERV_BASE_DIR)/db
---- unvedit/Makefile.install.UNIX
-+++ unvedit/Makefile.install.UNIX
-@@ -26,8 +26,10 @@
- MKDIR      = mkdir
- MKDIRFLAGS = -p
- 
--GAMES_BIN_DIR      = $(PREFIX)/games
--XSW_DATA_DIR       = $(PREFIX)/share/games/xshipwars
-+BINDIR             = $(PREFIX)/games
-+GAMES_BIN_DIR      = $(DESTDIR)$(BINDIR)
-+DATADIR            = $(PREFIX)/share/games
-+XSW_DATA_DIR       = $(DESTDIR)$(DATADIR)/xshipwars
- UNVEDIT_IMAGES_DIR = $(XSW_DATA_DIR)/images/unvedit
- 
- HR = "-------------------------------------------------------------------------"
---- client/xsw.h.old	2007-07-06 08:02:07.000000000 +0200
-+++ client/xsw.h	2007-07-06 08:04:05.000000000 +0200
-@@ -135,10 +135,10 @@
- #define XSW_DEF_SW_SERVER_DIR		CWD_STR
- #else
- #define XSW_DEF_LOCAL_DATA_DIR		".shipwars"
--#define XSW_DEF_GLOBAL_DATA_DIR		PREFIX "/share/games/xshipwars"
--#define XSW_DEF_GLOBAL_IMAGES_DIR	PREFIX "/share/games/xshipwars/images"
--#define XSW_DEF_GLOBAL_SOUNDS_DIR	PREFIX "/share/games/xshipwars/sounds"
--#define XSW_DEF_GLOBAL_ETC_DIR		PREFIX "/share/games/xshipwars/etc"
-+#define XSW_DEF_GLOBAL_DATA_DIR		"@GENTOO_DATADIR@"
-+#define XSW_DEF_GLOBAL_IMAGES_DIR	"@GENTOO_DATADIR@/images"
-+#define XSW_DEF_GLOBAL_SOUNDS_DIR	"@GENTOO_DATADIR@/sounds"
-+#define XSW_DEF_GLOBAL_ETC_DIR		"@GENTOO_DATADIR@/etc"
- #define XSW_DEF_SW_SERVER_DIR		"/home/swserv"
- #endif
- 
diff --git a/games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch b/games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch
deleted file mode 100644
index 62fb22f268a2..000000000000
--- a/games-action/xshipwars/files/xshipwars-2.6.1-ldflags.patch
+++ /dev/null
@@ -1,93 +0,0 @@
---- Makefile.unvedit.old	2010-10-08 11:39:09.000000000 +0200
-+++ Makefile.unvedit	2010-10-08 11:42:48.000000000 +0200
-@@ -1,5 +1,5 @@
- ALL_SRC_DIRS=unvedit
- all install clean:
- 	@for subdir in $(ALL_SRC_DIRS); do				\
--	  make -C $$subdir -f Makefile $@; 				\
-+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
- 	done
---- unvedit/makefile_append.ini.old	2010-10-08 11:53:21.000000000 +0200
-+++ unvedit/makefile_append.ini	2010-10-08 11:54:43.000000000 +0200
-@@ -14,7 +14,7 @@
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .cpp.o:
- 	@echo "Compiling module $*.o"
--	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
- 
- # Programs
- LS      = ls
-@@ -29,8 +29,8 @@
- 	@echo "Compiling resources"
- 
- modules: $(OBJ_C) $(OBJ_CPP)
--	@echo -n "Linking modules..."
--	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
-+	@echo "Linking modules..."
-+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
- 	@echo -n "   "
- 	@-$(LS) $(LSFLAGS) $(BIN)
- 
---- Makefile.monitor.old	2010-10-08 12:25:11.000000000 +0200
-+++ Makefile.monitor	2010-10-08 12:25:25.000000000 +0200
-@@ -1,5 +1,5 @@
- ALL_SRC_DIRS=monitor
- all install clean:
- 	@for subdir in $(ALL_SRC_DIRS); do				\
--	  make -C $$subdir -f Makefile $@; 				\
-+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
- 	done
---- monitor/makefile_append.ini.old	2010-10-08 12:26:24.000000000 +0200
-+++ monitor/makefile_append.ini	2010-10-08 12:26:56.000000000 +0200
-@@ -14,7 +14,7 @@
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .cpp.o:
- 	@echo "Compiling module $*.o"
--	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
- 
- # Programs
- LS      = ls
-@@ -29,8 +29,8 @@
- 	@echo "Compiling resources"
- 
- modules: $(OBJ_C) $(OBJ_CPP)
--	@echo -n "Linking modules..."
--	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
-+	@echo "Linking modules..."
-+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
- 	@echo -n "   "
- 	@-$(LS) $(LSFLAGS) $(BIN)
- 
---- client/makefile_append.ini.old	2010-10-08 12:37:44.000000000 +0200
-+++ client/makefile_append.ini	2010-10-08 12:38:08.000000000 +0200
-@@ -14,7 +14,7 @@
- OBJ_CPP = $(SRC_CPP:.cpp=.o)
- .cpp.o:
- 	@echo "Compiling module $*.o"
--	@+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
-+	+$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
- 
- # Programs
- LS      = ls
-@@ -29,8 +29,8 @@
- 	@echo "Compiling resources"
- 
- modules: $(OBJ_C) $(OBJ_CPP)
--	@echo -n "Linking modules..."
--	@$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
-+	@echo n "Linking modules..."
-+	$(CPP) $(LDFLAGS) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
- 	@echo -n "   "
- 	@-$(LS) $(LSFLAGS) $(BIN)
- 
---- Makefile.client.old	2010-10-08 12:37:19.000000000 +0200
-+++ Makefile.client	2010-10-08 12:37:31.000000000 +0200
-@@ -1,5 +1,5 @@
- ALL_SRC_DIRS=client
- all install clean:
- 	@for subdir in $(ALL_SRC_DIRS); do				\
--	  make -C $$subdir -f Makefile $@; 				\
-+	  $(MAKE) -C $$subdir -f Makefile $@; 				\
- 	done
diff --git a/games-action/xshipwars/metadata.xml b/games-action/xshipwars/metadata.xml
deleted file mode 100644
index 2534b352a844..000000000000
--- a/games-action/xshipwars/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>games</herd>
-  <use>
-    <flag name="yiff">Add support for the YIFF sound server</flag>
-  </use>
-</pkgmetadata>
diff --git a/games-action/xshipwars/xshipwars-2.5.5.ebuild b/games-action/xshipwars/xshipwars-2.5.5.ebuild
deleted file mode 100644
index 1de82c82494b..000000000000
--- a/games-action/xshipwars/xshipwars-2.5.5.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.5.5.ebuild,v 1.10 2009/11/06 20:43:51 mr_bones_ Exp $
-
-EAPI=2
-inherit eutils games
-
-MY_P=xsw-${PV}
-DESCRIPTION="massively multi-player, ultra graphical, space-oriented gaming system designed for network play"
-HOMEPAGE="http://wolfsinger.com/~wolfpack/XShipWars/"
-SRC_URI="http://wolfpack.twu.net/users/wolfpack/${MY_P}.tar.bz2
-	http://wolfpack.twu.net/users/wolfpack/xsw-data-${PV}.tar.bz2
-	http://wolfpack.twu.net/users/wolfpack/stimages-1.11.1.tar.bz2
-	http://wolfpack.twu.net/users/wolfpack/stsounds-1.6.4.tar.bz2
-	mirror://gentoo/${P}-64bit.patch.gz"
-
-LICENSE="GPL-2 xshipwars"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="joystick yiff debug"
-
-RDEPEND="x11-libs/libXpm
-	joystick? ( media-libs/libjsw )
-	yiff? ( media-libs/yiff )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${WORKDIR}"/${P}-64bit.patch
-	sed -i \
-		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^DATADIR/s:=.*:=${GAMES_DATADIR}:" \
-		*/Makefile.install.UNIX || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		client/xsw.h || die "sed on xsw.h failed"
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local myconf=" \
-		--disable-arch-i486 \
-		--disable-arch-i586 \
-		--disable-arch-i686 \
-		--disable-arch-pentiumpro \
-		--disable-ESounD \
-		$(use_enable joystick libjsw) \
-		$(use_enable debug) \
-		--enable-X11 \
-		--enable-libXpm \
-		$(use_enable yiff Y2) \
-	"
-	# xsw uses --{en,dis}able=FEATURE syntax
-	myconf=${myconf//able-/able=}
-
-	local x
-	for x in client monitor unvedit ; do #server
-		./configure.${x} Linux --prefix="${GAMES_PREFIX}" ${myconf} || die "configure ${x}"
-		emake -j1 -f Makefile.${x} all || die "build ${x}"
-	done
-}
-
-src_install() {
-	local x
-	for x in client monitor unvedit ; do #server
-		make -f Makefile.${x} DESTDIR="${D}" install || die "install ${x}"
-	done
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r "${WORKDIR}"/{etc,images,sounds} || die "doins data"
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Before playing, you should get a copy of the installed "
-	elog "global XShipWars client configuration file and copy it to "
-	elog "your home directory:"
-	echo
-	elog "# mkdir ~/.shipwars/"
-	elog "# cd /usr/share/games/xshipwars/etc/"
-	elog "# cp xsw.ini ~/.shipwars/"
-	elog "# cp universes.ini ~/.shipwars"
-	echo
-	elog "You will probably need to edit the xisw.ini to fit your needs."
-	echo
-	elog "Then type 'xsw &' to start the game"
-	echo
-	elog "Type 'monitor &' to start the Universe Monitor"
-	elog "Type 'unvedit &' to start the Universe Editor"
-}
diff --git a/games-action/xshipwars/xshipwars-2.6.1.ebuild b/games-action/xshipwars/xshipwars-2.6.1.ebuild
deleted file mode 100644
index 6817e6255a3a..000000000000
--- a/games-action/xshipwars/xshipwars-2.6.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.6.1.ebuild,v 1.2 2010/10/08 10:53:01 tupone Exp $
-
-EAPI=2
-inherit eutils games
-
-MY_P=xsw-${PV}
-DESCRIPTION="massively multi-player, ultra graphical, space-oriented gaming system designed for network play"
-HOMEPAGE="http://wolfsinger.com/~wolfpack/XShipWars/"
-SRC_URI="http://wolfsinger.com/~wolfpack/XShipWars/${MY_P}.tar.bz2
-	http://wolfsinger.com/~wolfpack/XShipWars/xsw-data-${PV}.tar.bz2
-	mirror://gentoo/stimages-1.11.1.tar.bz2
-	mirror://gentoo/stsounds-1.6.4.tar.bz2"
-
-LICENSE="GPL-2 xshipwars"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="joystick yiff debug"
-
-RDEPEND="x11-libs/libXpm
-	joystick? ( media-libs/libjsw )
-	yiff? ( media-libs/yiff )"
-DEPEND="${RDEPEND}
-	x11-proto/xextproto"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-build.patch \
-		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "/^BINDIR/s:=.*:=${GAMES_BINDIR}:" \
-		-e "/^DATADIR/s:=.*:=${GAMES_DATADIR}:" \
-		*/Makefile.install.UNIX || die
-	sed -i \
-		-e "s:@GENTOO_DATADIR@:${GAMES_DATADIR}/${PN}:" \
-		client/xsw.h || die
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	local myconf=" \
-		--disable-arch-i486 \
-		--disable-arch-i586 \
-		--disable-arch-i686 \
-		--disable-arch-pentiumpro \
-		--disable-ESounD \
-		$(use_enable joystick libjsw) \
-		$(use_enable debug) \
-		--enable-X11 \
-		--enable-libXpm \
-		$(use_enable yiff Y2) \
-	"
-	# xsw uses --{en,dis}able=FEATURE syntax
-	myconf=${myconf//able-/able=}
-
-	local x
-	for x in client monitor unvedit ; do #server
-		./configure.${x} Linux --prefix="${GAMES_PREFIX}" ${myconf} || die
-		emake -j1 -f Makefile.${x} all || die
-	done
-}
-
-src_install() {
-	local x
-	for x in client monitor unvedit ; do #server
-		emake -j1 DESTDIR="${D}" -f Makefile.${x} install || die
-	done
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r "${WORKDIR}"/{etc,images,sounds} || die
-
-	dodoc AUTHORS CREDITS README
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	echo
-	elog "Before playing, you should get a copy of the installed "
-	elog "global XShipWars client configuration file and copy it to "
-	elog "your home directory:"
-	echo
-	elog "# mkdir ~/.shipwars/"
-	elog "# cd /usr/share/games/xshipwars/etc/"
-	elog "# cp xsw.ini ~/.shipwars/"
-	elog "# cp universes.ini ~/.shipwars"
-	echo
-	elog "You will probably need to edit xsw.ini to fit your needs."
-	echo
-	elog "Then type 'xsw &' to start the game"
-	echo
-	elog "Type 'monitor &' to start the Universe Monitor"
-	elog "Type 'unvedit &' to start the Universe Editor"
-}