- Update to 140

- Remove el-data/pkg-plist file
- Remove BROKEN
- Add new el source code mastersite

3 files changed, 25 insertions, 23 deletions

diff --git a/games/el/Makefile b/games/el/Makefile
index 56e84debaf30..ee8d0835da56 100644
--- a/games/el/Makefile
+++ b/games/el/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	el
-PORTVERSION=	133
-PORTREVISION=	2
+PORTVERSION=	140
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	acm/${PORTNAME}
+MASTER_SITES=	http://bsdistfiles.googlecode.com/files/ \
+		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -23,12 +22,10 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		alut.1:${PORTSDIR}/audio/freealut
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME}/el.ini:${PORTSDIR}/games/el-data
 
-BROKEN=		Does not build
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
-USE_SDL=	sdl net
+USE_SDL=	sdl net image
 USE_GL=		yes
 USE_XLIB=	yes
 
@@ -42,10 +39,6 @@ PLIST=		${WRKDIR}/pkg-plist
 CFLAGS+=	-DX86_64
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile
-.endif
-
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
diff --git a/games/el/distinfo b/games/el/distinfo
index 8207cf069c77..205ee21129be 100644
--- a/games/el/distinfo
+++ b/games/el/distinfo
@@ -1,3 +1,3 @@
-MD5 (el/el-133.tar.bz2) = d8353219e21ccdb9e3c4143d05f7aa71
-SHA256 (el/el-133.tar.bz2) = 60a4adb6ed5065f28c8610118f64d085456aac3f883f1fee42ea9a005f539e19
-SIZE (el/el-133.tar.bz2) = 799859
+MD5 (el/el-140.tar.bz2) = 664e3f527bfe4b0692ad351707e51b94
+SHA256 (el/el-140.tar.bz2) = 325f95ced420088874f70b3a6f9dd864e14cc67018d484abd3232244917da6ec
+SIZE (el/el-140.tar.bz2) = 1474451
diff --git a/games/el/files/patch-Makefile.bsdg b/games/el/files/patch-Makefile.bsdg
index 91615f318c55..281882f69ad1 100644
--- a/games/el/files/patch-Makefile.bsdg
+++ b/games/el/files/patch-Makefile.bsdg
@@ -1,11 +1,11 @@
---- Makefile.bsdg	Fri Nov 24 13:42:55 2006
-+++ Makefile.bsdg	Fri Nov 24 14:05:16 2006
+--- 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 -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
@@ -26,17 +26,26 @@
 -_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$(X11BASE)/include/ -I$(LOCALBASE)/include
-+_CFLAGS=$(CFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS) $(shell sdl-config --cflags) $(shell xml2-config --cflags)
++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 -I$(X11BASE)/include $(OPTIONS)
-+_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math $(OPTIONS)
++_CXXFLAGS=$(CXXFLAGS) -fomit-frame-pointer -ffast-math -pipe $(OPTIONS)
  
--LDFLAGS=$(shell sdl11-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
-+LDFLAGS+=$(shell sdl-config --libs) $(shell xml2-config --libs) -lSDL_net -lopenal $(XDIR) -lalut -lGL -lGLU -lvorbis -lvorbisfile -lcal3d -lm -lpng
+-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
  
-@@ -68,11 +67,11 @@
+@@ -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)