Sat May 7 09:57:54 2016 UTC ()
Ensure intptr_t is defined in various places.


(joerg)
diff -r1.10 -r1.11 pkgsrc/games/xevil/distinfo
diff -r1.2 -r1.3 pkgsrc/games/xevil/patches/patch-ah
diff -r1.2 -r1.3 pkgsrc/games/xevil/patches/patch-ai
diff -r1.3 -r1.4 pkgsrc/games/xevil/patches/patch-ao
cvs diff -r1.10 -r1.11 pkgsrc/games/xevil/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xevil/distinfo 2015/11/03 20:57:08 1.10
+++ pkgsrc/games/xevil/distinfo 2016/05/07 09:57:53 1.11
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: distinfo,v 1.10 2015/11/03 20:57:08 agc Exp $ 1$NetBSD: distinfo,v 1.11 2016/05/07 09:57:53 joerg Exp $
2 2
3SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc 3SHA1 (xevilsrc2.02r2.zip) = e9a262daffc7ee5c06196dc94cf35c199be86bbc
4RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e 4RMD160 (xevilsrc2.02r2.zip) = dca82298ac2dfe66e4e92a02731bb6851563b67e
5SHA512 (xevilsrc2.02r2.zip) = ce9422da914234290797258f22fa5f8d6502dc5930eac1c3ce92d708196050ce5d75761c987e2d28b167699460b9c8fd72596242983a0b8ba6d2008c72b2354f 5SHA512 (xevilsrc2.02r2.zip) = ce9422da914234290797258f22fa5f8d6502dc5930eac1c3ce92d708196050ce5d75761c987e2d28b167699460b9c8fd72596242983a0b8ba6d2008c72b2354f
6Size (xevilsrc2.02r2.zip) = 1857315 bytes 6Size (xevilsrc2.02r2.zip) = 1857315 bytes
7SHA1 (patch-aa) = 7421021c8b5f486a031959db9ac3e7a1197f7763 7SHA1 (patch-aa) = 7421021c8b5f486a031959db9ac3e7a1197f7763
8SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35 8SHA1 (patch-ac) = 470479cc03cbd3cc35b5c12560868a18845cdf35
9SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0 9SHA1 (patch-ad) = df17b2c15b3eedaebd62e1de9e08fd01f98c37f0
10SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749 10SHA1 (patch-ae) = bd4c1811aabf3791563a80c392afe96e0c4ed749
11SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79 11SHA1 (patch-af) = 4d1e6e7cfa7c1b4423ac9edc8f3ece68dbab9b79
12SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2 12SHA1 (patch-ag) = c826c7ee631b3661ca78fe243b6aeb1ff37d73e2
13SHA1 (patch-ah) = b78acf6e01bd555024eb1a6a5d80ab8c393de4c5 13SHA1 (patch-ah) = 15c730952ed18425dce6a398eb71bdc17bd822be
14SHA1 (patch-ai) = 8579f4f6594ff2d01c35c2becc7cf395a5195550 14SHA1 (patch-ai) = 22dd40db2b111860090a83314dace236110645e2
15SHA1 (patch-aj) = 78214c3bf9d643f9f8ade8c24944eea6b976ea6c 15SHA1 (patch-aj) = 78214c3bf9d643f9f8ade8c24944eea6b976ea6c
16SHA1 (patch-ak) = a83854de16104e124213e3990597555c21533411 16SHA1 (patch-ak) = a83854de16104e124213e3990597555c21533411
17SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f 17SHA1 (patch-al) = 2530864b88b66b5c45b0996cb65269899b115e3f
18SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59 18SHA1 (patch-am) = 9250c6c734b22f1edf63040e2c70579917593f59
19SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237 19SHA1 (patch-an) = 4325b3ff1f32a9b09b540bcc0b482acdf8e96237
20SHA1 (patch-ao) = 85f4b0f2238ea1cbfe3ed16a9cd58ed2c64a0da1 20SHA1 (patch-ao) = b6871101e4a5e7c8b83f6754474d74183309375f
21SHA1 (patch-ap) = 7fb4d991f629ee5f36718a047ce4667c563fd95b 21SHA1 (patch-ap) = 7fb4d991f629ee5f36718a047ce4667c563fd95b
22SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983 22SHA1 (patch-aq) = 2a781bd3118bda38244f7b7a0bb1a202a90c3983
23SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903 23SHA1 (patch-ar) = 8be1ce3f1ed2bd55dfc77042fa5f62fc6b036903
24SHA1 (patch-as) = 4c4e4ef0e626b8f04a120c996ec155cacf0c0ddf 24SHA1 (patch-as) = 4c4e4ef0e626b8f04a120c996ec155cacf0c0ddf
25SHA1 (patch-at) = 6344907d83f7e6ee426e60970de88a0dc1686f48 25SHA1 (patch-at) = 6344907d83f7e6ee426e60970de88a0dc1686f48
26SHA1 (patch-au) = f1092ff4228d4bb6f13e6aeb0ea70a5b4b9635b6 26SHA1 (patch-au) = f1092ff4228d4bb6f13e6aeb0ea70a5b4b9635b6
27SHA1 (patch-cmn_game.h) = 47db702d729158290118cf75a0c437362f9af1c3 27SHA1 (patch-cmn_game.h) = 47db702d729158290118cf75a0c437362f9af1c3
28SHA1 (patch-cmn_streams.cpp) = bb32e15807cc5ff2289df2e1dc1c1661c8949ad4 28SHA1 (patch-cmn_streams.cpp) = bb32e15807cc5ff2289df2e1dc1c1661c8949ad4
29SHA1 (patch-cmn_world.cpp) = 7bae7dfe426bf7dcf06906d62cd60c50efe98d4f 29SHA1 (patch-cmn_world.cpp) = 7bae7dfe426bf7dcf06906d62cd60c50efe98d4f
30SHA1 (patch-x11_main.cpp) = 425c3be3de05666293e47ce37ec9ff255c456c25 30SHA1 (patch-x11_main.cpp) = 425c3be3de05666293e47ce37ec9ff255c456c25
31SHA1 (patch-x11_xdata.cpp) = 0942dda395ca3bf1038a900e985a27b3e655d484 31SHA1 (patch-x11_xdata.cpp) = 0942dda395ca3bf1038a900e985a27b3e655d484
cvs diff -r1.2 -r1.3 pkgsrc/games/xevil/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/games/xevil/patches/patch-ah 2008/08/17 23:50:06 1.2
+++ pkgsrc/games/xevil/patches/patch-ah 2016/05/07 09:57:54 1.3
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: patch-ah,v 1.2 2008/08/17 23:50:06 dholland Exp $ 1$NetBSD: patch-ah,v 1.3 2016/05/07 09:57:54 joerg Exp $
2 2
3--- cmn/actual.cpp.orig 2000-01-19 12:54:36.000000000 -0500 3--- cmn/actual.cpp.orig 2000-01-19 12:54:36.000000000 +0000
4+++ cmn/actual.cpp 2008-08-17 19:09:43.000000000 -0400 4+++ cmn/actual.cpp
5@@ -32,7 +32,8 @@ 5@@ -31,8 +31,10 @@
 6 #endif
