Index: head/games/openttd/Makefile =================================================================== --- head/games/openttd/Makefile (revision 498367) +++ head/games/openttd/Makefile (revision 498368) @@ -1,132 +1,145 @@ # Created by: Alexey Dokuchaev # $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 COMMENT= Open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 LIB_DEPENDS= libpng.so:graphics/png \ liblzo2.so:archivers/lzo2 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} CXXFLAGS= # Set to empty as OpenTTD treats it as an addition to CFLAGS 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 OPTIONS_DEFINE= DOCS .if defined(WITH_MIDI_PLAYER) CONFIGURE_ARGS+= --with-midi="${WITH_MIDI_PLAYER}" .endif .if defined(WITH_MIDI_PLAYER_ARGS) 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 \ libicui18n.so:devel/icu \ libicu-le-hb.so:devel/icu-le-hb \ libiculx.so:devel/icu-lx \ libfontconfig.so:x11-fonts/fontconfig USE_SDL= sdl INSTALLS_ICONS= yes .endif .if defined(WITH_OPEN_GAME_FILES) RUN_DEPENDS+= ${LOCALBASE}/share/${PORTNAME}/baseset/opengfx/opengfx.obg:games/opengfx \ ${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:games/openmsx \ ${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:games/opensfx .endif .if defined(WITH_SAVE_PASSWORDS) EXTRA_PATCHES= ${FILESDIR}/extra-patch-save-passwords .endif .include pre-everything:: .if !defined(WITH_MIDI_PLAYER) @${ECHO_MSG} "Define WITH_MIDI_PLAYER=/path/to/player to build with external MIDI player" .endif .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 .if !defined(WITH_OPEN_GAME_FILES) @${ECHO_MSG} "Define WITH_OPEN_GAME_FILES to install with libre graphics, music, and sounds" .endif .if !defined(WITH_SAVE_PASSWORDS) @${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 \ ${STAGEDIR}${MANPREFIX}/man/man6 .if !defined(WITH_DEDICATED_SERVER_ONLY) ${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps . for n in 16 32 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${n}x${n}/apps ${INSTALL_DATA} ${WRKSRC}/media/openttd.${n}.png \ ${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} post-install: .if defined(WITH_DEDICATED_SERVER_ONLY) @${REINPLACE_CMD} -E '/icons|pixmaps/d' ${TMPPLIST} .endif .include Index: head/games/openttd/distinfo =================================================================== --- head/games/openttd/distinfo (revision 498367) +++ head/games/openttd/distinfo (revision 498368) @@ -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 Index: head/games/openttd/pkg-plist =================================================================== --- head/games/openttd/pkg-plist (revision 498367) +++ head/games/openttd/pkg-plist (revision 498368) @@ -1,95 +1,106 @@ 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 %%DATADIR%%/ai/compat_1.2.nut %%DATADIR%%/ai/compat_1.3.nut %%DATADIR%%/ai/compat_1.4.nut %%DATADIR%%/ai/compat_1.5.nut %%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 %%DATADIR%%/lang/belarusian.lng %%DATADIR%%/lang/brazilian_portuguese.lng %%DATADIR%%/lang/bulgarian.lng %%DATADIR%%/lang/catalan.lng %%DATADIR%%/lang/croatian.lng %%DATADIR%%/lang/czech.lng %%DATADIR%%/lang/danish.lng %%DATADIR%%/lang/dutch.lng %%DATADIR%%/lang/english.lng %%DATADIR%%/lang/english_AU.lng %%DATADIR%%/lang/english_US.lng %%DATADIR%%/lang/esperanto.lng %%DATADIR%%/lang/estonian.lng %%DATADIR%%/lang/faroese.lng %%DATADIR%%/lang/finnish.lng %%DATADIR%%/lang/french.lng %%DATADIR%%/lang/gaelic.lng %%DATADIR%%/lang/galician.lng %%DATADIR%%/lang/german.lng %%DATADIR%%/lang/greek.lng %%DATADIR%%/lang/hebrew.lng %%DATADIR%%/lang/hungarian.lng %%DATADIR%%/lang/icelandic.lng %%DATADIR%%/lang/indonesian.lng %%DATADIR%%/lang/irish.lng %%DATADIR%%/lang/italian.lng %%DATADIR%%/lang/japanese.lng %%DATADIR%%/lang/korean.lng %%DATADIR%%/lang/latin.lng %%DATADIR%%/lang/latvian.lng %%DATADIR%%/lang/lithuanian.lng %%DATADIR%%/lang/luxembourgish.lng %%DATADIR%%/lang/malay.lng %%DATADIR%%/lang/norwegian_bokmal.lng %%DATADIR%%/lang/norwegian_nynorsk.lng %%DATADIR%%/lang/polish.lng %%DATADIR%%/lang/portuguese.lng %%DATADIR%%/lang/romanian.lng %%DATADIR%%/lang/russian.lng %%DATADIR%%/lang/serbian.lng %%DATADIR%%/lang/simplified_chinese.lng %%DATADIR%%/lang/slovak.lng %%DATADIR%%/lang/slovenian.lng %%DATADIR%%/lang/spanish.lng %%DATADIR%%/lang/spanish_MX.lng %%DATADIR%%/lang/swedish.lng %%DATADIR%%/lang/tamil.lng %%DATADIR%%/lang/thai.lng %%DATADIR%%/lang/traditional_chinese.lng %%DATADIR%%/lang/turkish.lng %%DATADIR%%/lang/ukrainian.lng %%DATADIR%%/lang/vietnamese.lng %%DATADIR%%/lang/welsh.lng %%DATADIR%%/scripts/autoexec.scr.example %%DATADIR%%/scripts/game_start.scr.example %%DATADIR%%/scripts/on_client.scr.example %%DATADIR%%/scripts/on_dedicated.scr.example %%DATADIR%%/scripts/on_server.scr.example %%DATADIR%%/scripts/on_server_connect.scr.example %%DATADIR%%/scripts/pre_dedicated.scr.example %%DATADIR%%/scripts/pre_server.scr.example %%DATADIR%%/scripts/readme.txt share/icons/hicolor/16x16/apps/openttd.png share/icons/hicolor/32x32/apps/openttd.png 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