Fixing compilation on gcc-4.1

Package-Manager: portage-2.1_pre7-r4

4 files changed, 697 insertions, 9 deletions

diff --git a/games-simulation/searchandrescue/ChangeLog b/games-simulation/searchandrescue/ChangeLog
index 68becd2b7650..0bf64e07ea74 100644
--- a/games-simulation/searchandrescue/ChangeLog
+++ b/games-simulation/searchandrescue/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-simulation/searchandrescue
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.9 2006/02/22 22:02:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/ChangeLog,v 1.10 2006/04/08 10:51:45 tupone Exp $
+
+  08 Apr 2006; <Tupone@gentoo.org> +files/searchandrescue-0.8.2-gcc41.patch,
+  searchandrescue-0.8.2.ebuild:
+  Fixing compilation on gcc-4.1.
+  Patches not sent upstream, unable to contact it
 
   22 Feb 2006; <Tupone@gentoo.org> searchandrescue-0.8.2.ebuild:
   Modular X dependency fix
diff --git a/games-simulation/searchandrescue/Manifest b/games-simulation/searchandrescue/Manifest
index 366100a9a914..24ec25ba7cc0 100644
--- a/games-simulation/searchandrescue/Manifest
+++ b/games-simulation/searchandrescue/Manifest
@@ -1,15 +1,28 @@
-MD5 778ca7545bd17c2e05c03d5f788e5555 ChangeLog 1121
-RMD160 57fa615571df121b5fbe3dd0d77d330bfe10cb9e ChangeLog 1121
-SHA256 4feef09725f3146bbc7b0f91a2795078b31aa079e3b3d193b9d028271a1b191a ChangeLog 1121
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 dd463d297b40e262490f074a03d39423 ChangeLog 1315
+RMD160 32eac6b2b7c2ffdd07cbc96894374588223d1914 ChangeLog 1315
+SHA256 9b167d37ba04573686ae6a5c652c105badd7da327b8cef871d1ed1067f27ae72 ChangeLog 1315
 MD5 4ff4ee620da1798d09f9290e211ad780 files/digest-searchandrescue-0.8.2 554
 RMD160 8c6a7dea21fbbc4653130e31e8b898649e38720e files/digest-searchandrescue-0.8.2 554
 SHA256 4a6f51def5fdfee9a0ff9776c6c5df3c3e0290154a77961382b8cc6bef10e8ff files/digest-searchandrescue-0.8.2 554
 MD5 08d186b8d3ec9636687f7453c0981c9b files/searchandrescue-0.8.2-gcc33.patch 883
 RMD160 cbfe9e3c4e794906cad26245ca5a307ef6b19166 files/searchandrescue-0.8.2-gcc33.patch 883
 SHA256 f0a91651eb634e71f302b6e706feffc02bd9fe31e159276d4fa339d7848c0991 files/searchandrescue-0.8.2-gcc33.patch 883
