- Update to 1.14.108, use correct SF urls, fix fetch by that

PR:		138243
Submitted by:	myself
Approved by:	Aragon Gouveia <aragon@phat.za.net> (maintainer)

3 files changed, 63 insertions, 74 deletions

diff --git a/games/d2x-xl/Makefile b/games/d2x-xl/Makefile
index 1ebaa124f3b7..1ebcee508615 100644
--- a/games/d2x-xl/Makefile
+++ b/games/d2x-xl/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	d2x-xl
-PORTVERSION=	1.14.99
+PORTVERSION=	1.14.108
 CATEGORIES=	games
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|sourceforge/%SUBDIR%/$|project/${PORTNAME}/Linux/|}:source \
-		${MASTER_SITE_SOURCEFORGE:S|sourceforge/%SUBDIR%/$|project/${PORTNAME}/Data/|}:data \
+MASTER_SITES=	SF/d2x-xl/Linux:source \
+		SF/d2x-xl/Data:data \
 		http://www.descent2.de/downloads/:source,data
 DISTFILES=	${PORTNAME}-src-${PORTVERSION}.rar:source \
-		${PORTNAME}-data-1.14.1.rar:data
+		${PORTNAME}-data-${DATAVERSION}.rar:data
 
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	Community Unix port of Descent 2 Game
 
 EXTRACT_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar
 
+DATAVERSION=	1.14.95
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-debug --enable-release=yes \
 		--with-sharepath=${PREFIX}/share/d2x-xl
@@ -69,7 +71,7 @@ post-patch:
 do-install:
 	@${MKDIR} ${DATADIR}
 	@cd ${DATADIR} && \
-		unrar x -o+ ${DISTDIR}/${PORTNAME}-data-1.14.1.rar >/dev/null
+		unrar x -o+ ${DISTDIR}/${PORTNAME}-data-${DATAVERSION}.rar >/dev/null
 	${INSTALL_PROGRAM} ${WRKSRC}/d2x-xl ${PREFIX}/bin/d2x-xl
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/d2x-xl/distinfo b/games/d2x-xl/distinfo
index ad3540ab33f1..be6f69e87bdb 100644
--- a/games/d2x-xl/distinfo
+++ b/games/d2x-xl/distinfo
@@ -1,6 +1,6 @@
-MD5 (d2x-xl-src-1.14.99.rar) = 8daf8900795b0568e3280d6fe6305983
-SHA256 (d2x-xl-src-1.14.99.rar) = 8cd81a6bd2e054e39b085aa82dcc8102eee75ab5687bc7f9a71481895763e8ca
-SIZE (d2x-xl-src-1.14.99.rar) = 1400323
-MD5 (d2x-xl-data-1.14.1.rar) = 182c19176fe93cd1cbe1ae0c49a677b6
-SHA256 (d2x-xl-data-1.14.1.rar) = f792cc5fb030dc5a9415d4e04bacdacb7bd227af4e05416c62e4f29bd9a239cc
-SIZE (d2x-xl-data-1.14.1.rar) = 9930854 
+MD5 (d2x-xl-src-1.14.108.rar) = eea9e6d26a2305a0527b3b9e1fb08046
+SHA256 (d2x-xl-src-1.14.108.rar) = a002c156eb319694fd1e28d682885456d105512a3864399551fb221977358081
+SIZE (d2x-xl-src-1.14.108.rar) = 1647699
+MD5 (d2x-xl-data-1.14.95.rar) = 20a2d3663171b0514b66f6c1ad41cf82
+SHA256 (d2x-xl-data-1.14.95.rar) = bf1d877aba1987c0d529e8dbfbc55a1c5e374556f89ecb860bfd6942f9430625
+SIZE (d2x-xl-data-1.14.95.rar) = 9034850
diff --git a/games/d2x-xl/pkg-plist b/games/d2x-xl/pkg-plist
index f63c4423e199..2faec9506206 100644
--- a/games/d2x-xl/pkg-plist
+++ b/games/d2x-xl/pkg-plist
@@ -1,98 +1,85 @@
 bin/d2x-xl
+%%DATADIR%%/config/d2x-default.ini
+%%DATADIR%%/data/d2x-xl.hog
 %%DATADIR%%/data/descent.tex.eng
 %%DATADIR%%/data/descent.tex.ger
-%%DATADIR%%/data/d2x-xl.hog
 %%DATADIR%%/data/exit.ham
-%%DATADIR%%/config/d2x-default.ini
+%%DATADIR%%/models/bullet.ase
+%%DATADIR%%/models/bullet.tga
 %%DATADIR%%/profiles/default.plr
 %%DATADIR%%/profiles/default.plx
