Update to xtrs-4.9d, with lots of bug fixes and improvements.

9 files changed, 84 insertions, 68 deletions

diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
index cd130e61fd8..523c7a045b7 100644
--- a/emulators/xtrs/Makefile
+++ b/emulators/xtrs/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2013/01/12 17:21:04 is Exp $
+# $NetBSD: Makefile,v 1.17 2013/01/12 19:07:55 is Exp $
 #
 
-DISTNAME=	xtrs-4.9
-PKGREVISION=	5
+DISTNAME=	xtrs-4.9d
+#PKGREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.tim-mann.org/trs80/
 
@@ -31,14 +31,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/utility.dsk ${DESTDIR}${PREFIX}/share/xtrs
 	${INSTALL_DATA} ${WRKSRC}/cpmutil.dsk ${DESTDIR}${PREFIX}/share/xtrs
 
-# The sources assume <malloc.h> exists.  Create a fake one for platforms
-# that don't have it.
-post-wrapper:
-	if ${TEST} ! -f /usr/include/malloc.h; then		\
-		${ECHO} "#include <stdlib.h>"			\
-			> ${BUILDLINK_DIR}/include/malloc.h;	\
-	fi
-
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/emulators/xtrs/distinfo b/emulators/xtrs/distinfo
index a4c174f9365..7178e8a04ea 100644
--- a/emulators/xtrs/distinfo
+++ b/emulators/xtrs/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.5 2013/01/12 17:21:04 is Exp $
+$NetBSD: distinfo,v 1.6 2013/01/12 19:07:55 is Exp $
 
