1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

Fix all the paths in context diff headers and remove the Index

lines, since the WORTHLESS, BROKEN new version of patch ignores
them.
This commit is contained in:
John Polstra 1998-01-17 21:12:15 +00:00
parent 2b3886b910
commit f118640d86
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=9363
27 changed files with 105 additions and 159 deletions

View File

@ -1,8 +1,7 @@
This patch corrects some errors in the Usignal interface for FreeBSD.
Index: m3/m3core/src/unix/freebsd-2/Usignal.i3
--- Usignal.i3.orig Mon Aug 12 15:47:48 1996
+++ Usignal.i3 Thu Jul 10 18:38:06 1997
--- m3/m3core/src/unix/freebsd-2/Usignal.i3.orig Mon Aug 12 15:47:48 1996
+++ m3/m3core/src/unix/freebsd-2/Usignal.i3 Thu Jul 10 18:38:06 1997
@@ -12,8 +12,6 @@
(*** <signal.h> ***)

View File

@ -1,12 +1,11 @@
Eliminate a compiler warning under FreeBSD.
Index: m3/quake/src/utils.c
===================================================================
RCS file: /home/jdp/m3-cvs/m3/quake/src/utils.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 utils.c
--- utils.c 1996/09/24 05:22:00 1.1.1.1
+++ utils.c 1996/09/24 05:32:34
--- m3/quake/src/utils.c.orig 1996/09/24 05:22:00 1.1.1.1
+++ m3/quake/src/utils.c 1996/09/24 05:32:34
@@ -10,7 +10,7 @@
*/

View File

@ -6,9 +6,8 @@ Fix numerous argument declarations to agree with their prototypes.
Fix the wrapper for ftruncate so that it deals properly with the 64-bit
arguments.
Index: m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c
--- RTHeapDepC.c.orig Sat Mar 23 14:52:21 1996
+++ RTHeapDepC.c Wed Sep 24 08:39:00 1997
--- m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c.orig Sat Mar 23 14:52:21 1996
+++ m3/m3core/src/runtime/FreeBSD2/RTHeapDepC.c Wed Sep 24 08:39:00 1997
@@ -80,7 +80,8 @@
#include <sys/file.h>
#include <sys/param.h>

View File

@ -5,8 +5,8 @@ Index: m3/coverage/src/analyze_coverage.c
RCS file: /home/jdp/m3-cvs/m3/coverage/src/analyze_coverage.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 analyze_coverage.c
--- analyze_coverage.c 1996/09/24 05:21:54 1.1.1.1
+++ analyze_coverage.c 1996/09/24 05:32:35
--- m3/coverage/src/analyze_coverage.c.orig 1996/09/24 05:21:54 1.1.1.1
+++ m3/coverage/src/analyze_coverage.c 1996/09/24 05:32:35
@@ -15,8 +15,6 @@
#endif
#include <stdio.h>

View File

@ -1,8 +1,7 @@
Update the m3build templates for FreeBSD-2.1 and later.
Index: m3/m3build/templates/COMMON
--- COMMON.orig Fri Feb 9 14:23:04 1996
+++ COMMON Fri Oct 25 13:48:57 1996
--- m3/m3build/templates/COMMON.orig Fri Feb 9 14:23:04 1996
+++ m3/m3build/templates/COMMON Fri Oct 25 13:48:57 1996
@@ -998,7 +998,7 @@
if HAVE_PKGTOOLS
_install_file (src, dest, "0755", "T")
@ -12,9 +11,8 @@ Index: m3/m3build/templates/COMMON
SL, BUILD_DIR, SL, src)
local link = format ("%s%s%s", dest, SL, src)
>> M3SHIP_FILE in
Index: m3/m3build/templates/FreeBSD2
--- FreeBSD2.orig Thu Jun 20 12:17:07 1996
+++ FreeBSD2 Fri Oct 25 13:47:16 1996
--- m3/m3build/templates/FreeBSD2.orig Thu Jun 20 12:17:07 1996
+++ m3/m3build/templates/FreeBSD2 Fri Oct 25 13:47:16 1996
@@ -8,8 +8,9 @@
% Modified On Thu Apr 8 13:45:49 PDT 1993 by muller
%

