Update to new DEC SRC release 3.6.

Use new custom distfiles which are MUCH smaller than the ones from
DEC.

Use the gcc-2.7.2.1 sources on the system if they are found in
/usr/src/contrib, to avoid having to fetch that distfile.

Use an existing Modula-3 compiler to bootstrap the new one, if
there happens to be one installed on the system.  Again, this
eliminates the need to fetch one of the distfiles.

Update the built-in thread-safe malloc to the latest version of
phkmalloc.

2 files changed, 138 insertions, 66 deletions

diff --git a/lang/modula-3/pkg-descr b/lang/modula-3/pkg-descr
index 40023d3..e4081fa 100644
--- a/lang/modula-3/pkg-descr
+++ b/lang/modula-3/pkg-descr
@@ -1,4 +1,4 @@
-This is a port of Modula-3 release 3.5.3, from DEC Systems Research
+This is a port of Modula-3 release 3.6, from DEC Systems Research
 Center.  Modula-3 is a modern compiled programming language designed
 for systems programming as well as large applications.  Some notable
 features include:
@@ -34,11 +34,35 @@ A wealth of information about Modula-3 can be found at:
     http://www.research.digital.com/SRC/modula-3/html/home.html
 
 This port includes patches for a number of bugs found since the
-release of DEC SRC's version 3.5.3.  To save space and time, only
+release of DEC SRC's version 3.6.  To save space and time, only
 the most commonly-used subset of the DEC distribution is built and
-installed by this port.  That includes the standard libraries and
-the graphics packages, but not the (huge) separate projects such
-as netobj, zeus, obliq, and visual obliq.  You can change what is built
-by doing "make configure" and then editing "work/m3/src/m3makefile".
+installed by this port.  That includes the compiler, the standard
+libraries, and the graphics packages, but not the (huge) separate
+projects such as netobj, zeus, obliq, and visual obliq.  Specifically,
+the following packages are included:
 
--- John Polstra <jdp@polstra.com>
+    X11R4             m3browser         mtex              showthread
+    coverage          m3build           parseparams       src
+    digraph           m3bundle          pp                table-list
+    formsedit         m3core            quake             tcp
+    formsvbt          m3front           realgeometry      tcpextras
+    formsvbtpixmaps   m3linker          recordheap        tempfiles
+    images            m3middle          replayheap        ui
+    jvideo            m3tohtml          set               vbtkit
+    libm3             m3tools           showheap          videovbt
+    m3                m3totex           shownew           web
+
+To reduce download times, this port uses custom distfiles containing
+only the packages listed above.  Also, I have updated the code
+generator so that it is based on gcc-2.7.2.1.  If the gcc sources
+are found on the system, the port will use the system sources
+instead of downloading them.  Altogether, these changes reduce the
+size of the necessary distfiles from about 16 MB down to 2.7-4.5
+MB, depending on what is already installed on the system.
+
+If desired, the packages not included here can be built directly
+from the DEC distribution, in:
+
+    ftp://gatekeeper.dec.com/pub/DEC/Modula-3/release-3.6/m3.tar.gz
+
+John Polstra <jdp@polstra.com>
diff --git a/lang/modula-3/pkg-plist b/lang/modula-3/pkg-plist
index 5a45ab6..b31cc73 100644
--- a/lang/modula-3/pkg-plist
+++ b/lang/modula-3/pkg-plist
@@ -1,6 +1,5 @@
 bin/analyze_coverage
 bin/formsedit
-bin/llscan
 bin/m3browser
 bin/m3build
 bin/m3bundle
@@ -16,34 +15,37 @@ bin/showheap
 bin/shownew
 bin/showthread
 etc/rc.d/m3.sh
