Hello,
Please find a patch to update games/tome4 to 1.5.1
I updated patch-src_getself_c because the (Free)BSD code changed
upstream and the previous patch wasn't applying anymore.
I hope the patch doesn't get scrambled in the process.
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/tome4/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile 29 Dec 2016 14:07:11 -0000 1.2
+++ Makefile 20 Mar 2017 11:39:44 -0000
@@ -3,7 +3,7 @@
COMMENT-main = graphical sdl rogue-like game
COMMENT-data = data for Tales of Maj'Eyal
-V = 1.4.9
+V = 1.5.1
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.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 28 Dec 2016 18:34:57 -0000 1.1.1.1
+++ distinfo 20 Mar 2017 11:39:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (t-engine4-src-1.4.9.tar.bz2) =
tKcX/jyN0qgithNCXs5iz7q9TEXn5vbg+8ToGx6oAjE=
-SIZE (t-engine4-src-1.4.9.tar.bz2) = 354443574
+SHA256 (t-engine4-src-1.5.1.tar.bz2) =
er5VbR72iQ0WrlO4KSwQWSVDopR6QCS7mjtnARp00Lg=
+SIZE (t-engine4-src-1.5.1.tar.bz2) = 421336208
cvs server: Diffing patches
Index: patches/patch-src_getself_c
===================================================================
RCS file: /cvs/ports/games/tome4/patches/patch-src_getself_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_getself_c
--- patches/patch-src_getself_c 28 Dec 2016 18:34:57 -0000 1.1.1.1
+++ patches/patch-src_getself_c 20 Mar 2017 11:39:44 -0000
@@ -1,29 +1,35 @@
-$OpenBSD: patch-src_getself_c,v 1.1.1.1 2016/12/28 18:34:57 awolk Exp $
---- src/getself.c.orig Thu Jan 7 20:09:06 2016
-+++ src/getself.c Tue Nov 29 16:38:12 2016
-@@ -47,7 +47,8 @@ const char *get_self_executable(int argc, char **argv)
+--- src/getself.c.orig Wed Mar 8 18:20:39 2017
++++ src/getself.c Mon Mar 20 10:57:10 2017
+@@ -47,13 +47,7 @@
+ const char *get_self_executable(int argc, char **argv)
+ {
static char res[PATH_MAX];
- // Like linux, but /proc is not always mounted
- // return 0 if it's not
-- if (realpath("/proc/curproc/file", res)) return NULL;
-+ //if (realpath("/proc/curproc/file", res)) return NULL;
+- int mib[4];
+- mib[0] = CTL_KERN;
+- mib[1] = KERN_PROC;
+- mib[2] = KERN_PROC_PATHNAME;
+- mib[3] = -1;
+- size_t cb = sizeof(res);
+- sysctl(mib,4,res,&cb,NULL,0);
+ realpath("${GAMEDIR}/", res);
return res;
}
-@@ -57,8 +58,14 @@ int get_number_cpus()
+@@ -61,7 +55,16 @@
+
+ int get_number_cpus()
{
- int count;
- size_t size=sizeof(count);
-+ int name[2];
-+ name[0] = CTL_HW;
-+ name[1] = HW_NCPU;
-
-- if (sysctlbyname("hw.ncpu",&count,&size,NULL,0)) return 1;
-+ if (sysctl(name, 2, &count, &size, NULL, 0) < 0) {
-+ count = 1;
-+ }
-+
- return count;
+- return sysconf(_SC_NPROCESSORS_ONLN);
++ int count;
++ size_t size=sizeof(count);
++ int name[2];
++ name[0] = CTL_HW;
++ name[1] = HW_NCPU;
++
++ if (sysctl(name, 2, &count, &size, NULL, 0) < 0) {
++ count = 1;
++ }
++ return count;
}
+ #elif defined(SELFEXE_WINDOWS)
cvs server: Diffing pkg
Index: pkg/PLIST-data
===================================================================
RCS file: /cvs/ports/games/tome4/pkg/PLIST-data,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-data
--- pkg/PLIST-data 29 Dec 2016 14:07:11 -0000 1.2
+++ pkg/PLIST-data 20 Mar 2017 11:39:44 -0000
@@ -2,7 +2,7 @@
share/tome4/
share/tome4/game/
share/tome4/game/modules/
-share/tome4/game/modules/boot-te4-1.4.9.team
-share/tome4/game/modules/tome-1.4.9-gfx.team
-share/tome4/game/modules/tome-1.4.9-music.team
-share/tome4/game/modules/tome-1.4.9.team
+share/tome4/game/modules/boot-te4-1.5.1.team
+share/tome4/game/modules/tome-1.5.1-gfx.team
+share/tome4/game/modules/tome-1.5.1-music.team
+share/tome4/game/modules/tome-1.5.1.team
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/games/tome4/pkg/PLIST-main,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-main
--- pkg/PLIST-main 29 Dec 2016 14:07:11 -0000 1.2
+++ pkg/PLIST-main 20 Mar 2017 11:39:44 -0000
@@ -5,9 +5,9 @@ share/tome4/bootstrap/boot.lua
share/tome4/game/addons/
share/tome4/game/addons/tome-addon-dev.teaa
share/tome4/game/addons/tome-items-vault.teaa
-share/tome4/game/addons/tome-stone-wardens.teaa
+share/tome4/game/addons/tome-possessors.teaa
share/tome4/game/engines/
-share/tome4/game/engines/te4-1.4.9.teae
+share/tome4/game/engines/te4-1.5.1.teae
share/tome4/game/loader/
share/tome4/game/loader/init.lua
share/tome4/game/loader/pre-init.lua