View File

@ -1,13 +1,12 @@
Fix the mapping from M3 platform to GNU configure target, for FreeBSD.
This particularly helps with m3gdb.
Index: m3/m3build/templates/PLATFORMS
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3build/templates/PLATFORMS,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 PLATFORMS
--- PLATFORMS 1996/09/24 05:28:51 1.1.1.2
+++ PLATFORMS 1996/09/24 05:34:56
--- m3/m3build/templates/PLATFORMS.orig 1996/09/24 05:28:51 1.1.1.2
+++ m3/m3build/templates/PLATFORMS 1996/09/24 05:34:56
@@ -10,7 +10,7 @@
"ARM" : [ "POSIX", "32BITS", "arm--riscos" ],
"DS3100" : [ "POSIX", "32BITS", "decstation" ],

View File

@ -1,12 +1,11 @@
Fix an erroneous structure declaration for FreeBSD.
Index: m3/m3core/src/C/FreeBSD2/Cstdio.i3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3core/src/C/FreeBSD2/Cstdio.i3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Cstdio.i3
--- Cstdio.i3 1996/09/24 05:21:57 1.1.1.1
+++ Cstdio.i3 1996/09/24 05:32:37
--- m3/m3core/src/C/FreeBSD2/Cstdio.i3.orig 1996/09/24 05:21:57 1.1.1.1
+++ m3/m3core/src/C/FreeBSD2/Cstdio.i3 1996/09/24 05:32:37
@@ -55,6 +55,7 @@
(* Unix stdio files get aligned to block boundaries on fseek() *)
blksize : int; (* stat.st_blksize (may be != _bf._size) *)

View File

@ -1,9 +1,8 @@
Changes to what is built by default in the FreeBSD port.
Index: m3/src/m3makefile
===================================================================
--- m3makefile.orig Tue Sep 17 16:47:59 1996
+++ m3makefile Wed Sep 25 17:14:37 1996
--- m3/src/m3makefile.orig Tue Sep 17 16:47:59 1996
+++ m3/src/m3makefile Wed Sep 25 17:14:37 1996
@@ -83,6 +83,12 @@
% requires:
BuildChunk ("m3core")

View File

@ -3,13 +3,12 @@ are available. The original algorithm came up with some really ugly
scaled fonts sometimes, even when an equally suitable unscaled
alternative was available.
Index: m3/ui/src/xvbt/XScrnFont.m3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/ui/src/xvbt/XScrnFont.m3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 XScrnFont.m3
--- XScrnFont.m3 1996/09/24 05:22:01 1.1.1.1
+++ XScrnFont.m3 1996/09/24 05:32:38
--- m3/ui/src/xvbt/XScrnFont.m3.orig 1996/09/24 05:22:01 1.1.1.1
+++ m3/ui/src/xvbt/XScrnFont.m3 1996/09/24 05:32:38
@@ -193,12 +193,16 @@
PROCEDURE FontLookup (orc: FontOracle; name: TEXT): ScrnFont.T

View File