-lib/m3/FreeBSD2/libGeometry.so.2.0
-lib/m3/FreeBSD2/libImages.so.2.0
-lib/m3/FreeBSD2/libTempFiles.so.2.0
-lib/m3/FreeBSD2/libjvideo.so.2.0
-lib/m3/FreeBSD2/libm3.so.2.0
-lib/m3/FreeBSD2/libm3X11R4.so.2.0
-lib/m3/FreeBSD2/libm3configvars.so.2.0
-lib/m3/FreeBSD2/libm3core.so.2.0
-lib/m3/FreeBSD2/libm3formsvbt.so.2.0
-lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.2.0
-lib/m3/FreeBSD2/libm3parseparams.so.2.0
-lib/m3/FreeBSD2/libm3tcp.so.2.0
-lib/m3/FreeBSD2/libm3tools.so.2.0
-lib/m3/FreeBSD2/libm3ui.so.2.0
-lib/m3/FreeBSD2/libm3vbtkit.so.2.0
-lib/m3/FreeBSD2/libset.so.2.0
-lib/m3/FreeBSD2/libvideovbt.so.2.0
+lib/m3/FreeBSD2/libDiGraph.so.3.0
+lib/m3/FreeBSD2/libGeometry.so.3.0
+lib/m3/FreeBSD2/libImages.so.3.0
+lib/m3/FreeBSD2/libTempFiles.so.3.0
+lib/m3/FreeBSD2/libjvideo.so.3.0
+lib/m3/FreeBSD2/libm3.so.3.0
+lib/m3/FreeBSD2/libm3X11R4.so.3.0
+lib/m3/FreeBSD2/libm3configvars.so.3.0
+lib/m3/FreeBSD2/libm3core.so.3.0
+lib/m3/FreeBSD2/libm3formsvbt.so.3.0
+lib/m3/FreeBSD2/libm3formsvbtpixmaps.so.3.0
+lib/m3/FreeBSD2/libm3parseparams.so.3.0
+lib/m3/FreeBSD2/libm3tcp.so.3.0
+lib/m3/FreeBSD2/libm3tools.so.3.0
+lib/m3/FreeBSD2/libm3ui.so.3.0
+lib/m3/FreeBSD2/libm3vbtkit.so.3.0
+lib/m3/FreeBSD2/libset.so.3.0
+lib/m3/FreeBSD2/libtable-list.so.3.0
+lib/m3/FreeBSD2/libtcpextras.so.3.0
+lib/m3/FreeBSD2/libvideovbt.so.3.0
+lib/m3/FreeBSD2/libweb.so.3.0
 lib/m3/FreeBSD2/m3
 lib/m3/FreeBSD2/m3cgc1
 lib/m3/FreeBSD2/m3mkdir
 lib/m3/FreeBSD2/report_coverage.o
-lib/m3/FreeBSD2/scan.llscan
 lib/m3/pkg/X11R4/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/X11R4/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/X11R4/FreeBSD2/.M3WEB
 lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.a
 lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.m3x
-lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.2.0
+lib/m3/pkg/X11R4/FreeBSD2/libm3X11R4.so.3.0
 lib/m3/pkg/X11R4/src/Common/X.i3
 lib/m3/pkg/X11R4/src/Common/Xatom.i3
 lib/m3/pkg/X11R4/src/Common/Xaw.i3
@@ -57,6 +59,17 @@ lib/m3/pkg/X11R4/src/Common/XtE.i3
 lib/m3/pkg/X11R4/src/Common/XtN.i3
 lib/m3/pkg/X11R4/src/Common/XtR.i3
 lib/m3/pkg/X11R4/src/Vanilla/XMachine.i3
+lib/m3/pkg/digraph/FreeBSD2/.M3EXPORTS
+lib/m3/pkg/digraph/FreeBSD2/.M3IMPTAB
+lib/m3/pkg/digraph/FreeBSD2/.M3WEB
+lib/m3/pkg/digraph/FreeBSD2/libDiGraph.a
+lib/m3/pkg/digraph/FreeBSD2/libDiGraph.m3x
+lib/m3/pkg/digraph/FreeBSD2/libDiGraph.so.3.0
+lib/m3/pkg/digraph/src/DiGraph.ig
+lib/m3/pkg/digraph/src/DiGraph.mg
+lib/m3/pkg/digraph/src/NullEdgeType.i3
+lib/m3/pkg/digraph/src/POEdgeType.i3
+lib/m3/pkg/digraph/src/digraph.tmpl
 lib/m3/pkg/formsedit/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/formsedit/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/formsedit/FreeBSD2/.M3WEB
@@ -67,11 +80,10 @@ lib/m3/pkg/formsvbt/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/formsvbt/FreeBSD2/.M3WEB
 lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.a
 lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.m3x
-lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.2.0
+lib/m3/pkg/formsvbt/FreeBSD2/libm3formsvbt.so.3.0
 lib/m3/pkg/formsvbt/src/FVRuntime.i3
 lib/m3/pkg/formsvbt/src/FVTypes.i3
 lib/m3/pkg/formsvbt/src/FormsVBT.i3
