- Update MASTER_SITES

- Change installation destination
- Bump PORTREVISION for PLIST changes

PR:		ports/153885
Submitted by:	Ilya A. Arhipov <micro@heavennet.ru> (maintainer)

4 files changed, 54 insertions, 55 deletions

diff --git a/games/openmsx/Makefile b/games/openmsx/Makefile
index d6063c2e059d..5b7668654239 100644
--- a/games/openmsx/Makefile
+++ b/games/openmsx/Makefile
@@ -7,10 +7,11 @@
 
 PORTNAME=	openmsx
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	http://ftp.snt.utwente.nl/pub/games/openttd/binaries/extra/openmsx/${PORTVERSION}/ \
-		http://gb.binaries.openttd.org/binaries/extra/openmsx/${PORTVERSION}/
+MASTER_SITES=	http://gb.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://de.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 
 MAINTAINER=	micro@heavennet.ru
@@ -20,12 +21,9 @@ USE_ZIP=	yes
 NO_BUILD=	yes
 LATEST_LINK=	openttd-${PORTNAME}
 
-post-extract:
-	@${FIND} ${WRKDIR}/openmsx-${PORTVERSION} -type f -name "*.txt" -exec ${MV} {} {}-msx \;
-
 do-install:
-	${MKDIR} ${PREFIX}/share/openttd/gm
+	${MKDIR} ${PREFIX}/share/openttd/gm/openmsx
 	${INSTALL_DATA} ${WRKDIR}/openmsx-${PORTVERSION}/* \
-		${PREFIX}/share/openttd/gm
+		${PREFIX}/share/openttd/gm/openmsx
 
 .include <bsd.port.mk>
diff --git a/games/openmsx/pkg-plist b/games/openmsx/pkg-plist
index a06fcac3944d..8df1fcdf2ddf 100644
--- a/games/openmsx/pkg-plist
+++ b/games/openmsx/pkg-plist
@@ -1,37 +1,38 @@
-share/openttd/gm/5432gone_redfarn.mid
-share/openttd/gm/be_sharp_bw_redfarn.mid
-share/openttd/gm/big_man_boogie_redfarn.mid
-share/openttd/gm/boogi_marabi_redfarn.mid
-share/openttd/gm/busy_schedule.mid
-share/openttd/gm/careless_perc_redfarn.mid
-share/openttd/gm/changelog.txt-msx
-share/openttd/gm/chemistry_lab.mid
-share/openttd/gm/chuggachugga.mid
-share/openttd/gm/city_blues_redfarn.mid
-share/openttd/gm/coconut_run2.mid
-share/openttd/gm/flying_scotsman.mid
-share/openttd/gm/harp_harmony.mid
-share/openttd/gm/license.txt-msx
-share/openttd/gm/linns_basket.mid
-share/openttd/gm/midnight_snow_run.mid
-share/openttd/gm/mighty_giant_run.mid
-share/openttd/gm/modern_motion.mid
-share/openttd/gm/moo_redfarn.mid
-share/openttd/gm/mosey_along_redfarn.mid
-share/openttd/gm/no_work_song_redfarn.mid
-share/openttd/gm/openmsx.obm
-share/openttd/gm/readme.txt-msx
-share/openttd/gm/relax_song.mid
-share/openttd/gm/run_for_your_life.mid
-share/openttd/gm/say_what_redfarn.mid
-share/openttd/gm/slow_neasy_redfarn.mid
-share/openttd/gm/the_fast_route.mid
-share/openttd/gm/the_hobo_redfarn.mid
-share/openttd/gm/train_filled_with_cash.mid
-share/openttd/gm/ttsong_iii_imuh3.mid
-share/openttd/gm/ttsong_iv_imuh3.mid
-share/openttd/gm/tttheme2.mid
-share/openttd/gm/ultimate_run.mid
-share/openttd/gm/wood_whistles.mid
+share/openttd/gm/openmsx/5432gone_redfarn.mid
+share/openttd/gm/openmsx/be_sharp_bw_redfarn.mid
+share/openttd/gm/openmsx/big_man_boogie_redfarn.mid
+share/openttd/gm/openmsx/boogi_marabi_redfarn.mid
+share/openttd/gm/openmsx/busy_schedule.mid
+share/openttd/gm/openmsx/careless_perc_redfarn.mid
+share/openttd/gm/openmsx/changelog.txt
+share/openttd/gm/openmsx/chemistry_lab.mid
+share/openttd/gm/openmsx/chuggachugga.mid
+share/openttd/gm/openmsx/city_blues_redfarn.mid
+share/openttd/gm/openmsx/coconut_run2.mid
+share/openttd/gm/openmsx/flying_scotsman.mid
+share/openttd/gm/openmsx/harp_harmony.mid
+share/openttd/gm/openmsx/license.txt
+share/openttd/gm/openmsx/linns_basket.mid
+share/openttd/gm/openmsx/midnight_snow_run.mid
+share/openttd/gm/openmsx/mighty_giant_run.mid
+share/openttd/gm/openmsx/modern_motion.mid
+share/openttd/gm/openmsx/moo_redfarn.mid
+share/openttd/gm/openmsx/mosey_along_redfarn.mid
+share/openttd/gm/openmsx/no_work_song_redfarn.mid
+share/openttd/gm/openmsx/openmsx.obm
+share/openttd/gm/openmsx/readme.txt
+share/openttd/gm/openmsx/relax_song.mid
+share/openttd/gm/openmsx/run_for_your_life.mid
+share/openttd/gm/openmsx/say_what_redfarn.mid
+share/openttd/gm/openmsx/slow_neasy_redfarn.mid
+share/openttd/gm/openmsx/the_fast_route.mid
+share/openttd/gm/openmsx/the_hobo_redfarn.mid
+share/openttd/gm/openmsx/train_filled_with_cash.mid
+share/openttd/gm/openmsx/ttsong_iii_imuh3.mid
+share/openttd/gm/openmsx/ttsong_iv_imuh3.mid
+share/openttd/gm/openmsx/tttheme2.mid
+share/openttd/gm/openmsx/ultimate_run.mid
+share/openttd/gm/openmsx/wood_whistles.mid
+@dirrmtry share/openttd/gm/openmsx
 @dirrmtry share/openttd/gm
 @dirrmtry share/openttd
diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile
index 44dee3330891..18cf66c80031 100644
--- a/games/opensfx/Makefile
+++ b/games/opensfx/Makefile
@@ -7,9 +7,11 @@
 
 PORTNAME=	opensfx
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	http://ftp.snt.utwente.nl/pub/games/openttd/binaries/extra/opensfx/${PORTVERSION}/ \
-		http://gb.binaries.openttd.org/binaries/extra/opensfx/${PORTVERSION}/
+MASTER_SITES=	http://gb.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://de.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 
 MAINTAINER=	micro@heavennet.ru
@@ -18,12 +20,9 @@ COMMENT=	Free alternative sounds for OpenTTD game engine
 USE_ZIP=	yes
 NO_BUILD=	yes
 
-post-extract:
-	@${FIND} ${WRKDIR}/opensfx-${PORTVERSION} -type f -name "*.txt" -exec ${MV} {} {}-sfx \;
-
 do-install:
-	${MKDIR} ${PREFIX}/share/openttd/data
+	${MKDIR} ${PREFIX}/share/openttd/data/opensfx/
 	${INSTALL_DATA} ${WRKDIR}/opensfx-${PORTVERSION}/* \
-		${PREFIX}/share/openttd/data
+		${PREFIX}/share/openttd/data/opensfx/
 
 .include <bsd.port.mk>
diff --git a/games/opensfx/pkg-plist b/games/opensfx/pkg-plist
index b76cf71feb4a..9b4aa9d82fb4 100644
--- a/games/opensfx/pkg-plist
+++ b/games/opensfx/pkg-plist
@@ -1,7 +1,8 @@
-share/openttd/data/changelog.txt-sfx
-share/openttd/data/license.txt-sfx
-share/openttd/data/opensfx.cat
-share/openttd/data/opensfx.obs
-share/openttd/data/readme.txt-sfx
+share/openttd/data/opensfx/changelog.txt
+share/openttd/data/opensfx/license.txt
+share/openttd/data/opensfx/opensfx.cat
+share/openttd/data/opensfx/opensfx.obs
+share/openttd/data/opensfx/readme.txt
+@dirrmtry share/openttd/data/opensfx
 @dirrmtry share/openttd/data
 @dirrmtry share/openttd