- Update to version 20050603-1400.

- Fix (was marked as BROKEN).

11 files changed, 79 insertions, 122 deletions

diff --git a/games/nil/files/Makeflags b/games/nil/files/Makeflags
deleted file mode 100644
index de83567d2f66..000000000000
--- a/games/nil/files/Makeflags
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file contains the template for Makeflags
-
-SYSTEM = FreeBSD
-FEATURES =  -DASYNCHRONOUS_IO -DUSE_POSIX_SIGNALS -DUNSIGNED_AUDIO_DATA -DFORCE_XSHM -DNETPLAY
-
-LOGIC = netlogic
-
-XPMINCLUDE = 
-XPMLINKDIR = 
-
-BINDIR = ${PREFIX}/bin
-LIBDIR = ${PREFIX}/share/Maelstrom
-DATAFILES = Images/*.icon Images/*.cicn "Maelstrom Fonts" \
-            "Maelstrom Sounds" "Maelstrom Sprites"
-
-OBJS = main.o framebuf.o v_framebuf.o x11_framebuf.o vga_framebuf.o \
-       dga_framebuf.o fontserv.o sound.o Mac_Resource.o imagedump.o \
-       init.o $(LOGIC)/$(LOGIC).o \
-       controls.o scores.o dialog.o fastrand.o netscore.o checksum.o \
-       Utils.o shared.o myerror.o
-SOUNDOBJS = Maelstrom_sound.o Mac_Resource.o soundres.o mixer.o shared.o myerror.o
-
-X11INCLUDE = -I${X11BASE}/include
-INCLUDES = -I$(LOGIC) $(X11INCLUDE) $(XPMINCLUDE)
-CFLAGS += $(INCLUDES) $(FEATURES) \
-                       -pedantic -DSYSTEM=\"$(SYSTEM)\" -DLIBDIR=\"$(LIBDIR)\"
-EXTRALIBS = 
-X11LINKDIR = -L${X11BASE}/lib
-X11LIBS = -lXpm $(XPMLINKDIR) -lX11 -lXext $(X11LINKDIR)
-CSUMLIB = 
-LIBS = $(EXTRALIBS) $(X11LIBS) $(CSUMLIB)
-SOUNDLIBS = 
-
-INSTALL = install
-
-all: $(MAELSTROM)
-
diff --git a/games/nil/files/patch-aa b/games/nil/files/patch-aa
deleted file mode 100644
index 52bfe8e77a60..000000000000
--- a/games/nil/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- nil/configuration.cpp	2000/09/28 15:45:28	1.1
-+++ nil/configuration.cpp	2000/09/28 15:46:09
-@@ -159,7 +159,7 @@
- 		"default.lump\tgfx/ripped\tgfx/original",
- #else
- 		"The filename of either the .lump file or the directory where data can be found (default is: ~/nil/gfx/ripped and ~/nil/gfx/original)",
--		"default.lump\t~/nil/gfx/ripped\t~/nil/gfx/original",
-+		"default.lump\t%%PREFIX%%/share/nil/gfx/ripped\t%%PREFIX%%/share/nil/gfx/original",
- #endif
- 		0,0,false,
- 		true
diff --git a/games/nil/files/patch-ab b/games/nil/files/patch-ab
deleted file mode 100644
index f8669e4bd7bd..000000000000
--- a/games/nil/files/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
---- nil/Makefile.in.orig	Thu Sep 28 20:41:58 2000
-+++ nil/Makefile.in	Thu Sep 28 20:45:33 2000
-@@ -69,7 +69,7 @@
- ####### kdevelop will overwrite this part!!! (end)############
- bin_PROGRAMS = nil
- nil_SOURCES = obj_grenade.cpp obj_clusterbomb.cpp obj_weapon_clusterbomb.cpp obj_fireball.cpp obj_weapon_flamethrower.cpp obj_weapon_rocket.cpp obj_weapon_mininuke.cpp obj_weapon_larpa.cpp obj_rocket.cpp soundsystem.cpp event.cpp event_target.cpp menu_item.cpp menu.cpp obj_weapon_bignuke.cpp obj_tinygranade.cpp obj_bignuke.cpp update_queue.cpp keymapper_bindings.cpp keymapper.cpp animations.cpp anim_helpers.cpp animation.cpp obj_weapon_plasmagun.cpp obj_plasmaball.cpp fonts.cpp nil_files.cpp game_client.cpp configuration.cpp font_instance.cpp font_glyph.cpp icon_graph.cpp icon_base.cpp animator.cpp tcp_socket.cpp serializer_writer.cpp serializer_reader.cpp serializer.cpp serializable.cpp nil_math.cpp obj_railslug.cpp obj_weapon_railgun.cpp raw_surface.cpp obj_weapon_megashotgun.cpp obj_scoreboard.cpp graphic_bar.cpp obj_hook.cpp obj_weapon_shotgun.cpp obj_weapon_minigun.cpp obj_projectile.cpp obj_weapon_test.cpp obj_weapon.cpp obj_gib.cpp tcp_client.cpp nil_client.cpp nil_main.cpp nil_server.cpp tcp_server_connection.cpp tcp_server.cpp obj_player_data.cpp obj_particle.cpp controls.cpp obj_player.cpp clientworld.cpp serverworld.cpp world.cpp viewport.cpp obj_test.cpp obj_explosion.cpp obj_base.cpp loader.cpp graphics.cpp graphic.cpp fluff.cpp 
--nil_LDADD = -lSDL -lSDL_mixer -L/usr/X11R6/lib -lXxf86dga -lXxf86vm -lpthread -lz -lXext -lX11
-+nil_LDADD = -lSDL_mixer -lz -lsmpeg
- 
- EXTRA_DIST = all.h fluff.cpp fluff.h graphic.cpp graphic.h graphics.cpp graphics.h loader.cpp loader.h obj_base.cpp obj_base.h obj_explosion.cpp obj_explosion.h obj_test.cpp obj_test.h viewport.cpp viewport.h world.cpp world.h serverworld.cpp serverworld.h clientworld.cpp clientworld.h obj_player.cpp obj_player.h controls.cpp controls.h obj_particle.cpp obj_particle.h obj_player_data.cpp obj_player_data.h tcp_server.cpp tcp_server.h tcp_server_connection.cpp tcp_server_connection.h nil_server.h nil_server.cpp nil_main.cpp nil_client.h nil_client.cpp tcp_client.cpp tcp_client.h obj_gib.cpp obj_gib.h obj_weapon.cpp obj_weapon.h obj_weapon_test.cpp obj_weapon_test.h obj_projectile.cpp obj_projectile.h obj_weapon_minigun.cpp obj_weapon_minigun.h obj_weapon_shotgun.cpp obj_weapon_shotgun.h obj_hook.cpp obj_hook.h graphic_bar.cpp graphic_bar.h obj_scoreboard.cpp obj_scoreboard.h obj_weapon_megashotgun.cpp obj_weapon_megashotgun.h raw_surface.cpp raw_surface.h obj_weapon_railgun.cpp obj_weapon_railgun.h obj_railslug.cpp obj_railslug.h nil_math.h nil_math.cpp systemheaders.h serializable.cpp serializable.h serializer.cpp serializer.h serializer_reader.cpp serializer_reader.h serializer_writer.cpp serializer_writer.h netpackets.h tcp_socket.cpp tcp_socket.h animator.cpp animator.h icon_base.cpp icon_base.h icon_graph.cpp icon_graph.h font_glyph.cpp font_glyph.h font_instance.cpp font_instance.h configuration.cpp configuration.h game_client.cpp game_client.h nil_files.h nil_files.cpp fonts.cpp fonts.h obj_plasmaball.cpp obj_plasmaball.h obj_weapon_plasmagun.cpp obj_weapon_plasmagun.h animation.cpp animation.h anim_helpers.h anim_helpers.cpp animations.cpp animations.h keymapper.cpp keymapper.h keymapper_bindings.h keymapper_bindings.cpp update_queue.cpp update_queue.h world_objects.h obj_bignuke.cpp obj_bignuke.h obj_tinygranade.cpp obj_tinygranade.h obj_weapon_bignuke.cpp obj_weapon_bignuke.h menu.cpp menu.h menu_item.cpp menu_item.h event_target.cpp event_target.h event.cpp event.h soundsystem.cpp soundsystem.h obj_rocket.cpp obj_rocket.h obj_weapon_larpa.cpp obj_weapon_larpa.h obj_weapon_mininuke.cpp obj_weapon_mininuke.h obj_weapon_rocket.cpp obj_weapon_rocket.h obj_weapon_clusterbomb.cpp obj_weapon_clusterbomb.h obj_clusterbomb.cpp obj_clusterbomb.h obj_grenade.cpp obj_grenade.h obj_fireball.cpp obj_weapon_flamethrower.cpp  
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -102,10 +102,12 @@
- loader.o graphics.o graphic.o fluff.o
- nil_DEPENDENCIES = 
- nil_LDFLAGS = 
-+SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
-+SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
- CXXFLAGS = @CXXFLAGS@
--CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(SDL_CFLAGS)
- CXXLD = $(CXX)
--CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) $(SDL_LDFLAGS) -o $@
- DIST_COMMON =  Makefile.am Makefile.in
- 
- 
diff --git a/games/nil/files/patch-ac b/games/nil/files/patch-ac
deleted file mode 100644
index 0110e0eb995f..000000000000
--- a/games/nil/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in	2000/10/19 13:28:36	1.1
-+++ Makefile.in	2000/10/19 13:29:07
-@@ -45,7 +45,7 @@
- ACLOCAL = @ACLOCAL@
- AUTOCONF = @AUTOCONF@
- AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
-+AUTOHEADER = true
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
diff --git a/games/nil/files/patch-configure b/games/nil/files/patch-configure
new file mode 100644
index 000000000000..1564726c5e15
--- /dev/null
+++ b/games/nil/files/patch-configure
@@ -0,0 +1,12 @@
+--- ./configure.orig	Thu Jan  6 13:06:23 2005
++++ ./configure	Fri Jun 16 21:54:02 2006
+@@ -23,8 +23,7 @@
+ echo "	@cd src && make all" >> Makefile
+ echo "utils:" >> Makefile
+ echo "	@cd utils && make all" >> Makefile
+-echo "all:" >> Makefile
+-echo "	nil utils" >> Makefile
++echo "all: nil utils" >> Makefile
+ echo "clean:" >> Makefile
+ echo "	@cd \$(CURRENTPATH)/utils && make clean" >> Makefile
+ echo "	@cd \$(CURRENTPATH)/src && make clean" >> Makefile
diff --git a/games/nil/files/patch-nil-anim_helpers.cpp b/games/nil/files/patch-nil-anim_helpers.cpp
deleted file mode 100644
index 66b7deebadb0..000000000000
--- a/games/nil/files/patch-nil-anim_helpers.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- nil/anim_helpers.cpp.orig	Sat Nov 15 16:43:08 2003
-+++ nil/anim_helpers.cpp	Sat Nov 15 16:57:35 2003
-@@ -210,7 +210,7 @@
- 	}
- 
- 	if (hit != end())
--  	return hit;
-+  	return &(*hit);
- 	else {
- 		logmsg(lt_debug,"Unable to find a suitable aim_id for elevation: %.2f (%i angles were tried)",elevation,size());
- 		return NULL;
diff --git a/games/nil/files/patch-nil-animation.h b/games/nil/files/patch-nil-animation.h
deleted file mode 100644
index 72fe65510a49..000000000000
--- a/games/nil/files/patch-nil-animation.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- nil/animation.h.orig	Sat Nov 15 16:18:52 2003
-+++ nil/animation.h	Sat Nov 15 16:26:19 2003
-@@ -25,7 +25,7 @@
- class Animator;
- class Animation {
- public:
--	friend Animator;
-+	friend class Animator;
- 
- 	Animation();
- 	~Animation();
diff --git a/games/nil/files/patch-nil-world.h b/games/nil/files/patch-nil-world.h
deleted file mode 100644
index 52ae1a629044..000000000000
--- a/games/nil/files/patch-nil-world.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- nil/world.h.orig	Sat Nov 15 16:28:04 2003
-+++ nil/world.h	Sat Nov 15 16:34:01 2003
-@@ -34,10 +34,8 @@
-   int flags;
- 	union {
- 		int object_id;
--		struct abspos {
--			float x_pos;
--			float y_pos;
--		};
-+		float x_pos;
-+		float y_pos;
- 	};
- };
- 
diff --git a/games/nil/files/patch-src__client__graphics__raw_surface.h b/games/nil/files/patch-src__client__graphics__raw_surface.h
new file mode 100644
index 000000000000..ed9a57ca0ad6
--- /dev/null
+++ b/games/nil/files/patch-src__client__graphics__raw_surface.h
@@ -0,0 +1,20 @@
+--- ./src/client/graphics/raw_surface.h.orig	Thu Jan  6 08:08:23 2005
++++ ./src/client/graphics/raw_surface.h	Fri Jun 16 21:53:31 2006
+@@ -28,7 +28,7 @@
+ #define RAW_SURFACE_H
+ 
+ #include "common/nil_files.h"
+-#include <endian.h>
++#include <machine/endian.h>
+ 
+ //! this must always become a 32bit integer
+ typedef unsigned int Pixel;
+@@ -36,7 +36,7 @@
+ //! emulate ptc names
+ typedef Pixel int32;
+ 
+-#if __BYTE_ORDER == __LITTLE_ENDIAN
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 
+ //! pixelflags used in the map:
+ #define PF_TYPE_BIT0 0x01000000
diff --git a/games/nil/files/patch-src__common__vfs__vfs_mapped_arena.cpp b/games/nil/files/patch-src__common__vfs__vfs_mapped_arena.cpp
new file mode 100644
index 000000000000..23fa1bf56e01
--- /dev/null
+++ b/games/nil/files/patch-src__common__vfs__vfs_mapped_arena.cpp
@@ -0,0 +1,10 @@
+--- ./src/common/vfs/vfs_mapped_arena.cpp.orig	Sun Mar  6 09:04:32 2005
++++ ./src/common/vfs/vfs_mapped_arena.cpp	Fri Jun 16 21:53:31 2006
+@@ -55,6 +55,7 @@
+ #include <sys/mman.h>
+ #endif
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <fcntl.h>
+ #include <map>
+ #include <cerrno>
diff --git a/games/nil/files/patch-src__configure b/games/nil/files/patch-src__configure
new file mode 100644
index 000000000000..590f1140697a
--- /dev/null
+++ b/games/nil/files/patch-src__configure
@@ -0,0 +1,37 @@
+--- ./src/configure.orig	Sun Mar  6 09:10:36 2005
++++ ./src/configure	Fri Jun 16 21:53:31 2006
+@@ -227,7 +227,7 @@
+ ####
+ check_lib() {
+ 	LIBNAME=$1
+-	LIB=`$COMP_EXE -print-file-name=$2 | grep "/"`
++	LIB=`$COMP_EXE -print-file-name=$2`
+ 	if test $LIB
+ 	then
+ 		echo "Checking for: $LIBNAME		found"
+@@ -328,15 +328,10 @@
+ 	then
+ 		echo "CCFLAGS = -D_WIN32_" >> Makefile
+ 	else
+-		echo "CCFLAGS =" >> Makefile
++		echo "CCFLAGS = $CFLAGS `$SDLCONFIG --cflags`" >> Makefile
+ 	fi
+ 	if test $optimize = 1
+ 	then
+-		ARCH=`uname -m`
+-		if test $ARCH != "unknown"
+-		then
+-			echo "CCFLAGS += -march=$ARCH" >> Makefile
+-		fi
+ 		echo "CCFLAGS += -O3 -fexpensive-optimizations" >> Makefile
+ 	fi
+ 	echo "" >> Makefile
+@@ -525,7 +520,7 @@
+ #THREADS_OBJS=`find . -maxdepth 1 -name '*.cpp' | sort | grep thread | sed -e 's/.cpp/.o \\\/'`
+ EXC_OBJ=`find . -name '*.cpp' | sort | grep /Exception.cpp | sed -e 's/.cpp/.o \\\/'`
+ THREAD_EXCP_OBJ=`find . -name '*.cpp' | sort | grep /ThreadException.cpp | sed -e 's/.cpp/.o \\\/'`
+-OTHER_OBJS=`find . -name '*.cpp' | sort | sed '/\/ThreadException.cpp/d' | sed '/\/thread/d' | sed -e 's/.cpp/.o \\\/'`
++OTHER_OBJS=`find . -name '*.cpp' | sort | sed '/\/ThreadException.cpp/d' | sed '/\/thread/d' | grep -Ev 'nil_main_(client|server)' | sed -e 's/.cpp/.o \\\/'`
+ 
+ ####
+ # Main script