bump games/tome4

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

bump games/tome4

Solene Rapenne
tome4 has been updated 2 days ago. It's only a bug fix.

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 26 Apr 2018 17:25:40 -0000 1.14
+++ Makefile 27 Apr 2018 23:44:10 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
 COMMENT-main = graphical sdl rogue-like game
 COMMENT-data = data for Tales of Maj'Eyal
 
-V = 1.5.7
+V = 1.5.8
 PKGNAME-main = tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES = games x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 26 Apr 2018 17:25:40 -0000 1.4
+++ distinfo 27 Apr 2018 23:44:10 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
-SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
+SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
+SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100

Reply | Threaded
Open this post in threaded view
|

Re: bump games/tome4

Brian Callahan-3

On 04/27/18 19:45, Solene Rapenne wrote:
> tome4 has been updated 2 days ago. It's only a bug fix.

When I run `make update-patches` some of the patches regenerated. So ok
with patch regeneration (but get an ok from jca@ too).

~Brian

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/tome4/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 26 Apr 2018 17:25:40 -0000 1.14
> +++ Makefile 27 Apr 2018 23:44:10 -0000
> @@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
>   COMMENT-main = graphical sdl rogue-like game
>   COMMENT-data = data for Tales of Maj'Eyal
>  
> -V = 1.5.7
> +V = 1.5.8
>   PKGNAME-main = tome4-${V}
>   PKGNAME-data = tome4-data-${V}
>   CATEGORIES = games x11
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/tome4/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 26 Apr 2018 17:25:40 -0000 1.4
> +++ distinfo 27 Apr 2018 23:44:10 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
> -SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
> +SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
> +SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100
>

Reply | Threaded
Open this post in threaded view
|

Re: bump games/tome4

Solene Rapenne

Brian Callahan writes:

> On 04/27/18 19:45, Solene Rapenne wrote:
>> tome4 has been updated 2 days ago. It's only a bug fix.
>
> When I run `make update-patches` some of the patches regenerated. So
> ok with patch regeneration (but get an ok from jca@ too).
>
> ~Brian
>
>> Index: Makefile
>> ===================================================================
>> RCS file: /cvs/ports/games/tome4/Makefile,v
>> retrieving revision 1.14
>> diff -u -p -r1.14 Makefile
>> --- Makefile 26 Apr 2018 17:25:40 -0000 1.14
>> +++ Makefile 27 Apr 2018 23:44:10 -0000
>> @@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
>>   COMMENT-main = graphical sdl rogue-like game
>>   COMMENT-data = data for Tales of Maj'Eyal
>>   -V = 1.5.7
>> +V = 1.5.8
>>   PKGNAME-main = tome4-${V}
>>   PKGNAME-data = tome4-data-${V}
>>   CATEGORIES = games x11
>> Index: distinfo
>> ===================================================================
>> RCS file: /cvs/ports/games/tome4/distinfo,v
>> retrieving revision 1.4
>> diff -u -p -r1.4 distinfo
>> --- distinfo 26 Apr 2018 17:25:40 -0000 1.4
>> +++ distinfo 27 Apr 2018 23:44:10 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
>> -SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
>> +SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
>> +SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100
>>

Nice catch!

Updated diff below

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 26 Apr 2018 17:25:40 -0000 1.14
+++ Makefile 28 Apr 2018 07:07:16 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
 COMMENT-main = graphical sdl rogue-like game
 COMMENT-data = data for Tales of Maj'Eyal
 
-V = 1.5.7
+V = 1.5.8
 PKGNAME-main = tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES = games x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 26 Apr 2018 17:25:40 -0000 1.4
+++ distinfo 28 Apr 2018 07:07:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
-SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
+SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
+SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100
cvs server: Diffing patches
Index: patches/patch-build_te4core_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-build_te4core_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_te4core_lua
--- patches/patch-build_te4core_lua 28 Dec 2016 18:34:57 -0000 1.1.1.1
+++ patches/patch-build_te4core_lua 28 Apr 2018 07:07:16 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-build_te4core_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
---- build/te4core.lua.orig Fri Dec  2 11:29:13 2016
-+++ build/te4core.lua Fri Dec  2 11:29:23 2016
-@@ -40,7 +40,7 @@ project "TEngine"
- links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip" }
+Index: build/te4core.lua
+--- build/te4core.lua.orig
++++ build/te4core.lua
+@@ -41,7 +41,7 @@ project "TEngine"
+ if _OPTIONS.discord then defines { "DISCORD_TE4" } end
  defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
  defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 - buildoptions { "-O3" }
@@ -10,3 +11,85 @@ $OpenBSD: patch-build_te4core_lua,v 1.1.
 
  if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
  if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end
