- Update to 1.9.2

- Add ELSOUND and ELMUSIC options. It installs additional sound and music files
- Remove Makefile.linux patch file
- Re-add Makefile.bsd patch file
- Respect CC/CXX/LINK [1]
- Few others modifications

PR:	161561
Submitted by:	Nali Toja <nalitoja __ at __ gmail.com> [1]

6 files changed, 84 insertions, 38 deletions

diff --git a/games/el-data/Makefile b/games/el-data/Makefile
index ab79fefc3d4e..7f92c445faef 100644
--- a/games/el-data/Makefile
+++ b/games/el-data/Makefile
@@ -6,30 +6,55 @@
 #
 
 PORTNAME=	data
-PORTVERSION=	180
+PORTVERSION=	192
 CATEGORIES=	games
-MASTER_SITES=	http://el.beplacid.net/downloads/ \
-		http://www.eternal-lands.com/ \
-		http://el.rauchs-home.de/client/
+MASTER_SITES=	http://el.beplacid.net/downloads/:data \
+		http://www.eternal-lands.com/:data \
+		http://el.rauchs-home.de/client/:data \
+		http://www.eternallands.co.uk/:sound \
+		http://www.eternallands.co.uk/:music
 PKGNAMEPREFIX=	el-
-DISTFILES=	${EL_DATA}
+DISTFILES=	${EL_DATA}:data
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm@FreeBSD.org
-COMMENT=	Eternal Lands data and sound files
+COMMENT=	Eternal Lands data, sound and music files
 
 USE_ZIP=	yes
+NO_PACKAGE=	Package will be 140MB, set FORCE_PACKAGE if you really want it
 NO_BUILD=	yes
 USE_DOS2UNIX=	*.ini *.txt
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-/_/}linux
-EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}_install.zip
+EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}.zip
+
+OPTIONS=	ELSOUND	"Install additional sound files"	on \
+		ELMUSIC	"Install additional music files"	on
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ELSOUND)
+DISTFILES+=	EL_sound_191${EXTRACT_SUFX}:sound
+HAVE_ESOUND=	yes
+.endif
+
+.if defined(WITH_ELMUSIC)
+DISTFILES+=	music_full${EXTRACT_SUFX}:music
+HAVE_EMUSIC=	yes
+.endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${UNZIP_CMD} -q ${_DISTDIR}/${EL_DATA} -d ${WRKDIR}
+.if defined(HAVE_ESOUND)
+	@${UNZIP_CMD} -q ${_DISTDIR}/EL_sound_191${EXTRACT_SUFX} -d ${WRKSRC}
+.endif
+.if defined(HAVE_EMUSIC)
+	@${MKDIR} ${WRKSRC}/music
+	@${UNZIP_CMD} -q ${_DISTDIR}/music_full${EXTRACT_SUFX} -d ${WRKSRC}/music
+.endif
 
 post-extract:
 	@${FIND} ${WRKSRC} -type d -name CVS -print0 | \
@@ -40,8 +65,6 @@ post-extract:
 		${XARGS} -0 ${RM} -R
 	@${FIND} ${WRKSRC} -type f -name "*.bin" -print0 | \
 		${XARGS} -0 ${RM} -R
-	@${RM} -R ${WRKSRC}/custom ${WRKSRC}/textures/eye_candy/textures
-
 
 pre-install:
 	@${RM} -f ${PLIST}
@@ -56,4 +79,4 @@ do-install:
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/el-data/distinfo b/games/el-data/distinfo
index 0708416b4b38..040a13e9000e 100644
--- a/games/el-data/distinfo
+++ b/games/el-data/distinfo
@@ -1,2 +1,6 @@
-SHA256 (el/el_linux_180_install.zip) = 59ed045e6540352cff81177538fc94d45ba3609624e19f6ee5043837b628d698
-SIZE (el/el_linux_180_install.zip) = 53003598
+SHA256 (el/el_linux_192.zip) = bd700258110b8ac7b540cce1517777ca718c22cb5330989e097206adf962b8e9
+SIZE (el/el_linux_192.zip) = 65888714
+SHA256 (el/EL_sound_191.zip) = e73046ab03c916d562cda2d243427969678e3bb7a22d98c3b44646b4c3ae5da7
+SIZE (el/EL_sound_191.zip) = 42979628
+SHA256 (el/music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec
+SIZE (el/music_full.zip) = 65511882
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