@ -5,13 +5,12 @@ the Modula-3 installation directory, by simply building a new shared
library for "m3configvars". With this approach, there is no need to
recompile or even relink applications.
Index: m3/m3configvars/src/COPYRIGHT
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3configvars/src/COPYRIGHT,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 COPYRIGHT
--- COPYRIGHT 1996/09/24 05:21:56 1.1.1.1
+++ COPYRIGHT 1996/09/24 05:32:39
--- m3/m3configvars/src/COPYRIGHT.orig 1996/09/24 05:21:56 1.1.1.1
+++ m3/m3configvars/src/COPYRIGHT 1996/09/24 05:32:39
@@ -0,0 +1,93 @@
+
+ Digital License Agreement
@ -106,13 +105,12 @@ diff -u -r1.1.1.1 COPYRIGHT
+13. Should you have any questions concerning this Agreement, or if you
+ desire to contact Digital for any reason, please do so via E-mail:
+ M3-REQUEST@SRC.DEC.COM.
Index: m3/m3configvars/src/M3ConfigVars.i3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3configvars/src/M3ConfigVars.i3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 M3ConfigVars.i3
--- M3ConfigVars.i3 1996/09/24 05:21:56 1.1.1.1
+++ M3ConfigVars.i3 1996/09/24 05:32:39
--- m3/m3configvars/src/M3ConfigVars.i3.orig 1996/09/24 05:21:56 1.1.1.1
+++ m3/m3configvars/src/M3ConfigVars.i3 1996/09/24 05:32:39
@@ -0,0 +1,41 @@
+(* Copyright (C) 1994, Digital Equipment Corporation *)
+(* All rights reserved. *)
@ -155,13 +153,12 @@ diff -u -r1.1.1.1 M3ConfigVars.i3
+ HTML_USE: TEXT;
+
+END M3ConfigVars.
Index: m3/m3configvars/src/m3makefile
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3configvars/src/m3makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m3makefile
--- m3makefile 1996/09/24 05:21:56 1.1.1.1
+++ m3makefile 1996/09/24 05:32:39
--- m3/m3configvars/src/m3makefile.orig 1996/09/24 05:21:56 1.1.1.1
+++ m3/m3configvars/src/m3makefile 1996/09/24 05:32:39
@@ -0,0 +1,57 @@
+% Copyright (C) 1994, Digital Equipment Corporation
+% All rights reserved.

View File

@ -1,9 +1,8 @@
This patch modifies m3browser to use the new "m3configvars" package.
Index: m3/m3browser/src/Main.m3
===================================================================
--- Main.m3.orig Mon Feb 5 10:49:57 1996
+++ Main.m3 Tue Sep 24 15:39:45 1996
--- m3/m3browser/src/Main.m3.orig Mon Feb 5 10:49:57 1996
+++ m3/m3browser/src/Main.m3 Tue Sep 24 15:39:45 1996
@@ -13,13 +13,12 @@
IMPORT Text, Rd, Wr, TextRd, Thread, Time, Fmt, IntRefTbl, IntList;
@ -33,12 +32,11 @@ Index: m3/m3browser/src/Main.m3
n_workers := 3;
refresh_interval := 30.0d0; (* minutes *)
start_time := Time.Now ();
Index: m3/m3browser/src/m3makefile
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3browser/src/m3makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m3makefile
--- m3/m3browser/src/m3makefile 1996/09/24 05:21:56 1.1.1.1
--- m3/m3browser/src/m3makefile.orig 1996/09/24 05:21:56 1.1.1.1
+++ m3/m3browser/src/m3makefile 1996/09/24 05:32:39
@@ -6,6 +6,7 @@

View File

@ -1,12 +1,11 @@
Changes to "m3tohtml" to use the new "m3configvars" package.
Index: m3/m3tohtml/src/Main.m3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3tohtml/src/Main.m3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Main.m3
--- Main.m3 1996/09/24 05:22:00 1.1.1.1
+++ Main.m3 1996/09/24 05:32:40
--- m3/m3tohtml/src/Main.m3.orig 1996/09/24 05:22:00 1.1.1.1
+++ m3/m3tohtml/src/Main.m3 1996/09/24 05:32:40
@@ -7,7 +7,7 @@
MODULE Main;
@ -53,12 +52,11 @@ diff -u -r1.1.1.1 Main.m3
filename := "derived" & Text.Sub (filename, i);
END;
RETURN filename;
Index: m3/m3tohtml/src/m3makefile
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3tohtml/src/m3makefile,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 m3makefile
--- m3/m3tohtml/src/m3makefile 1996/09/24 05:29:00 1.1.1.2
--- m3/m3tohtml/src/m3makefile.orig 1996/09/24 05:29:00 1.1.1.2
+++ m3/m3tohtml/src/m3makefile 1996/09/24 05:35:10
@@ -10,6 +10,7 @@
% m3_option ("-Y0@/udir/kalsow/pkg/m3/compiler/DS/m3c@-tDS3100@")

View File

