Update to 0.21.2. Main change since 0.20.7:

  o Updated to support GTK+ 2.x
  o Added the stopwatch command.
  o added support for more processors
  o EEPROM added to 18F devices by Mike Durian
  o Added breakpoint capability on nodes
  o Added spi Module
  o Added attributes to external usart module
  o log command has been added (Command Line)
  o Profiling has been added (gui)
  o Trace viewer has been added
  o Added parport - parallel port loadable module
  o Source level debugging of C files
  o Added module attibutes (attribute.cc)
  o Enhanced module interface - now LCD module works with gpsim
  o Beautified the Single Step and Trace dump outputs
  o Added break on stack overflow and underflow
  o Added break mask to wv/rv type break points. Now you can specify
    which bits are significant.
  o Added "--cli" command line option. Invokes gpsim in command line
    mode even if it has been configured to use the gui.
  o Program viewer can now display ASCII encode text in "dt" tables
  o Added pullup/pulldown resistors to the gpsim modules
  o added "frequency" command
  o Added time field to the gui status bar.

8 files changed, 38 insertions, 89 deletions

diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index f8c5f8429ba..272bf3ad287 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:39 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/26 21:50:24 bouyer Exp $
 #
 
-DISTNAME=	gpsim-0.20.7
-PKGREVISION=	3
+DISTNAME=	gpsim-0.21.2
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.dattalo.com/gnupic/
 
@@ -21,7 +20,8 @@ USE_GNU_READLINE=	# rl_callback_read_char, rl_copy_text,
 # rl_callback_handler_remove, rl_forced_update_display,
 # rl_callback_handler_install
 
-.include "../../devel/eXdbm/buildlink2.mk"
+CONFLICTS=	eXdbm-[0-9]*
+
 .include "../../devel/popt/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/emulators/gpsim/PLIST b/emulators/gpsim/PLIST
index 871efd56bc6..b248edfec66 100644
--- a/emulators/gpsim/PLIST
+++ b/emulators/gpsim/PLIST
@@ -1,5 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:52:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/04/26 21:50:24 bouyer Exp $
 bin/gpsim
+include/eXdbm/eXdbm.h
+include/eXdbm/eXdbmErrors.h
+include/eXdbm/eXdbmTypes.h
 include/gpsim/12bit-instructions.h
 include/gpsim/12bit-processors.h
 include/gpsim/14bit-instructions.h
@@ -10,22 +13,30 @@ include/gpsim/16bit-instructions.h
 include/gpsim/16bit-processors.h
 include/gpsim/16bit-registers.h
 include/gpsim/16bit-tmrs.h
+include/gpsim/attribute.h
 include/gpsim/breakpoints.h
 include/gpsim/cod.h
+include/gpsim/eeprom.h
+include/gpsim/registers.h
 include/gpsim/gpsim_classes.h
 include/gpsim/gpsim_def.h
 include/gpsim/gpsim_interface.h
 include/gpsim/gpsim_time.h
 include/gpsim/fopen-path.h
+include/gpsim/icd.h
+include/gpsim/intcon.h
 include/gpsim/interface.h
 include/gpsim/ioports.h
+include/gpsim/lxt_write.h
 include/gpsim/modules.h
 include/gpsim/p12x.h
 include/gpsim/p16x5x.h
+include/gpsim/p16f62x.h
 include/gpsim/p16x6x.h
 include/gpsim/p16x7x.h
 include/gpsim/p16x8x.h
 include/gpsim/p16f87x.h
+include/gpsim/p17c75x.h
 include/gpsim/p18x.h
 include/gpsim/packages.h
 include/gpsim/pic-instructions.h
@@ -33,6 +44,9 @@ 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/processor.h
 include/gpsim/stimuli.h
 include/gpsim/stimulus_orb.h
 include/gpsim/symbol.h
@@ -42,6 +56,13 @@ include/gpsim/trace.h
 include/gpsim/trace_orb.h
 include/gpsim/uart.h
 include/gpsim/xref.h
+lib/libgpsim_eXdbm.a
+lib/libgpsim_eXdbm.la
+lib/libgpsim_eXdbm.so
+lib/libgpsim_eXdbm.so.0
+lib/libgpsim_eXdbm.so.0.0
+lib/libgpsimgui.so.0
+lib/libgpsimgui.so.0.0
 lib/libgpsim.a
 lib/libgpsim.la
 lib/libgpsim.so
@@ -52,9 +73,13 @@ lib/libgpsimcli.la
 lib/libgpsimcli.so
 lib/libgpsimcli.so.0
 lib/libgpsimcli.so.0.0
-lib/libgui.a
-lib/libgui.la
-lib/libgui.so
-lib/libgui.so.0
-lib/libgui.so.0.0
+lib/libgpsim_modules.a
+lib/libgpsim_modules.la
+lib/libgpsimgui.a
+lib/libgpsimgui.la
+lib/libgpsimgui.so
+lib/libgpsim_modules.so
+lib/libgpsim_modules.so.0
+lib/libgpsim_modules.so.0.0
+@dirrm include/eXdbm
 @dirrm include/gpsim
