Split this port into two pieces, with most of the work now being done by

the new "modula-3-lib" port.  The split allows one to save a lot of
disk space by installing only the shared libraries needed for executing
programs.  The full "modula-3" port is needed only if you want to
compile programs as well.

5 files changed, 38 insertions, 229 deletions

diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index e9a37e845dd0..d75c1bc68b12 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -3,119 +3,33 @@
 # Date created:		18 Mar 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.5 1996/09/27 02:26:41 jdp Exp $
+# $Id: Makefile,v 1.6 1996/09/27 18:17:42 jdp Exp $
 #
 
 DISTNAME=	modula-3-3.6
 CATEGORIES+=	lang
-MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
-DISTFILES=	m3-fbsd-src-3.6.tar.gz m3-fbsd-m3cc-3.6.tar.gz
-# Note: Depending on what is already installed on the system, the code
-# below may add some more DISTFILES.
+DISTFILES=
 
 MAINTAINER=	jdp@polstra.com
 
-NO_WRKSUBDIR=	yes
+DEPENDS=	${PORTSDIR}/lang/modula-3-lib
 
-# There are two distfiles that may or may not be needed, depending on
-# what is already installed on the system.  First, we need an executable
-# for the Modula-3 compiler, in order to compile the new compiler, which
-# is written in Modula-3.  Often, there will already be such an executable
-# installed on the system.  Second, we need many files from gcc-2.7.2.1.
-# Often, we can find these in the system sources, under "/usr/src/contrib".
-#
-# This code tries to avoid fetching the distfiles, unless necessary.
-# We look on the system to see whether the necessary files are present,
-# and use those if we can.  If we cannot find the needed files, we
-# fetch the distfiles.
-
-# For the Modula-3 compiler, we look in ${PREFIX} and in /usr/local.
-.ifdef PREFIX
-have_boot!=	/bin/sh scripts/check_files files/T.boot installed ${PREFIX}
-.else
-have_boot=
-.endif
-.if empty(have_boot)
-have_boot!=	/bin/sh scripts/check_files files/T.boot installed /usr/local
-.endif
-.if empty(have_boot)
-DISTFILES+=	m3-fbsd-boot-3.6.tar.gz
-.endif
-
-# For gcc-2.7.2.1, we look in /usr/src/contrib.
-have_gcc!=	/bin/sh scripts/check_files files/T.gcc m3cc /usr/src/contrib
-.if empty(have_gcc)
-DISTFILES+=	m3-fbsd-gcc-3.6.tar.gz
-.endif
-
-# Startup script, run at boot time
-startup_dir=	${PREFIX}/etc/rc.d
-startup_script=	${startup_dir}/m3.sh
+WRKSRC=		${PORTSDIR}/lang/modula-3-lib/work
+NO_WRKDIR=	yes
+NO_CONFIGURE=	yes
+NO_BUILD=	yes
 
 # The Modula-3 build process insists on installing each individual
 # component immediately after that component is built.  To avoid having
 # to do the entire build as root, we arrange for everything to first
 # be "installed" into the following directory, which we own.
-temp_prefix=	${WRKDIR}/installed
+temp_prefix=	${WRKSRC}/installed
 
-# Some parts of the system depend on absolute pathnames into the
-# installed tree.  Those parts have to be built after we have moved
-# the tree to its final resting place.
-late_builds=	m3configvars
+do-extract:
+	@${DO_NADA}
 