@ -1,9 +1,8 @@
Fix many incorrect things in the Usocket interface for FreeBSD.
Also make provisions for using SOCKS.
Index: m3/m3core/src/unix/freebsd-2/Usocket.i3
--- Usocket.i3.orig Sat Jan 7 14:22:22 1995
+++ Usocket.i3 Thu Oct 24 16:04:43 1996
--- m3/m3core/src/unix/freebsd-2/Usocket.i3.orig Sat Jan 7 14:22:22 1995
+++ m3/m3core/src/unix/freebsd-2/Usocket.i3 Thu Oct 24 16:04:43 1996
@@ -30,28 +30,30 @@
(*
* Option flags per-socket.

View File

@ -1,13 +1,12 @@
Fix some things in the Uin interface for FreeBSD. Most important is the
change to "struct_sockaddr_in".
Index: m3/m3core/src/unix/freebsd-2/Uin.i3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3core/src/unix/freebsd-2/Uin.i3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Uin.i3
--- Uin.i3 1996/09/24 05:22:00 1.1.1.1
+++ Uin.i3 1996/09/24 05:32:41
--- m3/m3core/src/unix/freebsd-2/Uin.i3.orig 1996/09/24 05:22:00 1.1.1.1
+++ m3/m3core/src/unix/freebsd-2/Uin.i3 1996/09/24 05:32:41
@@ -8,7 +8,7 @@
INTERFACE Uin;

View File

@ -1,12 +1,11 @@
Correct some errno declarations for FreeBSD.
Index: m3/m3core/src/unix/freebsd-2/Uerror.i3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3core/src/unix/freebsd-2/Uerror.i3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Uerror.i3
--- Uerror.i3 1996/09/24 05:22:00 1.1.1.1
+++ Uerror.i3 1996/09/24 05:32:41
--- m3/m3core/src/unix/freebsd-2/Uerror.i3.orig 1996/09/24 05:22:00 1.1.1.1
+++ m3/m3core/src/unix/freebsd-2/Uerror.i3 1996/09/24 05:32:41
@@ -23,7 +23,7 @@
ENOEXEC = 8; (* Exec format error *)
EBADF = 9; (* Bad file number *)

View File

@ -1,11 +1,10 @@
Bugfix from SRC for uninitialized "FS.DirectoryFileType" variable.
Index: m3/libm3/src/os/Common/m3makefile
===================================================================
RCS file: /home/jdp/m3-cvs/m3/libm3/src/os/Common/m3makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 m3makefile
--- m3/libm3/src/os/Common/m3makefile 1996/09/24 05:21:55 1.1.1.1
--- m3/libm3/src/os/Common/m3makefile.orig 1996/09/24 05:21:55 1.1.1.1
+++ m3/libm3/src/os/Common/m3makefile 1996/09/24 05:32:42
@@ -19,6 +19,7 @@
Interface(Terminal)

View File

@ -1,12 +1,11 @@
Fix incorrect layout for the Udir.dirent structure.
Index: m3/m3core/src/unix/freebsd-2/Udir.i3
===================================================================
RCS file: /home/jdp/m3-cvs/m3/m3core/src/unix/freebsd-2/Udir.i3,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Udir.i3
--- Udir.i3 1996/09/24 05:22:00 1.1.1.1
+++ Udir.i3 1996/09/24 05:32:44
--- m3/m3core/src/unix/freebsd-2/Udir.i3.orig 1996/09/24 05:22:00 1.1.1.1
+++ m3/m3core/src/unix/freebsd-2/Udir.i3 1996/09/24 05:32:44
@@ -40,10 +40,10 @@
*)
TYPE

View File