-%%DATADIR%%/textures/monsterball.tga
+%%DATADIR%%/sounds2/afbr_1.wav
+%%DATADIR%%/sounds2/airbubbles.wav
+%%DATADIR%%/sounds2/d1/gatling-slowdown.wav
+%%DATADIR%%/sounds2/d1/gatling-speedup.wav
+%%DATADIR%%/sounds2/d1/headlight.wav
+%%DATADIR%%/sounds2/d1/highping.wav
+%%DATADIR%%/sounds2/d1/lowping.wav
+%%DATADIR%%/sounds2/d1/missileflight-big.wav
+%%DATADIR%%/sounds2/d1/missileflight-small.wav
+%%DATADIR%%/sounds2/d1/vulcan-firing.wav
+%%DATADIR%%/sounds2/d1/zoom1.wav
+%%DATADIR%%/sounds2/d1/zoom2.wav
+%%DATADIR%%/sounds2/gatling-slowdown.wav
+%%DATADIR%%/sounds2/gatling-speedup.wav
+%%DATADIR%%/sounds2/gauss-firing.wav
+%%DATADIR%%/sounds2/headlight.wav
+%%DATADIR%%/sounds2/highping.wav
+%%DATADIR%%/sounds2/lightning.wav
+%%DATADIR%%/sounds2/lowping.wav
+%%DATADIR%%/sounds2/missileflight-big.wav
+%%DATADIR%%/sounds2/missileflight-small.wav
+%%DATADIR%%/sounds2/slowdown.wav
+%%DATADIR%%/sounds2/speedup.wav
+%%DATADIR%%/sounds2/vulcan-firing.wav
+%%DATADIR%%/sounds2/zoom1.wav
+%%DATADIR%%/sounds2/zoom2.wav
 %%DATADIR%%/textures/bullettime#0.tga
-%%DATADIR%%/textures/slowmotion#0.tga
 %%DATADIR%%/textures/cockpit.tga
 %%DATADIR%%/textures/cockpitb.tga
-%%DATADIR%%/textures/status.tga
-%%DATADIR%%/textures/statusb.tga
+%%DATADIR%%/textures/d2x-xl/aimdmg.tga
+%%DATADIR%%/textures/d2x-xl/blast-hard.tga
+%%DATADIR%%/textures/d2x-xl/blast-medium.tga
+%%DATADIR%%/textures/d2x-xl/blast-soft.tga
 %%DATADIR%%/textures/d2x-xl/blast.tga
 %%DATADIR%%/textures/d2x-xl/bubble.tga
 %%DATADIR%%/textures/d2x-xl/bullcase.tga
 %%DATADIR%%/textures/d2x-xl/corona.tga
 %%DATADIR%%/textures/d2x-xl/deadzone.tga
+%%DATADIR%%/textures/d2x-xl/drivedmg.tga
 %%DATADIR%%/textures/d2x-xl/fire.tga
 %%DATADIR%%/textures/d2x-xl/glare.tga
+%%DATADIR%%/textures/d2x-xl/gundmg.tga
 %%DATADIR%%/textures/d2x-xl/halfhalo.tga
 %%DATADIR%%/textures/d2x-xl/halo.tga
 %%DATADIR%%/textures/d2x-xl/joymouse.tga
+%%DATADIR%%/textures/d2x-xl/original/blast.tga
 %%DATADIR%%/textures/d2x-xl/pwupicon.tga
 %%DATADIR%%/textures/d2x-xl/rboticon.tga
+%%DATADIR%%/textures/d2x-xl/scope.tga
 %%DATADIR%%/textures/d2x-xl/shield.tga
-%%DATADIR%%/textures/d2x-xl/smoke.tga
-%%DATADIR%%/textures/d2x-xl/sparks.tga
-%%DATADIR%%/textures/d2x-xl/thrust2d.tga
-%%DATADIR%%/textures/d2x-xl/thrust3d.tga
 %%DATADIR%%/textures/d2x-xl/smoke-hard.tga
 %%DATADIR%%/textures/d2x-xl/smoke-medium.tga
 %%DATADIR%%/textures/d2x-xl/smoke-soft.tga
