- Update to 180

4 files changed, 53 insertions, 73 deletions

diff --git a/games/el/Makefile b/games/el/Makefile
index c02aeeccb53e..7476d493a7ba 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	el
-PORTVERSION=	140
-PORTREVISION=	2
+PORTVERSION=	180
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
@@ -31,7 +30,7 @@ USE_SDL=	sdl net image
 USE_GL=		yes
 
 ALL_TARGET=	el.x86
-MAKEFILE=	Makefile.bsdg
+MAKEFILE=	Makefile.linux
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
@@ -44,10 +43,6 @@ CFLAGS+=	-DX86_64
 BROKEN=		Does not compile on sparc64
 .endif
 
-post-extract:
-	@cd ${WRKSRC} && \
-		${FIND} * -type f -exec ${REINPLACE_CMD} -i "" -e 's|malloc.h|stdlib.h|g' "{}" \;
-
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el
 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el
diff --git a/games/el/distinfo b/games/el/distinfo
index 205ee21129be..e11d6ef30a19 100644
--- a/games/el/distinfo
+++ b/games/el/distinfo
@@ -1,3 +1,3 @@
-MD5 (el/el-140.tar.bz2) = 664e3f527bfe4b0692ad351707e51b94
-SHA256 (el/el-140.tar.bz2) = 325f95ced420088874f70b3a6f9dd864e14cc67018d484abd3232244917da6ec
-SIZE (el/el-140.tar.bz2) = 1474451
+MD5 (el/el-180.tar.bz2) = 8a74d72a0722fcbcd97414db2d65d36a
+SHA256 (el/el-180.tar.bz2) = 482b5cbb9b3ff064175a80d0d1086ec9d2879c6175f11ed784635bd4ba148f88
+SIZE (el/el-180.tar.bz2) = 1882550
diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg
deleted file mode 100644
index 3a5baedbdd9a..000000000000
--- a/games/el/files/patch-Makefile.bsdg
+++ /dev/null
@@ -1,63 +0,0 @@
---- Makefile.bsdg	Sun Aug 19 19:21:10 2007
-+++ Makefile.bsdg	Sun Aug 19 19:21:36 2007
-@@ -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 -DCOUNTERS
- 
- #-DX86_64
- #-DTIMER_CHECK
-@@ -25,20 +25,19 @@
- #-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
-+XDIR=-L$(LOCALBASE)/lib
- CWARN=
- #-Wdeclaration-after-statement -Wall -Werror
- CPPWARN=
- #-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 sdl-config --cflags) $(shell xml2-config --cflags) -I/usr/X11R6/include/
-+_CFLAGS=$(CFLAGS) $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags)
-+CXXFLAGS+=-I$(LOCALBASE)/include $(OPTIONS)
-+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
- 
--LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
-+LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -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
- 
-@@ -54,7 +53,7 @@
- 	ignore.o init.o interface.o items.o	\
- 	keys.o knowledge.o lights.o list.o loading_win.o loginwin.o	\
- 	main.o manufacture.o map_io.o mapwin.o	\
--	md2loader.o md5.o misc.o multiplayer.o	\
-+	md5.o misc.o multiplayer.o	\
- 	new_actors.o new_character.o notepad.o	\
- 	openingwin.o	\
- 	particles.o paste.o pathfinder.o pm_log.o	\
-@@ -78,11 +77,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-Makefile.linux b/games/el/files/patch-Makefile.linux
new file mode 100644
index 000000000000..232ae7a6cc14
--- /dev/null
+++ b/games/el/files/patch-Makefile.linux
@@ -0,0 +1,48 @@
+--- Makefile.linux	2009-01-19 23:45:49.000000000 -0500
++++ Makefile.linux	2009-01-19 23:52:26.000000000 -0500
+@@ -2,16 +2,18 @@
+ 
+ -include make.conf
+ 
++XDIR=-L$(LOCALBASE)/lib
++
+ # basic compiling and linking - rarely changed
+-OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
+-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CFLAGS=$(PLATFORM) -O2 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+-_CXXFLAGS=$(PLATFORM) -O3 -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++OPTIONS = -DBSD -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
++CFLAGS+=$(PLATFORM) $(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++_CFLAGS=$(CFLAGS) $(PLATFORM) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++CXXFLAGS+=$(PLATFORM) $(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++_CXXFLAGS=$(CXXFLAGS) $(PLATFORM) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
+ 
+ ZLIB_LIBS = -lz
+ PNG_SCREENSHOT_LIBS = -lpng
+-LDFLAGS=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
++LDFLAGS=`$(SDL_CONFIG) --libs` $(shell xml2-config --libs) -lSDL_net -lSDL_image -lopenal $(XDIR) -lGL -lGLU -lcal3d -lm $(EXTRA_LIBS) -lz -lpng -lvorbis -lvorbisfile \
+ 	$(foreach FEATURE, $(FEATURES), $($(FEATURE)_LIBS))
+ _LDFLAGS=$(XDIR) -lGL -lpthread -lz
+ STATICLIBS=libs/libSDL_net.a libs/libSDL.a libs/libSDL_image.a libs/libopenal.a libs/libvorbisfile.a libs/libvorbis.a libs/libogg.a libs/libxml2.a libs/libcal3d.a libs/libpng.a libs/libasound.a $(EXTRA_STATICLIBS)
+@@ -75,16 +77,16 @@
+ DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P)) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P))
+ #(shell echo $OBJ |sed s/\.o/\.P/))
+ 
+-EXE=el.x86.linux.bin
++EXE=el.x86
+ 
+ ifndef CC
+-CC=gcc
++CC?=gcc
+ endif
+ ifndef CXX
+-CXX=g++
++CXX?=g++
+ endif
+ ifndef LINK
+-LINK=gcc
++LINK?=gcc
+ endif
+ 
+ # the compile targets