Update to 0.26.1

Changelog:
* Bugfixes
* Support new chips.

30 files changed, 62 insertions, 445 deletions

diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 0011e8b11aa..5ddb26829c8 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2013/06/06 12:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2013/06/11 12:58:42 ryoon Exp $
 #
 
-DISTNAME=	gpsim-0.21.11
-PKGREVISION=	19
+DISTNAME=	gpsim-0.26.1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gpsim/}
 
diff --git a/emulators/gpsim/PLIST b/emulators/gpsim/PLIST
index 846bcd5177c..bea1514942f 100644
--- a/emulators/gpsim/PLIST
+++ b/emulators/gpsim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 17:51:05 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2013/06/11 12:58:42 ryoon Exp $
 bin/gpsim
 include/eXdbm/eXdbm.h
 include/eXdbm/eXdbmErrors.h
@@ -13,14 +13,19 @@ include/gpsim/16bit-instructions.h
 include/gpsim/16bit-processors.h
 include/gpsim/16bit-registers.h
 include/gpsim/16bit-tmrs.h
+include/gpsim/ValueCollections.h
+include/gpsim/a2d_v2.h
+include/gpsim/a2dconverter.h
 include/gpsim/attributes.h
 include/gpsim/bit.h
 include/gpsim/bitlog.h
 include/gpsim/breakpoints.h
 include/gpsim/bytelog.h
+include/gpsim/clock_phase.h
 include/gpsim/cmd_gpsim.h
 include/gpsim/cmd_manager.h
 include/gpsim/cod.h
+include/gpsim/comparator.h
 include/gpsim/eeprom.h
 include/gpsim/errors.h
 include/gpsim/exports.h
@@ -31,6 +36,7 @@ include/gpsim/gpsim_def.h
 include/gpsim/gpsim_interface.h
 include/gpsim/gpsim_object.h
 include/gpsim/gpsim_time.h
+include/gpsim/hexutils.h
 include/gpsim/i2c-ee.h
 include/gpsim/icd.h
 include/gpsim/intcon.h
@@ -39,9 +45,12 @@ include/gpsim/ioports.h
 include/gpsim/lxt_write.h
 include/gpsim/modules.h
 include/gpsim/operator.h
+include/gpsim/p12f6xx.h
 include/gpsim/p12x.h
 include/gpsim/p16f62x.h
 include/gpsim/p16f87x.h
+include/gpsim/p16f88x.h
+include/gpsim/p16f8x.h
 include/gpsim/p16x5x.h
 include/gpsim/p16x6x.h
 include/gpsim/p16x7x.h
@@ -50,33 +59,40 @@ include/gpsim/p17c75x.h
 include/gpsim/p18x.h
 include/gpsim/packages.h
 include/gpsim/pic-instructions.h
+include/gpsim/pic-ioports.h
 include/gpsim/pic-packages.h
 include/gpsim/pic-processor.h
 include/gpsim/pic-registers.h
 include/gpsim/picdis.h
 include/gpsim/pie.h
 include/gpsim/pir.h
+include/gpsim/pm_rd.h
 include/gpsim/processor.h
 include/gpsim/program_files.h
 include/gpsim/protocol.h
+include/gpsim/psp.h
 include/gpsim/pthread-wrap.h
+include/gpsim/rcon.h
 include/gpsim/registers.h
 include/gpsim/sim_context.h
 include/gpsim/ssp.h
 include/gpsim/stimuli.h
-include/gpsim/stimulus_orb.h
 include/gpsim/symbol.h
-include/gpsim/symbol_orb.h
 include/gpsim/tmr0.h
 include/gpsim/trace.h
 include/gpsim/trace_orb.h
 include/gpsim/trigger.h
 include/gpsim/ttoken.h
 include/gpsim/uart.h
+include/gpsim/ui.h
 include/gpsim/value.h
 include/gpsim/xref.h
 lib/libgpsim.la
+lib/libgpsim_ds1307.la
+lib/libgpsim_dspic.la
 lib/libgpsim_eXdbm.la
