- 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]

2 files changed, 39 insertions, 12 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