Date: Wed, 22 Apr 2015 22:53:04 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384527 - in head/games/gtkradiant: . files Message-ID: <201504222253.t3MMr4C4013318@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Apr 22 22:53:03 2015 New Revision: 384527 URL: https://svnweb.freebsd.org/changeset/ports/384527 Log: - Fix build on 64 bit architectures (cast from pointer to int loses precision) - Drop @dirrm* from plist - Add empty directories to plist Approved by: portmgr blanket Modified: head/games/gtkradiant/files/patch-radiant_treemodel.cpp head/games/gtkradiant/pkg-plist Modified: head/games/gtkradiant/files/patch-radiant_treemodel.cpp ============================================================================== --- head/games/gtkradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 22:25:44 2015 (r384526) +++ head/games/gtkradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 22:53:03 2015 (r384527) @@ -9,7 +9,7 @@ + // C++ code, and Clang will assume that comparison below always evaluates + // to true, resulting in a segmentation fault. Use a dirty hack to force + // Clang to check those "bad" references for null nonetheless. -+ volatile int n = (int)&node; ++ volatile intptr_t n = (intptr_t)&node; + + if(n != 0) { @@ -20,7 +20,7 @@ void node_detach_name_changed_callback(scene::Node& node, const NameCallback& callback) { - if(&node != 0) -+ volatile int n = (int)&node; // see the comment on line 713 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713 + + if(n != 0) { @@ -31,7 +31,7 @@ const char* node_get_name_safe(scene::Node& node) { - if(&node == 0) -+ volatile int n = (int)&node; // see the comment on line 713 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713 + + if(n == 0) { @@ -42,7 +42,7 @@ void node_attach_name_changed_callback(scene::Node& node, const NameCallback& callback) { - if(&node != 0) -+ volatile int n = (int)&node; // see the comment on line 713 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713 + + if(n != 0) { @@ -53,7 +53,7 @@ void node_detach_name_changed_callback(scene::Node& node, const NameCallback& callback) { - if(&node != 0) -+ volatile int n = (int)&node; // see the comment on line 713 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713 + + if(n != 0) { Modified: head/games/gtkradiant/pkg-plist ============================================================================== --- head/games/gtkradiant/pkg-plist Wed Apr 22 22:25:44 2015 (r384526) +++ head/games/gtkradiant/pkg-plist Wed Apr 22 22:53:03 2015 (r384527) @@ -177,43 +177,6 @@ bin/gtkradiant %%DATADIR%%/wolf.game/main/default_shaderlist.txt %%DATADIR%%/wolf.game/main/wolf_entities.def %%DATADIR%%/wolf.game/main/wolf_entities.ent -@dirrm %%DATADIR%%/wolf.game/main -@dirrm %%DATADIR%%/wolf.game -@dirrm %%DATADIR%%/stvef.game/baseEF -@dirrm %%DATADIR%%/stvef.game -@dirrm %%DATADIR%%/sof2.game/base -@dirrm %%DATADIR%%/sof2.game -@dirrm %%DATADIR%%/q4.game/q4base -@dirrm %%DATADIR%%/q4.game -@dirrm %%DATADIR%%/q3bp.game/baseq3 -@dirrm %%DATADIR%%/q3bp.game -@dirrm %%DATADIR%%/q3.game/missionpack -@dirrm %%DATADIR%%/q3.game/baseq3 -@dirrm %%DATADIR%%/q3.game -@dirrm %%DATADIR%%/q2.game/baseq2 -@dirrm %%DATADIR%%/q2.game -@dirrm %%DATADIR%%/q1.game/id1 -@dirrm %%DATADIR%%/q1.game -@dirrm %%DATADIR%%/modules -@dirrm %%DATADIR%%/jk2.game/base -@dirrm %%DATADIR%%/jk2.game -@dirrm %%DATADIR%%/jabp.game -@dirrm %%DATADIR%%/ja.game/base -@dirrm %%DATADIR%%/ja.game -@dirrm %%DATADIR%%/hlcs.game -@dirrm %%DATADIR%%/hl.game/valve -@dirrm %%DATADIR%%/hl.game/cstrike -@dirrm %%DATADIR%%/hl.game -@dirrm %%DATADIR%%/heretic2.game/base -@dirrm %%DATADIR%%/heretic2.game -@dirrm %%DATADIR%%/heretic2 -@dirrm %%DATADIR%%/gl -@dirrm %%DATADIR%%/games -@dirrm %%DATADIR%%/et.game/etmain -@dirrm %%DATADIR%%/et.game/bitmaps -@dirrm %%DATADIR%%/et.game -@dirrm %%DATADIR%%/doom3.game/base -@dirrm %%DATADIR%%/doom3.game -@dirrm %%DATADIR%%/bitmaps -@dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%% +@dir %%DATADIR%%/hlcs.game +@dir %%DATADIR%%/jabp.game +@dir %%DATADIR%%/plugins
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504222253.t3MMr4C4013318>