From owner-svn-ports-head@freebsd.org Fri Sep 18 21:49:00 2015 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 10AD99CFAAC; Fri, 18 Sep 2015 21:49:00 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::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 00A641A26; Fri, 18 Sep 2015 21:49:00 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8ILmx8q092389; Fri, 18 Sep 2015 21:48:59 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8ILmwrU092382; Fri, 18 Sep 2015 21:48:58 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201509182148.t8ILmwrU092382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 18 Sep 2015 21:48:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397299 - in head/games/corsix-th: . 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.20 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: Fri, 18 Sep 2015 21:49:00 -0000 Author: madpilot Date: Fri Sep 18 21:48:57 2015 New Revision: 397299 URL: https://svnweb.freebsd.org/changeset/ports/397299 Log: - Update to 0.50 - Now depends on SDL2 - Remove LUAJIT option due to it causing crashes on startup - Disable newly added version check code, it causes errors and crashes - Allow any version of lua - Regenerate one patch file Added: head/games/corsix-th/files/patch-CMake_FindLua.cmake (contents, props changed) head/games/corsix-th/files/patch-CorsixTH_Lua_app.lua (contents, props changed) head/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua (contents, props changed) Deleted: head/games/corsix-th/files/patch-CorsixTH-CMakeLists.txt Modified: head/games/corsix-th/Makefile head/games/corsix-th/distinfo head/games/corsix-th/files/patch-CorsixTH-Src-iso_fs.cpp head/games/corsix-th/pkg-plist Modified: head/games/corsix-th/Makefile ============================================================================== --- head/games/corsix-th/Makefile Fri Sep 18 21:26:00 2015 (r397298) +++ head/games/corsix-th/Makefile Fri Sep 18 21:48:57 2015 (r397299) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= corsixth -PORTVERSION= 0.40 +PORTVERSION= 0.50 DISTVERSIONPREFIX= v CATEGORIES= games @@ -12,29 +12,27 @@ COMMENT= Open source clone of Theme Hosp LICENSE= MIT LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 +RUN_DEPENDS= ${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem \ + ${LUA_MODLIBDIR}/lpeg.so:${PORTSDIR}/devel/lua-lpeg -USES= cmake compiler:c++11-lang dos2unix pkgconfig -USE_SDL= mixer +USES= cmake compiler:c++11-lang dos2unix iconv lua pkgconfig +USE_SDL= mixer2 DOS2UNIX_FILES= CMake/FindFFmpeg.cmake \ CorsixTH/CMakeLists.txt \ CorsixTH/Src/iso_fs.cpp +CMAKE_ARGS= -DWITH_LUAJIT=OFF USE_GITHUB= yes GH_ACCOUNT= CorsixTH GH_PROJECT= CorsixTH -OPTIONS_DEFINE= LUAJIT MOVIES -OPTIONS_DEFAULT= LUAJIT MOVIES -LUAJIT_DESC= Use LUAJIT compiler +OPTIONS_DEFINE= MOVIES +OPTIONS_DEFAULT= MOVIES MOVIES_DESC= Play in-game movies MOVIES_CMAKE_ON= -DWITH_MOVIES=ON MOVIES_CMAKE_OFF= -DWITH_MOVIES=OFF MOVIES_LIB_DEPENDS= libswresample.so:${PORTSDIR}/multimedia/ffmpeg -LUAJIT_CMAKE_ON= -DWITH_LUAJIT=ON -LUAJIT_CMAKE_OFF= -DWITH_LUAJIT=OFF -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit -LUAJIT_USES_OFF= lua:51 post-patch: # Allow the game to find its resources without wrapper scripts Modified: head/games/corsix-th/distinfo ============================================================================== --- head/games/corsix-th/distinfo Fri Sep 18 21:26:00 2015 (r397298) +++ head/games/corsix-th/distinfo Fri Sep 18 21:48:57 2015 (r397299) @@ -1,2 +1,2 @@ -SHA256 (CorsixTH-CorsixTH-v0.40_GH0.tar.gz) = 0d6466b3bb63235b1e438087b59250a85d53488845399726b00d1804444b328c -SIZE (CorsixTH-CorsixTH-v0.40_GH0.tar.gz) = 4425926 +SHA256 (CorsixTH-CorsixTH-v0.50_GH0.tar.gz) = 822cb5b4a4ec863ba410b6a37e456b360516b2362337532689070e4555c037ee +SIZE (CorsixTH-CorsixTH-v0.50_GH0.tar.gz) = 4334892 Added: head/games/corsix-th/files/patch-CMake_FindLua.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/corsix-th/files/patch-CMake_FindLua.cmake Fri Sep 18 21:48:57 2015 (r397299) @@ -0,0 +1,13 @@ +--- CMake/FindLua.cmake.orig 2015-08-30 20:29:45 UTC ++++ CMake/FindLua.cmake +@@ -26,8 +26,8 @@ IF (WITH_LUAJIT) + SET (LUA_INCLUDE_DIRS include/luajit-2.0 include) + ELSE (WITH_LUAJIT) + SET (LUA_INTERPRETER_TYPE "Lua") +- SET (LUA_LIBRARY_NAME lua53 lua52 lua5.1 lua51 lua lua-5.1 liblua) +- SET (LUA_INCLUDE_DIRS include include/lua include/lua5.1 include/lua51 include/lua-5.1) ++ SET (LUA_LIBRARY_NAME lua-5.1 lua-5.2 lua-5.3) ++ SET (LUA_INCLUDE_DIRS include include/lua include/lua51 include/lua52 include/lua53) + ENDIF(WITH_LUAJIT) + + FIND_PATH (LUA_INCLUDE_DIR lua.h Modified: head/games/corsix-th/files/patch-CorsixTH-Src-iso_fs.cpp ============================================================================== --- head/games/corsix-th/files/patch-CorsixTH-Src-iso_fs.cpp Fri Sep 18 21:26:00 2015 (r397298) +++ head/games/corsix-th/files/patch-CorsixTH-Src-iso_fs.cpp Fri Sep 18 21:48:57 2015 (r397299) @@ -1,6 +1,6 @@ ---- CorsixTH/Src/iso_fs.cpp.orig 2013-09-17 17:59:28.434946572 +0200 -+++ CorsixTH/Src/iso_fs.cpp 2013-09-17 18:00:15.533944173 +0200 -@@ -30,6 +30,7 @@ +--- CorsixTH/Src/iso_fs.cpp.orig 2015-09-18 21:09:59 UTC ++++ CorsixTH/Src/iso_fs.cpp +@@ -31,6 +31,7 @@ SOFTWARE. #ifdef CORSIX_TH_HAS_ALLOCA_H #include #endif Added: head/games/corsix-th/files/patch-CorsixTH_Lua_app.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/corsix-th/files/patch-CorsixTH_Lua_app.lua Fri Sep 18 21:48:57 2015 (r397299) @@ -0,0 +1,11 @@ +--- CorsixTH/Lua/app.lua.orig 2015-08-30 20:29:45 UTC ++++ CorsixTH/Lua/app.lua +@@ -63,7 +63,7 @@ function App:App() + } + self.strings = {} + self.savegame_version = SAVEGAME_VERSION +- self.check_for_updates = true ++ self.check_for_updates = false + end + + --! Starts a Lua DBGp client & connects it to a DBGp server. Added: head/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/corsix-th/files/patch-CorsixTH_Lua_config__finder.lua Fri Sep 18 21:48:57 2015 (r397299) @@ -0,0 +1,11 @@ +--- CorsixTH/Lua/config_finder.lua.orig 2015-08-30 20:29:45 UTC ++++ CorsixTH/Lua/config_finder.lua +@@ -133,7 +133,7 @@ local config_defaults = { + shift_scroll_speed = 4, + new_graphics_folder = nil, + use_new_graphics = false, +- check_for_updates = true ++ check_for_updates = false + } + local fi = io.open(config_filename, "r") + local config_values = {} Modified: head/games/corsix-th/pkg-plist ============================================================================== --- head/games/corsix-th/pkg-plist Fri Sep 18 21:26:00 2015 (r397298) +++ head/games/corsix-th/pkg-plist Fri Sep 18 21:48:57 2015 (r397299) @@ -336,6 +336,7 @@ bin/CorsixTH %%DATADIR%%/Lua/rooms/ultrascan.lua %%DATADIR%%/Lua/rooms/ward.lua %%DATADIR%%/Lua/rooms/x_ray_room.lua +%%DATADIR%%/Lua/run_debugger.lua %%DATADIR%%/Lua/sprite_viewer.lua %%DATADIR%%/Lua/staff_profile.lua %%DATADIR%%/Lua/strict.lua