+MD5 7da4043a90e8ccae653eaa65afed506b files/searchandrescue-0.8.2-gcc41.patch 18686
+RMD160 5e5e67441982ebc0a4647301dabb73be974f2bd3 files/searchandrescue-0.8.2-gcc41.patch 18686
+SHA256 f641198e8e3408c43511253130269a99fed596e1629891850bf5c78c70099620 files/searchandrescue-0.8.2-gcc41.patch 18686
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 3370127d0823b44f6e8f6516c4a24df5 searchandrescue-0.8.2.ebuild 1858
-RMD160 170460aecc0400b91523ef4f0d794471d4ed5829 searchandrescue-0.8.2.ebuild 1858
-SHA256 6db3e661ece3688a3f296d2f367ea77785ff483a64a88f3f07fb5e1198240082 searchandrescue-0.8.2.ebuild 1858
+MD5 5ace38b759952153aed52b1c61f84d30 searchandrescue-0.8.2.ebuild 1893
+RMD160 17236f3d08c314e949477d4eba70910e4a33f0d2 searchandrescue-0.8.2.ebuild 1893
+SHA256 064ced3639cddd03f19987b8c1dba754dfe6502658b794670d5851374e3604bc searchandrescue-0.8.2.ebuild 1893
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.2 (GNU/Linux)
+
+iD8DBQFEN5Xe2CTtIKiFlQIRAsf8AJ4rxd2HSHU5Qeu/L5dKhtTtR1hxJwCfV4Xe
+Dq1S5F61C0LujEB8a6G9Cmg=
+=fo9D
+-----END PGP SIGNATURE-----
diff --git a/games-simulation/searchandrescue/files/searchandrescue-0.8.2-gcc41.patch b/games-simulation/searchandrescue/files/searchandrescue-0.8.2-gcc41.patch
new file mode 100644
index 000000000000..4d89f00415b6
--- /dev/null
+++ b/games-simulation/searchandrescue/files/searchandrescue-0.8.2-gcc41.patch
@@ -0,0 +1,669 @@
+--- sar/disk.cpp.old	2006-04-08 12:06:34.000000000 +0200
++++ sar/disk.cpp	2006-04-08 12:08:13.000000000 +0200
+@@ -131,11 +131,7 @@
+ 	    return(0);
+ 
+ 	// Dan S: typecast is due to const.
+-#if defined(__cplusplus) || defined(c_plusplus)
+-	while(ISBLANK(reinterpret_cast<char>(*path)))
+-#else
+ 	while(ISBLANK(*path))
+-#endif
+ 	    path++;
+ 
+ 	return(*path == DIR_DELIMINATOR);
+--- sar/menumap.c.old	2006-04-08 11:41:01.000000000 +0200
++++ sar/menumap.c	2006-04-08 11:41:48.000000000 +0200
+@@ -279,9 +279,10 @@
+ 	}   
+ 	    
+ 	/* Allocate structure */
+-	m->object[n] = (void *)map = SAR_MENU_MAP(calloc(
++	m->object[n] = SAR_MENU_MAP(calloc(
+ 	    1, sizeof(sar_menu_map_struct)
+ 	));
++	map = (sar_menu_map_struct *)m->object[n];
+ 	if(map == NULL)
+ 	    return(-1);
+ 	 
+--- sar/sarfioopen.c.old	2006-04-08 11:43:53.000000000 +0200
++++ sar/sarfioopen.c	2006-04-08 12:02:13.000000000 +0200
+@@ -270,7 +270,7 @@
+         )
+ 	{
+             sar_parm_version_struct *pv =
+-                (sar_parm_version_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_VERSION
+                 );
+ 
+@@ -295,7 +295,7 @@
+ 	)
+ 	{
+ 	    sar_parm_name_struct *pv =
+-		(sar_parm_name_struct *)p = SARParmNew(
++		p = SARParmNew(
+ 		    SAR_PARM_NAME
+ 		);
+ 
+@@ -311,7 +311,7 @@
+ 	)
+         {
+             sar_parm_description_struct *pv =
+-                (sar_parm_description_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_DESCRIPTION
+                 );
+ 
+@@ -326,7 +326,7 @@
+ 	)
+         {
+             sar_parm_player_model_file_struct *pv =
+-                (sar_parm_player_model_file_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_PLAYER_MODEL_FILE
+                 );
+ 
+@@ -343,7 +343,7 @@
+ 	)
+         {
+             sar_parm_weather_struct *pv =
+-                (sar_parm_weather_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_WEATHER
+                 ); 
+ 
+@@ -361,7 +361,7 @@
+         {
+ 	    int h, m, s;
+             sar_parm_time_of_day_struct *pv =
+-                (sar_parm_time_of_day_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_TIME_OF_DAY
+                 );
+ 
+@@ -382,7 +382,7 @@
+ 	)
+         {
+             sar_parm_register_location_struct *pv =
+-                (sar_parm_register_location_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_REGISTER_LOCATION
+                 );
+ 
+@@ -418,7 +418,7 @@
+         )
+         {
+             sar_parm_scene_gps_struct *pv = 
+-                (sar_parm_scene_gps_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_GPS
+                 );  
+ 
+@@ -440,7 +440,7 @@
+ 	)
+         {
+             sar_parm_scene_map_struct *pv =
+-                (sar_parm_scene_map_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_MAP
+                 );
+ 
+@@ -464,7 +464,7 @@
+ 	)
+         {
+ 	    sar_parm_scene_elevation_struct *pv =
+-                (sar_parm_scene_elevation_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_ELEVATION
+                 );
+ 
+@@ -480,7 +480,7 @@
+ 	)
+         {
+             sar_parm_scene_cant_struct *pv =
+-                (sar_parm_scene_cant_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_CANT
+                 );
+ 
+@@ -496,7 +496,7 @@
+ 	)
+         {
+             sar_parm_scene_ground_flags_struct *pv =
+-                (sar_parm_scene_ground_flags_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_GROUND_FLAGS
+                 );
+ 
+@@ -522,7 +522,7 @@
+ 	)
+         {
+             sar_parm_scene_ground_tile_struct *pv =
+-                (sar_parm_scene_ground_tile_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SCENE_GROUND_TILE
+                 );
+ 
+@@ -560,7 +560,7 @@
+ 	)
+         {
+             sar_parm_texture_base_directory_struct *pv =
+-                (sar_parm_texture_base_directory_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_TEXTURE_BASE_DIRECTORY
+                 );
+ 
+@@ -576,7 +576,7 @@
+ 	)
+         {
+             sar_parm_texture_load_struct *pv =
+-                (sar_parm_texture_load_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_TEXTURE_LOAD
+                 );
+ 
+@@ -605,7 +605,7 @@
+ 	)
+         {
+             sar_parm_mission_scene_file_struct *pv =
+-                (sar_parm_mission_scene_file_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_SCENE_FILE
+                 );
+ 
+@@ -620,7 +620,7 @@
+         )
+         {
+             sar_parm_mission_new_objective_struct *pv =
+-                (sar_parm_mission_new_objective_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_NEW_OBJECTIVE
+                 );
+ 
+@@ -660,7 +660,7 @@
+ 	)
+         {
+             sar_parm_mission_time_left_struct *pv =
+-                (sar_parm_mission_time_left_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_TIME_LEFT
+                 );
+ 
+@@ -676,7 +676,7 @@
+ 	)
+         {
+             sar_parm_mission_begin_at_struct *pv =
+-                (sar_parm_mission_begin_at_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_BEGIN_AT
+                 );
+ 
+@@ -695,7 +695,7 @@
+         )
+         {
+             sar_parm_mission_begin_at_pos_struct *pv =
+-                (sar_parm_mission_begin_at_pos_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_BEGIN_AT_POS
+                 );
+ 
+@@ -723,7 +723,7 @@
+ 	)
+         {
+             sar_parm_mission_arrive_at_struct *pv =
+-                (sar_parm_mission_arrive_at_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_ARRIVE_AT
+                 );
+ 
+@@ -742,7 +742,7 @@
+ 	)
+         {
+             sar_parm_mission_message_success_struct *pv =
+-                (sar_parm_mission_message_success_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_MESSAGE_SUCCESS
+                 );
+ 
+@@ -761,7 +761,7 @@
+ 	)
+         {
+             sar_parm_mission_message_fail_struct *pv =
+-                (sar_parm_mission_message_fail_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_MESSAGE_FAIL
+                 );
+ 
+@@ -780,7 +780,7 @@
+ 	)
+         {
+             sar_parm_mission_humans_tally_struct *pv =
+-                (sar_parm_mission_humans_tally_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_HUMANS_TALLY
+                 );
+ 
+@@ -810,7 +810,7 @@
+ 	)
+         {
+             sar_parm_mission_add_intercept_struct *pv =
+-                (sar_parm_mission_add_intercept_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MISSION_ADD_INTERCEPT
+                 );
+ 
+@@ -883,7 +883,7 @@
+ 	)
+         {
+             sar_parm_new_object_struct *pv =
+-                (sar_parm_new_object_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_OBJECT
+                 );
+ 
+@@ -901,7 +901,7 @@
+         )
+         {
+             sar_parm_new_helipad_struct *pv =
+-                (sar_parm_new_helipad_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_HELIPAD
+                 );
+ 
+@@ -1005,7 +1005,7 @@
+         )
+         {
+             sar_parm_new_runway_struct *pv =
+-                (sar_parm_new_runway_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_RUNWAY
+                 );
+ 
+@@ -1108,7 +1108,7 @@
+         )
+         {
+             sar_parm_new_human_struct *pv =
+-                (sar_parm_new_human_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_HUMAN
+                 );
+ 
+@@ -1186,7 +1186,7 @@
+         )
+         {
+             sar_parm_new_fire_struct *pv =
+-                (sar_parm_new_fire_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_FIRE
+                 );
+ 
+@@ -1211,7 +1211,7 @@
+         )
+         {
+             sar_parm_new_smoke_struct *pv =
+-                (sar_parm_new_smoke_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_SMOKE
+                 );
+ 
+@@ -1254,7 +1254,7 @@
+         )
+         {
+             sar_parm_new_premodeled_struct *pv =
+-                (sar_parm_new_premodeled_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NEW_PREMODELED
+                 );
+ 
+@@ -1278,7 +1278,7 @@
+         )
+         {
+             sar_parm_select_object_by_name_struct *pv =
+-                (sar_parm_select_object_by_name_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_SELECT_OBJECT_BY_NAME
+                 );
+ 
+@@ -1298,7 +1298,7 @@
+ 	)
+         {
+             sar_parm_model_file_struct *pv =
+-                (sar_parm_model_file_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_MODEL_FILE
+                 );
+ 
+@@ -1316,7 +1316,7 @@
+         )
+         {
+             sar_parm_range_struct *pv =
+-                (sar_parm_range_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_RANGE
+                 );
+ 
+@@ -1338,7 +1338,7 @@
+         )
+         {
+             sar_parm_range_far_struct *pv =
+-                (sar_parm_range_far_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_RANGE_FAR
+                 );
+ 
+@@ -1361,7 +1361,7 @@
+ 	)
+         {
+             sar_parm_translate_struct *pv =
+-                (sar_parm_translate_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_TRANSLATE
+                 );
+ 
+@@ -1382,7 +1382,7 @@
+         )
+         {
+             sar_parm_translate_random_struct *pv =
+-                (sar_parm_translate_random_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_TRANSLATE_RANDOM
+                 );
+ 
+@@ -1401,7 +1401,7 @@
+ 	)
+         {
+             sar_parm_rotate_struct *pv =
+-                (sar_parm_rotate_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_ROTATE
+                 );
+ 
+@@ -1421,7 +1421,7 @@
+ 	)
+         {
+             sar_parm_no_depth_test_struct *pv =
+-                (sar_parm_no_depth_test_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_NO_DEPTH_TEST
+                 );
+ 
+@@ -1435,7 +1435,7 @@
+         )
+         {
+             sar_parm_polygon_offset_struct *pv =
+-                (sar_parm_polygon_offset_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_POLYGON_OFFSET
+                 );
+ 
+@@ -1481,7 +1481,7 @@
+ 	)
+         {
+             sar_parm_contact_bounds_spherical_struct *pv =
+-                (sar_parm_contact_bounds_spherical_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_CONTACT_BOUNDS_SPHERICAL
+                 );
+ 
+@@ -1503,7 +1503,7 @@
+ 	)
+         {
+             sar_parm_contact_bounds_cylendrical_struct *pv =
+-                (sar_parm_contact_bounds_cylendrical_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_CONTACT_BOUNDS_CYLENDRICAL
+                 );
+ 
+@@ -1538,7 +1538,7 @@
+         )
+         {
+             sar_parm_contact_bounds_rectangular_struct *pv =
+-                (sar_parm_contact_bounds_rectangular_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_CONTACT_BOUNDS_RECTANGULAR
+                 );
+ 
+@@ -1589,7 +1589,7 @@
+ 	)
+         {
+             sar_parm_ground_elevation_struct *pv =
+-                (sar_parm_ground_elevation_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_GROUND_ELEVATION
+                 );
+ 
+@@ -1606,7 +1606,7 @@
+ 	)
+         {
+             sar_parm_object_name_struct *pv =
+-                (sar_parm_object_name_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_OBJECT_NAME
+                 );
+ 
+@@ -1627,7 +1627,7 @@
+         )
+         {
+             sar_parm_object_map_description_struct *pv =
+-                (sar_parm_object_map_description_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_OBJECT_MAP_DESCRIPTION
+                 );
+ 
+@@ -1645,7 +1645,7 @@
+ 	)
+         {
+             sar_parm_fuel_struct *pv =
+-                (sar_parm_fuel_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_FUEL
+                 );
+ 
+@@ -1670,7 +1670,7 @@
+ 	)
+         {
+             sar_parm_hitpoints_struct *pv =
+-                (sar_parm_hitpoints_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_HITPOINTS
+                 );
+ 
+@@ -1695,7 +1695,7 @@
+ 	)
+         {
+             sar_parm_engine_state_struct *pv =
+-                (sar_parm_engine_state_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_ENGINE_STATE
+                 );
+ 
+@@ -1711,7 +1711,7 @@
+ 	)
+         {
+             sar_parm_passengers_struct *pv =
+-                (sar_parm_passengers_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_PASSENGERS
+                 );
+ 
+@@ -1738,7 +1738,7 @@
+ 	)
+ 	{
+ 	    sar_parm_runway_approach_lighting_north_struct *pv =
+-		(sar_parm_runway_approach_lighting_north_struct *)p = SARParmNew(
++		p = SARParmNew(
+                     SAR_PARM_RUNWAY_APPROACH_LIGHTING_NORTH
+                 );
+ 
+@@ -1776,7 +1776,7 @@
+         )
+         {
+             sar_parm_runway_approach_lighting_south_struct *pv =
+-                (sar_parm_runway_approach_lighting_south_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_RUNWAY_APPROACH_LIGHTING_SOUTH
+                 );
+ 
+@@ -1815,7 +1815,7 @@
+ 	)
+         {
+             sar_parm_human_message_enter_struct *pv =
+-                (sar_parm_human_message_enter_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_HUMAN_MESSAGE_ENTER
+                 );
+ 
+@@ -1834,7 +1834,7 @@
+         )
+         {
+             sar_parm_human_reference_struct *pv =
+-                (sar_parm_human_reference_struct *)p = SARParmNew(
++                p = SARParmNew(
+                     SAR_PARM_HUMAN_REFERENCE
+                 );
+ 
+@@ -2030,7 +2030,7 @@
+ 	if(FILTER_CHECK(SAR_PARM_MISSION_LOG_HEADER))
+ 	{
+ 	    p_mission_log_header =
+-		(sar_parm_mission_log_header_struct *)p =
++		p =
+ 		SARParmNew(SAR_PARM_MISSION_LOG_HEADER);
+ 
+ 	    DO_ADD_PARM
+--- sar/menu.c.old	2006-04-08 11:27:14.000000000 +0200
++++ sar/menu.c	2006-04-08 11:40:37.000000000 +0200
+@@ -701,9 +701,8 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)label_ptr = SAR_MENU_LABEL(calloc(
+-	    1, sizeof(sar_menu_label_struct)
+-	));
++	m->object[n] = SAR_MENU_LABEL(calloc(1, sizeof(sar_menu_label_struct)));
++	label_ptr = (sar_menu_label_struct *)m->object[n];
+ 	if(label_ptr == NULL)
+ 	    return(-3);
+ 
+@@ -780,9 +779,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)button = SAR_MENU_BUTTON(calloc(
++	m->object[n] = SAR_MENU_BUTTON(calloc(
+ 	    1, sizeof(sar_menu_button_struct)
+ 	));
++	button = (sar_menu_button_struct *)m->object[n];
+ 	if(button == NULL)
+ 	    return(-3);
+ 
+@@ -861,9 +861,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)pb = SAR_MENU_PROGRESS(calloc(
++	m->object[n] = SAR_MENU_PROGRESS(calloc(
+ 	    1, sizeof(sar_menu_progress_struct)
+ 	));
++	pb = (sar_menu_progress_struct *)m->object[n];
+ 	if(pb == NULL)
+ 	    return(-3);
+ 
+@@ -964,9 +965,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)mesgbox = SAR_MENU_MESSAGE_BOX(calloc(
++	m->object[n] = SAR_MENU_MESSAGE_BOX(calloc(
+ 	    1, sizeof(sar_menu_message_box_struct)
+ 	));
++	mesgbox = (sar_menu_message_box_struct *)m->object[n];
+ 	if(mesgbox == NULL)
+ 	    return(-3);
+ 
+@@ -1078,9 +1080,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)list = SAR_MENU_LIST(calloc(
++	m->object[n] = SAR_MENU_LIST(calloc(
+ 	    1, sizeof(sar_menu_list_struct)
+ 	));
++	list = (sar_menu_list_struct *)m->object[n];
+ 	if(list == NULL)
+ 	    return(-3);
+ 
+@@ -1326,9 +1329,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)mdpy = SAR_MENU_MDISPLAY(calloc(
++	m->object[n] = SAR_MENU_MDISPLAY(calloc(
+ 	    1, sizeof(sar_menu_mdisplay_struct)
+ 	));
++	mdpy = (sar_menu_mdisplay_struct *)m->object[n];
+ 	if(mdpy == NULL)
+ 	   return(-3);
+ 
+@@ -1416,9 +1420,10 @@
+ 	}
+ 
+ 	/* Allocate structure */ 
+-	m->object[n] = (void *)sw = SAR_MENU_SWITCH(calloc(
++	m->object[n] = SAR_MENU_SWITCH(calloc(
+ 	    1, sizeof(sar_menu_switch_struct)
+ 	));
++	sw = (sar_menu_switch_struct *)m->object[n];
+ 	if(sw == NULL)  
+ 	    return(-3);
+ 
+@@ -1556,9 +1561,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)spin = SAR_MENU_SPIN(calloc(
++	m->object[n] = SAR_MENU_SPIN(calloc(
+ 	    1, sizeof(sar_menu_spin_struct)
+ 	));
++	spin = (sar_menu_spin_struct *)m->object[n];
+ 	if(spin == NULL)
+ 	    return(-3);
+ 
+@@ -2010,9 +2016,10 @@
+ 	}
+ 
+ 	/* Allocate structure */
+-	m->object[n] = (void *)slider = SAR_MENU_SLIDER(calloc(
++	m->object[n] = SAR_MENU_SLIDER(calloc(
+ 	    1, sizeof(sar_menu_slider_struct)
+ 	));
++	slider = (sar_menu_slider_struct *)m->object[n];
+ 	if(slider == NULL)
+ 	    return(-3);
+ 
+--- sar/menuobjview.c.old	2006-04-08 11:42:14.000000000 +0200
++++ sar/menuobjview.c	2006-04-08 11:43:00.000000000 +0200
+@@ -151,9 +151,10 @@
+ 	}   
+ 	    
+ 	/* Allocate structure */
+-	m->object[n] = (void *)objview = SAR_MENU_OBJVIEW(calloc(
++	m->object[n] = SAR_MENU_OBJVIEW(calloc(
+ 	    1, sizeof(sar_menu_objview_struct)
+ 	));
++	objview = (sar_menu_objview_struct *)m->object[n];
+ 	if(objview == NULL)
+ 	    return(-1);
+ 
+--- sar/sound.c.old	2006-04-08 12:04:32.000000000 +0200
++++ sar/sound.c	2006-04-08 12:05:57.000000000 +0200
+@@ -230,7 +230,7 @@
+  * YIDNULL.
+  */
+ #define SET_SND_PLAY_YID_NULL(p)	\
+- { if((p) != NULL) (snd_play_struct *)(p)->data = (void *)YIDNULL; }
++ { if((p) != NULL) (p)->data = (void *)YIDNULL; }
+ 
+ 	    if(recorder->con != NULL)
+ 	    {
diff --git a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild b/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild
index c4ee95e3d019..1919a5e902b6 100644
--- a/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild
+++ b/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.3 2006/02/22 22:02:12 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/searchandrescue/searchandrescue-0.8.2.ebuild,v 1.4 2006/04/08 10:51:45 tupone Exp $
 
 inherit eutils games
 
@@ -44,7 +44,8 @@ src_unpack() {
 	mkdir data ; cd data
 	unpack ${MY_PN}-data-${PV}.tar.bz2
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc33.patch
+	epatch "${FILESDIR}"/${P}-gcc33.patch \
+		"${FILESDIR}"/${P}-gcc41.patch
 	bunzip2 sar/man/${MY_PN}.6.bz2
 	sed -i \
 		-e '/FeatureCFLAGS.*march/s:=.*:=:g' sar/platforms.ini \