-lib/m3/pkg/formsvbt/src/MForm.i3
 lib/m3/pkg/formsvbt/src/Macro.i3
 lib/m3/pkg/formsvbt/src/Manpage.i3
 lib/m3/pkg/formsvbt/src/RefListUtils.i3
@@ -84,14 +96,14 @@ lib/m3/pkg/formsvbtpixmaps/FreeBSD2/.M3WEB
 lib/m3/pkg/formsvbtpixmaps/FreeBSD2/FormsVBTPixmapsBundle.i3
 lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.a
 lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.m3x
-lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.2.0
+lib/m3/pkg/formsvbtpixmaps/FreeBSD2/libm3formsvbtpixmaps.so.3.0
 lib/m3/pkg/images/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/images/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/images/FreeBSD2/.M3WEB
 lib/m3/pkg/images/FreeBSD2/ImagesBundle.i3
 lib/m3/pkg/images/FreeBSD2/libImages.a
 lib/m3/pkg/images/FreeBSD2/libImages.m3x
-lib/m3/pkg/images/FreeBSD2/libImages.so.2.0
+lib/m3/pkg/images/FreeBSD2/libImages.so.3.0
 lib/m3/pkg/images/src/ImageRd.i3
 lib/m3/pkg/images/src/ImageVBT.i3
 lib/m3/pkg/images/src/Images.i3
@@ -100,24 +112,24 @@ lib/m3/pkg/jvideo/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/jvideo/FreeBSD2/.M3WEB
 lib/m3/pkg/jvideo/FreeBSD2/libjvideo.a
 lib/m3/pkg/jvideo/FreeBSD2/libjvideo.m3x
-lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.2.0
-lib/m3/pkg/jvideo/src/JVAudio.i3
-lib/m3/pkg/jvideo/src/JVBuffer.i3
-lib/m3/pkg/jvideo/src/JVConverter.i3
-lib/m3/pkg/jvideo/src/JVConverterF.i3
-lib/m3/pkg/jvideo/src/JVDecomp.i3
-lib/m3/pkg/jvideo/src/JVDecompPool.i3
-lib/m3/pkg/jvideo/src/JVFromDecomp.i3
-lib/m3/pkg/jvideo/src/JVFromSource.i3
-lib/m3/pkg/jvideo/src/JVSink.i3
-lib/m3/pkg/jvideo/src/JVSinkPool.i3
-lib/m3/pkg/jvideo/src/Jv.i3
-lib/m3/pkg/jvideo/src/Jva.i3
-lib/m3/pkg/jvideo/src/JvaProtocol.i3
-lib/m3/pkg/jvideo/src/Jvs.i3
-lib/m3/pkg/jvideo/src/JvsBuffer.i3
-lib/m3/pkg/jvideo/src/JvsProtocol.i3
-lib/m3/pkg/jvideo/src/jvprotocol.i3
+lib/m3/pkg/jvideo/FreeBSD2/libjvideo.so.3.0
+lib/m3/pkg/jvideo/src/POSIX/JVAudio.i3
+lib/m3/pkg/jvideo/src/POSIX/JVBuffer.i3
+lib/m3/pkg/jvideo/src/POSIX/JVConverter.i3
+lib/m3/pkg/jvideo/src/POSIX/JVConverterF.i3
+lib/m3/pkg/jvideo/src/POSIX/JVDecomp.i3
+lib/m3/pkg/jvideo/src/POSIX/JVDecompPool.i3
+lib/m3/pkg/jvideo/src/POSIX/JVFromDecomp.i3
+lib/m3/pkg/jvideo/src/POSIX/JVFromSource.i3
+lib/m3/pkg/jvideo/src/POSIX/JVSink.i3
+lib/m3/pkg/jvideo/src/POSIX/JVSinkPool.i3
+lib/m3/pkg/jvideo/src/POSIX/Jv.i3
+lib/m3/pkg/jvideo/src/POSIX/Jva.i3
+lib/m3/pkg/jvideo/src/POSIX/JvaProtocol.i3
+lib/m3/pkg/jvideo/src/POSIX/Jvs.i3
+lib/m3/pkg/jvideo/src/POSIX/JvsBuffer.i3
+lib/m3/pkg/jvideo/src/POSIX/JvsProtocol.i3
+lib/m3/pkg/jvideo/src/POSIX/jvprotocol.i3
 lib/m3/pkg/libm3/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/libm3/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/libm3/FreeBSD2/.M3WEB