diff --git a/emulators/gpsim/distinfo b/emulators/gpsim/distinfo
index 2672fd40ea3..d6770c0bc8e 100644
--- a/emulators/gpsim/distinfo
+++ b/emulators/gpsim/distinfo
@@ -1,9 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/05/08 11:32:48 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/04/26 21:50:24 bouyer Exp $
 
-SHA1 (gpsim-0.20.7.tar.gz) = c3f76c4b8e4756ca1542a2529f44ace799b1d8ee
-Size (gpsim-0.20.7.tar.gz) = 448581 bytes
-SHA1 (patch-aa) = b01dc8b18a2718b1c9f440bd743e703bf8eecd5d
-SHA1 (patch-ab) = d8848b2bf5394f8b41e7b3359096df2e592c9bf3
-SHA1 (patch-ac) = f4225db4c5d8ee02f7322912bb8197f22c83a94e
-SHA1 (patch-ad) = ca6d5c469df91a278d594cf239424c8d9f88b305
-SHA1 (patch-ae) = 5a5d673fe7948cd29ebce729312595bc9f0af223
+SHA1 (gpsim-0.21.2.tar.gz) = 9c16a1288f0c83923395d01e9749d56a087707f9
+Size (gpsim-0.21.2.tar.gz) = 721817 bytes
diff --git a/emulators/gpsim/patches/patch-aa b/emulators/gpsim/patches/patch-aa
deleted file mode 100644
index 86ad36a5e2d..00000000000
--- a/emulators/gpsim/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/04/27 14:43:56 agc Exp $
-
---- gui/gui_regwin.c.orig	Mon Mar 26 23:28:56 2001
-+++ gui/gui_regwin.c	Mon Mar 26 23:29:13 2001
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <stdlib.h>
--#include <sys/errno.h>
-+#include <errno.h>
- 
- #include "../config.h"
- #ifdef HAVE_GUI
diff --git a/emulators/gpsim/patches/patch-ab b/emulators/gpsim/patches/patch-ab
deleted file mode 100644
index a927dd79ab6..00000000000
--- a/emulators/gpsim/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/04/27 14:43:56 agc Exp $
-
---- gui/gui_src_opcode.c.orig	Mon Mar 26 23:30:11 2001
-+++ gui/gui_src_opcode.c	Mon Mar 26 23:30:23 2001
-@@ -1,6 +1,6 @@
- #include <stdio.h>
- #include <stdlib.h>
--#include <sys/errno.h>
-+#include <errno.h>
- 
- #include "../config.h"
- #ifdef HAVE_GUI
diff --git a/emulators/gpsim/patches/patch-ac b/emulators/gpsim/patches/patch-ac
deleted file mode 100644
index 7766c4e53b0..00000000000
--- a/emulators/gpsim/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/04/27 14:43:56 agc Exp $
-
---- configure	2001/04/27 14:23:14	1.1
-+++ configure	2001/04/27 14:23:20
-@@ -2572,7 +2572,7 @@
-   cat > conftest.$ac_ext <<EOF
- #line 2574 "configure"
- #include "confdefs.h"
--#include <eXdbm/eXdbm.h>
-+#include <eXdbm.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:2579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/emulators/gpsim/patches/patch-ad b/emulators/gpsim/patches/patch-ad
deleted file mode 100644
index 52c45c31418..00000000000
--- a/emulators/gpsim/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/04/27 14:43:56 agc Exp $
-
-Look for the header file in the right place.
-
---- gui/gui_main.c	2001/04/27 14:26:21	1.1
-+++ gui/gui_main.c	2001/04/27 14:27:20
-@@ -21,8 +21,13 @@
- #include "gui.h"
- #include "gui_interface.h"
- 
-+#include <sys/param.h>
-+
-+#if (defined(BSD) && BSD >= 199506)
-+#include <eXdbm.h>
-+#else
- #include "eXdbm/eXdbm.h"
--// #include <eXdbm.h>
-+#endif
- 
- /*
-  * --- Function prototypes
diff --git a/emulators/gpsim/patches/patch-ae b/emulators/gpsim/patches/patch-ae
deleted file mode 100644
index 139b6454bf4..00000000000
--- a/emulators/gpsim/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2002/05/08 11:32:49 wiz Exp $
-
---- gpsim/main.cc.orig	Mon Nov 20 07:20:43 2000
-+++ gpsim/main.cc
-@@ -147,7 +147,7 @@
-   poptContext optCon;   /* context for parsing command-line options */
- 
- 
--  optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
-+  optCon = poptGetContext(NULL, argc, (const char **)argv, optionsTable, 0);
-   poptSetOtherOptionHelp(optCon, "[-h] [-p <device> [<hex_file>]] [-c <stc_file>]");
- 
-