+@@ -194,9 +194,9 @@ elseif _OPTIONS.lua == "jit2" then
+
+ local arch_test
+ if _OPTIONS.wincross then
+- arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("i686-pc-mingw32-cc -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
+
+ if string.find(arch_test, "LJ_TARGET_X64") then
+@@ -230,16 +230,16 @@ elseif _OPTIONS.lua == "jit2" then
+ configuration {"Debug"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+- 'gcc -o ../bin/Debug/minilua ../obj/Debug/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
++ 'cc -o ../bin/Debug/minilua ../obj/Debug/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+ }
+ end
+ postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", }
+ configuration {"Release"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+- 'gcc -o ../bin/Release/minilua ../obj/Release/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
++ 'cc -o ../bin/Release/minilua ../obj/Release/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+ }
+ end
+ postbuildcommands { "cp ../bin/Release/minilua ../src/luajit2/src/host/", }
+@@ -253,9 +253,9 @@ elseif _OPTIONS.lua == "jit2" then
+ local dasm_flags = ""
+ local arch_test
+ if _OPTIONS.wincross then
+- arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
++ arch_test = os.capture("i686-pc-mingw32-cc -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
+
+ if string.find(arch_test, "LJ_TARGET_X64") then
+@@ -332,24 +332,24 @@ elseif _OPTIONS.lua == "jit2" then
+ configuration {"Debug"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+- 'gcc -o ../bin/Debug/buildvm ../obj/Debug/buildvm/buildvm_lib.cross.o ../obj/Debug/buildvm/buildvm_asm.cross.o ../obj/Debug/buildvm/buildvm_peobj.cross.o ../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
++ 'cc -o ../bin/Debug/buildvm ../obj/Debug/buildvm/buildvm_lib.cross.o ../obj/Debug/buildvm/buildvm_asm.cross.o ../obj/Debug/buildvm/buildvm_peobj.cross.o ../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+ }
+ end
+ postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", }
+ configuration {"Release"}
+ if _OPTIONS.wincross then
+ postbuildcommands {
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+- 'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+- 'gcc -o ../bin/Release/buildvm ../obj/Release/buildvm/buildvm_lib.cross.o ../obj/Release/buildvm/buildvm_asm.cross.o ../obj/Release/buildvm/buildvm_peobj.cross.o ../obj/Release/buildvm/buildvm_fold.cross.o ../obj/Release/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
++ 'cc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
++ 'cc -o ../bin/Release/buildvm ../obj/Release/buildvm/buildvm_lib.cross.o ../obj/Release/buildvm/buildvm_asm.cross.o ../obj/Release/buildvm/buildvm_peobj.cross.o ../obj/Release/buildvm/buildvm_fold.cross.o ../obj/Release/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+ }
+ end
+ postbuildcommands { "cp ../bin/Release/buildvm ../src/luajit2/src/", }
Index: patches/patch-premake4_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.2
diff -u -p -r1.2 patch-premake4_lua
--- patches/patch-premake4_lua 29 Dec 2016 14:07:11 -0000 1.2
+++ patches/patch-premake4_lua 28 Apr 2018 07:07:16 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-premake4_lua,v 1.2 2016/12/29 14:07:11 awolk Exp $
---- premake4.lua.orig Mon May 19 10:42:14 2014
-+++ premake4.lua Thu Dec 29 12:28:14 2016
+Index: premake4.lua
+--- premake4.lua.orig
++++ premake4.lua
 @@ -44,10 +44,13 @@ end
 
  configuration "bsd"
@@ -17,7 +18,7 @@ $OpenBSD: patch-premake4_lua,v 1.2 2016/
  }
 
  if _OPTIONS.wincross then
-@@ -86,8 +89,9 @@ configuration "Debug"
+@@ -87,8 +90,9 @@ configuration "Debug"
 
  configuration "Release"
  defines { "NDEBUG=1" }

Reply | Threaded
Open this post in threaded view
|

Re: bump games/tome4

Solene Rapenne

> Brian Callahan writes:
>
> When I run `make update-patches` some of the patches regenerated. So
> ok with patch regeneration (but get an ok from jca@ too).
>
> ~Brian
>

The full diff without gcc replacement...

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 26 Apr 2018 17:25:40 -0000 1.14
+++ Makefile 28 Apr 2018 07:24:15 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
 COMMENT-main = graphical sdl rogue-like game
 COMMENT-data = data for Tales of Maj'Eyal
 
-V = 1.5.7
+V = 1.5.8
 PKGNAME-main = tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES = games x11
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 26 Apr 2018 17:25:40 -0000 1.4
+++ distinfo 28 Apr 2018 07:24:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
-SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
+SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
+SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100
cvs server: Diffing patches
Index: patches/patch-build_te4core_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-build_te4core_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_te4core_lua
--- patches/patch-build_te4core_lua 28 Dec 2016 18:34:57 -0000 1.1.1.1
+++ patches/patch-build_te4core_lua 28 Apr 2018 07:24:15 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-build_te4core_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
---- build/te4core.lua.orig Fri Dec  2 11:29:13 2016
-+++ build/te4core.lua Fri Dec  2 11:29:23 2016
-@@ -40,7 +40,7 @@ project "TEngine"
- links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip" }
+Index: build/te4core.lua
+--- build/te4core.lua.orig
++++ build/te4core.lua
+@@ -41,7 +41,7 @@ project "TEngine"
+ if _OPTIONS.discord then defines { "DISCORD_TE4" } end
  defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
  defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 - buildoptions { "-O3" }
Index: patches/patch-premake4_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.2
diff -u -p -r1.2 patch-premake4_lua
--- patches/patch-premake4_lua 29 Dec 2016 14:07:11 -0000 1.2
+++ patches/patch-premake4_lua 28 Apr 2018 07:24:15 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-premake4_lua,v 1.2 2016/12/29 14:07:11 awolk Exp $
---- premake4.lua.orig Mon May 19 10:42:14 2014
-+++ premake4.lua Thu Dec 29 12:28:14 2016
+Index: premake4.lua
+--- premake4.lua.orig
++++ premake4.lua
 @@ -44,10 +44,13 @@ end
 
  configuration "bsd"
@@ -17,7 +18,7 @@ $OpenBSD: patch-premake4_lua,v 1.2 2016/
  }
 
  if _OPTIONS.wincross then
-@@ -86,8 +89,9 @@ configuration "Debug"
+@@ -87,8 +90,9 @@ configuration "Debug"
 
  configuration "Release"
  defines { "NDEBUG=1" }

Reply | Threaded
Open this post in threaded view
|

Re: bump games/tome4

Jeremie Courreges-Anglas-2
On Sat, Apr 28 2018, Solene Rapenne <[hidden email]> wrote:
>> Brian Callahan writes:
>>
>> When I run `make update-patches` some of the patches regenerated. So
>> ok with patch regeneration (but get an ok from jca@ too).
>>
>> ~Brian
>>
>
> The full diff without gcc replacement...

ok jca@

The updated diff below also contains a fix for WANTLIB...


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 26 Apr 2018 17:25:40 -0000 1.14
+++ Makefile 28 Apr 2018 13:32:30 -0000
@@ -10,7 +10,7 @@ ONLY_FOR_ARCHS = i386 amd64
 COMMENT-main = graphical sdl rogue-like game
 COMMENT-data = data for Tales of Maj'Eyal
 
-V = 1.5.7
+V = 1.5.8
 PKGNAME-main = tome4-${V}
 PKGNAME-data = tome4-data-${V}
 CATEGORIES = games x11
@@ -50,7 +50,7 @@ COMPILER_LANGS = c
 # c++abi certainly pulled out by luajit when using clang
 .include <bsd.port.arch.mk>
 .if ${PROPERTIES:Mclang}
-WANTLIB += c++abi
+WANTLIB-main += c++abi
 .endif
 
 NO_TEST = Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/tome4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 26 Apr 2018 17:25:40 -0000 1.4
+++ distinfo 28 Apr 2018 13:26:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.5.7.tar.bz2) = x3ZMsXwrX4ByfOwJwB4OCMWJgaIGH0bwTriEuub9Kgs=
-SIZE (t-engine4-src-1.5.7.tar.bz2) = 422494514
+SHA256 (t-engine4-src-1.5.8.tar.bz2) = 5n6XiiRhhlzTOcWUW/JmGtUqNV5zrtZ+92d64Ik/fzg=
+SIZE (t-engine4-src-1.5.8.tar.bz2) = 422620100
Index: patches/patch-build_te4core_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-build_te4core_lua,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-build_te4core_lua
--- patches/patch-build_te4core_lua 28 Dec 2016 18:34:57 -0000 1.1.1.1
+++ patches/patch-build_te4core_lua 28 Apr 2018 13:26:20 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-build_te4core_lua,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
---- build/te4core.lua.orig Fri Dec  2 11:29:13 2016
-+++ build/te4core.lua Fri Dec  2 11:29:23 2016
-@@ -40,7 +40,7 @@ project "TEngine"
- links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip" }
+Index: build/te4core.lua
+--- build/te4core.lua.orig
++++ build/te4core.lua
+@@ -41,7 +41,7 @@ project "TEngine"
+ if _OPTIONS.discord then defines { "DISCORD_TE4" } end
  defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" }
  defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 - buildoptions { "-O3" }
Index: patches/patch-premake4_lua
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-premake4_lua,v
retrieving revision 1.2
diff -u -p -r1.2 patch-premake4_lua
--- patches/patch-premake4_lua 29 Dec 2016 14:07:11 -0000 1.2
+++ patches/patch-premake4_lua 28 Apr 2018 13:26:20 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-premake4_lua,v 1.2 2016/12/29 14:07:11 awolk Exp $
---- premake4.lua.orig Mon May 19 10:42:14 2014
-+++ premake4.lua Thu Dec 29 12:28:14 2016
+Index: premake4.lua
+--- premake4.lua.orig
++++ premake4.lua
 @@ -44,10 +44,13 @@ end
 
  configuration "bsd"
@@ -17,7 +18,7 @@ $OpenBSD: patch-premake4_lua,v 1.2 2016/
  }
 
  if _OPTIONS.wincross then
-@@ -86,8 +89,9 @@ configuration "Debug"
+@@ -87,8 +90,9 @@ configuration "Debug"
 
  configuration "Release"
  defines { "NDEBUG=1" }


--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE