svn commit: r384522 - in head/games/netradiant: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Apr 22 21:50:33 2015
New Revision: 384522
URL: https://svnweb.freebsd.org/changeset/ports/384522

Log:
  - Fix build on 64 bit architectures (cast from pointer to int loses precision)
  - Drop @dirrm* from plist
  
  Approved by:	portmgr blanket

Modified:
  head/games/netradiant/files/patch-radiant_treemodel.cpp
  head/games/netradiant/pkg-plist

Modified: head/games/netradiant/files/patch-radiant_treemodel.cpp
==============================================================================
--- head/games/netradiant/files/patch-radiant_treemodel.cpp	Wed Apr 22 21:29:21 2015	(r384521)
+++ head/games/netradiant/files/patch-radiant_treemodel.cpp	Wed Apr 22 21:50:33 2015	(r384522)
@@ -9,7 +9,7 @@
 +	// well-defined C++ code, and Clang will assume that comparison
 +	// below always evaluates to true, resulting in segmentation
 +	// fault.  Use a dirty hack to force Clang to check for null.
-+	volatile int n = (int)&node;
++	volatile intptr_t n = (intptr_t)&node;
 +	if ( n != 0 ) {
  		Nameable* nameable = Node_getNameable( node );
  		if ( nameable != 0 ) {
@@ -19,7 +19,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 650
++	volatile intptr_t n = (intptr_t)&node;	// see the comment on line 650
 +	if ( n != 0 ) {
  		Nameable* nameable = Node_getNameable( node );
  		if ( nameable != 0 ) {
@@ -29,7 +29,7 @@
  
  const char* node_get_name_safe( scene::Node& node ){
 -	if ( &node == 0 ) {
-+	volatile int n = (int)&node;	// see the comment on line 650
++	volatile intptr_t n = (intptr_t)&node;	// see the comment on line 650
 +	if ( n == 0 ) {
  		return "";
  	}
@@ -39,7 +39,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 650
++	volatile intptr_t n = (intptr_t)&node;	// see the comment on line 650
 +	if ( n != 0 ) {
  		Nameable* nameable = Node_getNameable( node );
  		if ( nameable != 0 ) {
@@ -49,7 +49,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 650
++	volatile intptr_t n = (intptr_t)&node;	// see the comment on line 650
 +	if ( n != 0 ) {
  		Nameable* nameable = Node_getNameable( node );
  		if ( nameable != 0 ) {

Modified: head/games/netradiant/pkg-plist
==============================================================================
--- head/games/netradiant/pkg-plist	Wed Apr 22 21:29:21 2015	(r384521)
+++ head/games/netradiant/pkg-plist	Wed Apr 22 21:50:33 2015	(r384522)
@@ -171,25 +171,3 @@ man/man6/q3map2.6.gz
 %%DATADIR%%/xonotic.game/data/entities.ent
 %%DATADIR%%/xonotic.game/default_build_menu.xml
 %%DATADIR%%/xonotic.game/game.xlink
- at dirrm %%DATADIR%%/xonotic.game/data
- at dirrm %%DATADIR%%/xonotic.game
- at dirrm %%DATADIR%%/warsow.game/basewsw
- at dirrm %%DATADIR%%/warsow.game
- at dirrm %%DATADIR%%/q1.game/id1
- at dirrm %%DATADIR%%/q1.game
- at dirrm %%DATADIR%%/plugins/bt
- at dirrm %%DATADIR%%/plugins/bitmaps
- at dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%/osirion.game/base
- at dirrm %%DATADIR%%/osirion.game
- at dirrm %%DATADIR%%/nexuiz.game/data
- at dirrm %%DATADIR%%/nexuiz.game
- at dirrm %%DATADIR%%/modules
- at dirrm %%DATADIR%%/heretic2
- at dirrm %%DATADIR%%/gl
- at dirrm %%DATADIR%%/games
- at dirrm %%DATADIR%%/docs
- at dirrm %%DATADIR%%/darkplaces.game/id1
- at dirrm %%DATADIR%%/darkplaces.game
- at dirrm %%DATADIR%%/bitmaps
- at dirrm %%DATADIR%%