Mon Dec 24 06:28:17 2012 UTC ()
Provide NULL if it's missing; should fix or advance the dfly build.


(dholland)
diff -r1.2 -r1.3 pkgsrc/games/xu4/distinfo
diff -r0 -r1.1 pkgsrc/games/xu4/patches/patch-src_moongate.cpp
cvs diff -r1.2 -r1.3 pkgsrc/games/xu4/distinfo (expand / switch to unified diff)

--- pkgsrc/games/xu4/distinfo 2012/05/23 06:35:17 1.2
+++ pkgsrc/games/xu4/distinfo 2012/12/24 06:28:16 1.3
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: distinfo,v 1.2 2012/05/23 06:35:17 dholland Exp $ 1$NetBSD: distinfo,v 1.3 2012/12/24 06:28:16 dholland Exp $
2 2
3SHA1 (xu4-1.0beta3.tar.gz) = baf1bbdc18088096ae11ea31aa497532b7e7124c 3SHA1 (xu4-1.0beta3.tar.gz) = baf1bbdc18088096ae11ea31aa497532b7e7124c
4RMD160 (xu4-1.0beta3.tar.gz) = f758fea4bc3034b19122651cfb725a88e0684960 4RMD160 (xu4-1.0beta3.tar.gz) = f758fea4bc3034b19122651cfb725a88e0684960
5Size (xu4-1.0beta3.tar.gz) = 418477 bytes 5Size (xu4-1.0beta3.tar.gz) = 418477 bytes
6SHA1 (patch-src_Makefile) = ac80c253affd3b150a377cd0072db9557c26407b 6SHA1 (patch-src_Makefile) = ac80c253affd3b150a377cd0072db9557c26407b
7SHA1 (patch-src_armor.cpp) = 1cc4ad07efaa70c5764b910d055939e22b4287d5 7SHA1 (patch-src_armor.cpp) = 1cc4ad07efaa70c5764b910d055939e22b4287d5
8SHA1 (patch-src_codex.cpp) = 706aa3a6854b72ae6ada927cc1bd1c71f7c4959e 8SHA1 (patch-src_codex.cpp) = 706aa3a6854b72ae6ada927cc1bd1c71f7c4959e
9SHA1 (patch-src_conversation.cpp) = 15ea5eed4abe11e7afb58359b6cd732b1e84b458 9SHA1 (patch-src_conversation.cpp) = 15ea5eed4abe11e7afb58359b6cd732b1e84b458
10SHA1 (patch-src_creature.cpp) = 9479f075c95b481bae073011c72672b383a5f7e4 10SHA1 (patch-src_creature.cpp) = 9479f075c95b481bae073011c72672b383a5f7e4
11SHA1 (patch-src_dialogueloader.cpp) = 10b46af20241f6571a7656b577f42dfca39f74cc 11SHA1 (patch-src_dialogueloader.cpp) = 10b46af20241f6571a7656b577f42dfca39f74cc
12SHA1 (patch-src_dialogueloader__tlk.cpp) = e4f69fc103836a15800b9f76ae742555a686ad34 12SHA1 (patch-src_dialogueloader__tlk.cpp) = e4f69fc103836a15800b9f76ae742555a686ad34
13SHA1 (patch-src_direction.cpp) = 412950b32b43dbfd7081733c94b4365ee85a3fdd 13SHA1 (patch-src_direction.cpp) = 412950b32b43dbfd7081733c94b4365ee85a3fdd
14SHA1 (patch-src_imageloader.cpp) = 88ed63cb53b5de9d14d940e045752f01a3a5f4b6 14SHA1 (patch-src_imageloader.cpp) = 88ed63cb53b5de9d14d940e045752f01a3a5f4b6
15SHA1 (patch-src_imageloader__png.cpp) = e790fac8468d74ff605868c29d8cc8759cb16871 15SHA1 (patch-src_imageloader__png.cpp) = e790fac8468d74ff605868c29d8cc8759cb16871
16SHA1 (patch-src_imagemgr.h) = 36b1bd2d750e17b9c403cded9d8787aa6a8a61cd 16SHA1 (patch-src_imagemgr.h) = 36b1bd2d750e17b9c403cded9d8787aa6a8a61cd
17SHA1 (patch-src_intro.cpp) = 5330d1bedb8e79750468d9463a016b041b7aa496 17SHA1 (patch-src_intro.cpp) = 5330d1bedb8e79750468d9463a016b041b7aa496
18SHA1 (patch-src_item.cpp) = 667498d2c8fcf4c2c35da0d9189d68c9b6a9baf5 18SHA1 (patch-src_item.cpp) = 667498d2c8fcf4c2c35da0d9189d68c9b6a9baf5
19SHA1 (patch-src_lzw_u6decode.cpp) = 1dbf1cb0f24ad9d083f4a7fe666f1503c9647ab6 19SHA1 (patch-src_lzw_u6decode.cpp) = 1dbf1cb0f24ad9d083f4a7fe666f1503c9647ab6
20SHA1 (patch-src_menuitem_cpp) = 400943827ddd59a9cff547765e87b30590569cb2 20SHA1 (patch-src_menuitem_cpp) = 400943827ddd59a9cff547765e87b30590569cb2
 21SHA1 (patch-src_moongate.cpp) = b9edda01c2d405ac94082280a62e8169be66ba85