+lib/libgpsim_graphicLCD.la
+lib/libgpsim_lcd.la
 lib/libgpsim_modules.la
 lib/libgpsimcli.la
 lib/libgpsimgui.la
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index 7a1b9277d45..353baa1fca7 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,32 +1,10 @@
-$NetBSD: distinfo,v 1.13 2013/03/02 18:12:01 joerg Exp $
+$NetBSD: distinfo,v 1.14 2013/06/11 12:58:42 ryoon Exp $
 
-SHA1 (gpsim-0.21.11.tar.gz) = 05337560a6b48a9afb7a3f4be1ba606709f6b30a
-RMD160 (gpsim-0.21.11.tar.gz) = 36001180948fc2394043d8283dc1dd028ee4f922
-Size (gpsim-0.21.11.tar.gz) = 1218332 bytes
-SHA1 (patch-aa) = 0d102952cb8dbe7faaf50416a2d9bec24683c300
-SHA1 (patch-ab) = c67d244af2a89d679083f8b4245a7be4debf82f4
-SHA1 (patch-ac) = 1c2cf1059db73c385817199bb35672f4f2246a67
-SHA1 (patch-ad) = f172ec71e2c2ef6bb798da79e1f73c063ff27d5b
-SHA1 (patch-ae) = 5185e3cbea6d5e036020f1de9636907efe54c851
-SHA1 (patch-cli_cmd__clear.cc) = 72f0f069692c6d9b8e6ba2abb4286a01de0d9a82
-SHA1 (patch-cli_cmd__help.cc) = 90d3df16dd7c1746f68b850f8dc86a751352b9d2
-SHA1 (patch-cli_cmd__list.cc) = 5f20122097f3be39b7a714b46ca0e71b6356a9b9
-SHA1 (patch-cli_cmd__x.cc) = c9730d62932455dcaf99ab1db9352219a0976188
-SHA1 (patch-cli_socket.cc) = 6b8b0c0e071ca6d78f943e6445bb5e2e1c4a941c
-SHA1 (patch-gui_gui__regwin.cc) = 218b41e9e4a0eb9336757c842686eef3b35ea403
-SHA1 (patch-gui_gui__src.cc) = 1622d9a75451230d74bc4aee907eeb7dd64f7aa2
-SHA1 (patch-gui_gui__stack.cc) = badf2fbda9f2f8a1f0005dab5bde4adf814aafe4
-SHA1 (patch-gui_gui__symbols.cc) = 2f36fb615029823065214a030b309ca4f36336cc
-SHA1 (patch-gui_settings__exdbm.cc) = 957854ab58bde81857a2729120a710346f89ecf6
-SHA1 (patch-modules_binary__indicator.cc) = a666710d4d93077c57163176428075416483719e
-SHA1 (patch-src_bitlog_h) = 406cfb4e4c3a8733e69fc0d9cf6692b61f9ac534
-SHA1 (patch-src_cmd__manager.h) = 1fda88495f6c4ff8a244787f19e64558f86675e0
-SHA1 (patch-src_modules.cc) = bc01b99a564051bce16c5d010635691a2b651c72
-SHA1 (patch-src_operator.cc) = 303dd4744aabc3a42fa97db3d3bebc3994c80e8a
-SHA1 (patch-src_processor.cc) = b77bc4710c14fd519dd5b72e0700172c9b2dc02e
-SHA1 (patch-src_processor.h) = 29cd80b086f7267c7d092e22d9f5780310d8d006
-SHA1 (patch-src_program__files.cc) = 25e3b4ee2e8ad91eaa54a64d7ccc2f1ff51b51a9
-SHA1 (patch-src_protocol.h) = ed2c7c903ed605b26a50c125436ac18f11d824eb
-SHA1 (patch-src_symbol.cc) = cb84a108f2a79a1d3eb40da33cd11f3276682bc0
-SHA1 (patch-src_symbol.h) = 2dc6dec366a023ed5215a95f7c2160f732006bba
-SHA1 (patch-src_value.cc) = 8a97172012cccb14c7b4654e4da1b60041b7733f
+SHA1 (gpsim-0.26.1.tar.gz) = 7e1c3cc5a821b3458717a94a09bc484bf6937b25
+RMD160 (gpsim-0.26.1.tar.gz) = 487de6a2508de2d51843a9ed684801778e4fe69a
+Size (gpsim-0.26.1.tar.gz) = 2350841 bytes
+SHA1 (patch-cli_cmd__list.cc) = 73dd63cfb069ab42a059686d3b6618172b967be5
+SHA1 (patch-src_bitlog_h) = 5edc59be9ccb3a83f81c1b13b965b2c075d9fc4e
+SHA1 (patch-src_processor.cc) = 34e098666a919b61bd0132ddf3176fd34f74c6d0
+SHA1 (patch-src_processor.h) = db2fd06c438036e9f7c4dfa45460a5d0737765e6
+SHA1 (patch-src_program__files.cc) = 0c5b525569e79e8f36e5b12e4305e32bb1088b5c
diff --git a/emulators/gpsim/patches/patch-aa b/emulators/gpsim/patches/patch-aa
deleted file mode 100644
index 85e259246da..00000000000
--- a/emulators/gpsim/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/06/04 06:14:11 dogcow Exp $
-
---- gui/Makefile.in.orig	2006-06-03 22:01:39.000000000 -0700
-+++ gui/Makefile.in	2006-06-03 21:55:02.000000000 -0700
-@@ -226,9 +226,9 @@ libgpsimgui_la_SOURCES = gui_break.cc gu
- 
- libgpsimgui_la_LDFLAGS = @X_LDFLAGS@ @Y_LDFLAGS@
- pixmapdir = $(datadir)/gpsim
--AM_CFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CXXFLAGS = -D DATADIR=\"~/.gpsim/\"
--AM_CPPFLAGS = -D DATADIR=\"~/.gpsim/\"
-+AM_CFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CXXFLAGS = -DDATADIR=\"~/.gpsim/\"
-+AM_CPPFLAGS = -DDATADIR=\"~/.gpsim/\"
- all: all-am
- 
- .SUFFIXES:
diff --git a/emulators/gpsim/patches/patch-ab b/emulators/gpsim/patches/patch-ab
deleted file mode 100644
index 96d189af9b8..00000000000
--- a/emulators/gpsim/patches/patch-ab
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2012/05/10 06:52:52 dholland Exp $
-
-- Use standard includes.
-- Deal with const-ness of dlerror()'s return value like gpsim-devel.
-- Fix build with latest glib2.
-
---- src/os_dependent.cc.orig	2005-08-25 21:57:41.000000000 +0000
-+++ src/os_dependent.cc
-@@ -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,14 +38,16 @@ Boston, MA 02111-1307, USA.  */
- #include "exports.h"
- #include "modules.h"
- 
-+#if defined(__DragonFly__)
-+#include <glib.h>
-+#endif
- #ifndef _WIN32
- #include <dlfcn.h>
- #define STRICMP strcasecmp
- #else
- #define G_PLATFORM_WIN32
- #define G_OS_WIN32
--#include <glib/gmem.h>
--#include <glib/gwin32.h>
-+#include <glib.h>
- #include <direct.h>
- #include <windows.h>
- 
-@@ -348,7 +351,9 @@ unsigned long get_error() {
- }
- 
- char * get_error_message() {
--#ifndef _WIN32
-+#if defined(__DragonFly__)
-+  return g_strdup(dlerror());
-+#elif !defined(_WIN32)
-   return dlerror();
- #else
-   return g_win32_error_message(GetLastError());
-@@ -357,7 +362,7 @@ char * get_error_message() {
- 
- void free_error_message(char * pszError)
- {
--#ifdef _WIN32
-+#if defined(_WIN32) || defined(__DragonFly__)
-   g_free(pszError);
- #endif
- }
diff --git a/emulators/gpsim/patches/patch-ac b/emulators/gpsim/patches/patch-ac
deleted file mode 100644
index bbf44cbd4a0..00000000000
--- a/emulators/gpsim/patches/patch-ac
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2007/10/14 08:14:11 rillig Exp $
-
---- src/value.h.orig	2005-09-07 15:34:24.000000000 +0200
-+++ src/value.h	2007-10-14 09:59:18.000000000 +0200
-@@ -290,7 +290,7 @@ public:
- 
-   bool getVal() { return value; }
- 
--  static Boolean* Boolean::typeCheck(Value* val, string valDesc);
-+  static Boolean* typeCheck(Value* val, string valDesc);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
-   virtual Value *copy() { return new Boolean(value); }
-@@ -353,9 +353,9 @@ public:
-   virtual char *toString(char *, int len);
-   virtual char *toBitStr(char *, int len);
- 
--  static Integer* Integer::typeCheck(Value* val, string valDesc);
--  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin);
--  static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
-+  static Integer* typeCheck(Value* val, string valDesc);
-+  static Integer* assertValid(Value* val, string valDesc, gint64 valMin);
-+  static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
-   inline operator gint64() {
-@@ -498,7 +498,7 @@ public:
-   /// copy the object value to a user char array
-   virtual char *toString(char *, int len);
- 
--  static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc);
-+  static AbstractRange* typeCheck(Value* val, string valDesc);
-   virtual bool compare(ComparisonOperator *compOp, Value *rvalue);
- 
- private:
diff --git a/emulators/gpsim/patches/patch-ad b/emulators/gpsim/patches/patch-ad
deleted file mode 100644
index 4e0add2fd16..00000000000
--- a/emulators/gpsim/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2007/10/14 08:14:11 rillig Exp $
-
---- cli/ui_gpsim.cc.orig	2005-09-24 05:59:20.000000000 +0200
-+++ cli/ui_gpsim.cc	2007-10-14 10:02:20.000000000 +0200
-@@ -34,7 +34,7 @@ public:
-   CGpsimUserInterface(const char *paStrings[]);
-   virtual ~CGpsimUserInterface() {}
- 
--  void CGpsimUserInterface::SetStreams(FILE *in, FILE *out);
-+  void SetStreams(FILE *in, FILE *out);
-   virtual ISimConsole &GetConsole();
-   virtual void DisplayMessage(unsigned int uStringID, ...);
-   virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...);
diff --git a/emulators/gpsim/patches/patch-ae b/emulators/gpsim/patches/patch-ae
deleted file mode 100644
index 0b9c1603926..00000000000
--- a/emulators/gpsim/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2007/10/14 08:14:11 rillig Exp $
-
---- src/p12x.h.orig	2005-09-26 05:51:23.000000000 +0200
-+++ src/p12x.h	2007-10-14 10:05:47.000000000 +0200
-@@ -108,7 +108,7 @@ class P12CE518 : public P12C508
- 
-   virtual PROCESSOR_TYPE isa(void){return _P12CE518_;};
-   virtual void tris_instruction(unsigned int tris_register);
--  virtual void P12CE518::set_eeprom(I2C_EE *e);
-+  virtual void set_eeprom(I2C_EE *e);
- 
-   P12CE518(void);
-   static Processor *construct(void);
diff --git a/emulators/gpsim/patches/patch-cli_cmd__clear.cc b/emulators/gpsim/patches/patch-cli_cmd__clear.cc
deleted file mode 100644
index de41c048d8d..00000000000
--- a/emulators/gpsim/patches/patch-cli_cmd__clear.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cli_cmd__clear.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- cli/cmd_clear.cc.orig	2005-06-25 03:25:30.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/patches/patch-cli_cmd__help.cc b/emulators/gpsim/patches/patch-cli_cmd__help.cc
deleted file mode 100644
index f45fff76b22..00000000000
--- a/emulators/gpsim/patches/patch-cli_cmd__help.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cli_cmd__help.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- cli/cmd_help.cc.orig	2005-06-25 03:25:31.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/patches/patch-cli_cmd__list.cc b/emulators/gpsim/patches/patch-cli_cmd__list.cc
index c6ea201da99..ae0a80caa27 100644
--- a/emulators/gpsim/patches/patch-cli_cmd__list.cc
+++ b/emulators/gpsim/patches/patch-cli_cmd__list.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-cli_cmd__list.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
+$NetBSD: patch-cli_cmd__list.cc,v 1.2 2013/06/11 12:58:42 ryoon Exp $
 
 Avoid conflict with C++ list<>.
 