@@ -186,8 +198,8 @@ lib/m3/pkg/libm3/FreeBSD2/TextSeqRep.i3
 lib/m3/pkg/libm3/FreeBSD2/TextTextTbl.i3
 lib/m3/pkg/libm3/FreeBSD2/libm3.a
 lib/m3/pkg/libm3/FreeBSD2/libm3.m3x
-lib/m3/pkg/libm3/FreeBSD2/libm3.so.2.0
-lib/m3/pkg/libm3/src/arith/Math.i3
+lib/m3/pkg/libm3/FreeBSD2/libm3.so.3.0
+lib/m3/pkg/libm3/src/arith/POSIX/Math.i3
 lib/m3/pkg/libm3/src/atom/Atom.i3
 lib/m3/pkg/libm3/src/bundleintf/Bundle.i3
 lib/m3/pkg/libm3/src/bundleintf/BundleRep.i3
@@ -290,6 +302,7 @@ lib/m3/pkg/libm3/src/types/Boolean.i3
 lib/m3/pkg/libm3/src/types/Char.i3
 lib/m3/pkg/libm3/src/types/Int32.i3
 lib/m3/pkg/libm3/src/types/Integer.i3
+lib/m3/pkg/libm3/src/types/LongrealType.i3
 lib/m3/pkg/libm3/src/types/RealType.i3
 lib/m3/pkg/libm3/src/types/Refany.i3
 lib/m3/pkg/libm3/src/uid/Common/Capability.i3
@@ -318,7 +331,6 @@ lib/m3/pkg/m3build/templates/COMMON.BOOT
 lib/m3/pkg/m3build/templates/FreeBSD2
 lib/m3/pkg/m3build/templates/PLATFORMS
 lib/m3/pkg/m3build/templates/POSIX
-lib/m3/pkg/m3build/templates/WIN32
 lib/m3/pkg/m3bundle/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/m3bundle/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/m3bundle/FreeBSD2/.M3WEB
@@ -327,14 +339,14 @@ 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.2.0
+lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.3.0
 lib/m3/pkg/m3configvars/src/M3ConfigVars.i3
 lib/m3/pkg/m3core/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/m3core/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/m3core/FreeBSD2/.M3WEB
 lib/m3/pkg/m3core/FreeBSD2/libm3core.a
 lib/m3/pkg/m3core/FreeBSD2/libm3core.m3x
-lib/m3/pkg/m3core/FreeBSD2/libm3core.so.2.0
+lib/m3/pkg/m3core/FreeBSD2/libm3core.so.3.0
 lib/m3/pkg/m3core/src/C/32BITS/BasicCtypes.i3
 lib/m3/pkg/m3core/src/C/Common/Cerrno.i3
 lib/m3/pkg/m3core/src/C/Common/Cstdarg.i3
@@ -464,7 +476,7 @@ lib/m3/pkg/m3tools/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/m3tools/FreeBSD2/.M3WEB
 lib/m3/pkg/m3tools/FreeBSD2/libm3tools.a
 lib/m3/pkg/m3tools/FreeBSD2/libm3tools.m3x
-lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.2.0
+lib/m3/pkg/m3tools/FreeBSD2/libm3tools.so.3.0
 lib/m3/pkg/m3tools/src/M3ID.i3
 lib/m3/pkg/m3tools/src/M3Scanner.i3
 lib/m3/pkg/m3tools/src/M3Token.i3
@@ -479,7 +491,7 @@ lib/m3/pkg/parseparams/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/parseparams/FreeBSD2/.M3WEB
 lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.a
 lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.m3x
-lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.2.0
+lib/m3/pkg/parseparams/FreeBSD2/libm3parseparams.so.3.0
 lib/m3/pkg/parseparams/src/ParseParams.i3
 lib/m3/pkg/pp/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/pp/FreeBSD2/.M3IMPTAB
@@ -495,7 +507,7 @@ lib/m3/pkg/realgeometry/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/realgeometry/FreeBSD2/.M3WEB
 lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.a
 lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.m3x
-lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.2.0
+lib/m3/pkg/realgeometry/FreeBSD2/libGeometry.so.3.0
 lib/m3/pkg/realgeometry/src/PathExtra.i3
 lib/m3/pkg/realgeometry/src/RealInterval.i3
 lib/m3/pkg/realgeometry/src/RealPath.i3