-post-extract:
-.if !empty(have_boot)
-	@echo "Copying bootstrap modula-3 compiler from ${have_boot}"
-	@/bin/sh ${SCRIPTDIR}/copy_files ${FILESDIR}/T.boot installed \
-	    ${have_boot} ${WRKDIR}
-.endif
-.if !empty(have_gcc)
-	@echo "Copying gcc sources from ${have_gcc}"
-	@/bin/sh ${SCRIPTDIR}/copy_files ${FILESDIR}/T.gcc m3cc \
-	    ${have_gcc} ${WRKDIR}
-.endif
-	@cd ${WRKDIR}/m3cc/gcc; \
-	    chmod +x config.sub configure move-if-change
-
-do-build:
-	@test -d ${temp_prefix}/bin || mkdir -p ${temp_prefix}/bin
-	@test -d ${temp_prefix}/man/man1 || mkdir -p ${temp_prefix}/man/man1
-	@test -d ${temp_prefix}/lib/m3/pkg/m3build/templates || \
-	    mkdir -p ${temp_prefix}/lib/m3/pkg/m3build/templates
-	@echo "++++++++++ quake ++++++++++"
-	@test -d ${WRKSRC}/m3/quake/FreeBSD2 || \
-	    mkdir -p ${WRKSRC}/m3/quake/FreeBSD2
-	@cd ${WRKSRC}/m3/quake/FreeBSD2; \
-	    make -f ../src/makefile TARGET=FreeBSD2 COPT=-O CDEBUG= ; \
-	    cp -p quake ${temp_prefix}/bin; \
-	    cp -p ../src/quake.1 ${temp_prefix}/man/man1
-	@echo "++++++++++ m3build ++++++++++"
-	@cd ${WRKSRC}/m3/m3build; \
-	    PATH=${temp_prefix}/bin:$$PATH ./build FreeBSD2; \
-	    cp -p FreeBSD2/m3build FreeBSD2/m3ship FreeBSD2/m3where \
-		${temp_prefix}/bin; \
-	    cp -p FreeBSD2/m3mkdir ${temp_prefix}/lib/m3/FreeBSD2; \
-	    cp -p templates/CLEANUP templates/COMMON templates/COMMON.BOOT \
-		templates/FreeBSD2 templates/PLATFORMS templates/POSIX \
-		${temp_prefix}/lib/m3/pkg/m3build/templates; \
-	    cp -p FreeBSD2/m3build.1 FreeBSD2/m3ship.1 FreeBSD2/m3where.1 \
-		${temp_prefix}/man/man1
-	@echo "++++++++++ m3cc ++++++++++"
-	@test -d ${WRKSRC}/m3cc/FreeBSD2 || mkdir -p ${WRKSRC}/m3cc/FreeBSD2
-	@cd ${WRKSRC}/m3cc/FreeBSD2; \
-	    ../gcc/configure i486-unknown-freebsd; \
-	    make m3cgc1 CC=cc CFLAGS=-O; \
-	    cp -p m3cgc1 ${temp_prefix}/lib/m3/FreeBSD2
-	@echo "++++++++++ everything else ++++++++++"
-	@cd ${WRKSRC}/m3; \
-	    LD_LIBRARY_PATH=${temp_prefix}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
-	    PATH=${temp_prefix}/bin:$$PATH; \
-	    export LD_LIBRARY_PATH PATH; \
-	    m3build
-
-pre-install:
-	@echo "Checking for conflicting shared libraries"
-	@PREFIX=${PREFIX} /bin/sh ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL
+checksum:
+	@${DO_NADA}
 
 do-install:
 	@echo "Deleting extraneous cruft"
@@ -123,11 +37,11 @@ do-install:
 	    rm -rf m3 m3front m3middle m3linker
 	@cd ${temp_prefix}/lib/m3/FreeBSD2; \
 	    rm -f libm3front.so.*.* libm3link.so.*.* libm3middle.so.*.*
