I botched my previous update of the thread safe malloc, making it

not thread safe at all.  This commit repairs the damage.

This changes the minor version numbers of the Modula-3 shared
libraries.  The packages that depend on modula-3-lib will need to
be rebuilt:

    net/cvsup
    print/virtualpaper

5 files changed, 51 insertions, 49 deletions

diff --git a/lang/modula-3-lib/files/patch-ah b/lang/modula-3-lib/files/patch-ah
index b0cba113a278..899d605c3a80 100644
--- a/lang/modula-3-lib/files/patch-ah
+++ b/lang/modula-3-lib/files/patch-ah
@@ -195,7 +195,7 @@ Index: m3/m3build/templates/FreeBSD2
  proc after_library_hooks(x) is
    local lib_a  = format ("lib%s.a", x)
 -  local lib_so = format ("lib%s.so.1.1", x)
-+  local lib_so = format ("lib%s.so.4.2", x)
++  local lib_so = format ("lib%s.so.4.3", x)
    local dest = format ("%s%s%s%s%s", PKG_INSTALL, SL, BUILD_PACKAGE,
                                                        SL, BUILD_DIR)
  
diff --git a/lang/modula-3-lib/files/patch-bg b/lang/modula-3-lib/files/patch-bg
index 898f23fc4b5a..ab90ed87437d 100644
--- a/lang/modula-3-lib/files/patch-bg
+++ b/lang/modula-3-lib/files/patch-bg
@@ -43,9 +43,9 @@ Index: m3/m3core/src/runtime/FreeBSD2/m3makefile
  %% s_source (RTStackASM)
  
 Index: m3/m3core/src/runtime/FreeBSD2/malloc.c
---- malloc.c.orig	Thu May  8 17:39:18 1997
-+++ malloc.c	Sat Jun 28 10:59:29 1997
-@@ -0,0 +1,1140 @@
+--- malloc.c.orig	Fri Jul  4 08:51:34 1997
++++ malloc.c	Fri Jul  4 08:53:21 1997
+@@ -0,0 +1,1142 @@
 +/*
 + * ----------------------------------------------------------------------------
 + * "THE BEER-WARE LICENSE" (Revision 42):
@@ -59,6 +59,8 @@ Index: m3/m3core/src/runtime/FreeBSD2/malloc.c
 + *
 + */
 +
