- Update to 0.6.

6 files changed, 48 insertions, 35 deletions

diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index d2b16da919a..45e6f9c7673 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	tme
-PORTVERSION=	0.4
-PORTREVISION=	3
+PORTVERSION=	0.6
 CATEGORIES=	emulators
-MASTER_SITES=	http://theory.lcs.mit.edu/~fredette/tme/
+MASTER_SITES=	http://people.csail.mit.edu/fredette/tme/
 
 MAINTAINER=	trasz@FreeBSD.org
-COMMENT=	Emulator for Sun 2/120 and Sun 3/150 machines
+COMMENT=	Emulator for Sun 2/120, 3/150 and SPARCstation 2 machines
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/emulators/tme/distinfo b/emulators/tme/distinfo
index c806605ba7a..4225b311b8a 100644
--- a/emulators/tme/distinfo
+++ b/emulators/tme/distinfo
@@ -1,3 +1,3 @@
-MD5 (tme-0.4.tar.gz) = 70673e07c3bd6bf2bd5abd2f7678f4e2
-SHA256 (tme-0.4.tar.gz) = edb148558e923ae25f11c4bba7dca1fe601c20e106aa0ada208a48ed305c7b47
-SIZE (tme-0.4.tar.gz) = 1448981
+MD5 (tme-0.6.tar.gz) = 4f156a1caed603d71a667a8cb15f5747
+SHA256 (tme-0.6.tar.gz) = 97293c113cbcca0da533c26ec576dbad4ed6f8c702875b3b7949c6538a063f19
+SIZE (tme-0.6.tar.gz) = 1700273
diff --git a/emulators/tme/files/patch-ic-m68k-m68k-bus-auto.c b/emulators/tme/files/patch-ic-m68k-m68k-bus-auto.c
deleted file mode 100644
index 1828c816f2c..00000000000
--- a/emulators/tme/files/patch-ic-m68k-m68k-bus-auto.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ic/m68k/m68k-bus-auto.c.orig	Thu Jan 11 12:09:14 2007
-+++ ic/m68k/m68k-bus-auto.c	Thu Jan 11 12:10:30 2007
-@@ -156,7 +156,7 @@
- };
- 
- /* the 32-bit bus router used on the 68020 and 68030: */
--static const tme_bus_lane_t tme_m68k_router_32[TME_M68K_BUS_ROUTER_SIZE(TME_BUS32_LOG2)] = {
-+const tme_bus_lane_t tme_m68k_router_32[TME_M68K_BUS_ROUTER_SIZE(TME_BUS32_LOG2)] = {
- 
-   /* [m68k] initiator maximum cycle size: 8 bits
-      [m68k] initiator A1,A0: 00
diff --git a/emulators/tme/files/patch-libtme-module.c b/emulators/tme/files/patch-libtme-module.c
index 9777d27075a..43c168c8370 100644
--- a/emulators/tme/files/patch-libtme-module.c
+++ b/emulators/tme/files/patch-libtme-module.c
@@ -4,7 +4,7 @@
    FILE *modules_index;
  
    /* pass over the search path environment variables: */
--  for (pass = 0; ++pass < 2; ) {
+-  for (pass = 0; ++pass <= 2; ) {
 +  for (pass = 0; ++pass <= 3; ) {
  
      /* get the next search path environment variable value: */
diff --git a/emulators/tme/pkg-descr b/emulators/tme/pkg-descr
index 9855bd98139..1dad28e00dd 100644
--- a/emulators/tme/pkg-descr
+++ b/emulators/tme/pkg-descr
@@ -1,5 +1,5 @@
 The Machine Emulator provides a general-purpose framework
-for computer emulation.  Right now it can emulate Sun 2/120 and
-3/150.
+for computer emulation.  Right now it can emulate Sun 2/120,
+3/150 and SPARCstation 2 (4/75).
 
-WWW:	http://theory.lcs.mit.edu/~fredette/tme/
+WWW:	http://people.csail.mit.edu/fredette/tme/
diff --git a/emulators/tme/pkg-plist b/emulators/tme/pkg-plist
index 2230a47b1e7..61c60d35a40 100644
--- a/emulators/tme/pkg-plist
+++ b/emulators/tme/pkg-plist
@@ -13,22 +13,31 @@ include/tme/generic/tape.h
 include/tme/generic/mouse.h
 include/tme/generic/float.h
 include/tme/generic/keyboard.h
+@dirrm include/tme/generic
 include/tme/ic/m68k.h
 include/tme/ic/am9513.h
 include/tme/ic/z8530.h
 include/tme/ic/mm58167.h
 include/tme/ic/isil7170.h
 include/tme/ic/i825x6.h
+include/tme/ic/sparc.h
+include/tme/ic/mk48txx.h
+include/tme/ic/nec765.h
+include/tme/ic/bt458.h
 include/tme/ic/ieee754.h
 include/tme/ic/ieee754-auto.h
 include/tme/ic/ieee754-ops-auto.h
+@dirrm include/tme/ic
 include/tme/machine/sun.h
+@dirrm include/tme/machine
 include/tme/scsi/scsi-disk.h
 include/tme/scsi/scsi-tape.h
+include/tme/scsi/scsi-cdrom.h
 include/tme/scsi/scsi-msg.h
 include/tme/scsi/scsi-cdb.h
 include/tme/scsi/scsi-device.h
-include/tme/atomics.h
+@dirrm include/tme/scsi
+include/tme/memory.h
 include/tme/common.h
 include/tme/connection.h
 include/tme/element.h
@@ -39,12 +48,16 @@ include/tme/tme.h
 include/tme/misc.h
 include/tme/hash.h
 include/tme/tmesh.h
+include/tme/memory-auto.h
+@dirrm include/tme
 include/ltdl.h
 lib/tme/tme-plugins.txt
 lib/tme/tme_generic.la
 lib/tme/tme_generic.a
 lib/tme/tme_ic_m68k.la
 lib/tme/tme_ic_m68k.a
+lib/tme/tme_ic_sparc.la
+lib/tme/tme_ic_sparc.a
 lib/tme/tme_ic_am9513.la
 lib/tme/tme_ic_am9513.a
 lib/tme/tme_ic_mm58167.la
@@ -57,12 +70,26 @@ lib/tme/tme_ic_isil7170.la
 lib/tme/tme_ic_isil7170.a
 lib/tme/tme_ic_ncr5380.la
 lib/tme/tme_ic_ncr5380.a
+lib/tme/tme_ic_am7930.la
+lib/tme/tme_ic_am7930.a
+lib/tme/tme_ic_am7990.la
+lib/tme/tme_ic_am7990.a
+lib/tme/tme_ic_ncr53c9x.la
+lib/tme/tme_ic_ncr53c9x.a
+lib/tme/tme_ic_mk48txx.la
+lib/tme/tme_ic_mk48txx.a
+lib/tme/tme_ic_lsi64854.la
+lib/tme/tme_ic_lsi64854.a
+lib/tme/tme_ic_nec765.la
+lib/tme/tme_ic_nec765.a
 lib/tme/libtme-machine-sun.la
 lib/tme/libtme-machine-sun.a
 lib/tme/tme_machine_sun2.la
 lib/tme/tme_machine_sun2.a
 lib/tme/tme_machine_sun3.la
 lib/tme/tme_machine_sun3.a
+lib/tme/tme_machine_sun4.la
+lib/tme/tme_machine_sun4.a
 lib/tme/tme_host_posix.la
 lib/tme/tme_host_posix.a
 lib/tme/tme_host_bsd.la
@@ -71,11 +98,14 @@ lib/tme/tme_host_gtk.la
 lib/tme/tme_host_gtk.a
 lib/tme/tme_bus_multibus.la
 lib/tme/tme_bus_multibus.a
+lib/tme/tme_bus_sbus.la
+lib/tme/tme_bus_sbus.a
 lib/tme/tme_serial_kb.la
 lib/tme/tme_serial_kb.a
 lib/tme/tme_scsi.la
 lib/tme/tme_scsi.a
 lib/tme/tmeconfig.h
+@dirrm lib/tme
 lib/libltdl.la
 lib/libltdl.a
 lib/libtme.la
@@ -86,15 +116,10 @@ lib/libtme-ieee754.la
 lib/libtme-ieee754.a
 lib/libtmesh.la
 lib/libtmesh.a
-%%EXAMPLESDIR%%/sun-keyboards.txt
-%%EXAMPLESDIR%%/my-sun-macros.txt
-%%EXAMPLESDIR%%/SUN2-MULTIBUS
-%%EXAMPLESDIR%%/SUN3-CARRERA
-%%EXAMPLESDIR%%/sun3-carrera-eeprom.txt
-@dirrmtry %%EXAMPLESDIR%%
-@dirrmtry lib/tme
-@dirrmtry include/tme/scsi
-@dirrmtry include/tme/machine
-@dirrmtry include/tme/ic
-@dirrmtry include/tme/generic
-@dirrmtry include/tme
+share/examples/tme/sun-keyboards.txt
+share/examples/tme/my-sun-macros.txt
+share/examples/tme/SUN2-MULTIBUS
+share/examples/tme/SUN3-CARRERA
+share/examples/tme/sun3-carrera-eeprom.txt
+share/examples/tme/SUN4-75
+@dirrm share/examples/tme