Index: branches/2014Q1/games/el-data/Makefile
===================================================================
--- branches/2014Q1/games/el-data/Makefile	(revision 339103)
+++ branches/2014Q1/games/el-data/Makefile	(revision 339104)
@@ -1,85 +1,82 @@
 # Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	data
 PORTVERSION=	192
 CATEGORIES=	games
 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
+		http://www.gm.fh-koeln.de/~linke/EL-Downloads/:sound \
+		http://www.gm.fh-koeln.de/~linke/EL-Downloads/:music
 PKGNAMEPREFIX=	el-
 DISTFILES=	${EL_DATA}:data
 DIST_SUBDIR=	${PKGNAMEPREFIX:S/-//}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Eternal Lands data, sound, and music files
 
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-12-22
-
 USE_ZIP=	yes
 NO_PACKAGE=	Package will be 140MB, set FORCE_PACKAGE if you really want it
 NO_BUILD=	yes
-USE_DOS2UNIX=	*.ini *.txt
+USES=		dos2unix
+DOS2UNIX_GLOB=	*.ini *.txt
 
 DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX:S/-//}
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX:S/-/_/}linux
 EL_DATA=	${PKGNAMEPREFIX:S/-/_/}linux_${PORTVERSION}.zip
 
 OPTIONS_DEFINE=	ELSOUND ELMUSIC
 OPTIONS_DEFAULT=	ELSOUND ELMUSIC
 ELSOUND_DESC=	Install additional sound files
 ELMUSIC_DESC=	Install additional music files
 
 NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MELSOUND}
-BROKEN=		EL_sound_191.zip is unfetchable
 DISTFILES+=	EL_sound_191${EXTRACT_SUFX}:sound
 HAVE_ESOUND=	yes
 .endif
 
 .if ${PORT_OPTIONS:MELMUSIC}
-DISTFILES+=	music_full${EXTRACT_SUFX}:music
+DISTFILES+=	EL_music_full${EXTRACT_SUFX}:music
 HAVE_EMUSIC=	yes
 .endif
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${UNZIP_CMD} -q ${_DISTDIR}/${EL_DATA} -d ${WRKDIR}
 .if ${PORT_OPTIONS:MELSOUND}
 	@${UNZIP_CMD} -q ${_DISTDIR}/EL_sound_191${EXTRACT_SUFX} -d ${WRKSRC}
 .endif
 .if ${PORT_OPTIONS:MELMUSIC}
 	@${MKDIR} ${WRKSRC}/music
-	@${UNZIP_CMD} -q ${_DISTDIR}/music_full${EXTRACT_SUFX} -d ${WRKSRC}/music
+	@${UNZIP_CMD} -q ${_DISTDIR}/EL_music_full${EXTRACT_SUFX} -d ${WRKSRC}/music
 .endif
 
 post-extract:
 	@${FIND} ${WRKSRC} -type d -name CVS -print0 | \
 		${XARGS} -0 ${RM} -R
 	@${FIND} ${WRKSRC} -type f -name "*.dll" -print0 | \
 		${XARGS} -0 ${RM} -R
 	@${FIND} ${WRKSRC} -type f -name "*.exe" -print0 | \
 		${XARGS} -0 ${RM} -R
 	@${FIND} ${WRKSRC} -type f -name "*.bin" -print0 | \
 		${XARGS} -0 ${RM} -R
 
 pre-install:
 	@${RM} -f ${PLIST}
 	@cd ${WRKSRC} && \
 		${FIND} * -type f | ${SORT} | ${SED} -e 's|^|%%DATADIR%%/|' >> ${PLIST} && \
 			${FIND} * -type d | ${SORT} -r | ${SED} -e 's|^|@dirrm %%DATADIR%%/|' >> ${PLIST}
 	@${ECHO_CMD} "@dirrm %%DATADIR%%" >> ${PLIST}
 
 do-install:
 	${MKDIR} ${DATADIR}
 	@cd ${WRKSRC} && \
 		${FIND} * -type d -exec ${MKDIR} "${DATADIR}/{}" \; && \
 			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/{}" \;
 
 .include <bsd.port.mk>
Index: branches/2014Q1/games/el-data/distinfo
===================================================================
--- branches/2014Q1/games/el-data/distinfo	(revision 339103)
+++ branches/2014Q1/games/el-data/distinfo	(revision 339104)
@@ -1,6 +1,6 @@
 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
+SHA256 (el/EL_music_full.zip) = 1ea4de25081034ac684aaebf127ab6ca8524ba5367532863d84d63837dd631ec
+SIZE (el/EL_music_full.zip) = 65511882
Index: branches/2014Q1
===================================================================
--- branches/2014Q1	(revision 339103)
+++ branches/2014Q1	(revision 339104)

Property changes on: branches/2014Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r338863