Date: Mon, 8 Apr 2019 12:14:19 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r498368 - head/games/openttd Message-ID: <201904081214.x38CEJtC058414@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Apr 8 12:14:19 2019 New Revision: 498368 URL: https://svnweb.freebsd.org/changeset/ports/498368 Log: - Update OpenTTD to the latest stable version 1.9.0 - Collapse per-mirror MASTER_SITES into single CDN entry point: old mirrors do not carry 1.9.0 distfile and I could not find current mirror list, should be OK as new entry point works with "fetch -A": it either does not redirect at all, or sends 301 (permanent), not 302 (temporary) redirect response - Allow to build with Fluidsynth music driver (off by default) - Install more complete set of documentation and game files - Move docfiles installation under `post-install-DOCS-on' - Add `sdl' to USES list and make pkg-plist file better sorted PR: 237094 (patchless update request) Modified: head/games/openttd/Makefile head/games/openttd/distinfo head/games/openttd/pkg-plist Modified: head/games/openttd/Makefile ============================================================================== --- head/games/openttd/Makefile Mon Apr 8 11:51:32 2019 (r498367) +++ head/games/openttd/Makefile Mon Apr 8 12:14:19 2019 (r498368) @@ -2,16 +2,9 @@ # $FreeBSD$ PORTNAME= openttd -DISTVERSION= 1.8.0 -PORTREVISION= 6 +DISTVERSION= 1.9.0 CATEGORIES= games -MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://de.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://fr.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${DISTVERSION}/ \ - http://uk.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ - http://us.binaries.openttd.org/binaries/releases/${DISTVERSION}/ +MASTER_SITES= https://proxy.binaries.openttd.org/openttd-releases/${DISTVERSION}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-source MAINTAINER= danfe@FreeBSD.org @@ -25,7 +18,8 @@ LIB_DEPENDS= libpng.so:graphics/png \ USES= cpe gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" -CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" +CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" \ + --without-libtimidity MAKE_ARGS= VERBOSE=1 WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} @@ -33,11 +27,12 @@ CXXFLAGS= # Set to empty as OpenTTD treats it as an ad SUB_FILES= pkg-message -PORTDOCS= HOWTO_compile_lang_files.txt admin_network.txt \ - elrail.svg elrail_tile.png elrail_track.png landscape.html \ - landscape_externals.html landscape_grid.html multiplayer.txt \ - obg_format.txt obm_format.txt obs_format.txt \ - ottd-colourtext-palette.png tileh.png +PORTDOCS= HOWTO_compile_lang_files.txt README.md admin_network.txt \ + changelog.txt elrail.svg elrail_tile.png elrail_track.png \ + known-bugs.txt landscape.html landscape_externals.html \ + landscape_grid.html multiplayer.txt obg_format.txt \ + obm_format.txt obs_format.txt ottd-colourtext-palette.png \ + tileh.png DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false @@ -52,13 +47,19 @@ CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" CONFIGURE_ARGS+= --with-midi-arg="${WITH_MIDI_PLAYER_ARGS}" .endif +.if defined(WITH_FLUIDSYNTH) +LIB_DEPENDS+= libfluidsynth.so:audio/fluidsynth +.else +CONFIGURE_ARGS+= --without-fluidsynth +.endif + .if defined(WITH_DEDICATED_SERVER_ONLY) CONFIGURE_ARGS+= --enable-dedicated # Aid it to find lzo2 headers; client build gets it via sdl-config CFLAGS+= -I${LOCALBASE}/include USE_RC_SUBR= ${PORTNAME} .else -USES+= compiler:c++11-lib +USES+= compiler:c++11-lib sdl USE_CXXSTD= gnu++11 CXXFLAGS+= -DU_USING_ICU_NAMESPACE=1 LIB_DEPENDS+= libfreetype.so:print/freetype2 \ @@ -89,6 +90,9 @@ pre-everything:: .if !defined(WITH_MIDI_PLAYER_ARGS) @${ECHO_MSG} "Define WITH_MIDI_PLAYER_ARGS=arguments for external MIDI player" .endif +.if !defined(WITH_FLUIDSYNTH) + @${ECHO_MSG} "Define WITH_FLUIDSYNTH to enable new Fluidsynth music driver" +.endif .if !defined(WITH_DEDICATED_SERVER_ONLY) @${ECHO_MSG} "Define WITH_DEDICATED_SERVER_ONLY to build CLI-based dedicated server" .endif @@ -99,15 +103,22 @@ pre-everything:: @${ECHO_MSG} "Define WITH_SAVE_PASSWORDS to save passwords between server restarts" .endif +post-extract: + @${MV} ${WRKSRC}/README.md ${WRKSRC}/changelog.txt \ + ${WRKSRC}/known-bugs.txt ${WRKSRC}/docs + post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib + @${REINPLACE_CMD} -e 's,OSX,${OPSYS:tu},' ${WRKSRC}/Makefile.grf.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ - ${STAGEDIR}${DATADIR}/lang ${STAGEDIR}${DATADIR}/scripts + ${STAGEDIR}${DATADIR}/game ${STAGEDIR}${DATADIR}/lang \ + ${STAGEDIR}${DATADIR}/scripts ${INSTALL_DATA} ${WRKSRC}/bin/ai/*.nut ${STAGEDIR}${DATADIR}/ai ${INSTALL_DATA} ${WRKSRC}/bin/baseset/* ${STAGEDIR}${DATADIR}/baseset + ${INSTALL_DATA} ${WRKSRC}/bin/game/* ${STAGEDIR}${DATADIR}/game ${INSTALL_DATA} ${WRKSRC}/bin/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ @@ -121,6 +132,8 @@ do-install: ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps/openttd.png . endfor .endif + +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} Modified: head/games/openttd/distinfo ============================================================================== --- head/games/openttd/distinfo Mon Apr 8 11:51:32 2019 (r498367) +++ head/games/openttd/distinfo Mon Apr 8 12:14:19 2019 (r498368) @@ -1,3 +1,3 @@ -TIMESTAMP = 1522588020 -SHA256 (openttd-1.8.0-source.tar.xz) = c2d32d9d736d27202a020027a3729ae763f5432ae6f424891e57a4095eeb087f -SIZE (openttd-1.8.0-source.tar.xz) = 6521016 +TIMESTAMP = 1554141178 +SHA256 (openttd-1.9.0-source.tar.xz) = 45fded554d973328496f6e01b0769d7b8b64048a8fe2cf252242194c08ea7419 +SIZE (openttd-1.9.0-source.tar.xz) = 6575956 Modified: head/games/openttd/pkg-plist ============================================================================== --- head/games/openttd/pkg-plist Mon Apr 8 11:51:32 2019 (r498367) +++ head/games/openttd/pkg-plist Mon Apr 8 12:14:19 2019 (r498368) @@ -1,6 +1,5 @@ bin/openttd man/man6/openttd.6.gz -share/pixmaps/openttd.32.xpm %%DATADIR%%/ai/compat_0.7.nut %%DATADIR%%/ai/compat_1.0.nut %%DATADIR%%/ai/compat_1.1.nut @@ -11,17 +10,28 @@ share/pixmaps/openttd.32.xpm %%DATADIR%%/ai/compat_1.6.nut %%DATADIR%%/ai/compat_1.7.nut %%DATADIR%%/ai/compat_1.8.nut +%%DATADIR%%/ai/compat_1.9.nut %%DATADIR%%/baseset/no_music.obm %%DATADIR%%/baseset/no_sound.obs %%DATADIR%%/baseset/openttd.grf %%DATADIR%%/baseset/opntitle.dat %%DATADIR%%/baseset/orig_dos.obg +%%DATADIR%%/baseset/orig_dos.obm %%DATADIR%%/baseset/orig_dos.obs %%DATADIR%%/baseset/orig_dos_de.obg %%DATADIR%%/baseset/orig_extra.grf +%%DATADIR%%/baseset/orig_tto.obm %%DATADIR%%/baseset/orig_win.obg %%DATADIR%%/baseset/orig_win.obm %%DATADIR%%/baseset/orig_win.obs +%%DATADIR%%/game/compat_1.2.nut +%%DATADIR%%/game/compat_1.3.nut +%%DATADIR%%/game/compat_1.4.nut +%%DATADIR%%/game/compat_1.5.nut +%%DATADIR%%/game/compat_1.6.nut +%%DATADIR%%/game/compat_1.7.nut +%%DATADIR%%/game/compat_1.8.nut +%%DATADIR%%/game/compat_1.9.nut %%DATADIR%%/lang/afrikaans.lng %%DATADIR%%/lang/arabic_egypt.lng %%DATADIR%%/lang/basque.lng @@ -93,3 +103,4 @@ share/icons/hicolor/48x48/apps/openttd.png share/icons/hicolor/64x64/apps/openttd.png share/icons/hicolor/128x128/apps/openttd.png share/icons/hicolor/256x256/apps/openttd.png +share/pixmaps/openttd.32.xpm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904081214.x38CEJtC058414>