---- cli/cmd_list.cc.orig	2005-05-11 13:29:01.000000000 +0000
+--- cli/cmd_list.cc.orig	2008-06-06 20:50:55.000000000 +0000
 +++ cli/cmd_list.cc
-@@ -76,7 +76,7 @@ void cmd_list::list(void)
-   if(!have_cpu(1))
-     return;
+@@ -75,7 +75,7 @@ void cmd_list::list(void)
  
--  GetActiveCPU()->list(file_id,GetActiveCPU()->pc->value,starting_line,ending_line);
-+  GetActiveCPU()->plist(file_id,GetActiveCPU()->pc->value,starting_line,ending_line);
+   Processor *pCpu = GetActiveCPU(true);
+   if(pCpu)
+-    pCpu->list(file_id,pCpu->pc->value,starting_line,ending_line);
++    pCpu->plist(file_id,pCpu->pc->value,starting_line,ending_line);
  
  }
  void cmd_list::list(cmd_options *opt)
diff --git a/emulators/gpsim/patches/patch-cli_cmd__x.cc b/emulators/gpsim/patches/patch-cli_cmd__x.cc
deleted file mode 100644
index f1707cab0d3..00000000000
--- a/emulators/gpsim/patches/patch-cli_cmd__x.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cli_cmd__x.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- cli/cmd_x.cc.orig	2005-05-11 13:29:02.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/patches/patch-cli_socket.cc b/emulators/gpsim/patches/patch-cli_socket.cc
deleted file mode 100644
index 2b66176e52e..00000000000
--- a/emulators/gpsim/patches/patch-cli_socket.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-cli_socket.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- cli/socket.cc.orig	2005-02-02 01:59:04.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/patches/patch-gui_gui__regwin.cc b/emulators/gpsim/patches/patch-gui_gui__regwin.cc
deleted file mode 100644
index a6ec5b443c6..00000000000
--- a/emulators/gpsim/patches/patch-gui_gui__regwin.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gui_gui__regwin.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- gui/gui_regwin.cc.orig	2005-10-03 13:46:22.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/patches/patch-gui_gui__src.cc b/emulators/gpsim/patches/patch-gui_gui__src.cc
deleted file mode 100644
index 709ec8779ec..00000000000
--- a/emulators/gpsim/patches/patch-gui_gui__src.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gui_gui__src.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- gui/gui_src.cc.orig	2005-06-10 02:46:20.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/patches/patch-gui_gui__stack.cc b/emulators/gpsim/patches/patch-gui_gui__stack.cc
deleted file mode 100644
index a1b49a7631b..00000000000
--- a/emulators/gpsim/patches/patch-gui_gui__stack.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gui_gui__stack.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- gui/gui_stack.cc.orig	2005-04-18 14:30:50.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/patches/patch-gui_gui__symbols.cc b/emulators/gpsim/patches/patch-gui_gui__symbols.cc
deleted file mode 100644
index 856b41ab656..00000000000
--- a/emulators/gpsim/patches/patch-gui_gui__symbols.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gui_gui__symbols.cc,v 1.1 2011/12/19 15:52:20 wiz Exp $
-
-Add missing include.
-
---- gui/gui_symbols.cc.orig	2005-09-24 03:59:20.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/patches/patch-gui_settings__exdbm.cc b/emulators/gpsim/patches/patch-gui_settings__exdbm.cc
deleted file mode 100644
index fbfebba5e8e..00000000000
--- a/emulators/gpsim/patches/patch-gui_settings__exdbm.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-gui_settings__exdbm.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- 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/patches/patch-modules_binary__indicator.cc b/emulators/gpsim/patches/patch-modules_binary__indicator.cc
deleted file mode 100644
index e05f709662f..00000000000
--- a/emulators/gpsim/patches/patch-modules_binary__indicator.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-modules_binary__indicator.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- modules/binary_indicator.cc.orig	2005-08-25 21:57:51.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/patches/patch-src_bitlog_h b/emulators/gpsim/patches/patch-src_bitlog_h
index 8482f718b23..27d48db4352 100644
--- a/emulators/gpsim/patches/patch-src_bitlog_h
+++ b/emulators/gpsim/patches/patch-src_bitlog_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_bitlog_h,v 1.1 2012/05/10 06:52:52 dholland Exp $
+$NetBSD: patch-src_bitlog_h,v 1.2 2013/06/11 12:58:42 ryoon Exp $
 
 Fix build with latest glib2.
 
