Fix C++ usage including passing non-POD types to sprintf. Bump revision.

5 files changed, 45 insertions, 3 deletions

diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index 430b1865900..0fe1ddb84d4 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2011/04/22 13:42:46 obache Exp $
+# $NetBSD: Makefile,v 1.18 2011/09/08 00:12:00 joerg Exp $
 #
 
 DISTNAME=	gpsim-20050905
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	emulators
 MASTER_SITES=	http://www-asim.lip6.fr/~bouyer/pic/
 
diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo
index 06186b6f609..7338f4b1424 100644
--- a/emulators/gpsim-devel/distinfo
+++ b/emulators/gpsim-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2007/01/27 11:08:57 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/09/08 00:12:00 joerg Exp $
 
 SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081
 RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d
@@ -8,3 +8,6 @@ SHA1 (patch-ab) = cd3ef9b6bef759e95ee18b1995d514546c2475ae
 SHA1 (patch-ac) = 47ff4e3cd8a9255a85519a29a61f1d1f51997965
 SHA1 (patch-ae) = 31c9ac582edf2e9e543905f0af6aed92da49f73c
 SHA1 (patch-af) = 7cc61d6a1b6476a2a120ae15f25c500693f1897f
+SHA1 (patch-cli-parse.yy) = 15828629b4d151f816699a22fa56abdf50b2fe5c
+SHA1 (patch-cli-scan.ll) = 27e96369b155fe3a627acef734b09b0398fb9c43
+SHA1 (patch-gui-gui_watch.cc) = c8c94ef11dd4378c73cb922380c2b8bc734d0949
diff --git a/emulators/gpsim-devel/patches/patch-cli-parse.yy b/emulators/gpsim-devel/patches/patch-cli-parse.yy
new file mode 100644
index 00000000000..78532053968
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-cli-parse.yy
@@ -0,0 +1,13 @@
+$NetBSD: patch-cli-parse.yy,v 1.1 2011/09/08 00:12:00 joerg Exp $
+
+--- cli/parse.yy.orig	2011-09-07 13:21:44.000000000 +0000
++++ cli/parse.yy
+@@ -84,7 +84,7 @@ extern command *getLastKnownCommand();
+ extern void init_cmd_state();
+ extern const char * GetLastFullCommand();
+ 
+-void yyerror(char *message)
++void yyerror(const char *message)
+ {
+   printf("***ERROR: %s while parsing:\n'%s'\n",message, yytext);
+   const char *last = GetLastFullCommand();
diff --git a/emulators/gpsim-devel/patches/patch-cli-scan.ll b/emulators/gpsim-devel/patches/patch-cli-scan.ll
new file mode 100644
index 00000000000..43e6efabcc5
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-cli-scan.ll
@@ -0,0 +1,13 @@
+$NetBSD: patch-cli-scan.ll,v 1.1 2011/09/08 00:12:00 joerg Exp $
+
+--- cli/scan.ll.orig	2011-09-07 13:25:35.000000000 +0000
++++ cli/scan.ll
+@@ -46,7 +46,7 @@ Boston, MA 02111-1307, USA.  */
+ 
+ /* Since our parser is reentrant, it needs to pass us a pointer
+  * to the yylval that it would like us to use */
+-#define YY_DECL int yylex YY_PROTO(( YYSTYPE* yylvalP ))
++#define YY_DECL int yylex(YYSTYPE* yylvalP)
+ extern int yyparse(void);
+ 
+ /* This is the max length of a line within a macro definition */
diff --git a/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc b/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc
new file mode 100644
index 00000000000..29158e9971a
--- /dev/null
+++ b/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc
@@ -0,0 +1,13 @@
+$NetBSD: patch-gui-gui_watch.cc,v 1.1 2011/09/08 00:12:00 joerg Exp $
+
+--- gui/gui_watch.cc.orig	2011-09-07 13:34:41.000000000 +0000
++++ gui/gui_watch.cc
+@@ -478,7 +478,7 @@ void Watch_Window::UpdateWatch(WatchEntr
+     strcpy(str, "?");
+   }
+   else {
+-    sprintf(str,"%d", rvNewValue);
++    sprintf(str,"%d", new_value);
+   }
+   gtk_clist_set_text(GTK_CLIST(watch_clist), row, DECIMALCOL, str);
+