-SHA1 (xtrs-4.9.tar.gz) = abfbbdb972c7fa2b3545ed42698162a88168bded
-RMD160 (xtrs-4.9.tar.gz) = 6daabf36a53e4af8b9d6b97d91cba00cc55b406f
-Size (xtrs-4.9.tar.gz) = 422910 bytes
-SHA1 (patch-Makefile) = 5c8f0cd142a1134fd99ad8946bf069ee9d0b53d7
-SHA1 (patch-aa) = f43c92142a240c45015fad93fd702df78e5a707c
-SHA1 (patch-ab) = 11aa129243aa5bb5c7b017241ebd444e9ac43ff2
-SHA1 (patch-ac) = f57cd85b5896bbdf1ae0346e1d703aa460ba8984
+SHA1 (xtrs-4.9d.tar.gz) = 72b99ede6e8024b8ade4f8aa22eb073078576e74
+RMD160 (xtrs-4.9d.tar.gz) = 009786b70fe1006d552b1d89ac2b74247b17e03f
+Size (xtrs-4.9d.tar.gz) = 455355 bytes
+SHA1 (patch-trs_cassette.c) = 44c1a8617a4b9d984aa1b740ca14b5a471acad79
+SHA1 (patch-trs_disk.c) = b43c7592db9a183b69bc2b17a7ddc4a1e32713e4
+SHA1 (patch-trs_xinterface.c) = e2190ea74f38d2cfc8fb7e8d17c5e889490aaa48
diff --git a/emulators/xtrs/patches/patch-Makefile b/emulators/xtrs/patches/patch-Makefile
deleted file mode 100644
index 57cf130cfc7..00000000000
--- a/emulators/xtrs/patches/patch-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2013/01/12 16:40:49 is Exp $
-
---- Makefile.orig	2002-05-11 21:35:23.000000000 +0000
-+++ Makefile
-@@ -145,7 +145,7 @@ z80code: $(Z80CODE)
- include Makefile.local
- 
- CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \
--       $(APPDEFAULTS) -DKBWAIT -DHAVE_SIGIO
-+       $(APPDEFAULTS) -DKBWAIT # -DHAVE_SIGIO
- LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)
- 
- ZMACFLAGS = -h
diff --git a/emulators/xtrs/patches/patch-aa b/emulators/xtrs/patches/patch-aa
deleted file mode 100644
index ad7142e5b8d..00000000000
--- a/emulators/xtrs/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2007/07/27 23:50:19 joerg Exp $
-
---- debug.c.orig	2007-07-27 23:28:45.000000000 +0000
-+++ debug.c
-@@ -21,7 +21,6 @@
- #include "z80.h"
- #include "trs.h"
- 
--#include <malloc.h>
- #include <stdlib.h>
- #include <signal.h>
- #include <errno.h>
diff --git a/emulators/xtrs/patches/patch-ab b/emulators/xtrs/patches/patch-ab
deleted file mode 100644
index ca1659e7357..00000000000
--- a/emulators/xtrs/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/07/27 23:50:20 joerg Exp $
-
---- trs_memory.c.orig	2007-07-27 23:28:29.000000000 +0000
-+++ trs_memory.c
-@@ -28,7 +28,6 @@
- 
- #include "z80.h"
- #include "trs.h"
--#include <malloc.h>
- #include <stdlib.h>
- #include "trs_disk.h"
- #include "trs_hard.h"
diff --git a/emulators/xtrs/patches/patch-ac b/emulators/xtrs/patches/patch-ac
deleted file mode 100644
index 443afeb9afd..00000000000
--- a/emulators/xtrs/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/07/27 23:50:20 joerg Exp $
-
---- trs_xinterface.c.orig	2007-07-27 23:31:37.000000000 +0000
-+++ trs_xinterface.c
-@@ -35,7 +35,6 @@
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/file.h>
--#include <malloc.h>
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
diff --git a/emulators/xtrs/patches/patch-trs_cassette.c b/emulators/xtrs/patches/patch-trs_cassette.c
new file mode 100644
index 00000000000..145412004fb
--- /dev/null
+++ b/emulators/xtrs/patches/patch-trs_cassette.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-trs_cassette.c,v 1.1 2013/01/12 19:07:55 is Exp $
+
+--- trs_cassette.c.orig	2008-06-26 04:40:13.000000000 +0000
++++ trs_cassette.c
+@@ -234,15 +234,17 @@ static long wave_dataid_offset = WAVE_DA
+ static long wave_datasize_offset = WAVE_DATASIZE_OFFSET;
+ static long wave_data_offset = WAVE_DATA_OFFSET;
+ 
++#if HAVE_OSS
+ /* Orchestra 80/85/90 stuff */
+ static int orch90_left = 128, orch90_right = 128;
++#endif
+ 
+ #if SB_SOUND
+ /* ioport of the SoundBlaster command register. 0 means none */
+ static unsigned char sb_cassette_volume[4];
+ static unsigned char sb_sound_volume[2];
+-#endif /*SB_SOUND*/
+ static unsigned int sb_address=0;
++#endif /*SB_SOUND*/
+ static int sb_volume = 0;
+ 
+ /* Put a 2-byte quantity to a file in little-endian order */
+@@ -1221,11 +1223,13 @@ trs_sound_out(int value)
+ #endif
+ }
+ 
++#if HAVE_OSS
+ static void
+ orch90_flush(int dummy)
+ {
+   trs_orch90_out(0, FLUSH);
+ }
++#endif
+ 
+ /* Orchestra 85/90 */
+ /* Not supported in obsolescent SB_SOUND mode */
diff --git a/emulators/xtrs/patches/patch-trs_disk.c b/emulators/xtrs/patches/patch-trs_disk.c
new file mode 100644
index 00000000000..bdb1a16526d
--- /dev/null
+++ b/emulators/xtrs/patches/patch-trs_disk.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-trs_disk.c,v 1.1 2013/01/12 19:07:56 is Exp $
+
+--- trs_disk.c.orig	2009-06-16 00:06:25.000000000 +0000
++++ trs_disk.c
+@@ -849,8 +849,8 @@ trs_disk_change(int drive)
+   } else if (d->emutype == DMK) {
+     fseek(d->file, DMK_NTRACKS, 0);
+     d->u.dmk.ntracks = (unsigned char) getc(d->file);
+-    d->u.dmk.tracklen = (unsigned char) getc(d->file) +
+-      (((unsigned char) getc(d->file)) << 8);
++    d->u.dmk.tracklen  =  (unsigned char) getc(d->file);
++    d->u.dmk.tracklen += ((unsigned char) getc(d->file)) << 8;
+     c = getc(d->file);
+     d->u.dmk.nsides = (c & DMK_SSIDE_OPT) ? 1 : 2;
+     d->u.dmk.sden = (c & DMK_SDEN_OPT) != 0;
diff --git a/emulators/xtrs/patches/patch-trs_xinterface.c b/emulators/xtrs/patches/patch-trs_xinterface.c
new file mode 100644
index 00000000000..2b59d715930
--- /dev/null
+++ b/emulators/xtrs/patches/patch-trs_xinterface.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-trs_xinterface.c,v 1.1 2013/01/12 19:07:56 is Exp $
+
+--- trs_xinterface.c.orig	2013-01-12 18:33:16.000000000 +0000
++++ trs_xinterface.c
+@@ -360,7 +360,7 @@ int trs_parse_command_line(int argc, cha
+     if (XrmGetResource(x_db, option, "Xtrs.Charset", &type, &value)) {
+       charset_name = (char*) value.addr;
+     }
+-    if (isdigit(*charset_name)) {
++    if (isdigit((int)(unsigned char)*charset_name)) {
+       trs_charset = atoi(charset_name);
+       cur_char_width = 8 * scale_x;
+     } else {
+@@ -396,7 +396,7 @@ int trs_parse_command_line(int argc, cha
+     if (XrmGetResource(x_db, option, "Xtrs.Charset", &type, &value)) {
+       charset_name = (char*) value.addr;
+     }
+-    if (isdigit(*charset_name)) {
++    if (isdigit((int)(unsigned char)*charset_name)) {
+       trs_charset = atoi(charset_name);
+     } else {
+       if (charset_name[0] == 'k'/*katakana*/) {