4 files changed, 45 insertions, 26 deletions

diff --git a/games/el/Makefile b/games/el/Makefile
index bc9d7c929062..ebdd3c4107ff 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	el
-PORTVERSION=	180
-PORTREVISION=	6
+PORTVERSION=	192
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
@@ -29,8 +28,8 @@ USE_GNOME=	libxml2
 USE_SDL=	sdl net image
 USE_GL=		yes
 
-ALL_TARGET=	el.x86
-MAKEFILE=	Makefile.linux
+ALL_TARGET=	el.bin
+MAKEFILE=	Makefile.bsd
 PLIST=		${WRKDIR}/pkg-plist
 
 .include <bsd.port.pre.mk>
@@ -42,15 +41,15 @@ BROKEN=		Does not compile on sparc64
 pre-install:
 	@${ECHO} "#!/bin/sh" > ${WRKDIR}/el
 	@${ECHO} "cd ${DATADIR} || exit 1 " >> ${WRKDIR}/el
-	@${ECHO} "exec ${DATADIR}/el.x86" >> ${WRKDIR}/el
+	@${ECHO} "exec ${DATADIR}/el.bin" >> ${WRKDIR}/el
 
 	@${ECHO} "bin/el" > ${PLIST}
-	@${ECHO} "%%DATADIR%%/el.x86" >> ${PLIST}
+	@${ECHO} "%%DATADIR%%/el.bin" >> ${PLIST}
 	@${ECHO} "@dirrmtry %%DATADIR%%" >> ${PLIST}
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/el ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/el.x86 ${DATADIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/el.bin ${DATADIR}
 
 .include <bsd.port.post.mk>
diff --git a/games/el/distinfo b/games/el/distinfo
index 0d6599f3b386..9b42ed9b58b4 100644
--- a/games/el/distinfo
+++ b/games/el/distinfo
@@ -1,2 +1,2 @@
-SHA256 (el/el-180.tar.bz2) = 482b5cbb9b3ff064175a80d0d1086ec9d2879c6175f11ed784635bd4ba148f88
-SIZE (el/el-180.tar.bz2) = 1882550
+SHA256 (el/el-192.tar.bz2) = 0a88f38642d1a05c7b533101201b80632af398cb0bdc616d2d33115e0689cb13
+SIZE (el/el-192.tar.bz2) = 2181980
diff --git a/games/el/files/patch-Makefile.linux b/games/el/files/patch-Makefile.bsd
index b7421e37ceda..fa4edcf39b26 100644
--- a/games/el/files/patch-Makefile.linux
+++ b/games/el/files/patch-Makefile.bsd
@@ -1,36 +1,37 @@
---- Makefile.linux	2009-01-19 23:45:49.000000000 -0500
-+++ Makefile.linux	2009-01-19 23:52:26.000000000 -0500
-@@ -2,16 +2,18 @@
+--- Makefile.bsd.orig	2011-10-20 11:30:54.000000000 -0500
++++ Makefile.bsd	2011-10-20 11:40:50.000000000 -0500
+@@ -2,17 +2,19 @@
  
  -include make.conf
  
 +XDIR=-L$(LOCALBASE)/lib
 +
  # basic compiling and linking - rarely changed
--OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE))
+ OPTIONS = -DBSD -DUSE_FILE32API -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
 -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+=$(CWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++_CFLAGS=-fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
 +CXXFLAGS+=$(CXXWARN) $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
-+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) `$(SDL_CONFIG) --cflags` $(shell xml2-config --cflags) -fno-strict-aliasing $(EXTRA_INCLUDES)
++_CXXFLAGS=-fomit-frame-pointer -ffast-math $(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 \
++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))
+-_LDFLAGS=$(XDIR) -lGL -lpthread -lstdc++
++_LDFLAGS=$(XDIR) -lGL -pthread -lstdc++
+ 
+ # This works on Ubuntu 8.04 (LTS) at least
+ # Install these packages in addition to those required for a standard build
+@@ -87,16 +89,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
+-EXE=el.x86.bsd.bin
++EXE=el.bin
  
  ifndef CC
 -CC=gcc
@@ -42,7 +43,7 @@
  endif
  ifndef LINK
 -LINK=gcc
-+LINK?=gcc
++LINK?=$(CC)
  endif
  
- # the compile targets
+ all: $(EXE)
diff --git a/games/el/files/patch-make.defaults b/games/el/files/patch-make.defaults
new file mode 100644
index 000000000000..43a7565672a8
--- /dev/null
+++ b/games/el/files/patch-make.defaults
@@ -0,0 +1,19 @@
+--- make.defaults.orig	2011-10-20 11:41:47.000000000 -0500
++++ make.defaults	2011-10-20 11:42:04.000000000 -0500
+@@ -65,8 +65,6 @@
+ 
+ 
+ 
+-PLATFORM=-march=i686
+-XDIR=-L/usr/X11R6/lib
+ CWARN=-Wall -Wdeclaration-after-statement
+ # -Wno-pointer-sign -Wno-sign-compare -Werror
+ CXXWARN=-Wall 
+@@ -82,7 +80,3 @@
+ #EXTRA_INCLUDES=-IC:\\Programme\\Dev-Cpp\\Include
+ #EXTRA_LIBS=-lz
+ #EXTRA_STATICLIBS=libs/zlib.a
+-
+-CC=gcc
+-CXX=g++
+-LINK=gcc