Index: head/games/openttd/Makefile =================================================================== --- head/games/openttd/Makefile (revision 357563) +++ head/games/openttd/Makefile (revision 357564) @@ -1,122 +1,115 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= openttd -PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTVERSION= 1.4.1 CATEGORIES= games -MASTER_SITES= http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \ +MASTER_SITES= http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \ + http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \ http://us.binaries.openttd.org/binaries/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= danfe@FreeBSD.org COMMENT= Open source clone of Microprose Transport Tycoon Deluxe LICENSE= GPLv2 LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ liblzo2.so:${PORTSDIR}/archivers/lzo2 USES= gmake pkgconfig tar:xz HAS_CONFIGURE= yes CONFIGURE_ENV= STRIP="${STRIP_CMD} ${STRIP}" CONFIGURE_ARGS= --prefix-dir="${PREFIX}" --data-dir="${DATADIR_REL}" .if defined(BATCH) || defined(PACKAGE_BUILDING) MAKE_ARGS= VERBOSE=1 .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} 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 DESKTOP_ENTRIES="OpenTTD" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ "Game;Simulation;StrategyGame;" false .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_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 LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/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:${PORTSDIR}/games/opengfx \ ${LOCALBASE}/share/${PORTNAME}/baseset/openmsx/openmsx.obm:${PORTSDIR}/games/openmsx \ ${LOCALBASE}/share/${PORTNAME}/baseset/opensfx/opensfx.obs:${PORTSDIR}/games/opensfx .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_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 post-patch: -# Remove extra (vendor-provided) CFLAGS and LDFLAGS and make the port more -# LOCALBASE safe - @${REINPLACE_CMD} -e '/-O2 -fomit-frame-pointer/d ; \ - s,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib -# Use custom liblzma.pc for when we use liblzma from base - @${REINPLACE_CMD} -e \ - 's,pkg-config liblzma,pkg-config ${FILESDIR}/liblzma.pc,' \ - ${WRKSRC}/config.lib + @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},' ${WRKSRC}/config.lib do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/ai ${STAGEDIR}${DATADIR}/baseset \ ${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/lang/* ${STAGEDIR}${DATADIR}/lang ${INSTALL_DATA} ${WRKSRC}/bin/scripts/* ${STAGEDIR}${DATADIR}/scripts ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.6 \ ${STAGEDIR}${MANPREFIX}/man/man6 ${INSTALL_DATA} ${WRKSRC}/media/openttd.32.xpm \ ${STAGEDIR}${PREFIX}/share/pixmaps .if !defined(WITH_DEDICATED_SERVER_ONLY) . 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 @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR} post-install: .if defined(WITH_DEDICATED_SERVER_ONLY) @${REINPLACE_CMD} -e '/icons/d' ${TMPPLIST} .endif .include Index: head/games/openttd/distinfo =================================================================== --- head/games/openttd/distinfo (revision 357563) +++ head/games/openttd/distinfo (revision 357564) @@ -1,2 +1,2 @@ -SHA256 (openttd-1.4.0-source.tar.xz) = d85bcb89d499a177a904f627ce407a086db8b26bc9a021030ee7f5534fbe0955 -SIZE (openttd-1.4.0-source.tar.xz) = 6661904 +SHA256 (openttd-1.4.1-source.tar.xz) = 1face3af7a9b2169c0e284f3916f4b7b82947364e836107c404be520a570753e +SIZE (openttd-1.4.1-source.tar.xz) = 6664600 Index: head/games/openttd/files/liblzma.pc =================================================================== --- head/games/openttd/files/liblzma.pc (revision 357563) +++ head/games/openttd/files/liblzma.pc (nonexistent) @@ -1,19 +0,0 @@ -# -# Author: Lasse Collin -# -# This file has been put into the public domain. -# You can do whatever you want with this file. -# - -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: liblzma -Description: General purpose data compression library -URL: http://tukaani.org/xz/ -Version: 5.0.0 -Cflags: -I${includedir} -Libs: -L${libdir} -llzma -Libs.private: -D_THREAD_SAFE -pthread Property changes on: head/games/openttd/files/liblzma.pc ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/games/openttd/files/patch-config.lib =================================================================== --- head/games/openttd/files/patch-config.lib (nonexistent) +++ head/games/openttd/files/patch-config.lib (revision 357564) @@ -0,0 +1,83 @@ +--- config.lib.orig 2014-06-03 02:26:54 +0800 ++++ config.lib +@@ -804,15 +804,15 @@ check_params() { + pre_detect_with_lzma=$with_lzma + detect_lzma + +- if [ "$with_lzma" = "0" ] || [ -z "$lzma_config" ]; then ++ if [ "$with_lzma" = "0" ] || [ -z "$lzma" ]; then + log 1 "WARNING: lzma was not detected or disabled" + log 1 "WARNING: OpenTTD doesn't require lzma, but it does mean that many features" + log 1 "WARNING: (like loading most savegames/scenarios and joining most servers)" + log 1 "WARNING: will be disabled." + if [ "$pre_detect_with_lzma" = "0" ]; then + log 1 "WARNING: We strongly suggest you to install liblzma." +- log 1 "configure: error: no liblzma detected" + else ++ log 1 "configure: error: no liblzma detected" + log 1 " If you want to compile without lzma use --without-lzma as parameter" + exit + fi +@@ -1449,8 +1449,6 @@ make_cflags_and_ldflags() { + CFLAGS="-I/gg/os-include -noixemul -fstrict-aliasing -fexpensive-optimizations -mcpu=604 -fno-inline -mstring -mmultiple $CFLAGS" + LDFLAGS="$LDFLAGS -noixemul" + fi +- +- CFLAGS="-O2 -fomit-frame-pointer $CFLAGS" + else + OBJS_SUBDIR="debug" + +@@ -1660,16 +1658,14 @@ make_cflags_and_ldflags() { + CFLAGS="$CFLAGS -DWITH_ZLIB" + fi + +- if [ -n "$lzma_config" ]; then +- CFLAGS="$CFLAGS -DWITH_LZMA" +- CFLAGS="$CFLAGS `$lzma_config --cflags | tr '\n\r' ' '`" +- +- if [ "$enable_static" != "0" ]; then ++ if [ "$with_lzma" != "0" ]; then ++ if [ "$enable_static" != "0" ] && [ "$os" != "OSX" ]; then + CFLAGS="$CFLAGS -DLZMA_API_STATIC" +- LIBS="$LIBS `$lzma_config --libs --static | tr '\n\r' ' '`" ++ LIBS="$LIBS $lzma" + else +- LIBS="$LIBS `$lzma_config --libs | tr '\n\r' ' '`" ++ LIBS="$LIBS -llzma" + fi ++ CFLAGS="$CFLAGS -DWITH_LZMA" + fi + + if [ "$with_lzo2" != "0" ]; then +@@ -2712,6 +2708,10 @@ detect_lzo2() { + detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h" + } + ++detect_lzma() { ++ detect_library "$with_lzma" "lzma" "liblzma.a" "" "lzma.h" ++} ++ + detect_libtimidity() { + detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h" + } +@@ -2768,10 +2768,6 @@ detect_pkg_config() { + log 1 "checking $2... found" + } + +-detect_lzma() { +- detect_pkg_config "$with_lzma" "liblzma" "lzma_config" "5.0" +-} +- + detect_xdg_basedir() { + detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2" + } +@@ -3665,8 +3661,7 @@ showhelp() { + echo " --with-cocoa enables COCOA video driver (OSX ONLY)" + echo " --with-sdl[=sdl-config] enables SDL video driver support" + echo " --with-zlib[=zlib.a] enables zlib support" +- echo " --with-liblzma[=\"pkg-config liblzma\"]" +- echo " enables liblzma support" ++ echo " --with-liblzma[=liblzma.a] enables liblzma support" + echo " --with-liblzo2[=liblzo2.a] enables liblzo2 support" + echo " --with-png[=libpng-config] enables libpng support" + echo " --with-freetype[=freetype-config]" Property changes on: head/games/openttd/files/patch-config.lib ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property