Mon Dec 24 06:08:30 2012 UTC ()
Remove any putc macro before defining a putc member function.
Should fix (or advance) dfly build.


(dholland)
diff -r1.11 -r1.12 pkgsrc/emulators/gpsim/distinfo
diff -r0 -r1.1 pkgsrc/emulators/gpsim/patches/patch-src_protocol.h
cvs diff -r1.11 -r1.12 pkgsrc/emulators/gpsim/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/gpsim/distinfo 2012/05/10 06:52:52 1.11
+++ pkgsrc/emulators/gpsim/distinfo 2012/12/24 06:08:29 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.11 2012/05/10 06:52:52 dholland Exp $ 1$NetBSD: distinfo,v 1.12 2012/12/24 06:08:29 dholland Exp $
2 2
3SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a 3SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
4RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922 4RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
5Size (gpsim-0.21.11.tar.gz) = 1218332 bytes 5Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
6SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300 6SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
7SHA1 (patch-ab) = c67d244af2a89d679083f8b4245a7be4debf82f4 7SHA1 (patch-ab) = c67d244af2a89d679083f8b4245a7be4debf82f4
8SHA1 (patch-ac) = 1c2cf1059db73c385817199bb35672f4f2246a67 8SHA1 (patch-ac) = 1c2cf1059db73c385817199bb35672f4f2246a67
9SHA1 (patch-ad) = f172ec71e2c2ef6bb798da79e1f73c063ff27d5b 9SHA1 (patch-ad) = f172ec71e2c2ef6bb798da79e1f73c063ff27d5b
10SHA1 (patch-ae) = 5185e3cbea6d5e036020f1de9636907efe54c851 10SHA1 (patch-ae) = 5185e3cbea6d5e036020f1de9636907efe54c851
11SHA1 (patch-cli_cmd__clear.cc) = 72f0f069692c6d9b8e6ba2abb4286a01de0d9a82 11SHA1 (patch-cli_cmd__clear.cc) = 72f0f069692c6d9b8e6ba2abb4286a01de0d9a82
12SHA1 (patch-cli_cmd__help.cc) = 90d3df16dd7c1746f68b850f8dc86a751352b9d2 12SHA1 (patch-cli_cmd__help.cc) = 90d3df16dd7c1746f68b850f8dc86a751352b9d2
13SHA1 (patch-cli_cmd__list.cc) = 5f20122097f3be39b7a714b46ca0e71b6356a9b9 13SHA1 (patch-cli_cmd__list.cc) = 5f20122097f3be39b7a714b46ca0e71b6356a9b9
14SHA1 (patch-cli_cmd__x.cc) = c9730d62932455dcaf99ab1db9352219a0976188 14SHA1 (patch-cli_cmd__x.cc) = c9730d62932455dcaf99ab1db9352219a0976188
@@ -16,15 +16,16 @@ SHA1 (patch-cli_socket.cc) = 6b8b0c0e071 @@ -16,15 +16,16 @@ SHA1 (patch-cli_socket.cc) = 6b8b0c0e071
16SHA1 (patch-gui_gui__regwin.cc) = 218b41e9e4a0eb9336757c842686eef3b35ea403 16SHA1 (patch-gui_gui__regwin.cc) = 218b41e9e4a0eb9336757c842686eef3b35ea403
17SHA1 (patch-gui_gui__src.cc) = 1622d9a75451230d74bc4aee907eeb7dd64f7aa2 17SHA1 (patch-gui_gui__src.cc) = 1622d9a75451230d74bc4aee907eeb7dd64f7aa2
18SHA1 (patch-gui_gui__stack.cc) = badf2fbda9f2f8a1f0005dab5bde4adf814aafe4 18SHA1 (patch-gui_gui__stack.cc) = badf2fbda9f2f8a1f0005dab5bde4adf814aafe4
19SHA1 (patch-gui_gui__symbols.cc) = 2f36fb615029823065214a030b309ca4f36336cc 19SHA1 (patch-gui_gui__symbols.cc) = 2f36fb615029823065214a030b309ca4f36336cc
20SHA1 (patch-gui_settings__exdbm.cc) = 957854ab58bde81857a2729120a710346f89ecf6 20SHA1 (patch-gui_settings__exdbm.cc) = 957854ab58bde81857a2729120a710346f89ecf6
21SHA1 (patch-modules_binary__indicator.cc) = a666710d4d93077c57163176428075416483719e 21SHA1 (patch-modules_binary__indicator.cc) = a666710d4d93077c57163176428075416483719e
22SHA1 (patch-src_bitlog_h) = 406cfb4e4c3a8733e69fc0d9cf6692b61f9ac534 22SHA1 (patch-src_bitlog_h) = 406cfb4e4c3a8733e69fc0d9cf6692b61f9ac534
23SHA1 (patch-src_cmd__manager.h) = 1fda88495f6c4ff8a244787f19e64558f86675e0 23SHA1 (patch-src_cmd__manager.h) = 1fda88495f6c4ff8a244787f19e64558f86675e0
24SHA1 (patch-src_modules.cc) = bc01b99a564051bce16c5d010635691a2b651c72 24SHA1 (patch-src_modules.cc) = bc01b99a564051bce16c5d010635691a2b651c72
25SHA1 (patch-src_operator.cc) = 303dd4744aabc3a42fa97db3d3bebc3994c80e8a 25SHA1 (patch-src_operator.cc) = 303dd4744aabc3a42fa97db3d3bebc3994c80e8a
26SHA1 (patch-src_processor.cc) = b77bc4710c14fd519dd5b72e0700172c9b2dc02e 26SHA1 (patch-src_processor.cc) = b77bc4710c14fd519dd5b72e0700172c9b2dc02e
27SHA1 (patch-src_processor.h) = 29cd80b086f7267c7d092e22d9f5780310d8d006 27SHA1 (patch-src_processor.h) = 29cd80b086f7267c7d092e22d9f5780310d8d006
28SHA1 (patch-src_program__files.cc) = 25e3b4ee2e8ad91eaa54a64d7ccc2f1ff51b51a9 28SHA1 (patch-src_program__files.cc) = 25e3b4ee2e8ad91eaa54a64d7ccc2f1ff51b51a9
 29SHA1 (patch-src_protocol.h) = ed2c7c903ed605b26a50c125436ac18f11d824eb
29SHA1 (patch-src_symbol.cc) = cb84a108f2a79a1d3eb40da33cd11f3276682bc0 30SHA1 (patch-src_symbol.cc) = cb84a108f2a79a1d3eb40da33cd11f3276682bc0
30SHA1 (patch-src_value.cc) = 8a97172012cccb14c7b4654e4da1b60041b7733f 31SHA1 (patch-src_value.cc) = 8a97172012cccb14c7b4654e4da1b60041b7733f
File Added: pkgsrc/emulators/gpsim/patches/Attic/patch-src_protocol.h
$NetBSD: patch-src_protocol.h,v 1.1 2012/12/24 06:08:30 dholland Exp $

Remove any putc macro before defining a putc member function.
Required for building on DragonFly.

--- src/protocol.h~	2005-08-25 21:57:44.000000000 +0000
+++ src/protocol.h
@@ -101,6 +101,7 @@ public:
 
   void terminate();
 
+#undef putc /* in case it's a macro coming from stdio.h */
   void putc(char c)
   {
     if(index < size)