diff options
author | wiz <wiz> | 2011-12-19 15:58:40 +0000 |
---|---|---|
committer | wiz <wiz> | 2011-12-19 15:58:40 +0000 |
commit | d4476bcb198ca88ff1f4a58fcc6e64fd4a3a707c (patch) | |
tree | 879d10f38c19d6d1b01883d9ae4685184b50198f /emulators | |
parent | 125911592b73d5b95fb1668eaa517ff74e30ee18 (diff) | |
download | pkgsrc-d4476bcb198ca88ff1f4a58fcc6e64fd4a3a707c.tar.gz |
Fix build with gcc-4.5.
Diffstat (limited to 'emulators')
22 files changed, 298 insertions, 11 deletions
diff --git a/emulators/gpsim-devel/distinfo b/emulators/gpsim-devel/distinfo index 7338f4b1424..fb714b4e9a1 100644 --- a/emulators/gpsim-devel/distinfo +++ b/emulators/gpsim-devel/distinfo @@ -1,13 +1,32 @@ -$NetBSD: distinfo,v 1.7 2011/09/08 00:12:00 joerg Exp $ +$NetBSD: distinfo,v 1.8 2011/12/19 15:58:40 wiz Exp $ SHA1 (gpsim-20050905.tar.gz) = 46e7d0d69695961aca4324d8d3267181bd641081 RMD160 (gpsim-20050905.tar.gz) = 1b717f0e51440c4e2db72a4bdfb90d2e8d5e4a3d Size (gpsim-20050905.tar.gz) = 2027957 bytes SHA1 (patch-aa) = f7d1c04b216ecabaf3071f92c97c7436a54f1e87 -SHA1 (patch-ab) = cd3ef9b6bef759e95ee18b1995d514546c2475ae +SHA1 (patch-ab) = 5e8c56b7d5b995bd19ce9e74a657f67656af10da 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 +SHA1 (patch-cli_cmd__clear.cc) = c5cded15623247dfc3028f8af6bf6331ee8f8e63 +SHA1 (patch-cli_cmd__help.cc) = a26b30ca138f630de751acc7a8bc463f48c4739b +SHA1 (patch-cli_cmd__list.cc) = 9494ef3c3458e22b85bd0555a59e1dab3598cc03 +SHA1 (patch-cli_cmd__x.cc) = 6206a130b312989e6f76b7562e60e1973f567d2b +SHA1 (patch-cli_socket.cc) = 4e1c17ded9094f13b8ccf273df5fe507fee30039 +SHA1 (patch-gui-gui_watch.cc) = 850b003e5716be91b55b6baa5649406a73fb4c8a +SHA1 (patch-gui_gui__regwin.cc) = adfc57c04d58fbce8bdf8768a0b4c0b2e82dd100 +SHA1 (patch-gui_gui__src.cc) = 351f8eff9e2118a963cdb1bdd7055d4f8cbf22b5 +SHA1 (patch-gui_gui__stack.cc) = 041ee43064d17e298a8457f083477729c08994eb +SHA1 (patch-gui_gui__symbols.cc) = be4da964ee6d7e5311188d535a9cb283e7f8ba1b +SHA1 (patch-gui_settings__exdbm.cc) = 4a5962fd13ec791ada60d0e9c8055deb5eeeff7b +SHA1 (patch-modules_binary__indicator.cc) = d51d3c7f7b5025d268575b8336e07114d88ce249 +SHA1 (patch-src_cmd__manager.h) = a59cede11198ef71f902067219205f1c86c1b879 +SHA1 (patch-src_modules.cc) = bd66268e162fb3377adcb795dfecf20df611baa3 +SHA1 (patch-src_operator.cc) = 4bdb1cee156930fb817ddff3e0eda6b49731872e +SHA1 (patch-src_processor.cc) = 5139b24bf928c98250c9a87981b9ee0070f65949 +SHA1 (patch-src_processor.h) = 48ad5c1318e5b1e096643cd714cbb3ff3ce57db3 +SHA1 (patch-src_program__files.cc) = db0b4561d20f6b1feabeb33847f22326455608da +SHA1 (patch-src_symbol.cc) = 195c15f4c258398d4a7c28cee1cf3d3ad7164429 +SHA1 (patch-src_value.cc) = 3fceae8b4d40ad1c26a06ac7dce6bb88965ae018 diff --git a/emulators/gpsim-devel/patches/patch-ab b/emulators/gpsim-devel/patches/patch-ab index 8655378d8fc..17943f24ee3 100644 --- a/emulators/gpsim-devel/patches/patch-ab +++ b/emulators/gpsim-devel/patches/patch-ab @@ -1,8 +1,16 @@ -$NetBSD: patch-ab,v 1.3 2006/04/28 15:33:28 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2011/12/19 15:58:40 wiz Exp $ ---- src/os_dependent.cc.orig 2006-04-28 14:38:52.000000000 +0000 +--- src/os_dependent.cc.orig 2005-08-03 18:01:01.000000000 +0000 +++ src/os_dependent.cc -@@ -37,6 +37,10 @@ Boston, MA 02111-1307, USA. */ +@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdlib.h> + #include <unistd.h> + #include <string> ++#include <string.h> + + #include <iostream> + #include <iomanip> +@@ -37,6 +38,10 @@ Boston, MA 02111-1307, USA. */ #include "exports.h" #include "modules.h" @@ -13,7 +21,7 @@ $NetBSD: patch-ab,v 1.3 2006/04/28 15:33:28 joerg Exp $ #ifndef _WIN32 #include <dlfcn.h> #define STRICMP strcasecmp -@@ -348,7 +352,9 @@ unsigned long get_error() { +@@ -348,7 +353,9 @@ unsigned long get_error() { } char * get_error_message() { @@ -24,7 +32,7 @@ $NetBSD: patch-ab,v 1.3 2006/04/28 15:33:28 joerg Exp $ return dlerror(); #else return g_win32_error_message(GetLastError()); -@@ -357,7 +363,7 @@ char * get_error_message() { +@@ -357,7 +364,7 @@ char * get_error_message() { void free_error_message(char * pszError) { diff --git a/emulators/gpsim-devel/patches/patch-cli_cmd__clear.cc b/emulators/gpsim-devel/patches/patch-cli_cmd__clear.cc new file mode 100644 index 00000000000..0259ee66d0d --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-cli_cmd__clear.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-cli_cmd__clear.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- cli/cmd_clear.cc.orig 2005-08-31 14:46:29.000000000 +0000 ++++ cli/cmd_clear.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <iostream> + #include <iomanip> + #include <string> ++#include <typeinfo> + + #include "command.h" + #include "cmd_clear.h" diff --git a/emulators/gpsim-devel/patches/patch-cli_cmd__help.cc b/emulators/gpsim-devel/patches/patch-cli_cmd__help.cc new file mode 100644 index 00000000000..7cbdc8cb104 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-cli_cmd__help.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-cli_cmd__help.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- cli/cmd_help.cc.orig 2005-08-31 14:46:33.000000000 +0000 ++++ cli/cmd_help.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <iostream> + #include <iomanip> + #include <string> ++#include <string.h> + + #include "command.h" + #include "cmd_help.h" diff --git a/emulators/gpsim-devel/patches/patch-cli_cmd__list.cc b/emulators/gpsim-devel/patches/patch-cli_cmd__list.cc new file mode 100644 index 00000000000..db27bb79592 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-cli_cmd__list.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-cli_cmd__list.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- cli/cmd_list.cc.orig 2005-08-31 14:46:33.000000000 +0000 ++++ cli/cmd_list.cc +@@ -76,7 +76,7 @@ void cmd_list::list(void) + if(!have_cpu(1)) + return; + +- GetActiveCPU()->list(file_id,GetActiveCPU()->pc->value,starting_line,ending_line); ++ GetActiveCPU()->plist(file_id,GetActiveCPU()->pc->value,starting_line,ending_line); + + } + void cmd_list::list(cmd_options *opt) diff --git a/emulators/gpsim-devel/patches/patch-cli_cmd__x.cc b/emulators/gpsim-devel/patches/patch-cli_cmd__x.cc new file mode 100644 index 00000000000..73dd8612cca --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-cli_cmd__x.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-cli_cmd__x.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- cli/cmd_x.cc.orig 2005-08-31 14:46:34.000000000 +0000 ++++ cli/cmd_x.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <iostream> + #include <iomanip> + #include <string> ++#include <typeinfo> + + + #include "command.h" diff --git a/emulators/gpsim-devel/patches/patch-cli_socket.cc b/emulators/gpsim-devel/patches/patch-cli_socket.cc new file mode 100644 index 00000000000..51b88f1a857 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-cli_socket.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-cli_socket.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- cli/socket.cc.orig 2005-08-31 14:46:35.000000000 +0000 ++++ cli/socket.cc +@@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */ + #endif + + #include <stdio.h> ++#include <stdlib.h> + #include <string.h> + #include <unistd.h> + #include <sys/types.h> diff --git a/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc b/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc index 29158e9971a..36df24a6bab 100644 --- a/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc +++ b/emulators/gpsim-devel/patches/patch-gui-gui_watch.cc @@ -1,8 +1,16 @@ -$NetBSD: patch-gui-gui_watch.cc,v 1.1 2011/09/08 00:12:00 joerg Exp $ +$NetBSD: patch-gui-gui_watch.cc,v 1.2 2011/12/19 15:58:40 wiz Exp $ ---- gui/gui_watch.cc.orig 2011-09-07 13:34:41.000000000 +0000 +--- gui/gui_watch.cc.orig 2005-08-31 14:46:39.000000000 +0000 +++ gui/gui_watch.cc -@@ -478,7 +478,7 @@ void Watch_Window::UpdateWatch(WatchEntr +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <typeinfo> + + #include "../config.h" + #ifdef HAVE_GUI +@@ -478,7 +479,7 @@ void Watch_Window::UpdateWatch(WatchEntr strcpy(str, "?"); } else { diff --git a/emulators/gpsim-devel/patches/patch-gui_gui__regwin.cc b/emulators/gpsim-devel/patches/patch-gui_gui__regwin.cc new file mode 100644 index 00000000000..4541c8399fe --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-gui_gui__regwin.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_gui__regwin.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- gui/gui_regwin.cc.orig 2005-08-31 14:46:39.000000000 +0000 ++++ gui/gui_regwin.cc +@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <typeinfo> + + #include "../config.h" + #ifdef HAVE_GUI diff --git a/emulators/gpsim-devel/patches/patch-gui_gui__src.cc b/emulators/gpsim-devel/patches/patch-gui_gui__src.cc new file mode 100644 index 00000000000..191d32443fa --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-gui_gui__src.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_gui__src.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- gui/gui_src.cc.orig 2005-08-31 14:46:39.000000000 +0000 ++++ gui/gui_src.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <typeinfo> + + #include "../config.h" + #ifdef HAVE_GUI diff --git a/emulators/gpsim-devel/patches/patch-gui_gui__stack.cc b/emulators/gpsim-devel/patches/patch-gui_gui__stack.cc new file mode 100644 index 00000000000..7b5a54602eb --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-gui_gui__stack.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_gui__stack.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- gui/gui_stack.cc.orig 2005-08-31 14:46:39.000000000 +0000 ++++ gui/gui_stack.cc +@@ -21,6 +21,7 @@ Boston, MA 02111-1307, USA. */ + + #include <stdio.h> + #include <stdlib.h> ++#include <typeinfo> + #include <errno.h> + + #include "../config.h" diff --git a/emulators/gpsim-devel/patches/patch-gui_gui__symbols.cc b/emulators/gpsim-devel/patches/patch-gui_gui__symbols.cc new file mode 100644 index 00000000000..794e42d0cf5 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-gui_gui__symbols.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_gui__symbols.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- gui/gui_symbols.cc.orig 2005-08-31 14:46:39.000000000 +0000 ++++ gui/gui_symbols.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <typeinfo> + + #include "../config.h" + #ifdef HAVE_GUI diff --git a/emulators/gpsim-devel/patches/patch-gui_settings__exdbm.cc b/emulators/gpsim-devel/patches/patch-gui_settings__exdbm.cc new file mode 100644 index 00000000000..be224a46652 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-gui_settings__exdbm.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-gui_settings__exdbm.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- gui/settings_exdbm.cc.orig 2004-07-06 05:20:20.000000000 +0000 ++++ gui/settings_exdbm.cc +@@ -19,6 +19,7 @@ along with gpsim; see the file COPYING. + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + ++#include <stdlib.h> + #include "settings_exdbm.h" + + diff --git a/emulators/gpsim-devel/patches/patch-modules_binary__indicator.cc b/emulators/gpsim-devel/patches/patch-modules_binary__indicator.cc new file mode 100644 index 00000000000..03309dfcac4 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-modules_binary__indicator.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-modules_binary__indicator.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- modules/binary_indicator.cc.orig 2005-08-31 14:46:39.000000000 +0000 ++++ modules/binary_indicator.cc +@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA. */ + #include <errno.h> + #include <stdlib.h> + #include <string> ++#include <string.h> + + + #include "binary_indicator.h" diff --git a/emulators/gpsim-devel/patches/patch-src_cmd__manager.h b/emulators/gpsim-devel/patches/patch-src_cmd__manager.h new file mode 100644 index 00000000000..e327a08822b --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_cmd__manager.h @@ -0,0 +1,12 @@ +$NetBSD: patch-src_cmd__manager.h,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/cmd_manager.h.orig 2005-08-16 15:02:34.000000000 +0000 ++++ src/cmd_manager.h +@@ -5,6 +5,7 @@ + #include "gpsim_interface.h" + #include <vector> + #include <string> ++#include <string.h> + #include <functional> + using namespace std; + diff --git a/emulators/gpsim-devel/patches/patch-src_modules.cc b/emulators/gpsim-devel/patches/patch-src_modules.cc new file mode 100644 index 00000000000..5a232eff453 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_modules.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-src_modules.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/modules.cc.orig 2005-08-31 14:48:18.000000000 +0000 ++++ src/modules.cc +@@ -28,6 +28,7 @@ Boston, MA 02111-1307, USA. */ + #include <string> + #include <list> + #include <vector> ++#include <typeinfo> + + #include "../config.h" + diff --git a/emulators/gpsim-devel/patches/patch-src_operator.cc b/emulators/gpsim-devel/patches/patch-src_operator.cc new file mode 100644 index 00000000000..33c340014c2 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_operator.cc @@ -0,0 +1,10 @@ +$NetBSD: patch-src_operator.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/operator.cc.orig 2005-08-31 14:48:18.000000000 +0000 ++++ src/operator.cc +@@ -1,4 +1,5 @@ + #include <iostream> ++#include <typeinfo> + + #include "operator.h" + #include "errors.h" diff --git a/emulators/gpsim-devel/patches/patch-src_processor.cc b/emulators/gpsim-devel/patches/patch-src_processor.cc new file mode 100644 index 00000000000..c69e7c00b54 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_processor.cc @@ -0,0 +1,35 @@ +$NetBSD: patch-src_processor.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/processor.cc.orig 2005-09-01 10:17:59.000000000 +0000 ++++ src/processor.cc +@@ -36,6 +36,7 @@ Boston, MA 02111-1307, USA. */ + #include <iostream> + #include <iomanip> + #include <string> ++#include <typeinfo> + + #include "../config.h" + #include "gpsim_def.h" +@@ -625,11 +626,11 @@ void Processor::read_src_files(void) + + //------------------------------------------------------------------- + // +-// processor -- list ++// processor -- plist + // + // Display the contents of either a source or list file + // +-void Processor::list(unsigned int file_id, ++void Processor::plist(unsigned int file_id, + unsigned int pc_val, + unsigned int start_line, + unsigned int end_line) +@@ -2137,7 +2138,7 @@ void FileContext::ReadSource(void) + line_seek = new vector<int>(max_line()+1); + pm_address = new vector<int>(max_line()+1); + +- std::rewind(fptr); ++ ::rewind(fptr); + + char buf[256],*s; + (*line_seek)[0] = 0; diff --git a/emulators/gpsim-devel/patches/patch-src_processor.h b/emulators/gpsim-devel/patches/patch-src_processor.h new file mode 100644 index 00000000000..e8f660e7828 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_processor.h @@ -0,0 +1,13 @@ +$NetBSD: patch-src_processor.h,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/processor.h.orig 2005-08-31 14:48:19.000000000 +0000 ++++ src/processor.h +@@ -544,7 +544,7 @@ public: + + virtual void disassemble (signed int start_address, + signed int end_address); +- virtual void list(unsigned int file_id, ++ virtual void plist(unsigned int file_id, + unsigned int pcval, + unsigned int start_line, + unsigned int end_line); diff --git a/emulators/gpsim-devel/patches/patch-src_program__files.cc b/emulators/gpsim-devel/patches/patch-src_program__files.cc new file mode 100644 index 00000000000..f680ee06823 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_program__files.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-src_program__files.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/program_files.cc.orig 2005-07-30 21:32:26.000000000 +0000 ++++ src/program_files.cc +@@ -136,7 +136,7 @@ ProgramFileBuf::int_type ProgramFileBuf: + if (numPutback > 4) { + numPutback = 4; + } +- std::memcpy (m_Buffer+(4-numPutback), gptr() - numPutback, numPutback); ++ memcpy (m_Buffer+(4-numPutback), gptr() - numPutback, numPutback); + + int num; + if((num = ::fread((void*)( m_Buffer + 4), 1, m_iBufferSize - 4, m_pFile)) <= 0) { diff --git a/emulators/gpsim-devel/patches/patch-src_symbol.cc b/emulators/gpsim-devel/patches/patch-src_symbol.cc new file mode 100644 index 00000000000..85a8bc4ad14 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_symbol.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-src_symbol.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/symbol.cc.orig 2005-09-05 09:39:37.000000000 +0000 ++++ src/symbol.cc +@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA. */ + #include <iostream> + #include <iomanip> + #include <sstream> ++#include <typeinfo> + + #include <string> + #include <vector> diff --git a/emulators/gpsim-devel/patches/patch-src_value.cc b/emulators/gpsim-devel/patches/patch-src_value.cc new file mode 100644 index 00000000000..c2b674259f8 --- /dev/null +++ b/emulators/gpsim-devel/patches/patch-src_value.cc @@ -0,0 +1,12 @@ +$NetBSD: patch-src_value.cc,v 1.1 2011/12/19 15:58:40 wiz Exp $ + +--- src/value.cc.orig 2005-08-31 14:48:21.000000000 +0000 ++++ src/value.cc +@@ -22,6 +22,7 @@ Boston, MA 02111-1307, USA. */ + #include <stdio.h> + #include <iostream> + #include <iomanip> ++#include <typeinfo> + + #include "processor.h" + |