Add changes to compile on current; still works on 1.3(.1)

Reported and tested by Bernhard Riedel <bernhard@sdg.de>

4 files changed, 57 insertions, 9 deletions

diff --git a/emulators/doscmd/patches/patch-aa b/emulators/doscmd/patches/patch-aa
index 280d69c4444..c6c91a1b83b 100644
--- a/emulators/doscmd/patches/patch-aa
+++ b/emulators/doscmd/patches/patch-aa
@@ -1,13 +1,20 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:34 agc Exp $
+$NetBSD: patch-aa,v 1.3 1998/10/28 01:29:16 hubertf Exp $
 
---- signal.c.orig	Fri Jul 17 23:00:17 1998
-+++ signal.c	Fri Jul 17 23:00:34 1998
-@@ -98,7 +98,7 @@
+--- signal.c.orig	Thu May  2 22:03:39 1996
++++ signal.c	Wed Oct 28 02:03:15 1998
+@@ -98,8 +98,14 @@
  	if (s >= 0 && s < NSIG) {
  		handler[s] = h;
  
 -		sa.sa_handler = generichandler;
 +		sa.sa_handler = (void (*)())generichandler;
++#if defined(__LIBC12_SOURCE__)
  		sa.sa_mask = sigmask(SIGIO) | sigmask(SIGALRM);
++#else
++		sigemptyset(&sa.sa_mask);
++		sigaddset(&sa.sa_mask, SIGIO);
++		sigaddset(&sa.sa_mask, SIGALRM);
++#endif
  		sa.sa_flags = SA_ONSTACK;
  		sigaction(s, &sa, NULL);
+ 
diff --git a/emulators/doscmd/patches/patch-ab b/emulators/doscmd/patches/patch-ab
index d86785995b4..f79741db50a 100644
--- a/emulators/doscmd/patches/patch-ab
+++ b/emulators/doscmd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 1998/08/07 10:40:34 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/28 01:29:16 hubertf Exp $
 
---- Makefile.orig	Thu May  2 12:55:19 1996
-+++ Makefile	Fri Jul 17 23:30:12 1998
-@@ -8,20 +8,23 @@
+--- Makefile.orig	Thu May  2 19:55:19 1996
++++ Makefile	Wed Oct 28 02:07:49 1998
+@@ -8,30 +8,33 @@
  	int1a.c int2f.c intff.c \
  	mem.c mouse.c net.c null.c port.c setver.c signal.c timer.c trace.c trap.c tty.c xms.c
  
@@ -29,4 +29,16 @@ $NetBSD: patch-ab,v 1.2 1998/08/07 10:40:34 agc Exp $
 +		${.CURDIR}/instbsdi.exe ${PREFIX}/libexec/
  
  doscmd: doscmd.kernel ${LIBCRT0} doscmd_loader.o
- 	ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD}
+-	ld -N -Bstatic -o doscmd ${LDFLAGS} ${LIBCRT0} doscmd_loader.o ${LDADD}
++	ld -N -Bstatic -o doscmd ${LDFLAGS:S/^-Wl,//g} ${LIBCRT0} doscmd_loader.o ${LDADD}
+ 
+ .include <bsd.prog.mk>
+ 
+ .depend: doscmd_loader.c
+ 
+ doscmd.kernel: crt0.o ${OBJS}
+-	ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS} crt0.o ${OBJS} ${LDADD}
++	ld -N -Bstatic -T 110000 -o doscmd.kernel ${LDFLAGS:S/^-Wl,//g} crt0.o ${OBJS} ${LDADD}
+ 
+ doscmd.0: doscmd.1
+ 	tbl ${.IMPSRC} | nroff -mandoc > ${.TARGET}
diff --git a/emulators/doscmd/patches/patch-ae b/emulators/doscmd/patches/patch-ae
new file mode 100644
index 00000000000..5727c6b5bd3
--- /dev/null
+++ b/emulators/doscmd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 1998/10/28 01:29:16 hubertf Exp $
+
+--- doscmd.h.BAK	Wed Oct 28 01:48:56 1998
++++ doscmd.h	Wed Oct 28 01:49:02 1998
+@@ -58,7 +58,7 @@
+ 
+ #define	MAX_AVAIL_SEG 0xa000
+ char *dosmem;
+-char cmdname[];
++char cmdname[256];
+ int dosmem_size;
+ 
+ int pspseg;                                     /* segment # of PSP */
diff --git a/emulators/doscmd/patches/patch-af b/emulators/doscmd/patches/patch-af
new file mode 100644
index 00000000000..a6026f9aa43
--- /dev/null
+++ b/emulators/doscmd/patches/patch-af
@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.1 1998/10/28 01:29:16 hubertf Exp $
+
+--- doscmd.c.BAK	Wed Oct 28 01:57:30 1998
++++ doscmd.c	Wed Oct 28 01:58:17 1998
+@@ -581,7 +581,11 @@
+ 	SET16(sc.sc_fs, 0x0000);
+ 	SET16(sc.sc_gs, 0x0000);
+ 	
++#if defined(__LIBC12_SOURCE__)
+ 	sc.sc_mask = 0;
++#else
++	sigemptyset(&sc.sc_mask);
++#endif
+ 	sc.sc_onstack = 0;
+ 
+ 	if (tflag) {