6  7
7 // Include Files 8 // Include Files
 9+#include <inttypes.h>
8 #if X11 10 #if X11
9-#include <strstream.h> 11-#include <strstream.h>
10+#include <strstream> 12+#include <strstream>
11+using namespace std; 13+using namespace std;
12 #endif 14 #endif
13 #if WIN32 15 #if WIN32
14 #include <strstrea.h> 16 #include <strstrea.h>
15@@ -1534,7 +1535,7 @@ Boolean Transmogifier::transmogify_targe 17@@ -1534,7 +1536,7 @@ Boolean Transmogifier::transmogify_targe
16 void *closure) { 18 void *closure) {
17 // notThis is used to prevent transmogifying into the same class an object 19 // notThis is used to prevent transmogifying into the same class an object
18 // already is. 20 // already is.
19- ClassId notThis = (ClassId)closure; 21- ClassId notThis = (ClassId)closure;
20+ ClassId notThis = (ClassId)(intptr_t)closure; 22+ ClassId notThis = (ClassId)(intptr_t)closure;
21 if (pc->classId == notThis) { 23 if (pc->classId == notThis) {
22 return False; 24 return False;
23 } 25 }
cvs diff -r1.2 -r1.3 pkgsrc/games/xevil/patches/patch-ai (expand / switch to unified diff)

--- pkgsrc/games/xevil/patches/patch-ai 2008/08/17 23:50:06 1.2
+++ pkgsrc/games/xevil/patches/patch-ai 2016/05/07 09:57:54 1.3
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1$NetBSD: patch-ai,v 1.2 2008/08/17 23:50:06 dholland Exp $ 1$NetBSD: patch-ai,v 1.3 2016/05/07 09:57:54 joerg Exp $
2 2
3--- cmn/xetp.cpp.orig 2000-01-19 12:54:30.000000000 -0500 3--- cmn/xetp.cpp.orig 2000-01-19 12:54:30.000000000 +0000
4+++ cmn/xetp.cpp 2008-08-17 19:12:24.000000000 -0400 4+++ cmn/xetp.cpp
5@@ -29,9 +29,10 @@ 5@@ -29,9 +29,11 @@
6  6
7 #include "stdafx.h" 7 #include "stdafx.h"
8  8
9-#include <iostream.h> 9-#include <iostream.h>
 10+#include <inttypes.h>
10+#include <iostream> 11+#include <iostream>
11 #if X11 12 #if X11
12-#include <strstream.h> 13-#include <strstream.h>
13+#include <strstream> 14+#include <strstream>
14+using namespace std; 15+using namespace std;
15 #endif 16 #endif
16 #if WIN32 17 #if WIN32
17 #include <strstrea.h> 18 #include <strstrea.h>
18@@ -159,7 +160,7 @@ void XETP::send_objects(OutStreamP out,c 19@@ -159,7 +161,7 @@ void XETP::send_objects(OutStreamP out,c
19 for (n = 0; n < physicals.length(); n++) { 20 for (n = 0; n < physicals.length(); n++) {
20 PhysicalP p = (PhysicalP)physicals.get(n); 21 PhysicalP p = (PhysicalP)physicals.get(n);
21 // computing object_length twice, but who cares. 22 // computing object_length twice, but who cares.
22- _send_object(out,p,turn,(TickType)tickTypes.get(n), 23- _send_object(out,p,turn,(TickType)tickTypes.get(n),
23+ _send_object(out,p,turn,(TickType)(intptr_t)tickTypes.get(n), 24+ _send_object(out,p,turn,(TickType)(intptr_t)tickTypes.get(n),
24 compute_object_length(p)); 25 compute_object_length(p));
25 } 26 }
26  27
cvs diff -r1.3 -r1.4 pkgsrc/games/xevil/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/games/xevil/patches/patch-ao 2011/11/27 19:43:33 1.3
+++ pkgsrc/games/xevil/patches/patch-ao 2016/05/07 09:57:54 1.4
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1$NetBSD: patch-ao,v 1.3 2011/11/27 19:43:33 joerg Exp $ 1$NetBSD: patch-ao,v 1.4 2016/05/07 09:57:54 joerg Exp $
2 2
3--- cmn/game_style.cpp.orig 2003-03-22 20:47:42.000000000 +0000 3--- cmn/game_style.cpp.orig 2003-03-22 20:47:42.000000000 +0000
4+++ cmn/game_style.cpp 4+++ cmn/game_style.cpp
5@@ -29,19 +29,18 @@ 5@@ -29,19 +29,19 @@
6  6
7 // Include Files 7 // Include Files
8 #include "stdafx.h" 8 #include "stdafx.h"
9-extern "C" { 9-extern "C" {
10-#include <string.h> 10-#include <string.h>
11-} 11-}
12+#include <cstring> 12+#include <cstring>
 13+#include <inttypes.h>
13  14
14 #if X11 15 #if X11
15-#include <strstream.h> 16-#include <strstream.h>
16+#include <strstream> 17+#include <strstream>
17+using namespace std; 18+using namespace std;
18 #endif 19 #endif
19  20
20 #if WIN32 21 #if WIN32
21 #include <strstrea.h> 22 #include <strstrea.h>
22 #endif 23 #endif
23  24
24-#include <iomanip.h> 25-#include <iomanip.h>
25+#include <iomanip> 26+#include <iomanip>
26 #include "utils.h" 27 #include "utils.h"
27 #include "coord.h" 28 #include "coord.h"
28 #include "world.h" 29 #include "world.h"
29@@ -2680,7 +2679,7 @@ int ZigZag::new_level_check(int,WorldP w 30@@ -2680,7 +2680,7 @@ int ZigZag::new_level_check(int,WorldP w
30 HumanP human = locator->get_human(n); 31 HumanP human = locator->get_human(n);
31 if (human) { 32 if (human) {
32 // previous depth 33 // previous depth
33- int depthOld = (int)human->get_data(); 34- int depthOld = (int)human->get_data();
34+ int depthOld = (int)(intptr_t)human->get_data(); 35+ int depthOld = (int)(intptr_t)human->get_data();
35 Id id = human->get_id(); 36 Id id = human->get_id();
36  37
37 // Get physical for intelligence 38 // Get physical for intelligence