---- src/bitlog.h~	2005-09-03 03:03:48.000000000 +0000
+--- src/bitlog.h.orig	2010-06-05 06:46:30.000000000 +0000
 +++ src/bitlog.h
 @@ -25,7 +25,7 @@ class Cycle_Counter;
  
diff --git a/emulators/gpsim/patches/patch-src_cmd__manager.h b/emulators/gpsim/patches/patch-src_cmd__manager.h
deleted file mode 100644
index 1c568a8d794..00000000000
--- a/emulators/gpsim/patches/patch-src_cmd__manager.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_cmd__manager.h,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- src/cmd_manager.h.orig	2005-08-25 21:57:43.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/patches/patch-src_modules.cc b/emulators/gpsim/patches/patch-src_modules.cc
deleted file mode 100644
index 928d60e7df8..00000000000
--- a/emulators/gpsim/patches/patch-src_modules.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_modules.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- src/modules.cc.orig	2005-09-16 13:58:24.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/patches/patch-src_operator.cc b/emulators/gpsim/patches/patch-src_operator.cc
deleted file mode 100644
index c4537d26f2a..00000000000
--- a/emulators/gpsim/patches/patch-src_operator.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_operator.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- src/operator.cc.orig	2005-09-07 13:34:23.000000000 +0000
-+++ src/operator.cc
-@@ -1,4 +1,5 @@
- #include <iostream>
-+#include <typeinfo>
- 
- #include "operator.h"
- #include "errors.h"
diff --git a/emulators/gpsim/patches/patch-src_processor.cc b/emulators/gpsim/patches/patch-src_processor.cc
index 14b16057441..3076b8236e1 100644
--- a/emulators/gpsim/patches/patch-src_processor.cc
+++ b/emulators/gpsim/patches/patch-src_processor.cc
@@ -1,19 +1,11 @@
-$NetBSD: patch-src_processor.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
+$NetBSD: patch-src_processor.cc,v 1.2 2013/06/11 12:58:42 ryoon Exp $
 
 Add missing include.
 Avoid conflict with C++ list<>.
 