++#define _THREAD_SAFE	1	/* Turn on thread safety for Modula-3 */
++
 +/*
 + * Defining EXTRA_SANITY will enable extra checks which are related
 + * to internal conditions and consistency in malloc.c. This has a
diff --git a/lang/modula-3-lib/pkg-plist b/lang/modula-3-lib/pkg-plist
index 96d59d7f6aa1..67fd12f99074 100644
--- a/lang/modula-3-lib/pkg-plist
+++ b/lang/modula-3-lib/pkg-plist
@@ -1,43 +1,43 @@
 etc/rc.d/50.m3.sh
-lib/m3/FreeBSD2/libDiGraph.so.4.2
-lib/m3/FreeBSD2/libGeometry.so.4.2
-lib/m3/FreeBSD2/libImages.so.4.2
-lib/m3/FreeBSD2/libTempFiles.so.4.2
-lib/m3/FreeBSD2/libjvideo.so.4.2
-lib/m3/FreeBSD2/libm3.so.4.2
-lib/m3/FreeBSD2/libm3X11R4.so.4.2
-lib/m3/FreeBSD2/libm3core.so.4.2
-lib/m3/FreeBSD2/libm3formsvbt.so.4.2
-lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.4.2
-lib/m3/FreeBSD2/libm3parseparams.so.4.2
-lib/m3/FreeBSD2/libm3tcp.so.4.2
-lib/m3/FreeBSD2/libm3tools.so.4.2
-lib/m3/FreeBSD2/libm3ui.so.4.2
-lib/m3/FreeBSD2/libm3vbtkit.so.4.2
-lib/m3/FreeBSD2/libset.so.4.2
-lib/m3/FreeBSD2/libtable-list.so.4.2
-lib/m3/FreeBSD2/libtcpextras.so.4.2
-lib/m3/FreeBSD2/libvideovbt.so.4.2
-lib/m3/FreeBSD2/libweb.so.4.2
-lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.4.2
-lib/m3/pkg/digraph/FreeBSD2/libDiGraph.so.4.2
-lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.4.2
-lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.4.2
-lib/m3/pkg/images/FreeBSD2/libImages.so.4.2
-lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.4.2
-lib/m3/pkg/libm3/FreeBSD2/libm3.so.4.2
-lib/m3/pkg/m3core/FreeBSD2/libm3core.so.4.2
-lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.4.2
-lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.4.2
-lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.4.2
-lib/m3/pkg/set/FreeBSD2/libset.so.4.2
-lib/m3/pkg/table-list/FreeBSD2/libtable-list.so.4.2
-lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.4.2
-lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.so.4.2
-lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.4.2
-lib/m3/pkg/ui/FreeBSD2/libm3ui.so.4.2
-lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.4.2
-lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.4.2
-lib/m3/pkg/web/FreeBSD2/libweb.so.4.2
+lib/m3/FreeBSD2/libDiGraph.so.4.3
+lib/m3/FreeBSD2/libGeometry.so.4.3
+lib/m3/FreeBSD2/libImages.so.4.3
+lib/m3/FreeBSD2/libTempFiles.so.4.3
+lib/m3/FreeBSD2/libjvideo.so.4.3
+lib/m3/FreeBSD2/libm3.so.4.3
+lib/m3/FreeBSD2/libm3X11R4.so.4.3
+lib/m3/FreeBSD2/libm3core.so.4.3
+lib/m3/FreeBSD2/libm3formsvbt.so.4.3
+lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.4.3
+lib/m3/FreeBSD2/libm3parseparams.so.4.3
+lib/m3/FreeBSD2/libm3tcp.so.4.3
+lib/m3/FreeBSD2/libm3tools.so.4.3
+lib/m3/FreeBSD2/libm3ui.so.4.3
+lib/m3/FreeBSD2/libm3vbtkit.so.4.3
+lib/m3/FreeBSD2/libset.so.4.3
+lib/m3/FreeBSD2/libtable-list.so.4.3
+lib/m3/FreeBSD2/libtcpextras.so.4.3
+lib/m3/FreeBSD2/libvideovbt.so.4.3
+lib/m3/FreeBSD2/libweb.so.4.3
+lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.4.3
+lib/m3/pkg/digraph/FreeBSD2/libDiGraph.so.4.3
+lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.4.3
+lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.4.3
+lib/m3/pkg/images/FreeBSD2/libImages.so.4.3
+lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.4.3
+lib/m3/pkg/libm3/FreeBSD2/libm3.so.4.3
+lib/m3/pkg/m3core/FreeBSD2/libm3core.so.4.3
+lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.4.3
+lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.4.3
+lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.4.3
+lib/m3/pkg/set/FreeBSD2/libset.so.4.3
+lib/m3/pkg/table-list/FreeBSD2/libtable-list.so.4.3
+lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.4.3
+lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.so.4.3
+lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.4.3
+lib/m3/pkg/ui/FreeBSD2/libm3ui.so.4.3
+lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.4.3
+lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.4.3
+lib/m3/pkg/web/FreeBSD2/libweb.so.4.3
 share/modula-3-lib/COPYRIGHT
 @exec /sbin/ldconfig -m %D/lib/m3/FreeBSD2
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index f96e2cf407d7..ea3f079e2c6b 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 Mar 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.12 1997/05/09 20:44:54 jdp Exp $
+# $Id: Makefile,v 1.13 1997/06/29 20:43:17 jdp Exp $
 #
 
 DISTNAME=	modula-3-3.6
@@ -22,7 +22,7 @@ NO_BUILD=	yes
 # Keep these in sync with the PLIST and with the library version numbers
 # in the modula-3-lib port.
 major=		4
-minor=		2
+minor=		3
 
 # The Modula-3 build process insists on installing each individual
 # component immediately after that component is built.  To avoid having
diff --git a/lang/modula-3/pkg-plist b/lang/modula-3/pkg-plist
index f28435afdaab..b038e2e78545 100644
--- a/lang/modula-3/pkg-plist
+++ b/lang/modula-3/pkg-plist
@@ -3,7 +3,7 @@ bin/formsedit
 bin/m3browser
 bin/m3build
 bin/m3build-4
-bin/m3build-4.2
+bin/m3build-4.3
 bin/m3bundle
 bin/m3pp
 bin/m3ship
@@ -16,7 +16,7 @@ bin/replayheap
 bin/showheap
 bin/shownew
 bin/showthread
-lib/m3/FreeBSD2/libm3configvars.so.4.2
+lib/m3/FreeBSD2/libm3configvars.so.4.3
 lib/m3/FreeBSD2/m3
 lib/m3/FreeBSD2/m3cgc1
 lib/m3/FreeBSD2/m3mkdir
@@ -313,7 +313,7 @@ lib/m3/pkg/m3configvars/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/m3configvars/FreeBSD2/.M3WEB
 lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.a
 lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.m3x
-lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.4.2
+lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.4.3
 lib/m3/pkg/m3configvars/src/M3ConfigVars.i3
 lib/m3/pkg/m3core/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/m3core/FreeBSD2/.M3IMPTAB