Update 1.4.1 to 1.5

-------------------
   User-visible changes in version 1.5 (since version 1.4.1):

   * New features/improvements:

   * VMIPS now includes a basic direct-mapped cache simulation. The
     cache isolation and cache swap bits in the CP0 Status register are
     now honored.

   * The boot monitor distributed with VMIPS now sets up a dummy
     `argv[0]' value for the loaded program. Also, it halts by entering
     an infinite loop rather than attempting to execute a `break'
     instruction when it encounters an unexpected exception.

   * The setup assembly routine distributed with VMIPS has been made
     more TLB-friendly. Identity virtual-to-physical mappings for the
     first few pages of physical RAM are installed in the TLB at program
     start time.

   * When `-o excmsg' is on, TLB miss addresses will be printed to
     stderr.

   * When `-o ttydev=stdout' is specified, simulated program output
     will be sent to VMIPS's standard output, even if it is not a tty.

   * The interactor can now disassemble memory. Also, stepping in the
     interactor now prints the PC after each step.

   * VMIPS now supports more of the GDB remote serial protocol, in
     support of the GDB `info threads' and `detach' commands. The debug
     protocol TCP port is now configurable via the `-o debugport'
     option. Also, if something halts the program while the debugger
     interface is active, VMIPS will tell GDB that the program exited.

   * Bug fixes:

   * A bug was fixed in the debugger interface where disconnecting from
     the debugger socket could cause vmips to enter an infinite loop.

   * The interactor will refuse to dump raw memory words at
     non-word-aligned addresses.

   * The CP0 Cause register IP field is now recomputed whenever the
     register is read, rather than only when exceptions happen. This
     makes polling loops with interrupts disabled work correctly.

   * A bug was fixed in the DECstation-compatible clock device which was
     preventing some of its registers from being zeroed properly.

   * Some endianness bugs were fixed in the generic memory-mapped device
     code and in the DECstation-compatible serial device.

5 files changed, 7 insertions, 56 deletions

diff --git a/emulators/vmips/Makefile b/emulators/vmips/Makefile
index d770ceff2d4..3dd04afa754 100644
--- a/emulators/vmips/Makefile
+++ b/emulators/vmips/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.10 2013/05/16 05:17:45 shattered Exp $
+# $NetBSD: Makefile,v 1.11 2014/11/24 14:47:27 mef Exp $
 #
 
-DISTNAME=		vmips-1.4.1
+DISTNAME=		vmips-1.5
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vmips/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://vmips.sourceforge.net/
 COMMENT=		MIPS R3000 emulator
+LICENSE=		gnu-gpl-v2
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/emulators/vmips/distinfo b/emulators/vmips/distinfo
index 4ab6d29be3a..c0cec16362b 100644
--- a/emulators/vmips/distinfo
+++ b/emulators/vmips/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2013/05/16 05:17:45 shattered Exp $
+$NetBSD: distinfo,v 1.6 2014/11/24 14:47:27 mef Exp $
 
-SHA1 (vmips-1.4.1.tar.gz) = 1a087ed01e4e76c0ee19f3bbe5a8882a5183bf7c
-RMD160 (vmips-1.4.1.tar.gz) = bb4a34bfcfdbc0c8b5644498ec237bfa8956fde9
-Size (vmips-1.4.1.tar.gz) = 1038289 bytes
-SHA1 (patch-cpu.cc) = 723ab3f436a460b3a7cca0f7610943606a8bdc3e
-SHA1 (patch-options.cc) = 65c0a46c7c1d1feddef344f95026007ccc7b0b1d
-SHA1 (patch-vmipstool.cc) = fe42e124cb205764be08cff6f65d9c3300220dfc
+SHA1 (vmips-1.5.tar.gz) = ba0c753b76c439e6d29f8696b32fb9ef60aba1c8
+RMD160 (vmips-1.5.tar.gz) = 246072dabad177889548f3d07d0e629394388861
+Size (vmips-1.5.tar.gz) = 1103204 bytes
diff --git a/emulators/vmips/patches/patch-cpu.cc b/emulators/vmips/patches/patch-cpu.cc
deleted file mode 100644
index eb42765bea5..00000000000
--- a/emulators/vmips/patches/patch-cpu.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-cpu.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $
-
---- cpu.cc.orig	2011-11-27 02:48:15.000000000 +0000
-+++ cpu.cc
-@@ -17,6 +17,7 @@ You should have received a copy of the G
- with VMIPS; if not, write to the Free Software Foundation, Inc.,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
-+#include <string.h>
- #include "cpu.h"
- #include "cpzero.h"
- #include "debug.h"
diff --git a/emulators/vmips/patches/patch-options.cc b/emulators/vmips/patches/patch-options.cc
deleted file mode 100644
index 9253d4e0231..00000000000
--- a/emulators/vmips/patches/patch-options.cc
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-options.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $
-
---- options.cc.orig	2011-05-08 07:23:19.000000000 +0000
-+++ options.cc
-@@ -24,13 +24,13 @@ with VMIPS; if not, write to the Free So
- #include <cassert>
- #include <cctype>
- #include <cerrno>
-+#include <climits>
- #include <cstdio>
- #include <cstdlib>
- #include <cstring>
- #include <pwd.h>
- #include <string>
- #include <unistd.h>
--#include <limits.h>
- #include <vector>
- 
- #define OPTBUFSIZ 1024
diff --git a/emulators/vmips/patches/patch-vmipstool.cc b/emulators/vmips/patches/patch-vmipstool.cc
deleted file mode 100644
index 2dc7e63b6b4..00000000000
--- a/emulators/vmips/patches/patch-vmipstool.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-vmipstool.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $
-
---- vmipstool.cc.orig	2011-05-08 07:23:19.000000000 +0000
-+++ vmipstool.cc
-@@ -32,9 +32,9 @@ int getpagesize(void);
- #include "options.h"
- #include <cerrno>
- #include <cstdarg>
--#include <cstring>
-+#include <climits>
- #include <cstdlib>
--#include <limits.h>
-+#include <cstring>
- #include <cstdio>
- #include <iostream>
- #include <sys/stat.h>