21SHA1 (patch-src_person.cpp) = b93703514429257ae4665ab7242c5dc1ead18c3c 22SHA1 (patch-src_person.cpp) = b93703514429257ae4665ab7242c5dc1ead18c3c
22SHA1 (patch-src_savegame.cpp) = 6a0b43d29bd26fd2265953588ae82c950d14e6ba 23SHA1 (patch-src_savegame.cpp) = 6a0b43d29bd26fd2265953588ae82c950d14e6ba
23SHA1 (patch-src_screen.cpp) = bffaf51b9ac63112733d89c0b5e30370a695d45d 24SHA1 (patch-src_screen.cpp) = bffaf51b9ac63112733d89c0b5e30370a695d45d
24SHA1 (patch-src_settings.cpp) = 6eacdf00c5d85cb848b089933ce9a70817714453 25SHA1 (patch-src_settings.cpp) = 6eacdf00c5d85cb848b089933ce9a70817714453
25SHA1 (patch-src_spell.cpp) = 4412c24a2265f41f30b6fdbc4a21ac0a1df8e329 26SHA1 (patch-src_spell.cpp) = 4412c24a2265f41f30b6fdbc4a21ac0a1df8e329
26SHA1 (patch-src_stats.cpp) = da37132d4c710e5dda29b222d27aed84fcd250d1 27SHA1 (patch-src_stats.cpp) = da37132d4c710e5dda29b222d27aed84fcd250d1
27SHA1 (patch-src_textview.cpp) = 18da8c99836c4a277c1f674b03f7c77da58f020e 28SHA1 (patch-src_textview.cpp) = 18da8c99836c4a277c1f674b03f7c77da58f020e
28SHA1 (patch-src_u4file.cpp) = 70d8d1650d0888d56c2d9f720b1d4b715b8502dd 29SHA1 (patch-src_u4file.cpp) = 70d8d1650d0888d56c2d9f720b1d4b715b8502dd
29SHA1 (patch-src_weapon.cpp) = d87690c8ed0b63be171437b2331955284859be97 30SHA1 (patch-src_weapon.cpp) = d87690c8ed0b63be171437b2331955284859be97
File Added: pkgsrc/games/xu4/patches/patch-src_moongate.cpp
$NetBSD: patch-src_moongate.cpp,v 1.1 2012/12/24 06:28:16 dholland Exp $

Provide NULL if it's missing. Apparently Required on Dragonfly.

--- src/moongate.cpp~	2004-06-01 15:07:45.000000000 +0000
+++ src/moongate.cpp
@@ -11,6 +11,10 @@
 #include "moongate.h"
 #include "types.h"
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 typedef std::map<int, Coords> MoongateList; /* map moon phase to map coordinates */
 
 MoongateList gates;