summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2001-03-16 13:58:58 +0000
committerwiz <wiz@pkgsrc.org>2001-03-16 13:58:58 +0000
commitd51e0f9c2efdfe187baf27ae4c8356124eda1f9d (patch)
treeb546050ddc8ed5dad695d102d4d0ac10ea650e56 /emulators
parent742a34cf85a38a070005831fddb19e508d2f4c9a (diff)
downloadpkgsrc-d51e0f9c2efdfe187baf27ae4c8356124eda1f9d.tar.gz
Standardize patches.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/doscmd/patches/patch-af90
-rw-r--r--emulators/doscmd/patches/patch-ag6
2 files changed, 42 insertions, 54 deletions
diff --git a/emulators/doscmd/patches/patch-af b/emulators/doscmd/patches/patch-af
index c6545835b77..abdce1307e0 100644
--- a/emulators/doscmd/patches/patch-af
+++ b/emulators/doscmd/patches/patch-af
@@ -1,52 +1,40 @@
-$NetBSD: patch-af,v 1.2 1999/12/18 01:46:29 christos Exp $
+$NetBSD: patch-af,v 1.3 2001/03/16 13:58:58 wiz Exp $
-*** doscmd.c.orig Thu May 2 15:37:33 1996
---- doscmd.c Fri Dec 17 20:25:25 1999
-***************
-*** 100,106 ****
- char *dos_path = 0;
- char cmdname[256];
-
-! char *memfile = "/tmp/doscmd.XXXXXX";
-
- int
- main(int argc, char **argv)
---- 100,106 ----
- char *dos_path = 0;
- char cmdname[256];
-
-! char memfile[] = "/tmp/doscmd.XXXXXX";
-
- int
- main(int argc, char **argv)
-***************
-*** 133,138 ****
---- 133,146 ----
- if (fd != 3 && fd != 4)
- close (fd);
-
-+ #ifdef __ELF__
-+ if (mmap((void *)4096, 1024 * 1024, PROT_READ|PROT_WRITE,
-+ MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, (off_t)0) == MAP_FAILED) {
-+ perror("mmap botch");
-+ quit(1);
-+ }
-+ #endif
-+
- fd = -1;
-
- debug_set(0); /* debug any D_TRAPS without intnum */
-***************
-*** 581,587 ****
---- 589,599 ----
- 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) {
+--- doscmd.c.orig Thu May 2 21:37:33 1996
++++ doscmd.c
+@@ -100,7 +100,7 @@
+ char *dos_path = 0;
+ char cmdname[256];
+
+-char *memfile = "/tmp/doscmd.XXXXXX";
++char memfile[] = "/tmp/doscmd.XXXXXX";
+
+ int
+ main(int argc, char **argv)
+@@ -133,6 +133,14 @@
+ if (fd != 3 && fd != 4)
+ close (fd);
+
++#ifdef __ELF__
++ if (mmap((void *)4096, 1024 * 1024, PROT_READ|PROT_WRITE,
++ MAP_ANON|MAP_FIXED|MAP_PRIVATE, -1, (off_t)0) == MAP_FAILED) {
++ perror("mmap botch");
++ quit(1);
++ }
++#endif
++
+ fd = -1;
+
+ debug_set(0); /* debug any D_TRAPS without intnum */
+@@ -581,7 +589,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) {
diff --git a/emulators/doscmd/patches/patch-ag b/emulators/doscmd/patches/patch-ag
index 56f28007a59..8974ccacb0f 100644
--- a/emulators/doscmd/patches/patch-ag
+++ b/emulators/doscmd/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.1 1998/11/29 23:39:30 sommerfe Exp $
+$NetBSD: patch-ag,v 1.2 2001/03/16 13:58:58 wiz Exp $
---- AsyncIO.c Thu May 2 02:51:00 1996
-+++ /tmp/AsyncIO.c Sun Nov 29 18:28:44 1998
+--- AsyncIO.c.orig Thu May 2 08:51:00 1996
++++ AsyncIO.c
@@ -320,6 +320,7 @@
abort();
}