Add automatic ${VARIABLE} handling for MESSAGE files.

Convert most MESSAGE files to new syntax (${VARIABLE} gets replaced,
not @VARIABLE@, nor @@VARIABLE@@).
By default, substitutions are done for LOCALBASE, PKGNAME, PREFIX,
X11BASE, X11PREFIX; additional patterns can be added via MESSAGE_SUBST.
Clean up some packages while I'm there; add RCS tags to most MESSAGEs.
Remove some uninteresting MESSAGEs.

4 files changed, 15 insertions, 13 deletions

diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 35ca9d1b4f5..ce8b334fdc9 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/10/21 22:52:37 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2001/01/29 11:34:39 wiz Exp $
 
 DISTNAME=	glunix-release-1-0a
 PKGNAME=	glunix-1.0a
@@ -23,9 +23,8 @@ IS_INTERACTIVE= yes
 NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 NOW_ROOT=	${LOCALBASE}/now
+MESSAGE_SUBST+=	NOW_ROOT=${NOW_ROOT}
 
 .if (${MACHINE} == "i386")
 FLAGS= "-m486 -DL_ENDIAN"
@@ -56,7 +55,6 @@ pre-configure:
 	fi
 
 pre-install:
-	${SED} -e 's|\$${NOW_ROOT}|${NOW_ROOT}|g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 	@${ECHO} "updating /etc/shells";
 	${CP} /etc/shells /etc/shells.bak;
 	( ${GREP} -v ${NOW_ROOT}/bin/glush /etc/shells.bak;		\
diff --git a/parallel/glunix/pkg/MESSAGE b/parallel/glunix/pkg/MESSAGE
index f2b3b580739..4cf2086aa9d 100644
--- a/parallel/glunix/pkg/MESSAGE
+++ b/parallel/glunix/pkg/MESSAGE
@@ -1,3 +1,6 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:39 wiz Exp $
+
 QUICK START GUIDE:
 
 Change your directory to the now installation base, eg:
@@ -28,3 +31,5 @@ Here is a sample run_glunix command:
 
 Once the run_glunix command has successfully completed, you can run
 "glustat" to find out how many nodes came up.
+
+======================================================================
diff --git a/parallel/pvm3/Makefile b/parallel/pvm3/Makefile
index 2ee60bf7e0e..e07d888c5e1 100644
--- a/parallel/pvm3/Makefile
+++ b/parallel/pvm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/10/21 22:53:35 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2001/01/29 11:34:39 wiz Exp $
 
 DISTNAME=		pvm3.4.3
 PKGNAME=		pvm-3.4.3
@@ -23,14 +23,10 @@ MAKE_ENV+=		PVM_ROOT=${WRKSRC}
 MAKE_ENV+=		PVM_ARCH=
 MAKE_ENV+=		SSH=${SSH}
 ALL_TARGET=		all install
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 PLIST_SRC=		${WRKDIR}/PLIST-src
 
 PVM_DIR=		${PREFIX}/pvm3
 
-pre-install:
-	${SED} "s_@PREFIX@_${PREFIX}_g" < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 do-install:
 	PVM_ARCH=`${PVM_ROOT}/lib/pvmgetarch` ; export PVM_ARCH ;\
 	${INSTALL_PROGRAM_DIR} ${PVM_DIR}/bin/$$PVM_ARCH ;\
diff --git a/parallel/pvm3/pkg/MESSAGE b/parallel/pvm3/pkg/MESSAGE
index 1bd5c533656..a92e75ac5bf 100644
--- a/parallel/pvm3/pkg/MESSAGE
+++ b/parallel/pvm3/pkg/MESSAGE
@@ -1,11 +1,14 @@
-$NetBSD: MESSAGE,v 1.4 2000/09/03 13:02:21 wiz Exp $
+======================================================================
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:39 wiz Exp $
 
-You must set the environment variable PVM_ROOT to @PREFIX@/pvm3 in your
+You must set the environment variable PVM_ROOT to ${PREFIX}/pvm3 in your
 startup files (.cshrc, .profile) on all machines in the cluster.  In 
 addition, you may want to add the lines contained in 
-@PREFIX@/pvm3/lib/cshrc.stub to the system .cshrc.
+${PREFIX}/pvm3/lib/cshrc.stub to the system .cshrc.
 
 You can specify each host's run path in your pvmhosts file like so:
-hostname ep=@PREFIX@/bin
+hostname ep=${PREFIX}/bin
 This allows you to point different architecture types to various sets of
 shared or local binaries.  See pvmd(1) for more information.
+
+======================================================================