-%%DATADIR%%/textures/d2x-xl/scope.tga
-%%DATADIR%%/textures/d2x-xl/aimdmg.tga
-%%DATADIR%%/textures/d2x-xl/drivedmg.tga
-%%DATADIR%%/textures/d2x-xl/gundmg.tga
-%%DATADIR%%/textures/d2x-xl/original/blast.tga
-%%DATADIR%%/textures/d2x-xl/original/bubble.tga
-%%DATADIR%%/textures/d2x-xl/original/bullcase.tga
-%%DATADIR%%/textures/d2x-xl/original/corona.tga
-%%DATADIR%%/textures/d2x-xl/original/deadzone.tga
-%%DATADIR%%/textures/d2x-xl/original/fire.tga
-%%DATADIR%%/textures/d2x-xl/original/glare.tga
-%%DATADIR%%/textures/d2x-xl/original/halfhalo.tga
-%%DATADIR%%/textures/d2x-xl/original/halo.tga
-%%DATADIR%%/textures/d2x-xl/original/joymouse.tga
-%%DATADIR%%/textures/d2x-xl/original/pwupicon.tga
-%%DATADIR%%/textures/d2x-xl/original/rboticon.tga
-%%DATADIR%%/textures/d2x-xl/original/shield.tga
-%%DATADIR%%/textures/d2x-xl/original/smoke.tga
-%%DATADIR%%/textures/d2x-xl/original/sparks.tga
-%%DATADIR%%/textures/d2x-xl/original/thrust2d.tga
-%%DATADIR%%/textures/d2x-xl/original/thrust3d.tga
+%%DATADIR%%/textures/d2x-xl/smoke.tga
+%%DATADIR%%/textures/d2x-xl/sparks.tga
 %%DATADIR%%/textures/d2x-xl/thrust2d-blue.tga
 %%DATADIR%%/textures/d2x-xl/thrust2d-red.tga
+%%DATADIR%%/textures/d2x-xl/thrust2d.tga
 %%DATADIR%%/textures/d2x-xl/thrust3d-blue.tga
 %%DATADIR%%/textures/d2x-xl/thrust3d-red.tga
-%%DATADIR%%/models/bullet.ase
-%%DATADIR%%/models/bullet.tga
-%%DATADIR%%/sounds2/gatling-slowdown.wav
-%%DATADIR%%/sounds2/gatling-speedup.wav
-%%DATADIR%%/sounds2/gauss-firing.wav
-%%DATADIR%%/sounds2/vulcan-firing.wav
-%%DATADIR%%/sounds2/missileflight-big.wav
-%%DATADIR%%/sounds2/missileflight-small.wav
-%%DATADIR%%/sounds2/afbr_1.wav
-%%DATADIR%%/sounds2/airbubbles.wav
-%%DATADIR%%/sounds2/highping.wav
-%%DATADIR%%/sounds2/lowping.wav
-%%DATADIR%%/sounds2/slowdown.wav
-%%DATADIR%%/sounds2/speedup.wav
-%%DATADIR%%/sounds2/lightning.wav
-%%DATADIR%%/sounds2/headlight.wav
-%%DATADIR%%/sounds2/zoom1.wav
-%%DATADIR%%/sounds2/zoom2.wav
-%%DATADIR%%/sounds2/d1/gatling-slowdown.wav
-%%DATADIR%%/sounds2/d1/gatling-speedup.wav
-%%DATADIR%%/sounds2/d1/headlight.wav
-%%DATADIR%%/sounds2/d1/highping.wav
-%%DATADIR%%/sounds2/d1/lowping.wav
-%%DATADIR%%/sounds2/d1/missileflight-big.wav
-%%DATADIR%%/sounds2/d1/missileflight-small.wav
-%%DATADIR%%/sounds2/d1/zoom1.wav
-%%DATADIR%%/sounds2/d1/zoom2.wav
-%%DATADIR%%/sounds2/d1/vulcan-firing.wav
-@dirrm %%DATADIR%%/sounds2/d1
-@dirrm %%DATADIR%%/sounds2
-@dirrm %%DATADIR%%/models
+%%DATADIR%%/textures/d2x-xl/thrust3d.tga
+%%DATADIR%%/textures/monsterball.tga
+%%DATADIR%%/textures/slowmotion#0.tga
+%%DATADIR%%/textures/status.tga
+%%DATADIR%%/textures/statusb.tga
 @dirrm %%DATADIR%%/textures/d2x-xl/original
 @dirrm %%DATADIR%%/textures/d2x-xl
 @dirrm %%DATADIR%%/textures
+@dirrm %%DATADIR%%/sounds2/d1
+@dirrm %%DATADIR%%/sounds2
 @dirrm %%DATADIR%%/profiles
-@dirrm %%DATADIR%%/config
+@dirrm %%DATADIR%%/models
 @dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%