-	@echo "Setting permissions of installed files"
-	@/usr/sbin/chown -R ${BINOWN}.${BINGRP} ${temp_prefix}/*
-	@chmod -R go=u-w ${temp_prefix}/*
-	@echo "Copying files to ${PREFIX}"
-	@cp -R -P -p ${temp_prefix}/* ${PREFIX}
+	@echo "Installing files in \"${PREFIX}\""
+	@cd ${temp_prefix}; \
+	    umask 022; \
+	    sed -e "/^@/d" -e "s/\.gz$$//" ${PKGDIR}/PLIST | \
+		cpio -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
 	@echo "Fixing absolute pathnames in installed files"
 	@/bin/sh ${SCRIPTDIR}/fix_pathnames ${temp_prefix} ${PREFIX}
 	@echo "Rebuilding and shipping m3build with correct pathnames"
@@ -144,9 +58,8 @@ do-install:
 		${PREFIX}/lib/m3/pkg/m3build/templates/FreeBSD2 \
 		${WRKSRC}/m3/m3build/src/m3makefile; \
 	    ./m3ship
-	@for i in ${late_builds}; do \
-	    echo "Building and shipping $${i}"; \
-	    cd ${WRKSRC}/m3/$${i}; \
+	@echo "Rebuilding and shipping m3configvars with correct pathnames"
+	@cd ${WRKSRC}/m3/m3configvars; \
 	    LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
 	    export LD_LIBRARY_PATH; \
 	    PATH=${PREFIX}/bin:$$PATH; \
@@ -154,8 +67,7 @@ do-install:
 	    umask 022; \
 	    rm -rf FreeBSD2; \
 	    m3build; \
-	    m3ship; \
-	    done
+	    m3ship
 	@echo "Stripping executables"
 	@cd ${temp_prefix}; \
 	    find bin -type f ! -name recordheap | (cd ${PREFIX}; xargs strip)
@@ -165,15 +77,12 @@ do-install:
 	@cd ${temp_prefix}; \
 	    find man -type f | (cd ${PREFIX}; xargs gzip -9nf)
 .endif
-	@if [ ! -f ${startup_script} ]; then \
-	    echo "Installing ${startup_script} file"; \
-	    test -d ${startup_dir} || mkdir -p ${startup_dir}; \
-	    echo "#!/bin/sh" > ${startup_script}; \
-	    echo "echo -n ' Modula-3'" >> ${startup_script}; \
-	    echo "/sbin/ldconfig -m ${PREFIX}/lib/m3/FreeBSD2" >> \
-		    ${startup_script}; \
-	    chmod 755 ${startup_script}; \
-	fi
+	@echo "Fixing file permissions"
+	@cd ${PREFIX}; \
+	    grep -v "^@" ${PKGDIR}/PLIST | xargs chown ${BINOWN}.${BINGRP}; \
+	    grep -v "^@" ${PKGDIR}/PLIST | xargs chmod go=u-w; \
+	    find -X lib/m3 -type d | xargs chown ${BINOWN}.${BINGRP}; \
+	    find -X lib/m3 -type d | xargs chmod 755
 	@echo "Running ldconfig"
 	@/sbin/ldconfig -m ${PREFIX}/lib/m3/FreeBSD2
 
diff --git a/lang/modula-3/pkg-descr b/lang/modula-3/pkg-descr
index e4081fa85f4a..84b23d2e925d 100644
--- a/lang/modula-3/pkg-descr
+++ b/lang/modula-3/pkg-descr
@@ -1,35 +1,7 @@
 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:
-
-    * A clean type system with good support for object-oriented
-      programming.
-    * A powerful module system.
-    * Lightweight threads, fully integrated into the language and all of
-      the libraries.
-    * Generics.
-    * Exceptions.
-    * Automatic storage management by a multithreaded, incremental,
-      generational garbage collector.
-    * Guaranteed type safety, plus the ability to confine unsafe code
-      behind safe interfaces.
-    * Elegance and simplicity, even compared with less powerful
-      languages such as C++ and Ada.
-    * Ease of integration with existing C libraries.
-    * A huge collection of runtime libraries, providing:
-	- Text manipulation.
-	- Generic containers (lists, sequences, tables, etc.).
-	- Atoms and symbolic expressions.
-	- An extensible stream I/O system.
-	- Persistent objects.
-	- Operating system interfaces.
-	- Networking.
-	- Very nice object-oriented graphics facilities, and some
-	  convenient tools for building GUIs.
-    * A convenient browser.
-
-A wealth of information about Modula-3 can be found at:
+for systems programming as well as large applications.  A wealth
+of information about Modula-3 can be found at:
 
     http://www.research.digital.com/SRC/modula-3/html/home.html
 
diff --git a/lang/modula-3/pkg-plist b/lang/modula-3/pkg-plist
index b31cc73df8ac..0ee68b790d70 100644
--- a/lang/modula-3/pkg-plist
+++ b/lang/modula-3/pkg-plist
@@ -14,28 +14,7 @@ bin/replayheap
 bin/showheap
 bin/shownew
 bin/showthread
-etc/rc.d/m3.sh
-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/libm3configvars.so.4.0
 lib/m3/FreeBSD2/m3
 lib/m3/FreeBSD2/m3cgc1
 lib/m3/FreeBSD2/m3mkdir
@@ -45,7 +24,6 @@ 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.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
@@ -64,7 +42,6 @@ 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
@@ -80,7 +57,6 @@ 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.3.0
 lib/m3/pkg/formsvbt/src/FVRuntime.i3
 lib/m3/pkg/formsvbt/src/FVTypes.i3
 lib/m3/pkg/formsvbt/src/FormsVBT.i3
@@ -96,14 +72,12 @@ 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.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.3.0
 lib/m3/pkg/images/src/ImageRd.i3
 lib/m3/pkg/images/src/ImageVBT.i3
 lib/m3/pkg/images/src/Images.i3
@@ -112,7 +86,6 @@ 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.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
@@ -198,7 +171,6 @@ 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.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
@@ -339,14 +311,13 @@ 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.3.0
+lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so.4.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.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
@@ -476,7 +447,6 @@ 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.3.0
 lib/m3/pkg/m3tools/src/M3ID.i3
 lib/m3/pkg/m3tools/src/M3Scanner.i3
 lib/m3/pkg/m3tools/src/M3Token.i3
@@ -491,7 +461,6 @@ 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.3.0
 lib/m3/pkg/parseparams/src/ParseParams.i3
 lib/m3/pkg/pp/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/pp/FreeBSD2/.M3IMPTAB
@@ -507,7 +476,6 @@ 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.3.0
 lib/m3/pkg/realgeometry/src/PathExtra.i3
 lib/m3/pkg/realgeometry/src/RealInterval.i3
 lib/m3/pkg/realgeometry/src/RealPath.i3
@@ -533,7 +501,6 @@ 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.3.0
 lib/m3/pkg/set/src/Set.ig
 lib/m3/pkg/set/src/Set.mg
 lib/m3/pkg/set/src/SetDef.ig
@@ -565,7 +532,6 @@ 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
@@ -574,7 +540,6 @@ 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.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
@@ -589,7 +554,6 @@ 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
@@ -597,7 +561,6 @@ 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.3.0
 lib/m3/pkg/tempfiles/src/TempFiles.i3
 lib/m3/pkg/ui/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/ui/FreeBSD2/.M3IMPTAB
@@ -610,7 +573,6 @@ 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.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
@@ -725,7 +687,6 @@ 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.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
@@ -821,7 +782,6 @@ 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.3.0
 lib/m3/pkg/videovbt/src/AudioVBT.i3
 lib/m3/pkg/videovbt/src/POSIX/VideoVBTRep.i3
 lib/m3/pkg/videovbt/src/VideoVBT.i3
@@ -830,7 +790,6 @@ 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
diff --git a/lang/modula-3/scripts/configure b/lang/modula-3/scripts/configure
deleted file mode 100644
index a1b9f7e880f9..000000000000
--- a/lang/modula-3/scripts/configure
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-#
-# $Id: configure,v 1.1.1.1 1996/03/20 22:10:19 jdp Exp $
-
-umask 022
-
-files_to_patch="\
-    ${WRKSRC}/m3/m3build/templates/FreeBSD2"
-temp_prefix=${WRKDIR}/installed
-
-for i in ${files_to_patch}; do
-    test -f ${i}.bak || cp -p ${i} ${i}.bak
-    rm -f ${i}
-    sed -e "s+!!PREFIX!!+${temp_prefix}+g" ${i}.bak >${i}
-done
diff --git a/lang/modula-3/scripts/fix_pathnames b/lang/modula-3/scripts/fix_pathnames
index 1f8e43c63490..c04fca5f9868 100644
--- a/lang/modula-3/scripts/fix_pathnames
+++ b/lang/modula-3/scripts/fix_pathnames
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# $Id: fix_pathnames,v 1.1.1.1 1996/03/20 22:10:19 jdp Exp $
+# $Id: fix_pathnames,v 1.2 1996/09/10 05:25:10 jdp Exp $
 
 umask 022
 
@@ -11,33 +11,17 @@ fi
 
 oldpath=$1
 newpath=$2
-
 pkgdir=lib/m3/pkg
 
-t1=/tmp/fixpaths$$a
-trap "rm -f $t1" 0 1 2 3 15
-touch -f $t1
-chmod 600 $t1
-
-# Fix absolute pathnames in files.
-
-cd ${oldpath}/${pkgdir}
-find . -type f \( -name .M3IMPTAB -o -name FreeBSD2 \) >${t1}
+# Fix absolute pathnames in files so that they reference the actual
+# installation directory, instead of the temporary directory we have
+# been using.
 
 cd ${newpath}/${pkgdir}
-for i in `cat ${t1}`; do
+for i in `cd ${oldpath}/${pkgdir}; \
+  find . -type f \( -name .M3IMPTAB -o -name FreeBSD2 \)`; do
     test -f ${i}.bak || cp -p ${i} ${i}.bak
     rm -f ${i}
-    sed -e "s|${oldpath}|${newpath}|g" ${i}.bak >${i} && rm -f ${i}.bak
+    sed -e "s|/[^ 	]*/work/installed/|${newpath}/|g" ${i}.bak >${i} && \
+      rm -f ${i}.bak
 done
-
-# Fix absolute symbolic links.
-
-cd ${oldpath}
-find . -type l -ls | \
-    sed -e \
-    "s|^.* \([^ ][^ ]*\) -> ${oldpath}/\([^ ]*\)|ln -sf ${newpath}/\2 \1|" \
-    >${t1}
-
-cd ${newpath}
-. ${t1}