Date: Tue, 25 Mar 2014 12:04:50 -0400 (EDT) From: Nikolai Lifanov <lifanov@mail.lifanov.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187937: [maintainer] [update] [patch] games/tome4: 1.2.0 Message-ID: <20140325160450.0907F1A9538@mail.lifanov.com> Resent-Message-ID: <201403251610.s2PGA0XM084412@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187937 >Category: ports >Synopsis: [maintainer] [update] [patch] games/tome4: 1.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Mar 25 16:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Nikolai Lifanov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD mail.lifanov.com 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Please update games/tome4 to 1.2.0. This is a major update. Check http://te4.org/ for details. >How-To-Repeat: Apply this patch. >Fix: --- tome4.diff begins here --- Index: Makefile =================================================================== --- Makefile (revision 349154) +++ Makefile (working copy) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= tome4 -PORTVERSION= 1.1.5 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= games MASTER_SITES= http://te4.org/dl/t-engine/ \ - SF/lifanov-ports-icons/${PORTNAME}/:icons + SF/lifanov-ports-distfiles/${PORTNAME}/:icons DISTFILES= t-engine4-src-${PORTVERSION}${EXTRACT_SUFX} \ ${PORTNAME}.png:icons EXTRACT_ONLY= t-engine4-src-${PORTVERSION}${EXTRACT_SUFX} Index: distinfo =================================================================== --- distinfo (revision 349154) +++ distinfo (working copy) @@ -1,4 +1,4 @@ -SHA256 (t-engine4-src-1.1.5.tar.bz2) = f911b095064153b97b62fcb72124cdbcf19d712c24e5a735c7de6b98e527d4dd -SIZE (t-engine4-src-1.1.5.tar.bz2) = 259331390 +SHA256 (t-engine4-src-1.2.0.tar.bz2) = dae5eab8c639208a0879d601dc48ea7a0fc65fe82e715af10c13955eaf58bbeb +SIZE (t-engine4-src-1.2.0.tar.bz2) = 265551008 SHA256 (tome4.png) = b5223208ca6f0a51f8bbe3b96055f38f94336dbeca6704db6684fec00fad1a36 SIZE (tome4.png) = 37143 Index: files/patch-build__te4core.lua =================================================================== --- files/patch-build__te4core.lua (revision 349154) +++ files/patch-build__te4core.lua (working copy) @@ -1,20 +1,20 @@ ---- ./build/te4core.lua.orig 2014-01-05 19:42:37.000000000 -0500 -+++ ./build/te4core.lua 2014-01-05 19:42:37.000000000 -0500 -@@ -159,7 +159,7 @@ +--- ./build/te4core.lua.orig 2014-03-25 10:06:45.641186405 -0400 ++++ ./build/te4core.lua 2014-03-25 10:08:09.953180861 -0400 +@@ -180,7 +180,7 @@ + if _OPTIONS.wincross then + arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true) + else +- arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true) ++ arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true) + end - files { "../src/luajit2/src/host/minilua.c" } - -- local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true) -+ local arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true) - if string.find(arch_test, "LJ_TARGET_X64") then - target_arch = "x64" -@@ -201,7 +201,7 @@ - links { "minilua" } +@@ -239,7 +239,7 @@ + if _OPTIONS.wincross then + arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true) + else +- arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true) ++ arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true) + end - local dasm_flags = "" -- local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true) -+ local arch_test = os.capture("cc -E ../src/luajit2/src/lj_arch.h -dM", true) - if string.find(arch_test, "LJ_TARGET_X64") then - target_arch = "x64" Index: files/patch-premake4.lua =================================================================== --- files/patch-premake4.lua (revision 349154) +++ files/patch-premake4.lua (working copy) @@ -1,6 +1,6 @@ ---- ./premake4.lua.orig 2014-01-06 20:04:42.000000000 -0500 -+++ ./premake4.lua 2014-03-23 19:34:38.037102075 -0400 -@@ -30,11 +30,14 @@ +--- ./premake4.lua.orig 2014-03-25 10:05:07.385193050 -0400 ++++ ./premake4.lua 2014-03-25 10:06:20.097188143 -0400 +@@ -42,11 +42,14 @@ configuration "bsd" libdirs { @@ -14,9 +14,9 @@ + "-pthread", + } + if _OPTIONS.wincross then configuration "windows" - libdirs { -@@ -61,8 +64,6 @@ +@@ -84,8 +87,6 @@ configuration "Release" defines { "NDEBUG=1" } Index: files/patch-src__web.c =================================================================== --- files/patch-src__web.c (revision 0) +++ files/patch-src__web.c (working copy) @@ -0,0 +1,11 @@ +--- ./src/web.c.orig 2014-03-25 10:02:43.865203671 -0400 ++++ ./src/web.c 2014-03-25 10:03:01.584202250 -0400 +@@ -469,8 +469,6 @@ + void te4_web_load() { + #if defined(SELFEXE_LINUX) + void *web = SDL_LoadObject("libte4-web.so"); +-#elif defined(SELFEXE_BSD) +- void *web = SDL_LoadObject("libte4-web.so"); + #elif defined(SELFEXE_WINDOWS) + void *web = SDL_LoadObject("te4-web.dll"); + #elif defined(SELFEXE_MACOSX) Property changes on: files/patch-src__web.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property 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 Index: pkg-plist =================================================================== --- pkg-plist (revision 349154) +++ pkg-plist (working copy) @@ -4,10 +4,10 @@ %%DATADIR%%/game/addons/tome-addon-dev.teaa %%DATADIR%%/game/addons/tome-items-vault.teaa %%DATADIR%%/game/addons/tome-stone-wardens.teaa -%%DATADIR%%/game/engines/te4-1.1.5.teae +%%DATADIR%%/game/engines/te4-1.2.0.teae %%DATADIR%%/game/loader/init.lua %%DATADIR%%/game/loader/pre-init.lua -%%DATADIR%%/game/modules/boot-te4-1.1.5.team +%%DATADIR%%/game/modules/boot-te4-1.2.0.team %%DATADIR%%/game/modules/example/class/Actor.lua %%DATADIR%%/game/modules/example/class/Game.lua %%DATADIR%%/game/modules/example/class/Grid.lua @@ -56,9 +56,9 @@ %%DATADIR%%/game/modules/example_realtime/dialogs/Quit.lua %%DATADIR%%/game/modules/example_realtime/init.lua %%DATADIR%%/game/modules/example_realtime/load.lua -%%DATADIR%%/game/modules/tome-1.1.5-gfx.team -%%DATADIR%%/game/modules/tome-1.1.5-music.team -%%DATADIR%%/game/modules/tome-1.1.5.team +%%DATADIR%%/game/modules/tome-1.2.0-gfx.team +%%DATADIR%%/game/modules/tome-1.2.0-music.team +%%DATADIR%%/game/modules/tome-1.2.0.team %%DATADIR%%/game/profile-thread/Client.lua %%DATADIR%%/game/profile-thread/UserChat.lua %%DATADIR%%/game/profile-thread/init.lua @@ -93,6 +93,7 @@ %%DATADIR%%/game/thirdparty/moonscript/util.lua %%DATADIR%%/game/thirdparty/moonscript/version.lua %%DATADIR%%/game/thirdparty/remdebug/engine.lua +%%DATADIR%%/game/thirdparty/slt2.lua %%DATADIR%%/game/thirdparty/socket.lua %%DATADIR%%/game/thirdparty/socket/ftp.lua %%DATADIR%%/game/thirdparty/socket/http.lua @@ -99,6 +100,8 @@ %%DATADIR%%/game/thirdparty/socket/smtp.lua %%DATADIR%%/game/thirdparty/socket/tp.lua %%DATADIR%%/game/thirdparty/socket/url.lua +%%DATADIR%%/game/thirdparty/tween.LICENSE +%%DATADIR%%/game/thirdparty/tween.lua %%DATADIR%%/t-engine @dirrm %%DATADIR%%/game/thirdparty/socket @dirrm %%DATADIR%%/game/thirdparty/remdebug --- tome4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140325160450.0907F1A9538>