- Update OpenGFX bundle to version 0.4.4

- Adjust file paths to the new world order
- Set similar LATEST_LINK in all three ports
- Remove trailing slashes in directory names for consistency
- Canonicalize Makefile header and mute MKDIR's while here

Submitted by:	Ilya Arkhipov

7 files changed, 84 insertions, 82 deletions

diff --git a/games/opengfx/Makefile b/games/opengfx/Makefile
index 1daa3a4f3ea0..7b20e5ed62cd 100644
--- a/games/opengfx/Makefile
+++ b/games/opengfx/Makefile
@@ -1,15 +1,15 @@
-# New ports collection makefile for:	opengfx
-# Date created:			2010-11-04
-# Whom:				Ilya A. Arhipov
+# New ports collection makefile for:	OpenGFX
+# Date created:				2010-11-04
+# Whom:					Ilya A. Arhipov <admin@gorodkirov.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	opengfx
-PORTVERSION=	0.3.7
+PORTVERSION=	0.4.4
 CATEGORIES=	games
-MASTER_SITES=	http://gb.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
-		http://de.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+MASTER_SITES=	http://hu.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://us.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
 		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 
@@ -18,10 +18,11 @@ COMMENT=	Free alternative graphics for OpenTTD game engine
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+LATEST_LINK=	openttd-${PORTNAME}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/openttd/data/opengfx/
+	@${MKDIR} ${PREFIX}/share/openttd/baseset/opengfx
 	${INSTALL_DATA} ${WRKDIR}/opengfx-${PORTVERSION}/* \
-		${PREFIX}/share/openttd/data/opengfx/
+		${PREFIX}/share/openttd/baseset/opengfx
 
 .include <bsd.port.mk>
diff --git a/games/opengfx/distinfo b/games/opengfx/distinfo
index 57d1c27a5220..1ef3df76be1c 100644
--- a/games/opengfx/distinfo
+++ b/games/opengfx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opengfx-0.3.7-all.zip) = 1ed05b5d37c9b84a8b1158852500db468c827f0ca5dfe1425fdc919814f3ed13
-SIZE (opengfx-0.3.7-all.zip) = 3459045
+SHA256 (opengfx-0.4.4-all.zip) = e4ab944c5b2e17726b2966076c77a859b681d4325ad394f517e78fff1319e494
+SIZE (opengfx-0.4.4-all.zip) = 3470306
diff --git a/games/opengfx/pkg-plist b/games/opengfx/pkg-plist
index 7f9e1e46c21d..3782c0470119 100644
--- a/games/opengfx/pkg-plist
+++ b/games/opengfx/pkg-plist
@@ -1,13 +1,13 @@
-share/openttd/data/opengfx/changelog.txt
-share/openttd/data/opengfx/license.txt
-share/openttd/data/opengfx/ogfx1_base.grf
-share/openttd/data/opengfx/ogfxc_arctic.grf
-share/openttd/data/opengfx/ogfxe_extra.grf
-share/openttd/data/opengfx/ogfxh_tropical.grf
-share/openttd/data/opengfx/ogfxi_logos.grf
-share/openttd/data/opengfx/ogfxt_toyland.grf
-share/openttd/data/opengfx/opengfx.obg
-share/openttd/data/opengfx/readme.txt
-@dirrmtry share/openttd/data/opengfx
-@dirrmtry share/openttd/data
+share/openttd/baseset/opengfx/changelog.txt
+share/openttd/baseset/opengfx/license.txt
+share/openttd/baseset/opengfx/ogfx1_base.grf
+share/openttd/baseset/opengfx/ogfxc_arctic.grf
+share/openttd/baseset/opengfx/ogfxe_extra.grf
+share/openttd/baseset/opengfx/ogfxh_tropical.grf
+share/openttd/baseset/opengfx/ogfxi_logos.grf
+share/openttd/baseset/opengfx/ogfxt_toyland.grf
+share/openttd/baseset/opengfx/opengfx.obg
+share/openttd/baseset/opengfx/readme.txt
+@dirrmtry share/openttd/baseset/opengfx
+@dirrmtry share/openttd/baseset
 @dirrmtry share/openttd
diff --git a/games/openmsx/Makefile b/games/openmsx/Makefile
index 5b7668654239..895f9ee30379 100644
--- a/games/openmsx/Makefile
+++ b/games/openmsx/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:	openmsx
-# Date created:			2010-11-04
-# Whom:				Ilya A. Arhipov
+# New ports collection makefile for:	OpenMSX
+# Date created:				2010-11-04
+# Whom:					Ilya A. Arhipov <admin@gorodkirov.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	openmsx
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	http://gb.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
-		http://de.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+MASTER_SITES=	http://hu.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://us.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
 		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 
@@ -22,8 +22,8 @@ NO_BUILD=	yes
 LATEST_LINK=	openttd-${PORTNAME}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/openttd/gm/openmsx
+	@${MKDIR} ${PREFIX}/share/openttd/baseset/openmsx
 	${INSTALL_DATA} ${WRKDIR}/openmsx-${PORTVERSION}/* \
-		${PREFIX}/share/openttd/gm/openmsx
+		${PREFIX}/share/openttd/baseset/openmsx
 
 .include <bsd.port.mk>
diff --git a/games/openmsx/pkg-plist b/games/openmsx/pkg-plist
index 8df1fcdf2ddf..38851d2ac762 100644
--- a/games/openmsx/pkg-plist
+++ b/games/openmsx/pkg-plist
@@ -1,38 +1,38 @@
-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
+share/openttd/baseset/openmsx/5432gone_redfarn.mid
+share/openttd/baseset/openmsx/be_sharp_bw_redfarn.mid
+share/openttd/baseset/openmsx/big_man_boogie_redfarn.mid
+share/openttd/baseset/openmsx/boogi_marabi_redfarn.mid
+share/openttd/baseset/openmsx/busy_schedule.mid
+share/openttd/baseset/openmsx/careless_perc_redfarn.mid
+share/openttd/baseset/openmsx/changelog.txt
+share/openttd/baseset/openmsx/chemistry_lab.mid
+share/openttd/baseset/openmsx/chuggachugga.mid
+share/openttd/baseset/openmsx/city_blues_redfarn.mid
+share/openttd/baseset/openmsx/coconut_run2.mid
+share/openttd/baseset/openmsx/flying_scotsman.mid
+share/openttd/baseset/openmsx/harp_harmony.mid
+share/openttd/baseset/openmsx/license.txt
+share/openttd/baseset/openmsx/linns_basket.mid
+share/openttd/baseset/openmsx/midnight_snow_run.mid
+share/openttd/baseset/openmsx/mighty_giant_run.mid
+share/openttd/baseset/openmsx/modern_motion.mid
+share/openttd/baseset/openmsx/moo_redfarn.mid
+share/openttd/baseset/openmsx/mosey_along_redfarn.mid
+share/openttd/baseset/openmsx/no_work_song_redfarn.mid
+share/openttd/baseset/openmsx/openmsx.obm
+share/openttd/baseset/openmsx/readme.txt
+share/openttd/baseset/openmsx/relax_song.mid
+share/openttd/baseset/openmsx/run_for_your_life.mid
+share/openttd/baseset/openmsx/say_what_redfarn.mid
+share/openttd/baseset/openmsx/slow_neasy_redfarn.mid
+share/openttd/baseset/openmsx/the_fast_route.mid
+share/openttd/baseset/openmsx/the_hobo_redfarn.mid
+share/openttd/baseset/openmsx/train_filled_with_cash.mid
+share/openttd/baseset/openmsx/ttsong_iii_imuh3.mid
+share/openttd/baseset/openmsx/ttsong_iv_imuh3.mid
+share/openttd/baseset/openmsx/tttheme2.mid
+share/openttd/baseset/openmsx/ultimate_run.mid
+share/openttd/baseset/openmsx/wood_whistles.mid
+@dirrmtry share/openttd/baseset/openmsx
+@dirrmtry share/openttd/baseset
 @dirrmtry share/openttd
diff --git a/games/opensfx/Makefile b/games/opensfx/Makefile
index 18cf66c80031..6c97af3270fc 100644
--- a/games/opensfx/Makefile
+++ b/games/opensfx/Makefile
@@ -1,16 +1,16 @@
-# New ports collection makefile for:	opensfx
-# Date created:			2010-11-04
-# Whom:				Ilya A. Arhipov
+# New ports collection makefile for:	OpenSFX
+# Date created:				2010-11-04
+# Whom:					Ilya A. Arhipov <admin@gorodkirov.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	opensfx
 PORTVERSION=	0.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
-MASTER_SITES=	http://gb.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
-		http://de.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+MASTER_SITES=	http://hu.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
+		http://us.binaries.openttd.org/binaries/extra/${PORTNAME}/${PORTVERSION}/ \
 		http://cz.binaries.openttd.org/openttd/binaries/extra/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-all
 
@@ -19,10 +19,11 @@ COMMENT=	Free alternative sounds for OpenTTD game engine
 
 USE_ZIP=	yes
 NO_BUILD=	yes
+LATEST_LINK=	openttd-${PORTNAME}
 
 do-install:
-	${MKDIR} ${PREFIX}/share/openttd/data/opensfx/
+	@${MKDIR} ${PREFIX}/share/openttd/baseset/opensfx
 	${INSTALL_DATA} ${WRKDIR}/opensfx-${PORTVERSION}/* \
-		${PREFIX}/share/openttd/data/opensfx/
+		${PREFIX}/share/openttd/baseset/opensfx
 
 .include <bsd.port.mk>
diff --git a/games/opensfx/pkg-plist b/games/opensfx/pkg-plist
index 9b4aa9d82fb4..adad0ef25de7 100644
--- a/games/opensfx/pkg-plist
+++ b/games/opensfx/pkg-plist
@@ -1,8 +1,8 @@
-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
+share/openttd/baseset/opensfx/changelog.txt
+share/openttd/baseset/opensfx/license.txt
+share/openttd/baseset/opensfx/opensfx.cat
+share/openttd/baseset/opensfx/opensfx.obs
+share/openttd/baseset/opensfx/readme.txt
+@dirrmtry share/openttd/baseset/opensfx
+@dirrmtry share/openttd/baseset
 @dirrmtry share/openttd