---- src/processor.cc.orig	2005-10-01 21:12:55.000000000 +0000
+--- src/processor.cc.orig	2011-02-16 06:38:31.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"
-@@ -628,11 +629,11 @@ void Processor::read_src_files(void)
+@@ -733,11 +733,11 @@ void Processor::read_src_files(void)
  
  //-------------------------------------------------------------------
  //
@@ -22,17 +14,17 @@ Avoid conflict with C++ list<>.
  //
  // 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)
-@@ -2122,7 +2123,7 @@ void FileContext::ReadSource(void)
-   line_seek = new vector<int>(max_line()+1);
-   pm_address = new vector<int>(max_line()+1);
+-void Processor::list(unsigned int file_id,
++void Processor::plist(unsigned int file_id,
+                      unsigned int pc_val,
+                      int start_line,
+                      int end_line)
+@@ -2346,7 +2346,7 @@ void FileContext::ReadSource(void)
+   line_seek.resize(max_line()+1);
+   pm_address.resize(max_line()+1);
  
 -  std::rewind(fptr);
 +  ::rewind(fptr);
  
    char buf[256],*s;
-   (*line_seek)[0] = 0;
+   line_seek[0] = 0;
diff --git a/emulators/gpsim/patches/patch-src_processor.h b/emulators/gpsim/patches/patch-src_processor.h
index 07c2fcbcb66..a2d62654808 100644
--- a/emulators/gpsim/patches/patch-src_processor.h
+++ b/emulators/gpsim/patches/patch-src_processor.h
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_processor.h,v 1.1 2011/12/19 15:52:21 wiz Exp $
+$NetBSD: patch-src_processor.h,v 1.2 2013/06/11 12:58:42 ryoon Exp $
 
 Avoid conflict with C++ list<>.
 
---- src/processor.h.orig	2005-08-31 03:57:38.000000000 +0000
+--- src/processor.h.orig	2011-03-12 09:34:27.000000000 +0000
 +++ src/processor.h
-@@ -544,7 +544,7 @@ public:
+@@ -581,7 +581,7 @@ public:
  
    virtual void disassemble (signed int start_address, 
- 			    signed int end_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);
+                     unsigned int pcval, 
+                     int start_line, 
+                     int end_line);
diff --git a/emulators/gpsim/patches/patch-src_program__files.cc b/emulators/gpsim/patches/patch-src_program__files.cc
index 3c705b38528..ac76872a73f 100644
--- a/emulators/gpsim/patches/patch-src_program__files.cc
+++ b/emulators/gpsim/patches/patch-src_program__files.cc
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_program__files.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
+$NetBSD: patch-src_program__files.cc,v 1.2 2013/06/11 12:58:42 ryoon Exp $
 
 Fix namespace.
 
