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


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

--- pkgsrc/emulators/gpsim-devel/distinfo 2012/10/20 22:09:09 1.10
+++ pkgsrc/emulators/gpsim-devel/distinfo 2012/12/24 06:11:25 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.10 2012/10/20 22:09:09 joerg Exp $ 1$NetBSD: distinfo,v 1.11 2012/12/24 06:11:25 dholland Exp $
2 2
3SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081 3SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
4RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d 4RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
5Size (gpsim-20050905.tar.gz) = 2027957 bytes 5Size (gpsim-20050905.tar.gz) = 2027957 bytes
6SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87 6SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87
7SHA1 (patch-ab) = 5e5b840c3b965484db9fece50130f25d92929f68 7SHA1 (patch-ab) = 5e5b840c3b965484db9fece50130f25d92929f68
8SHA1 (patch-ac) = 47ff4e3cd8a9255a85519a29a61f1d1f51997965 8SHA1 (patch-ac) = 47ff4e3cd8a9255a85519a29a61f1d1f51997965
9SHA1 (patch-ae) = 31c9ac582edf2e9e543905f0af6aed92da49f73c 9SHA1 (patch-ae) = 31c9ac582edf2e9e543905f0af6aed92da49f73c
10SHA1 (patch-af) = 7cc61d6a1b6476a2a120ae15f25c500693f1897f 10SHA1 (patch-af) = 7cc61d6a1b6476a2a120ae15f25c500693f1897f
11SHA1 (patch-cli-parse.yy) = 15828629b4d151f816699a22fa56abdf50b2fe5c 11SHA1 (patch-cli-parse.yy) = 15828629b4d151f816699a22fa56abdf50b2fe5c
12SHA1 (patch-cli-scan.ll) = 27e96369b155fe3a627acef734b09b0398fb9c43 12SHA1 (patch-cli-scan.ll) = 27e96369b155fe3a627acef734b09b0398fb9c43
13SHA1 (patch-cli_cmd__clear.cc) = c5cded15623247dfc3028f8af6bf6331ee8f8e63 13SHA1 (patch-cli_cmd__clear.cc) = c5cded15623247dfc3028f8af6bf6331ee8f8e63
14SHA1 (patch-cli_cmd__help.cc) = a26b30ca138f630de751acc7a8bc463f48c4739b 14SHA1 (patch-cli_cmd__help.cc) = a26b30ca138f630de751acc7a8bc463f48c4739b
@@ -19,16 +19,17 @@ SHA1 (patch-gui-gui_watch.cc) = 850b003e @@ -19,16 +19,17 @@ SHA1 (patch-gui-gui_watch.cc) = 850b003e
19SHA1 (patch-gui_gui__regwin.cc) = adfc57c04d58fbce8bdf8768a0b4c0b2e82dd100 19SHA1 (patch-gui_gui__regwin.cc) = adfc57c04d58fbce8bdf8768a0b4c0b2e82dd100
20SHA1 (patch-gui_gui__src.cc) = 351f8eff9e2118a963cdb1bdd7055d4f8cbf22b5 20SHA1 (patch-gui_gui__src.cc) = 351f8eff9e2118a963cdb1bdd7055d4f8cbf22b5
21SHA1 (patch-gui_gui__stack.cc) = 041ee43064d17e298a8457f083477729c08994eb 21SHA1 (patch-gui_gui__stack.cc) = 041ee43064d17e298a8457f083477729c08994eb
22SHA1 (patch-gui_gui__symbols.cc) = be4da964ee6d7e5311188d535a9cb283e7f8ba1b 22SHA1 (patch-gui_gui__symbols.cc) = be4da964ee6d7e5311188d535a9cb283e7f8ba1b
23SHA1 (patch-gui_settings__exdbm.cc) = 4a5962fd13ec791ada60d0e9c8055deb5eeeff7b 23SHA1 (patch-gui_settings__exdbm.cc) = 4a5962fd13ec791ada60d0e9c8055deb5eeeff7b
24SHA1 (patch-modules_binary__indicator.cc) = d51d3c7f7b5025d268575b8336e07114d88ce249 24SHA1 (patch-modules_binary__indicator.cc) = d51d3c7f7b5025d268575b8336e07114d88ce249
25SHA1 (patch-src_bitlog_h) = c40862474c3b22659031f6dd36a8e1b271af47fd 25SHA1 (patch-src_bitlog_h) = c40862474c3b22659031f6dd36a8e1b271af47fd
26SHA1 (patch-src_cmd__manager.h) = a59cede11198ef71f902067219205f1c86c1b879 26SHA1 (patch-src_cmd__manager.h) = a59cede11198ef71f902067219205f1c86c1b879
27SHA1 (patch-src_modules.cc) = bd66268e162fb3377adcb795dfecf20df611baa3 27SHA1 (patch-src_modules.cc) = bd66268e162fb3377adcb795dfecf20df611baa3
28SHA1 (patch-src_operator.cc) = 4bdb1cee156930fb817ddff3e0eda6b49731872e 28SHA1 (patch-src_operator.cc) = 4bdb1cee156930fb817ddff3e0eda6b49731872e
29SHA1 (patch-src_processor.cc) = 5139b24bf928c98250c9a87981b9ee0070f65949 29SHA1 (patch-src_processor.cc) = 5139b24bf928c98250c9a87981b9ee0070f65949
30SHA1 (patch-src_processor.h) = 48ad5c1318e5b1e096643cd714cbb3ff3ce57db3 30SHA1 (patch-src_processor.h) = 48ad5c1318e5b1e096643cd714cbb3ff3ce57db3
31SHA1 (patch-src_program__files.cc) = db0b4561d20f6b1feabeb33847f22326455608da 31SHA1 (patch-src_program__files.cc) = db0b4561d20f6b1feabeb33847f22326455608da
 32SHA1 (patch-src_protocol.h) = ed2c7c903ed605b26a50c125436ac18f11d824eb
32SHA1 (patch-src_symbol.cc) = 195c15f4c258398d4a7c28cee1cf3d3ad7164429 33SHA1 (patch-src_symbol.cc) = 195c15f4c258398d4a7c28cee1cf3d3ad7164429
33SHA1 (patch-src_symbol.h) = 778f2b9f8febfa498b87acfb59fdcb665975e592 34SHA1 (patch-src_symbol.h) = 778f2b9f8febfa498b87acfb59fdcb665975e592
34SHA1 (patch-src_value.cc) = 3fceae8b4d40ad1c26a06ac7dce6bb88965ae018 35SHA1 (patch-src_value.cc) = 3fceae8b4d40ad1c26a06ac7dce6bb88965ae018
File Added: pkgsrc/emulators/gpsim-devel/patches/patch-src_protocol.h
$NetBSD: patch-src_protocol.h,v 1.1 2012/12/24 06:11:26 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)