Hi, OpenTTD's data files are independently versioned from the main package and each other. The biggest distfile (opensfx) hardly ever changes, so splitting into several packages will save a bit of bandwidth and make the port simpler for me to update (I've been meaning to do this for a while now).
The attached patch also updates to openttd-1.7.0. ok? -- Anthony J. Bentley
Index: Makefile =================================================================== RCS file: /cvs/ports/games/openttd/Makefile,v retrieving revision 1.49 diff -u -p -u -p -r1.49 Makefile --- Makefile 5 Dec 2016 16:16:23 -0000 1.49 +++ Makefile 12 Apr 2017 08:55:00 -0000 @@ -2,18 +2,9 @@ COMMENT= open source clone of the game Transport Tycoon Deluxe -V = 1.6.1 -DISTNAME = openttd-$V -EXTRACT_SUFX= -source.tar.gz -GFX_V = 0.5.4 -SFX_V= 0.2.3 -MSX_V= 0.3.1 -REVISION= 0 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - opengfx-${GFX_V}.zip:0 \ - opensfx-${SFX_V}.zip:1 \ - openmsx-${MSX_V}.zip:2 -DIST_SUBDIR= openttd +V = 1.7.0 +DISTNAME = openttd-$V-source +PKGNAME = openttd-$V CATEGORIES= games @@ -27,10 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes WANTLIB += SDL c fontconfig freetype icudata icui18n icuuc WANTLIB += lzma lzo2 m png pthread stdc++ xdg-basedir z -MASTER_SITES= http://binaries.openttd.org/releases/${V}/ -MASTER_SITES0= https://bundles.openttdcoop.org/opengfx/releases/${GFX_V}/ -MASTER_SITES1= https://bundles.openttdcoop.org/opensfx/releases/${SFX_V}/ -MASTER_SITES2= https://bundles.openttdcoop.org/openmsx/releases/${MSX_V}/ +MASTER_SITES= https://binaries.openttd.org/releases/$V/ LIB_DEPENDS= archivers/lzo2 \ devel/sdl \ @@ -40,6 +28,9 @@ LIB_DEPENDS= archivers/lzo2 \ x11/libxdg-basedir RUN_DEPENDS= devel/desktop-file-utils \ + games/openttd-data/opengfx \ + games/openttd-data/openmsx \ + games/openttd-data/opensfx \ x11/gtk+3,-guic CONFIGURE_STYLE= simple @@ -69,8 +60,7 @@ GAMEDIR= ${PREFIX}/share/openttd FAKE_FLAGS=BUNDLE_DIR=${WRKINST}/bundle BUNDLES_DIR=${WRKINST}/bundle -post-extract: - cd ${WRKDIR} && ${TAR} xf opengfx-${GFX_V}.tar +WRKDIST = ${WRKDIR}/openttd-$V post-install: ${INSTALL_DATA_DIR} ${GAMEDIR}/media @@ -79,11 +69,6 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${EXAMPLESDIR} ${INSTALL_DATA_DIR} ${DOCSDIR} cd ${WRKSRC}/docs/ && umask 022 && pax -rw . ${DOCSDIR} - ${INSTALL_DATA_DIR} ${GAMEDIR}/data - ${INSTALL_DATA_DIR} ${GAMEDIR}/gm - ${INSTALL_DATA} ${WRKDIR}/opengfx-${GFX_V}/*.{grf,obg} ${GAMEDIR}/data - ${INSTALL_DATA} ${WRKDIR}/opensfx-${SFX_V}/*.{cat,obs} ${GAMEDIR}/data - ${INSTALL_DATA} ${WRKDIR}/openmsx-${MSX_V}/*.{mid,obm} ${GAMEDIR}/gm rm -rf ${WRKINST}/bundle rm -rf ${GAMEDIR}/media/openttd.desktop* Index: distinfo =================================================================== RCS file: /cvs/ports/games/openttd/distinfo,v retrieving revision 1.29 diff -u -p -u -p -r1.29 distinfo --- distinfo 1 Aug 2016 19:19:46 -0000 1.29 +++ distinfo 12 Apr 2017 08:55:00 -0000 @@ -1,8 +1,2 @@ -SHA256 (openttd/opengfx-0.5.4.zip) = PRNtd2kG2+i13xQ0y5po0SSVEaPEz6ylXMJMwAKK4Hg= -SHA256 (openttd/openmsx-0.3.1.zip) = kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU= -SHA256 (openttd/opensfx-0.2.3.zip) = NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI= -SHA256 (openttd/openttd-1.6.1-source.tar.gz) = x71xM3fwjVtj1wPjuLjv87tOxwQq0TURV1//RkDLx48= -SIZE (openttd/opengfx-0.5.4.zip) = 3547720 -SIZE (openttd/openmsx-0.3.1.zip) = 136981 -SIZE (openttd/opensfx-0.2.3.zip) = 11144025 -SIZE (openttd/openttd-1.6.1-source.tar.gz) = 10157130 +SHA256 (openttd-1.7.0-source.tar.gz) = FrjvJFDIDnn8oo4JMkNcRJPw9NGPGz9V68xlRUs66zg= +SIZE (openttd-1.7.0-source.tar.gz) = 10088730 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/games/openttd/pkg/PLIST,v retrieving revision 1.24 diff -u -p -u -p -r1.24 PLIST --- pkg/PLIST 1 Aug 2016 19:19:46 -0000 1.24 +++ pkg/PLIST 12 Apr 2017 08:55:00 -0000 @@ -46,7 +46,6 @@ share/icons/hicolor/256x256/apps/openttd share/icons/hicolor/32x32/apps/openttd.png share/icons/hicolor/48x48/apps/openttd.png share/icons/hicolor/64x64/apps/openttd.png -share/openttd/ share/openttd/ai/ share/openttd/ai/compat_0.7.nut share/openttd/ai/compat_1.0.nut @@ -56,6 +55,7 @@ share/openttd/ai/compat_1.3.nut share/openttd/ai/compat_1.4.nut share/openttd/ai/compat_1.5.nut share/openttd/ai/compat_1.6.nut +share/openttd/ai/compat_1.7.nut share/openttd/baseset/ share/openttd/baseset/no_music.obm share/openttd/baseset/no_sound.obs @@ -64,58 +64,17 @@ share/openttd/baseset/opntitle.dat share/openttd/baseset/orig_dos.obg share/openttd/baseset/orig_dos.obs share/openttd/baseset/orig_dos_de.obg +share/openttd/baseset/orig_extra.grf share/openttd/baseset/orig_win.obg share/openttd/baseset/orig_win.obm share/openttd/baseset/orig_win.obs -share/openttd/data/ -share/openttd/data/ogfx1_base.grf -share/openttd/data/ogfxc_arctic.grf -share/openttd/data/ogfxe_extra.grf -share/openttd/data/ogfxh_tropical.grf -share/openttd/data/ogfxi_logos.grf -share/openttd/data/ogfxt_toyland.grf -share/openttd/data/opengfx.obg -share/openttd/data/opensfx.cat -share/openttd/data/opensfx.obs share/openttd/game/ share/openttd/game/compat_1.2.nut share/openttd/game/compat_1.3.nut share/openttd/game/compat_1.4.nut share/openttd/game/compat_1.5.nut share/openttd/game/compat_1.6.nut -share/openttd/gm/ -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/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/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/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/game/compat_1.7.nut share/openttd/lang/ share/openttd/lang/afrikaans.lng share/openttd/lang/arabic_egypt.lng @@ -198,6 +157,7 @@ share/openttd/media/extra_grf/autorail.p share/openttd/media/extra_grf/canal_locks.png share/openttd/media/extra_grf/canals.nfo share/openttd/media/extra_grf/canals.png +share/openttd/media/extra_grf/canals_extra.nfo share/openttd/media/extra_grf/chars.nfo share/openttd/media/extra_grf/chars.png share/openttd/media/extra_grf/elrails.nfo @@ -215,6 +175,7 @@ share/openttd/media/extra_grf/oneway.png share/openttd/media/extra_grf/openttd.nfo share/openttd/media/extra_grf/openttdgui.nfo share/openttd/media/extra_grf/openttdgui.png +share/openttd/media/extra_grf/orig_extra.nfo share/openttd/media/extra_grf/palette.nfo share/openttd/media/extra_grf/rivers/ share/openttd/media/extra_grf/rivers/arctic.nfo
openttd-data.tar.gz
Description: openttd-data.tar.gz