@@ -521,7 +533,7 @@ lib/m3/pkg/set/FreeBSD2/TextSetDef.i3
 lib/m3/pkg/set/FreeBSD2/TextSetList.i3
 lib/m3/pkg/set/FreeBSD2/libset.a
 lib/m3/pkg/set/FreeBSD2/libset.m3x
-lib/m3/pkg/set/FreeBSD2/libset.so.2.0
+lib/m3/pkg/set/FreeBSD2/libset.so.3.0
 lib/m3/pkg/set/src/Set.ig
 lib/m3/pkg/set/src/Set.mg
 lib/m3/pkg/set/src/SetDef.ig
@@ -539,12 +551,30 @@ lib/m3/pkg/shownew/src/ZIO.i3
 lib/m3/pkg/showthread/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/showthread/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/showthread/FreeBSD2/.M3WEB
+lib/m3/pkg/table-list/FreeBSD2/.M3EXPORTS
+lib/m3/pkg/table-list/FreeBSD2/.M3IMPTAB
+lib/m3/pkg/table-list/FreeBSD2/.M3WEB
+lib/m3/pkg/table-list/FreeBSD2/AtomAtomTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/AtomRefTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/AtomTextTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/RefAtomTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/RefRefTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/RefTextTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/TextAtomTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/TextRefTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/TextTextTblList.i3
+lib/m3/pkg/table-list/FreeBSD2/libtable-list.a
+lib/m3/pkg/table-list/FreeBSD2/libtable-list.m3x
+lib/m3/pkg/table-list/FreeBSD2/libtable-list.so.3.0
+lib/m3/pkg/table-list/src/TableList.ig
+lib/m3/pkg/table-list/src/TableList.mg
+lib/m3/pkg/table-list/src/table-list.tmpl
 lib/m3/pkg/tcp/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/tcp/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/tcp/FreeBSD2/.M3WEB
 lib/m3/pkg/tcp/FreeBSD2/libm3tcp.a
 lib/m3/pkg/tcp/FreeBSD2/libm3tcp.m3x
-lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.2.0
+lib/m3/pkg/tcp/FreeBSD2/libm3tcp.so.3.0
 lib/m3/pkg/tcp/src/POSIX/Herrno.i3
 lib/m3/pkg/tcp/src/POSIX/TCPHack.i3
 lib/m3/pkg/tcp/src/POSIX/TCPPosix.i3
@@ -554,12 +584,20 @@ lib/m3/pkg/tcp/src/common/ConnRW.i3
 lib/m3/pkg/tcp/src/common/IP.i3
 lib/m3/pkg/tcp/src/common/TCP.i3
 lib/m3/pkg/tcp/src/common/TCPSpecial.i3
+lib/m3/pkg/tcpextras/FreeBSD2/.M3EXPORTS
+lib/m3/pkg/tcpextras/FreeBSD2/.M3IMPTAB
+lib/m3/pkg/tcpextras/FreeBSD2/.M3WEB
+lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.a
+lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.m3x
+lib/m3/pkg/tcpextras/FreeBSD2/libtcpextras.so.3.0
+lib/m3/pkg/tcpextras/src/TCPExtras.i3
+lib/m3/pkg/tcpextras/src/TCPPeer.i3
 lib/m3/pkg/tempfiles/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/tempfiles/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/tempfiles/FreeBSD2/.M3WEB
 lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.a
 lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.m3x
-lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.2.0
+lib/m3/pkg/tempfiles/FreeBSD2/libTempFiles.so.3.0
 lib/m3/pkg/tempfiles/src/TempFiles.i3
 lib/m3/pkg/ui/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/ui/FreeBSD2/.M3IMPTAB
@@ -572,7 +610,7 @@ lib/m3/pkg/ui/FreeBSD2/STypeMapSeq.i3
 lib/m3/pkg/ui/FreeBSD2/STypeMapSeqRep.i3
 lib/m3/pkg/ui/FreeBSD2/libm3ui.a
 lib/m3/pkg/ui/FreeBSD2/libm3ui.m3x
-lib/m3/pkg/ui/FreeBSD2/libm3ui.so.2.0
+lib/m3/pkg/ui/FreeBSD2/libm3ui.so.3.0
 lib/m3/pkg/ui/src/picture/Completion.i3
 lib/m3/pkg/ui/src/picture/FreeList.mg
 lib/m3/pkg/ui/src/picture/Picture.i3
