Update to 1.4. Notable changes: - Completely remove half-done disk controller, skeletonize half-done fpu - Guard use of the FPU with a runtime option (-o fpu).diff -r1.8 -r1.9 pkgsrc/emulators/vmips/Makefile
(shattered)
| @@ -1,22 +1,30 @@ | @@ -1,22 +1,30 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.8 2012/10/03 12:55:21 asau Exp $ | 1 | # $NetBSD: Makefile,v 1.9 2012/10/14 05:44:44 shattered Exp $ | |
| 2 | # | 2 | # | |
| 3 | 3 | |||
| 4 | DISTNAME= vmips-1.3.1 | 4 | DISTNAME= vmips-1.4 | |
| 5 | CATEGORIES= emulators | 5 | CATEGORIES= emulators | |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vmips/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vmips/} | |
| 7 | 7 | |||
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 9 | HOMEPAGE= http://vmips.sourceforge.net/ | 9 | HOMEPAGE= http://vmips.sourceforge.net/ | |
| 10 | COMMENT= MIPS R3000 emulator | 10 | COMMENT= MIPS R3000 emulator | |
| 11 | 11 | |||
| 12 | USE_PKGLOCALEDIR= yes | 12 | USE_PKGLOCALEDIR= yes | |
| 13 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
| 14 | INFO_FILES= yes | |||
| 14 | INSTALLATION_DIRS= bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips | 15 | INSTALLATION_DIRS= bin include/vmips ${PKGMANDIR}/man1 share/vmips share/examples/vmips | |
| 15 | INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} | 16 | INSTALL_MAKE_FLAGS+= ${MAKE_FLAGS} sysconfdir=${EGDIR:Q} | |
| 16 | 17 | |||
| 17 | EGDIR= ${PREFIX}/share/examples/vmips | 18 | EGDIR= ${PREFIX}/share/examples/vmips | |
| 18 | CONF_FILES= ${EGDIR}/vmipsrc ${PKG_SYSCONFDIR}/vmipsrc | 19 | CONF_FILES= ${EGDIR}/vmipsrc ${PKG_SYSCONFDIR}/vmipsrc | |
| 19 | 20 | |||
| 20 | USE_LANGUAGES= c c++ | 21 | USE_LANGUAGES= c c++ | |
| 21 | 22 | |||
| 23 | do-test: | |||
| 24 | if ${PKG_INFO} -qe dejagnu; then \ | |||
| 25 | (cd ${WRKSRC}/test_code && ${MAKE} check); \ | |||
| 26 | else \ | |||
| 27 | ${ECHO} "dejagnu is required for the test target"; \ | |||
| 28 | fi | |||
| 29 | ||||
| 22 | .include "../../mk/bsd.pkg.mk" | 30 | .include "../../mk/bsd.pkg.mk" |
| @@ -1,15 +1,8 @@ | @@ -1,15 +1,8 @@ | |||
| 1 | $NetBSD: distinfo,v 1.3 2011/11/27 19:39:09 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.4 2012/10/14 05:44:44 shattered Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (vmips-1.3.1.tar.gz) = 0ca5d942db5ceaabe18aae831e80df59be8e16d9 | 3 | SHA1 (vmips-1.4.tar.gz) = e8e1699c6922c00ed39d3e6210ba92bf5381e5aa | |
| 4 | RMD160 (vmips-1.3.1.tar.gz) = cfc831072cac4295e26fc57d8ed892d56f32c81a | 4 | RMD160 (vmips-1.4.tar.gz) = 6bc6b7bac1dc692ce8bce879b0e1c96ad779e9cc | |
| 5 | Size (vmips-1.3.1.tar.gz) = 1144409 bytes | 5 | Size (vmips-1.4.tar.gz) = 1028066 bytes | |
| 6 | SHA1 (patch-aa) = c8ba30db8a11adfd3848771e8eea5bdb0821b767 | |||
| 7 | SHA1 (patch-ab) = 3cc0b6f7a02f06cfbf9d70a1b26944b89f834c56 | |||
| 8 | SHA1 (patch-cpu.cc) = 723ab3f436a460b3a7cca0f7610943606a8bdc3e | 6 | SHA1 (patch-cpu.cc) = 723ab3f436a460b3a7cca0f7610943606a8bdc3e | |
| 9 | SHA1 (patch-cpzero.h) = 7b476c321a0a7a272c7af3b32c38d02d3e991349 | 7 | SHA1 (patch-options.cc) = 65c0a46c7c1d1feddef344f95026007ccc7b0b1d | |
| 10 | SHA1 (patch-debug.cc) = c2307568ec6c5854c1a9e7fe6176069e4551ffca | 8 | SHA1 (patch-vmipstool.cc) = fe42e124cb205764be08cff6f65d9c3300220dfc | |
| 11 | SHA1 (patch-exeloader.cc) = df1facc3acaf78f3f57b398dc201a94a5cf67edf | |||
| 12 | SHA1 (patch-options.cc) = ac2319232f2e8cec8f4cc7c9117f3ac8faa88f99 | |||
| 13 | SHA1 (patch-terminalcontroller.cc) = 9927a984d99f3ca2cfe4861e89d7e9a288f338c1 | |||
| 14 | SHA1 (patch-vmips.cc) = 4783cd484c251427efc93c384616a06b67593664 | |||
| 15 | SHA1 (patch-vmipstool.cc) = cc8b271f868f999e389eadc959e36747a5d9a444 |
| @@ -1,14 +1,19 @@ | @@ -1,14 +1,19 @@ | |||
| 1 | $NetBSD: patch-options.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $ | 1 | $NetBSD: patch-options.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $ | |
| 2 | 2 | |||
| 3 | --- options.cc.orig 2011-11-27 02:50:22.000000000 +0000 | 3 | --- options.cc.orig 2011-05-08 07:23:19.000000000 +0000 | |
| 4 | +++ options.cc | 4 | +++ options.cc | |
| 5 | @@ -25,6 +25,9 @@ with VMIPS; if not, write to the Free So | 5 | @@ -24,13 +24,13 @@ with VMIPS; if not, write to the Free So | |
| 6 | #include <cassert> | |||
| 6 | #include <cctype> | 7 | #include <cctype> | |
| 7 | #include <cerrno> | 8 | #include <cerrno> | |
| 8 | #include <cstdio> | |||
| 9 | +#include <climits> | 9 | +#include <climits> | |
| 10 | +#include <cstdlib> | 10 | #include <cstdio> | |
| 11 | +#include <cstring> | 11 | #include <cstdlib> | |
| 12 | #include <cstring> | |||
| 12 | #include <pwd.h> | 13 | #include <pwd.h> | |
| 13 | #include <string> | 14 | #include <string> | |
| 14 | #include <unistd.h> | 15 | #include <unistd.h> | |
| 16 | -#include <limits.h> | |||
| 17 | #include <vector> | |||
| 18 | ||||
| 19 | #define OPTBUFSIZ 1024 |
| @@ -1,14 +1,16 @@ | @@ -1,14 +1,16 @@ | |||
| 1 | $NetBSD: patch-vmipstool.cc,v 1.1 2011/11/27 19:39:09 joerg Exp $ | 1 | $NetBSD: patch-vmipstool.cc,v 1.2 2012/10/14 05:44:45 shattered Exp $ | |
| 2 | 2 | |||
| 3 | --- vmipstool.cc.orig 2011-11-27 02:51:38.000000000 +0000 | 3 | --- vmipstool.cc.orig 2011-05-08 07:23:19.000000000 +0000 | |
| 4 | +++ vmipstool.cc | 4 | +++ vmipstool.cc | |
| 5 | @@ -33,6 +33,9 @@ int getpagesize(void); | 5 | @@ -32,9 +32,9 @@ int getpagesize(void); | |
| 6 | #include "options.h" | |||
| 6 | #include <cerrno> | 7 | #include <cerrno> | |
| 7 | #include <cstdarg> | 8 | #include <cstdarg> | |
| 8 | #include <cstdio> | 9 | -#include <cstring> | |
| 9 | +#include <climits> | 10 | +#include <climits> | |
| 10 | +#include <cstdlib> | 11 | #include <cstdlib> | |
| 12 | -#include <limits.h> | |||
| 11 | +#include <cstring> | 13 | +#include <cstring> | |
| 14 | #include <cstdio> | |||
| 12 | #include <iostream> | 15 | #include <iostream> | |
| 13 | #include <sys/stat.h> | 16 | #include <sys/stat.h> | |
| 14 | #include <sys/wait.h> |