3 files changed, 83 insertions, 78 deletions

diff --git a/games/el/files/patch-Makefile.bsd b/games/el/files/patch-Makefile.bsd
deleted file mode 100644
index 6b6f2ebfa36d..000000000000
--- a/games/el/files/patch-Makefile.bsd
+++ /dev/null
@@ -1,78 +0,0 @@
---- Makefile.bsd.orig	Mon Oct  3 02:43:06 2005
-+++ Makefile.bsd	Thu Dec 22 13:46:02 2005
-@@ -1,40 +1,41 @@
- PROG= el.x86.bsd.bin
--SRCS= 2d_objects.c 3d_objects.c  \
--    actor_scripts.c actors.c asc.c buddy.c books.c \
--    cache.c chat.c colors.c console.c consolewin.c cursors.c    \
--    dialogues.c draw_scene.c    \
--    elconfig.c elmemory.c elwindows.c encyclopedia.c errors.c events.c \
--    framebuffer.o filter.c font.c frustum.c   \
--    gamewin.c gl_init.c hud.c help.c    \
--    ignore.c init.c interface.c items.c \
--    keys.c knowledge.c lights.c loading_win.c loginwin.c  \
--    main.c manufacture.c map_io.c mapwin.c  \
--    md2loader.c md5.c misc.c multiplayer.c  \
--    new_actors.c new_character.c notepad.c   \
--    openingwin.c \
--    particles.c paste.c pathfinder.c pm_log.c   \
--    questlog.c reflection.c rules.c \
--    sector.c shadows.c sound.c spells.c stats.c tabs.c  \
--    text.c textures.c tile_map.c timers.c translate.c trade.c   \
--    weather.c widgets.c
-+SRCS= 2d_objects.c 3d_objects.c actor_scripts.c actors.c \
-+      alphamap.c asc.c bags.c books.c buddy.c cache.c cal.c \
-+      chat.c colors.c console.c consolewin.c cursors.c \
-+      dialogues.c draw_scene.c elconfig.c elmemory.c elwindows.c \
-+      encyclopedia.c errors.c events.c filter.c font.c framebuffer.c \
-+      frustum.c gamewin.c gl_init.c help.c highlight.c hud.c \
-+      ignore.c init.c interface.c items.c keys.c knowledge.c \
-+      lights.c loading_win.c loginwin.c main.c manufacture.c \
-+      map_io.c mapwin.c md2loader.c md5.c misc.c multiplayer.c \
-+      new_actors.c new_character.c normals.c notepad.c \
-+      openingwin.c particles.c paste.c pathfinder.c pm_log.c \
-+      questlog.c queue.c reflection.c rules.c sector.c shader.c \
-+      shadows.c simd.c skills.c sort.c sound.c spells.c stats.c \
-+      storage.c symbol_table.c tabs.c terrain.c text.c textures.c \
-+      tile_map.c timers.c trade.c translate.c weather.c widgets.c
- 
--NOMAN= true
-+NO_MAN= true
- LOCALBASE?=/usr/local
- X11BASE?=/usr/X11R6
- SDL_CONFIG?=${LOCALBASE}/bin/sdl11-config
- LIBXML2_CONFIG?=${LOCALBASE}/bin/xml2-config
- .if NODEBUG
- CFLAGS=-O3 -fomit-frame-pointer -ffast-math -pipe
-+CXXFLAGS=${CFLAGS} -fno-exceptions
- .else
--CFLAGS=-Wdeclaration-after-statement -Wall -Werror -ggdb -pipe
-+CFLAGS+=-Wdeclaration-after-statement -ggdb -pipe
-+CXXFLAGS=-ggdb -pipe -fno-exceptions
- .endif
--CFLAGS+=-march=i686 -DBSD -DELC
--CFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags`
--CFLAGS+=`${LIBXML2_CONFIG} --cflags` -I${LOCALBASE}/include
-+CPPFLAGS+=-DBSD -DELC
-+CPPFLAGS+=-I${X11BASE}/include `${SDL_CONFIG} --cflags`
-+CPPFLAGS+=`${LIBXML2_CONFIG} --cflags` -I${LOCALBASE}/include
-+CFLAGS+=${CPPFLAGS}
-+CXXFLAGS+=${CPPFLAGS}
- LDFLAGS+=-L${X11BASE}/lib -lGL `${SDL_CONFIG} --libs` `${LIBXML2_CONFIG} --libs`
--LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lGLU -lvorbis -lvorbisfile -lm
-+LDFLAGS+=-L${LOCALBASE}/lib -lSDL_net -lopenal -lalut -lGLU -lvorbis -lvorbisfile -lm
- .if CAL3D
--SRCS+=cal3dwrap.c
-+SRCS+=cal3d_wrapper.cpp
- LDFLAGS+=-lcal3d
- .endif
-  
-@@ -43,8 +44,5 @@
- 
- cal3d:
- 	make -DCAL3D -f Makefile.bsd 
--
--cal3dwrap.o:
--	$(CXX) ${CFLAGS} -c cal3dwrap.c 
- 
- .include <bsd.prog.mk>
diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg
new file mode 100644
index 000000000000..f33e7a43fa36
--- /dev/null
+++ b/games/el/files/patch-Makefile.bsdg
@@ -0,0 +1,53 @@
+--- Makefile.bsdg	Fri Aug 18 08:37:43 2006
++++ Makefile.bsdg	Fri Aug 18 08:47:09 2006
+@@ -1,7 +1,7 @@
+ .PHONY: clean release docs
+ 
+ # tune these for your setup & compile options
+-OPTIONS=-DLINUX -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DAUTO_UPDATE -DCOUNTERS
++OPTIONS=-DFREEBSD -DELC -DPNG_SCREENSHOT -DUSE_FRAMEBUFFER -DNEW_FRUSTUM -DBUG_FIX_3D_OBJECTS_MIN_MAX -DNEW_TEX -DOPTIONS_I18N -DATI_9200_FIX -DNEW_ACTOR_ANIMATION -DAUTO_UPDATE -DCOUNTERS
+ 
+ #-DX86_64
+ #-DTIMER_CHECK
+@@ -25,7 +25,6 @@
+ #-DAFK_FIX	# fixes afk messages to count only PM's, and store and count local messages if the option is selected
+ #-DFONTS_FIX		# dynamically loads all fonts with the filename in the format font*.bmp, and makes them accessable in the options
+ 
+-PLATFORM=-march=i686
+ XDIR=-L/usr/X11R6/lib
+ CWARN=
+ #-Wdeclaration-after-statement -Wall -Werror
+@@ -33,12 +32,12 @@
+ #-Wall -Werror
+ 
+ # basic compiling and linking - rarely changed
+-CFLAGS=$(PLATFORM) $(CWARN) -g -ggdb -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
+-_CFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags)
+-CXXFLAGS=$(PLATFORM) $(CPPWARN) -O -ggdb -pipe -I/usr/local/include $(OPTIONS)
+-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
++CFLAGS+=$(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
++_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl11-config --cflags) $(shell xml2-config --cflags)
++CXXFLAGS+=-I/usr/local/include $(OPTIONS)
++_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math $(OPTIONS)
+ 
+-LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
++LDFLAGS+=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
+ _LDFLAGS=$(XDIR) -lGL -lpthread -lz
+ STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a
+ 
+@@ -68,11 +67,11 @@
+ 
+ OBJS=$(COBJS) $(CXXOBJS)
+ 
+-EXE=el.x86.bsd.bin
++EXE=el.x86
+ 
+-CC=gcc
+-CXX=g++
+-LINK=gcc
++CC?=gcc
++CXX?=g++
++LINK?=gcc
+ 
+ # the compile targets
+ $(EXE): $(OBJS)
diff --git a/games/el/files/patch-sound.c b/games/el/files/patch-sound.c
new file mode 100644
index 000000000000..773f40cf4824
--- /dev/null
+++ b/games/el/files/patch-sound.c
@@ -0,0 +1,30 @@
+--- sound.c	Fri Aug 18 12:54:36 2006
++++ sound.c	Fri Aug 18 11:33:35 2006
+@@ -313,10 +313,11 @@
+ ALuint get_loaded_buffer(int i)
+ {
+ 	int error;
+-	ALsizei size,freq;
++	ALsizei size;
+ 	ALenum  format;
+-	ALvoid  *data;
+ 	ALboolean loop;
++	ALfloat freq;
++	ALvoid* data = 0;
+ 	FILE *fin;
+ 	
+ 	if(!alIsBuffer(sound_buffer[i]))
+@@ -349,10 +350,10 @@
+ 		// OS X alutLoadWAVFile doesn't have a loop option... Oh well :-)
+ 		alutLoadWAVFile (sound_files[i], &format, &data, &size, &freq);
+ #else
+-		alutLoadWAVFile (sound_files[i], &format, &data, &size, &freq, &loop);
++		data = alutLoadMemoryFromFile (sound_files[i], &format, &size, &freq);
+ #endif
+-		alBufferData(sound_buffer[i],format,data,size,freq);
+-		alutUnloadWAV(format,data,size,freq);
++		alBufferData(sound_buffer[i],format,data,size,(int)freq);
++//		alutUnloadWAV(format,data,size,freq);
+ 	}
+ 	return sound_buffer[i];
+ }