3 files changed, 21 insertions, 18 deletions

diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 4f3e4a4b919e..39a6eba92d0e 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -2,25 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	uhexen2
-PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTVERSION=	1.5.6
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/HoT%20-%20Other%20content/extra%20data \
 		SF/${PORTNAME}/HoT%20-%20Other%20content/hexen2%20mods:mods \
 		SF/${PORTNAME}/HoT%20-%20Other%20content/hexenworld%20mods:hw_mods
 PKGNAMESUFFIX=	-extras
-EXTRACT_SUFX=	.tgz
 DISTFILES=	#
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hexen II source port extras (demos, mods, etc)
 
-BROKEN=		unfetchable
-
 RUN_DEPENDS=	uhexen2>0:${PORTSDIR}/games/uhexen2
 
 NO_BUILD=	yes
+NO_ARCH=	yes
+USES=		tar:tgz
 
 OPTIONS_MULTI=	EXTRA
 OPTIONS_MULTI_EXTRA=	HEXEN2_DEMOS HEXEN2_LITS HEXEN2_MODS HW_MODS
@@ -31,7 +29,7 @@ HEXEN2_DEMOS_DESC=	Install pre-recorded demos for Hexen II
 HEXEN2_DEMOS_DISTFILES=	hexen2-demos${EXTRACT_SUFX}
 
 HEXEN2_LITS_DESC=	Install colored light data for Hexen II
-HEXEN2_LITS_DISTFILES=	hexen2-lit_files${EXTRACT_SUFX}
+HEXEN2_LITS_DISTFILES=	hexen2-litfiles-20140628.zip
 
 HEXEN2_MODS_DESC=	Install several mods for Hexen II
 HEXEN2_MODS_DISTFILES=	apocbot-0.2.0${EXTRACT_SUFX}:mods \
@@ -45,27 +43,27 @@ HW_MODS_DISTFILES=	dungeonbreak${EXTRACT_SUFX}:hw_mods \
 			rivalkingdoms${EXTRACT_SUFX}:hw_mods \
 			siege${EXTRACT_SUFX}:hw_mods
 
-.include <bsd.port.options.mk>
-
 do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+
+do-install-HEXEN2_DEMOS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data1
-.if ${PORT_OPTIONS:MHEXEN2_DEMOS}
 	${INSTALL_DATA} ${WRKDIR}/data1/*demo* ${STAGEDIR}${DATADIR}/data1
-.endif
-.if ${PORT_OPTIONS:MHEXEN2_LITS}
+
+do-install-HEXEN2_LITS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data1/maps
 	${INSTALL_DATA} ${WRKDIR}/data1/maps/*.lit ${STAGEDIR}${DATADIR}/data1/maps
-.endif
-.if ${PORT_OPTIONS:MHEXEN2_MODS}
+
+do-install-HEXEN2_MODS-on:
 	(cd ${WRKDIR} && ${COPYTREE_SHARE} "apocbot fo4d hcbots" \
 		${STAGEDIR}${DATADIR})
-.endif
-.if ${PORT_OPTIONS:MHW_MODS}
+
+do-install-HW_MODS-on:
 	(cd ${WRKDIR} && ${COPYTREE_SHARE} "db hexarena hwctf rk siege" \
 		${STAGEDIR}${DATADIR})
+	@${MKDIR} ${STAGEDIR}${DATADIR}/data1
 .for f in hexarena hwctf rk siege
 	${INSTALL_DATA} ${WRKDIR}/data1/${f}.cfg ${STAGEDIR}${DATADIR}/data1
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/games/uhexen2-extras/distinfo b/games/uhexen2-extras/distinfo
index cb6d72f3e883..3856752f09e0 100644
--- a/games/uhexen2-extras/distinfo
+++ b/games/uhexen2-extras/distinfo
@@ -10,8 +10,8 @@ SHA256 (uhexen2/rivalkingdoms.tgz) = c87c8e4dba2aa410fbe37766303659081bd226932b2
 SIZE (uhexen2/rivalkingdoms.tgz) = 12026172
 SHA256 (uhexen2/siege.tgz) = 00e0fe0cc41ed26c2af230f3cfb36d38a577fffc42436a597703827f9548c004
 SIZE (uhexen2/siege.tgz) = 8616438
-SHA256 (uhexen2/hexen2-lit_files.tgz) = 1932cba4af209c7b3a9ee89f1e985297ccc8daaf1ad3c0e3b71bccee14593100
-SIZE (uhexen2/hexen2-lit_files.tgz) = 8326577
+SHA256 (uhexen2/hexen2-litfiles-20140628.zip) = dc897e617e8fbd70bfcfe394274a236e2ce9e0970d21e57de39132534aa3d3c2
+SIZE (uhexen2/hexen2-litfiles-20140628.zip) = 8957207
 SHA256 (uhexen2/apocbot-0.2.0.tgz) = d09f80d409b2052832e517fb4b16a0fdfcce133bf6452064e9d65ffc90283615
 SIZE (uhexen2/apocbot-0.2.0.tgz) = 382823
 SHA256 (uhexen2/fo4d.tgz) = 15a8363dcf290f73acef0f6792899577be896af898c2f19030101b712b9b2cd7
diff --git a/games/uhexen2-extras/pkg-plist b/games/uhexen2-extras/pkg-plist
index 7226e56a63a8..f9fe7c356bea 100644
--- a/games/uhexen2-extras/pkg-plist
+++ b/games/uhexen2-extras/pkg-plist
@@ -31,6 +31,11 @@
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/meso6.lit
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/meso8.lit
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/meso9.lit
+%%HEXEN2_LITS%%%%DATADIR%%/data1/maps/ravdm1.lit
+%%HEXEN2_LITS%%%%DATADIR%%/data1/maps/ravdm2.lit
+%%HEXEN2_LITS%%%%DATADIR%%/data1/maps/ravdm3.lit
+%%HEXEN2_LITS%%%%DATADIR%%/data1/maps/ravdm4.lit
+%%HEXEN2_LITS%%%%DATADIR%%/data1/maps/ravdm5.lit
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/rider1a.lit
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/rider2c.lit
 %%HEXEN2_LITS%%%%DATADIR%%/data1/maps/romeric1.lit