Make these ports work on ELF systems.

4 files changed, 44 insertions, 25 deletions

diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index 6eafec3b2827..caad128860a1 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.21 1998/06/27 05:19:10 asami Exp $
+# $Id: Makefile,v 1.22 1998/08/20 08:57:47 hoek Exp $
 #
 
 DISTNAME=	modula-3-3.6
@@ -20,21 +20,22 @@ NO_BUILD=	yes
 MAN1=		analyze_coverage.1 m3browser.1 m3build.1 \
 		m3bundle.1 m3pp.1 m3ship.1 m3tohtml.1 \
 		m3totex.1 m3where.1 quake.1 recordheap.1
+SCRIPTS_ENV+=	MAJOR=${major} PKGDIR=${PKGDIR} PLIST=${PLIST}
 
 # Support building on systems with or without X11 installed.  The port
 # only supports X11R6 in the standard location, so we don't bother using
 # the X11BASE macro.  It's not defined yet at this point in the Makefile
 # anyway.
-.if !exists(/usr/X11R6/lib/libX11.a)
-PLIST=		${PKGDIR}/PLIST.noX11
-.else
+.if exists(/usr/X11R6/lib/libX11.a)
+PLIST=		${WRKDIR}/PLIST
 MAN1+=		formsedit.1 replayheap.1 showheap.1 shownew.1 showthread.1
+.else
+PLIST=		${WRKDIR}/PLIST.noX11
 .endif
 
-# Keep these in sync with the PLIST and with the library version numbers
-# in the modula-3-lib port (PLIST and patch-ah there).
+# Shared library major version number.  Keep this in sync with the
+# modula-3-lib port.
 major=		6
-minor=		0
 
 # The Modula-3 build process insists on installing each individual
 # component immediately after that component is built.  To avoid having
@@ -52,7 +53,7 @@ do-install:
 	@cd ${temp_prefix}; \
 	    umask 022; \
 	    sed -e "/^@/d" -e "/m3build-/d" -e "s/\.gz$$//" \
-		-e "/^share/d" ${PLIST} | \
+		-e "/^share/d" ${PLIST}.real | \
 		cpio -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
 	@cd ${temp_prefix}/man/man1; \
 	    umask 022; \
@@ -95,17 +96,16 @@ do-install:
 	    find bin -type f ! -name recordheap | (cd ${PREFIX}; xargs strip)
 	@cd ${PREFIX}/lib/m3/FreeBSD2; strip m3 m3cgc1 m3mkdir
 	@cd ${PREFIX}/bin; \
-	    ln -f m3build m3build-${major}; \
-	    ln -f m3build m3build-${major}.${minor}
+	    ln -f m3build m3build-${major}
 	@echo "Fixing file permissions"
 	@cd ${PREFIX}; \
-	    sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST} |\
+	    sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST}.real |\
 		xargs chown ${BINOWN}.${BINGRP}; \
-	    sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST} |\
+	    sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST}.real |\
 		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"
-	@${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2
+	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2
 
 .include <bsd.port.mk>
diff --git a/lang/modula-3/pkg-plist b/lang/modula-3/pkg-plist
index 164f0ca9897e..10be54295199 100644
--- a/lang/modula-3/pkg-plist
+++ b/lang/modula-3/pkg-plist
@@ -2,8 +2,6 @@ bin/analyze_coverage
 bin/formsedit
 bin/m3browser
 bin/m3build
-bin/m3build-6
-bin/m3build-6.0
 bin/m3bundle
 bin/m3pp
 bin/m3ship
@@ -16,7 +14,7 @@ bin/replayheap
 bin/showheap
 bin/shownew
 bin/showthread
-lib/m3/FreeBSD2/libm3configvars.so.6.0
+lib/m3/FreeBSD2/libm3configvars.so
 lib/m3/FreeBSD2/m3
 lib/m3/FreeBSD2/m3cgc1
 lib/m3/FreeBSD2/m3mkdir
@@ -313,7 +311,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.6.0
+lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so
 lib/m3/pkg/m3configvars/src/M3ConfigVars.i3
 lib/m3/pkg/m3core/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/m3core/FreeBSD2/.M3IMPTAB
@@ -795,5 +793,5 @@ lib/m3/pkg/web/FreeBSD2/libweb.m3x
 lib/m3/pkg/web/src/Web.i3
 lib/m3/www/m3tohtml.1.html
 share/modula-3/COPYRIGHT
-@exec /sbin/ldconfig -m %D/lib/m3/FreeBSD2
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/m3/FreeBSD2
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/lang/modula-3/pkg-plist.noX11 b/lang/modula-3/pkg-plist.noX11
index 1697b66601dc..b5c3cfa7fbd7 100644
--- a/lang/modula-3/pkg-plist.noX11
+++ b/lang/modula-3/pkg-plist.noX11
@@ -1,8 +1,6 @@
 bin/analyze_coverage
 bin/m3browser
 bin/m3build
-bin/m3build-6
-bin/m3build-6.0
 bin/m3bundle
 bin/m3pp
 bin/m3ship
@@ -11,7 +9,7 @@ bin/m3totex
 bin/m3where
 bin/quake
 bin/recordheap
-lib/m3/FreeBSD2/libm3configvars.so.6.0
+lib/m3/FreeBSD2/libm3configvars.so
 lib/m3/FreeBSD2/m3
 lib/m3/FreeBSD2/m3cgc1
 lib/m3/FreeBSD2/m3mkdir
@@ -234,7 +232,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.6.0
+lib/m3/pkg/m3configvars/FreeBSD2/libm3configvars.so
 lib/m3/pkg/m3configvars/src/M3ConfigVars.i3
 lib/m3/pkg/m3core/FreeBSD2/.M3EXPORTS
 lib/m3/pkg/m3core/FreeBSD2/.M3IMPTAB
@@ -480,5 +478,5 @@ lib/m3/pkg/web/FreeBSD2/libweb.m3x
 lib/m3/pkg/web/src/Web.i3
 lib/m3/www/m3tohtml.1.html
 share/modula-3/COPYRIGHT
-@exec /sbin/ldconfig -m %D/lib/m3/FreeBSD2
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib/m3/FreeBSD2
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
diff --git a/lang/modula-3/scripts/configure b/lang/modula-3/scripts/configure
new file mode 100644
index 000000000000..17f2dfdd8d56
--- /dev/null
+++ b/lang/modula-3/scripts/configure
@@ -0,0 +1,23 @@
+#! /bin/sh
+#
+# $Id: configure,v 1.3 1998/06/02 23:22:23 jdp Exp $
+
+umask 022
+
+plist_src=${PKGDIR}/${PLIST##*/}
+
+# Generate a PLIST, duplicating certain lines with the major version
+# number tacked on the end.
+sed -e "/\.so\$/p" \
+    -e "s/\.so\$/&.${MAJOR}/" \
+    -e "/m3build\$/p" \
+    -e "s/m3build\$/&-${MAJOR}/" \
+    ${plist_src} > ${PLIST}
+
+# Also generate a "PLIST.real" file which includes the minor version
+# numbers on shared library names if the object format is a.out.
+if [ "${PORTOBJFORMAT}" = aout ]; then
+    sed -e "s/\.so\.${MAJOR}\$/&.0/" ${PLIST} > ${PLIST}.real
+else
+    cp ${PLIST} ${PLIST}.real
+fi