On Sat, Apr 28 2018, Solene Rapenne <[email protected]> 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