@ -8,7 +8,6 @@ core dumps.
This also adds separate wrapper files for network related functions to the
m3makefile, for SOCKS support.
Index: m3/m3core/src/runtime/FreeBSD2/m3makefile
--- m3/m3core/src/runtime/FreeBSD2/m3makefile.orig Tue Sep 17 16:48:03 1996
+++ m3/m3core/src/runtime/FreeBSD2/m3makefile Thu Oct 24 16:11:02 1996
@@ -13,6 +13,30 @@
@ -42,9 +41,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/m3makefile
%% s_source (RTStackASM)
Index: m3/m3core/src/runtime/FreeBSD2/malloc.c
--- malloc.c.orig Mon Jul 28 14:36:20 1997
+++ malloc.c Thu Sep 4 22:15:00 1997
--- m3/m3core/src/runtime/FreeBSD2/malloc.c.orig Mon Jul 28 14:36:20 1997
+++ m3/m3core/src/runtime/FreeBSD2/malloc.c Thu Sep 4 22:15:00 1997
@@ -0,0 +1,1153 @@
+/*
+ * ----------------------------------------------------------------------------

View File

@ -9,9 +9,8 @@ Bug fix from SRC:
two array types are not assignable if they have different base
indices, even if they have the same size.
Index: m3/m3front/src/types/ArrayType.m3
--- ArrayType.m3.orig Tue May 23 15:24:27 1995
+++ ArrayType.m3 Mon Sep 30 11:12:31 1996
--- m3/m3front/src/types/ArrayType.m3.orig Tue May 23 15:24:27 1995
+++ m3/m3front/src/types/ArrayType.m3 Mon Sep 30 11:12:31 1996
@@ -286,7 +286,9 @@
a := Reduce (ta); b := Reduce (tb);
IF (a = NIL) OR (b = NIL) THEN EXIT END;
@ -23,9 +22,8 @@ Index: m3/m3front/src/types/ArrayType.m3
END;
ta := a.element;
tb := b.element;
Index: m3/m3front/src/types/OpenArrayType.m3
--- OpenArrayType.m3.orig Tue May 23 15:24:22 1995
+++ OpenArrayType.m3 Mon Sep 30 11:13:12 1996
--- m3/m3front/src/types/OpenArrayType.m3.orig Tue May 23 15:24:22 1995
+++ m3/m3front/src/types/OpenArrayType.m3 Mon Sep 30 11:13:12 1996
@@ -188,7 +188,9 @@
(* peel off the fixed dimensions as long as the sizes are equal *)

View File

@ -1,9 +1,8 @@
New wrapper files for network related functions. These are separated so
that they can be easily overridden when SOCKS support is desired.
Index: m3/m3core/src/runtime/FreeBSD2/accept.c
--- accept.c.orig Thu Oct 24 13:11:22 1996
+++ accept.c Thu Oct 24 12:47:29 1996
--- m3/m3core/src/runtime/FreeBSD2/accept.c.orig Thu Oct 24 13:11:22 1996
+++ m3/m3core/src/runtime/FreeBSD2/accept.c Thu Oct 24 12:47:29 1996
@@ -0,0 +1,16 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -21,9 +20,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/accept.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/bind.c
--- bind.c.orig Thu Oct 24 13:11:23 1996
+++ bind.c Thu Oct 24 12:48:12 1996
--- m3/m3core/src/runtime/FreeBSD2/bind.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/bind.c Thu Oct 24 12:48:12 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -40,9 +38,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/bind.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/close.c
--- close.c.orig Thu Oct 24 13:11:23 1996
+++ close.c Thu Oct 24 12:48:51 1996
--- m3/m3core/src/runtime/FreeBSD2/close.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/close.c Thu Oct 24 12:48:51 1996
@@ -0,0 +1,13 @@
+#include "wrap.h"
+#include <unistd.h>
@ -57,9 +54,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/close.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/connect.c
--- connect.c.orig Thu Oct 24 13:11:23 1996
+++ connect.c Thu Oct 24 12:49:40 1996
--- m3/m3core/src/runtime/FreeBSD2/connect.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/connect.c Thu Oct 24 12:49:40 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -76,9 +72,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/connect.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/dup.c
--- dup.c.orig Thu Oct 24 13:11:23 1996
+++ dup.c Thu Oct 24 12:50:09 1996
--- m3/m3core/src/runtime/FreeBSD2/dup.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/dup.c Thu Oct 24 12:50:09 1996
@@ -0,0 +1,13 @@
+#include "wrap.h"
+#include <unistd.h>
@ -93,9 +88,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/dup.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/dup2.c
--- dup2.c.orig Thu Oct 24 13:11:23 1996
+++ dup2.c Thu Oct 24 12:50:28 1996
--- m3/m3core/src/runtime/FreeBSD2/dup2.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/dup2.c Thu Oct 24 12:50:28 1996
@@ -0,0 +1,13 @@
+#include "wrap.h"
+#include <unistd.h>
@ -110,9 +104,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/dup2.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/gethostbyaddr.c
--- gethostbyaddr.c.orig Thu Oct 24 16:07:10 1996
+++ gethostbyaddr.c Thu Oct 24 16:10:19 1996
--- m3/m3core/src/runtime/FreeBSD2/gethostbyaddr.c.orig Thu Oct 24 16:07:10 1996
+++ m3/m3core/src/runtime/FreeBSD2/gethostbyaddr.c Thu Oct 24 16:10:19 1996
@@ -0,0 +1,14 @@
+#include "wrap.h"
+#include <netdb.h>
@ -128,9 +121,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/gethostbyaddr.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/gethostbyname.c
--- gethostbyname.c.orig Thu Oct 24 13:11:23 1996
+++ gethostbyname.c Thu Oct 24 16:08:41 1996
--- m3/m3core/src/runtime/FreeBSD2/gethostbyname.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/gethostbyname.c Thu Oct 24 16:08:41 1996
@@ -0,0 +1,14 @@
+#include "wrap.h"
+#include <netdb.h>
@ -146,9 +138,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/gethostbyname.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/getpeername.c
--- getpeername.c.orig Thu Oct 24 13:11:23 1996
+++ getpeername.c Thu Oct 24 12:52:25 1996
--- m3/m3core/src/runtime/FreeBSD2/getpeername.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/getpeername.c Thu Oct 24 12:52:25 1996
@@ -0,0 +1,16 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -166,9 +157,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/getpeername.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/getsockname.c
--- getsockname.c.orig Thu Oct 24 13:11:23 1996
+++ getsockname.c Thu Oct 24 12:52:56 1996
--- m3/m3core/src/runtime/FreeBSD2/getsockname.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/getsockname.c Thu Oct 24 12:52:56 1996
@@ -0,0 +1,16 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -186,9 +176,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/getsockname.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/listen.c
--- listen.c.orig Thu Oct 24 13:11:23 1996
+++ listen.c Thu Oct 24 12:53:42 1996
--- m3/m3core/src/runtime/FreeBSD2/listen.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/listen.c Thu Oct 24 12:53:42 1996
@@ -0,0 +1,14 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -204,9 +193,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/listen.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/read.c
--- read.c.orig Thu Oct 24 13:11:23 1996
+++ read.c Thu Oct 24 12:55:56 1996
--- m3/m3core/src/runtime/FreeBSD2/read.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/read.c Thu Oct 24 12:55:56 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -223,9 +211,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/read.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/recv.c
--- recv.c.orig Thu Oct 24 13:11:23 1996
+++ recv.c Thu Oct 24 12:56:57 1996
--- m3/m3core/src/runtime/FreeBSD2/recv.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/recv.c Thu Oct 24 12:56:57 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -242,9 +229,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/recv.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/recvfrom.c
--- recvfrom.c.orig Thu Oct 24 13:11:23 1996
+++ recvfrom.c Thu Oct 24 12:58:10 1996
--- m3/m3core/src/runtime/FreeBSD2/recvfrom.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/recvfrom.c Thu Oct 24 12:58:10 1996
@@ -0,0 +1,18 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -264,9 +250,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/recvfrom.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/select.c
--- select.c.orig Thu Oct 24 13:11:23 1996
+++ select.c Thu Oct 24 12:59:17 1996
--- m3/m3core/src/runtime/FreeBSD2/select.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/select.c Thu Oct 24 12:59:17 1996
@@ -0,0 +1,20 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -288,9 +273,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/select.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/send.c
--- send.c.orig Thu Oct 24 13:11:23 1996
+++ send.c Thu Oct 24 13:00:25 1996
--- m3/m3core/src/runtime/FreeBSD2/send.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/send.c Thu Oct 24 13:00:25 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -307,9 +291,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/send.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/sendto.c
--- sendto.c.orig Thu Oct 24 13:11:23 1996
+++ sendto.c Thu Oct 24 13:01:18 1996
--- m3/m3core/src/runtime/FreeBSD2/sendto.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/sendto.c Thu Oct 24 13:01:18 1996
@@ -0,0 +1,17 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -328,9 +311,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/sendto.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/shutdown.c
--- shutdown.c.orig Thu Oct 24 13:11:23 1996
+++ shutdown.c Thu Oct 24 13:01:40 1996
--- m3/m3core/src/runtime/FreeBSD2/shutdown.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/shutdown.c Thu Oct 24 13:01:40 1996
@@ -0,0 +1,14 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -346,9 +328,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/shutdown.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/socket.c
--- socket.c.orig Thu Oct 24 16:11:12 1996
+++ socket.c Thu Oct 24 16:12:22 1996
--- m3/m3core/src/runtime/FreeBSD2/socket.c.orig Thu Oct 24 16:11:12 1996
+++ m3/m3core/src/runtime/FreeBSD2/socket.c Thu Oct 24 16:12:22 1996
@@ -0,0 +1,14 @@
+#include "wrap.h"
+#include <sys/types.h>
@ -364,9 +345,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/socket.c
+ EXIT_CRITICAL;
+ return result;
+}
Index: m3/m3core/src/runtime/FreeBSD2/socksconf.h
--- socksconf.h.orig Fri Oct 25 14:05:03 1996
+++ socksconf.h Fri Oct 25 14:05:28 1996
--- m3/m3core/src/runtime/FreeBSD2/socksconf.h.orig Fri Oct 25 14:05:03 1996
+++ m3/m3core/src/runtime/FreeBSD2/socksconf.h Fri Oct 25 14:05:28 1996
@@ -0,0 +1,6 @@
+/*
+ * Define 0 or 1 of these, to select the variety of SOCKS support you want.
@ -374,9 +354,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/socksconf.h
+#undef HPSOCKS
+#undef SOCKS4
+#undef SOCKS5
Index: m3/m3core/src/runtime/FreeBSD2/wrap.h
--- wrap.h.orig Thu Oct 24 20:50:16 1996
+++ wrap.h Fri Oct 25 14:04:13 1996
--- m3/m3core/src/runtime/FreeBSD2/wrap.h.orig Thu Oct 24 20:50:16 1996
+++ m3/m3core/src/runtime/FreeBSD2/wrap.h Fri Oct 25 14:04:13 1996
@@ -0,0 +1,61 @@
+#include "socksconf.h"
+
@ -439,9 +418,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/wrap.h
+
+#define MAKE_WRITABLE(x) \
+ if ((int)x) { *(char*)(x) = RTHeapDepC__c = *(char*)(x); }
Index: m3/m3core/src/runtime/FreeBSD2/write.c
--- write.c.orig Thu Oct 24 13:11:23 1996
+++ write.c Thu Oct 24 13:02:24 1996
--- m3/m3core/src/runtime/FreeBSD2/write.c.orig Thu Oct 24 13:11:23 1996
+++ m3/m3core/src/runtime/FreeBSD2/write.c Thu Oct 24 13:02:24 1996
@@ -0,0 +1,15 @@
+#include "wrap.h"
+#include <sys/types.h>

View File

@ -1,9 +1,8 @@
Support for SOCKS wrappers in Unix.i3.
Also add some missing system call declarations.
Index: m3/m3core/src/unix/freebsd-2/Unix.i3
--- Unix.i3.orig Sat Jan 7 14:41:42 1995
+++ Unix.i3 Thu Jul 10 18:32:36 1997
--- m3/m3core/src/unix/freebsd-2/Unix.i3.orig Sat Jan 7 14:41:42 1995
+++ m3/m3core/src/unix/freebsd-2/Unix.i3 Thu Jul 10 18:32:36 1997
@@ -84,9 +84,10 @@
<*EXTERNAL*> PROCEDURE fchmod (fd, mode: mode_t): int;
(* ok *)

View File

@ -1,8 +1,7 @@
Support for SOCKS wrappers in Uuio.i3.
Index: m3/m3core/src/unix/freebsd-2/Uuio.i3
--- Uuio.i3.orig Sat Jan 7 14:22:23 1995
+++ Uuio.i3 Tue Oct 8 14:22:15 1996
--- m3/m3core/src/unix/freebsd-2/Uuio.i3.orig Sat Jan 7 14:22:23 1995
+++ m3/m3core/src/unix/freebsd-2/Uuio.i3 Tue Oct 8 14:22:15 1996
@@ -50,13 +50,17 @@
(*** read, readv(2) - read from a file ***)

View File

@ -1,8 +1,7 @@
Support for SOCKS wrappers in Unetdb.i3.
Index: m3/m3core/src/unix/freebsd-2/Unetdb.i3
--- Unetdb.i3.orig Sat Jan 7 14:22:19 1995
+++ Unetdb.i3 Thu Oct 24 16:05:40 1996
--- m3/m3core/src/unix/freebsd-2/Unetdb.i3.orig Sat Jan 7 14:22:19 1995
+++ m3/m3core/src/unix/freebsd-2/Unetdb.i3 Thu Oct 24 16:05:40 1996
@@ -88,10 +88,10 @@
(*** gethostent(3n), gethostbyaddr(3n), gethostbyname(3n),
sethostent(3n), endhostent(3n) - get network host entry ***)

View File

@ -4,9 +4,8 @@ procedure is invoked.
This patch has been sent to SRC.
Index: m3/vbtkit/src/etext/TextPortClass.m3
--- TextPortClass.m3- Mon Jan 30 14:34:34 1995
+++ TextPortClass.m3 Thu May 8 17:20:58 1997
--- m3/vbtkit/src/etext/TextPortClass.m3.orig Mon Jan 30 14:34:34 1995
+++ m3/vbtkit/src/etext/TextPortClass.m3 Thu May 8 17:20:58 1997
@@ -271,8 +271,12 @@
left := MTextUnit.StartOfLine (v.vtext.mtext, here);
BEGIN

View File

@ -1,9 +1,8 @@
This patch uses the sigaction interface to gain access to the PC value
so that it can be printed out when a fatal signal occurs.
Index: m3/m3core/src/runtime/FreeBSD2/RTSignal.m3
--- RTSignal.m3.orig Mon Nov 21 10:31:19 1994
+++ RTSignal.m3 Thu Jul 10 14:24:59 1997
--- m3/m3core/src/runtime/FreeBSD2/RTSignal.m3.orig Mon Nov 21 10:31:19 1994
+++ m3/m3core/src/runtime/FreeBSD2/RTSignal.m3 Thu Jul 10 14:24:59 1997
@@ -7,18 +7,21 @@
UNSAFE MODULE RTSignal;

View File

@ -1,8 +1,7 @@
Add chflags(2) and fchflags(2) to Ustat.i3.
Index: m3/m3core/src/unix/freebsd-2/Ustat.i3
--- Ustat.i3.orig Wed Mar 15 16:47:47 1995
+++ Ustat.i3 Thu Jul 10 18:41:32 1997
--- m3/m3core/src/unix/freebsd-2/Ustat.i3.orig Wed Mar 15 16:47:47 1995
+++ m3/m3core/src/unix/freebsd-2/Ustat.i3 Thu Jul 10 18:41:32 1997
@@ -70,4 +70,26 @@
<*EXTERNAL*> PROCEDURE fstat (fd: int; buf: struct_stat_star): int;

View File

@ -12,9 +12,8 @@ values for window size while resizing it.
I have sent this patch to DEC SRC.
Index: m3/ui/src/xvbt/XClient.m3
--- XClient.m3.orig Mon Mar 6 17:44:15 1995
+++ XClient.m3 Mon Jul 28 13:45:30 1997
--- m3/ui/src/xvbt/XClient.m3.orig Mon Mar 6 17:44:15 1995
+++ m3/ui/src/xvbt/XClient.m3 Mon Jul 28 13:45:30 1997
@@ -520,7 +520,7 @@
BEGIN
ur.sh := sh;