---- src/program_files.cc.orig	2005-08-25 21:57:41.000000000 +0000
+--- src/program_files.cc.orig	2007-02-11 20:49:21.000000000 +0000
 +++ src/program_files.cc
-@@ -136,7 +136,7 @@ ProgramFileBuf::int_type ProgramFileBuf:
+@@ -139,7 +139,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) {
+     if(errno != 0)
diff --git a/emulators/gpsim/patches/patch-src_protocol.h b/emulators/gpsim/patches/patch-src_protocol.h
deleted file mode 100644
index 2aebfad3fd7..00000000000
--- a/emulators/gpsim/patches/patch-src_protocol.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$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)
diff --git a/emulators/gpsim/patches/patch-src_symbol.cc b/emulators/gpsim/patches/patch-src_symbol.cc
deleted file mode 100644
index 3b4e662ae2b..00000000000
--- a/emulators/gpsim/patches/patch-src_symbol.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_symbol.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- src/symbol.cc.orig	2005-09-07 13:34:24.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/patches/patch-src_symbol.h b/emulators/gpsim/patches/patch-src_symbol.h
deleted file mode 100644
index c341c819e23..00000000000
--- a/emulators/gpsim/patches/patch-src_symbol.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_symbol.h,v 1.1 2013/03/02 18:12:01 joerg Exp $
-
---- src/symbol.h.orig	2013-02-28 10:35:39.000000000 +0000
-+++ src/symbol.h
-@@ -23,6 +23,7 @@ Boston, MA 02111-1307, USA.  */
- //
- 
- #include <string>
-+#include <typeinfo>
- #include <vector>
- #include "value.h"
- #include "registers.h"
diff --git a/emulators/gpsim/patches/patch-src_value.cc b/emulators/gpsim/patches/patch-src_value.cc
deleted file mode 100644
index 4b63972174f..00000000000
--- a/emulators/gpsim/patches/patch-src_value.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_value.cc,v 1.1 2011/12/19 15:52:21 wiz Exp $
-
-Add missing include.
-
---- src/value.cc.orig	2005-09-10 13:45:30.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"
-