@@ -687,7 +725,7 @@ lib/m3/pkg/vbtkit/FreeBSD2/.M3WEB
 lib/m3/pkg/vbtkit/FreeBSD2/VBTKitBundle.i3
 lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.a
 lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.m3x
-lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.2.0
+lib/m3/pkg/vbtkit/FreeBSD2/libm3vbtkit.so.3.0
 lib/m3/pkg/vbtkit/src/color/Color.i3
 lib/m3/pkg/vbtkit/src/color/ColorName.i3
 lib/m3/pkg/vbtkit/src/color/ColorNameF.i3
@@ -706,6 +744,8 @@ lib/m3/pkg/vbtkit/src/etext/TextPortClass.i3
 lib/m3/pkg/vbtkit/src/etext/TypeinVBT.i3
 lib/m3/pkg/vbtkit/src/etext/TypescriptVBT.i3
 lib/m3/pkg/vbtkit/src/etext/XtermModel.i3
+lib/m3/pkg/vbtkit/src/lego/AnchorHelpSplit.i3
+lib/m3/pkg/vbtkit/src/lego/AnchorHelpVBT.i3
 lib/m3/pkg/vbtkit/src/lego/AnchorSplit.i3
 lib/m3/pkg/vbtkit/src/lego/BiFeedbackVBT.i3
 lib/m3/pkg/vbtkit/src/lego/BooleanVBT.i3
@@ -739,7 +779,6 @@ lib/m3/pkg/vbtkit/src/lego/SplitterVBT.i3
 lib/m3/pkg/vbtkit/src/lego/SwitchVBT.i3
 lib/m3/pkg/vbtkit/src/lego/TrillSwitchVBT.i3
 lib/m3/pkg/vbtkit/src/lego/VBTKitResources.i3
-lib/m3/pkg/vbtkit/src/lego/VBTutils.i3
 lib/m3/pkg/vbtkit/src/lego/ViewportVBT.i3
 lib/m3/pkg/vbtkit/src/lego/ZBackgroundVBT.i3
 lib/m3/pkg/vbtkit/src/lego/ZChassisVBT.i3
@@ -759,6 +798,7 @@ lib/m3/pkg/vbtkit/src/vbtkitutils/LargeCursor.i3
 lib/m3/pkg/vbtkit/src/vbtkitutils/Pts.i3
 lib/m3/pkg/vbtkit/src/vbtkitutils/Rsrc.i3
 lib/m3/pkg/vbtkit/src/vbtkitutils/VBTColors.i3
+lib/m3/pkg/vbtkit/src/vbtkitutils/VBTKitEnv.i3
 lib/m3/pkg/vbtkit/src/vbtkitutils/XParam.i3
 lib/m3/pkg/vbtkit/src/vbtkitutils/XTrestle.i3
 lib/m3/pkg/vbtkit/src/vtext/VT.i3
@@ -781,18 +821,26 @@ lib/m3/pkg/videovbt/FreeBSD2/.M3IMPTAB
 lib/m3/pkg/videovbt/FreeBSD2/.M3WEB
 lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.a
 lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.m3x
-lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.2.0
+lib/m3/pkg/videovbt/FreeBSD2/libvideovbt.so.3.0
 lib/m3/pkg/videovbt/src/AudioVBT.i3
+lib/m3/pkg/videovbt/src/POSIX/VideoVBTRep.i3
 lib/m3/pkg/videovbt/src/VideoVBT.i3
-lib/m3/pkg/videovbt/src/VideoVBTRep.i3
+lib/m3/pkg/web/FreeBSD2/.M3EXPORTS
+lib/m3/pkg/web/FreeBSD2/.M3IMPTAB
+lib/m3/pkg/web/FreeBSD2/.M3WEB
+lib/m3/pkg/web/FreeBSD2/libweb.a
+lib/m3/pkg/web/FreeBSD2/libweb.m3x
+lib/m3/pkg/web/FreeBSD2/libweb.so.3.0
+lib/m3/pkg/web/src/Web.i3
+lib/m3/www/m3tohtml.1.html
 man/man1/analyze_coverage.1.gz
 man/man1/formsedit.1.gz
-man/man1/llscan.1.gz
 man/man1/m3browser.1.gz
 man/man1/m3build.1.gz
 man/man1/m3bundle.1.gz
 man/man1/m3pp.1.gz
 man/man1/m3ship.1.gz
+man/man1/m3tohtml.1.gz
 man/man1/m3totex.1.gz
 man/man1/m3where.1.gz
 man/man1/quake.1.gz