From owner-svn-ports-head@freebsd.org Sun Apr 3 05:24:36 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DB9FFB00810; Sun, 3 Apr 2016 05:24:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9D3371F85; Sun, 3 Apr 2016 05:24:36 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u335OZQ0087853; Sun, 3 Apr 2016 05:24:35 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u335OZwc087849; Sun, 3 Apr 2016 05:24:35 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201604030524.u335OZwc087849@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 3 Apr 2016 05:24:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412448 - in head/games/openttd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2016 05:24:37 -0000 Author: danfe Date: Sun Apr 3 05:24:35 2016 New Revision: 412448 URL: https://svnweb.freebsd.org/changeset/ports/412448 Log: Update to version 1.6.0. Modified: head/games/openttd/Makefile head/games/openttd/distinfo head/games/openttd/files/patch-config.lib head/games/openttd/pkg-plist Modified: head/games/openttd/Makefile ============================================================================== --- head/games/openttd/Makefile Sun Apr 3 05:23:19 2016 (r412447) +++ head/games/openttd/Makefile Sun Apr 3 05:24:35 2016 (r412448) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openttd -DISTVERSION= 1.5.3 +DISTVERSION= 1.6.0 CATEGORIES= games MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \ Modified: head/games/openttd/distinfo ============================================================================== --- head/games/openttd/distinfo Sun Apr 3 05:23:19 2016 (r412447) +++ head/games/openttd/distinfo Sun Apr 3 05:24:35 2016 (r412448) @@ -1,2 +1,2 @@ -SHA256 (openttd-1.5.3-source.tar.xz) = d8b9a7aaca7c9f3ff69b1d210daf1e2658402941bb9b30cb2789a9df73d1ba63 -SIZE (openttd-1.5.3-source.tar.xz) = 6568140 +SHA256 (openttd-1.6.0-source.tar.xz) = 4c12e6b516ffdee20a03ebad80dad85d137130002d6d3e123a568376fe4b4eb2 +SIZE (openttd-1.6.0-source.tar.xz) = 6557124 Modified: head/games/openttd/files/patch-config.lib ============================================================================== --- head/games/openttd/files/patch-config.lib Sun Apr 3 05:23:19 2016 (r412447) +++ head/games/openttd/files/patch-config.lib Sun Apr 3 05:24:35 2016 (r412448) @@ -1,6 +1,6 @@ ---- config.lib.orig 2014-06-03 02:26:54 +0800 +--- config.lib.orig 2016-04-01 18:33:55 UTC +++ config.lib -@@ -804,15 +804,15 @@ check_params() { +@@ -816,15 +816,15 @@ check_params() { pre_detect_with_lzma=$with_lzma detect_lzma @@ -18,7 +18,7 @@ log 1 " If you want to compile without lzma use --without-lzma as parameter" exit fi -@@ -1454,7 +1454,6 @@ make_cflags_and_ldflags() { +@@ -1468,7 +1468,6 @@ make_cflags_and_ldflags() { # -fomit-frame-pointer and -pg do not go well together (gcc errors they are incompatible) CFLAGS="-fomit-frame-pointer $CFLAGS" fi @@ -26,8 +26,8 @@ else OBJS_SUBDIR="debug" -@@ -1664,16 +1663,14 @@ make_cflags_and_ldflags() { - CFLAGS="$CFLAGS -DWITH_ZLIB" +@@ -1675,16 +1674,14 @@ make_cflags_and_ldflags() { + fi fi - if [ -n "$lzma_config" ]; then @@ -48,7 +48,7 @@ fi if [ "$with_lzo2" != "0" ]; then -@@ -2716,6 +2713,10 @@ detect_lzo2() { +@@ -2692,6 +2689,10 @@ detect_lzo2() { detect_library "$with_lzo2" "lzo2" "liblzo2.a" "lzo/" "lzo1x.h" } @@ -57,9 +57,9 @@ +} + detect_libtimidity() { - detect_library "$with_libtimidity" "libtimidity" "libtimidity.a" "" "timidity.h" + detect_pkg_config "$with_libtimidity" "libtimidity" "libtimidity_config" "0.1" "1" } -@@ -2772,10 +2773,6 @@ detect_pkg_config() { +@@ -2756,10 +2757,6 @@ detect_pkg_config() { log 1 "checking $2... found" } @@ -70,13 +70,13 @@ detect_xdg_basedir() { detect_pkg_config "$with_xdg_basedir" "libxdg-basedir" "xdg_basedir_config" "1.2" } -@@ -3669,8 +3666,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" +@@ -3523,8 +3520,7 @@ showhelp() { + echo " --with-sdl[=\"pkg-config sdl\"] enables SDL video driver support" + echo " --with-zlib[=\"pkg-config zlib\"]" + echo " 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]" + echo " --with-png[=\"pkg-config libpng\"]" + echo " enables libpng support" Modified: head/games/openttd/pkg-plist ============================================================================== --- head/games/openttd/pkg-plist Sun Apr 3 05:23:19 2016 (r412447) +++ head/games/openttd/pkg-plist Sun Apr 3 05:24:35 2016 (r412448) @@ -8,6 +8,7 @@ share/pixmaps/openttd.32.xpm %%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%%/baseset/no_music.obm %%DATADIR%%/baseset/no_sound.obs %%DATADIR%%/baseset/openttd.grf