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.

8 files changed, 65 insertions, 60 deletions

diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index d72045fcc95..ec55e1d564a 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/01/04 22:51:53 simonb Exp $
+# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:25 wiz Exp $
 
 DISTNAME=		bochs-2000_0325a
 PKGNAME=		bochs-2000.03.25a
@@ -13,19 +13,17 @@ USE_GMAKE=		yes
 #CONFIGURE_ARGS=		--enable-debugger --enable-disasm
 USE_X11=		yes
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 BOCHS_MAINDIR=		${PREFIX}/share/bochs
 BOCHS_BIOSDIR=		${BOCHS_MAINDIR}/bios
 BOCHS_FONTDIR=		${BOCHS_MAINDIR}/xfonts
 BOCHS_DOCDIR=		${PREFIX}/share/doc/html/bochs
+MESSAGE_SUBST+=		BOCHS_MAINDIR=${BOCHS_MAINDIR} \
+			BOCHS_FONTDIR=${BOCHS_FONTDIR} \
+			BOCHS_DOCDIR=${BOCHS_DOCDIR}
 
 post-configure:
 	${SED} -e 's@XXXPREFIXXXX@${PREFIX}@' \
 		< ${WRKSRC}/.bochsrc > ${WRKSRC}/bochsrc
-	${SED} -e 's,@BOCHS_MAINDIR@,${BOCHS_MAINDIR},g' \
-		-e 's,@BOCHS_FONTDIR@,${BOCHS_FONTDIR},g' \
-		-e 's,@BOCHS_DOCDIR@,${BOCHS_DOCDIR},g' \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_DATA_DIR} ${BOCHS_BIOSDIR}
diff --git a/emulators/bochs/pkg/MESSAGE b/emulators/bochs/pkg/MESSAGE
index e1dcf730906..2d0263e054d 100644
--- a/emulators/bochs/pkg/MESSAGE
+++ b/emulators/bochs/pkg/MESSAGE
@@ -1,13 +1,18 @@
-You need to copy the @BOCHS_MAINDIR@/bochsrc file to your home
+======================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:25 wiz Exp $
+
+You need to copy the ${BOCHS_MAINDIR}/bochsrc file to your home
 directory and name it .bochsrc.  Then edit it to your tastes
-defining the hard drives, and floppies as needed.  You also need
-to @BOCHS_FONTDIR@ to your X font path and to enable it
-before running bochs.  e.g.
+defining the hard drives and floppies as needed.  You also need
+to ${BOCHS_FONTDIR} to your X font path and to enable it
+before running bochs, e.g.
 
-  $ xset fp+ @BOCHS_FONTDIR@
+  $ xset fp+ ${BOCHS_FONTDIR}
   $ xset fp rehash
 
 Documentation is available on the website, and a copy of that
-website is in @BOCHS_DOCDIR@.  The file install.html
+website is in ${BOCHS_DOCDIR}.  The file install.html
 will assist you in creating a HD "file". (A raw disk partition can
-be used as well)
+be used as well.)
+
+======================================================================
diff --git a/emulators/plex86/Makefile b/emulators/plex86/Makefile
index 15118924b8f..ce32cba8e41 100644
--- a/emulators/plex86/Makefile
+++ b/emulators/plex86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/01/07 17:07:13 tron Exp $
+# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:25 wiz Exp $
 
 DISTNAME=	plex86-20010106
 PKGNAME=	${DISTNAME:S/-/-0./}
@@ -22,8 +22,6 @@ RESTRICTED=	CPU-specific binary code
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-MESSAGE_FILE=	${WRKSRC}/.MESSAGE
-
 BSDSRCDIR?=	/nonexistent	# to override <bsd.own.mk>, MUST be
                                 # set this way BEFORE bsd.prefs.mk
 .include "../../mk/bsd.prefs.mk"
@@ -48,7 +46,6 @@ post-build:
 
 do-install: do-install-dirs do-install-binaries do-install-bios \
 		do-install-font do-install-conf
-	${SED} -e 's,@PREFIX@,${PREFIX},g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
 
 do-install-dirs:
 	${INSTALL_DATA_DIR} ${PREFIX}/lkm \
diff --git a/emulators/plex86/pkg/MESSAGE b/emulators/plex86/pkg/MESSAGE
index ad74889a1fe..2bd980ca207 100644
--- a/emulators/plex86/pkg/MESSAGE
+++ b/emulators/plex86/pkg/MESSAGE
@@ -1,4 +1,5 @@
 ===========================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:26 wiz Exp $
 
 NOTE:  Because plex86 contains a kernel module, it must be run with a
 kernel built from the same sources as the plex86 binaries.  If you are
@@ -9,7 +10,7 @@ updated sources.  (Be sure to disable the LKM while doing this!)
 In order to enable loading of the plex86 kernel module at boot time,
 edit /etc/lkm.conf and add the following line:
 
-@PREFIX@/lkm/plex86.o - - @PREFIX@/lib/plex86/netbsd_post.sh - AFTERMOUNT
+${PREFIX}/lkm/plex86.o - - ${PREFIX}/lib/plex86/netbsd_post.sh - AFTERMOUNT
 
 The module will be loaded after reboot, and the netbsd_post.sh script will
 automatically create the needed /dev/plex86 device.
diff --git a/emulators/xbeeb/Makefile b/emulators/xbeeb/Makefile
index 917747db94f..bff97c1cabf 100644
--- a/emulators/xbeeb/Makefile
+++ b/emulators/xbeeb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/09/03 10:01:41 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:26 wiz Exp $
 #
 
 DISTNAME=	xbeeb-0.3.6
@@ -11,11 +11,11 @@ HOMEPAGE=	http://www.netcomuk.co.uk/~james/BBCMicro/Xbeeb/index.html
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xbeeb
-PLIST_SRC=	${WRKDIR}/PLIST
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 MAN_PAGE=	${WRKDIR}/xbeeb.1
 
 XBEEBROOT=	share/xbeeb
+MESSAGE_SUBST+=	XBEEBROOT=${XBEEBROOT}
+PLIST_SUBST+=	XBEEBROOT=${XBEEBROOT}
 
 # xbeeb build starts in the source directory
 do-configure:
@@ -25,10 +25,10 @@ post-patch:
 	(cd ${WRKSRC}/src && \
 	${MV} Config.h Config.h.dist && \
 	${SED} 's+^\(#define[	 ]*XBEEBROOT[	 ]*\)[^	 ].*$$+\1"${PREFIX}/${XBEEBROOT}/"+' Config.h.dist > Config.h)
-	${SED} 's+#XBEEBROOT#+${XBEEBROOT}+g' ${PKGDIR}/PLIST > ${PLIST_SRC}
+testt:
 	${SED} -e 's+@XBEEBROOT@+${XBEEBROOT}+g' \
 		-e 's+@PREFIX@+${PREFIX}+g' \
-		${PKGDIR}/xbeeb.1 > ${MAN_PAGE}
+		${FILESDIR}/xbeeb.1 > ${MAN_PAGE}
 
 do-build:
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} xbeeb)
@@ -37,15 +37,6 @@ do-build:
 	do \
 		bdftopcf $$i -o `basename $$i .bdf`.pcf ; \
 	done)
-	${ECHO} > ${MESSAGE_FILE} "You must copy the BBC \"BASIC2\" ROM image to"
-	${ECHO} >> ${MESSAGE_FILE} ""
-	${ECHO} >> ${MESSAGE_FILE} "	${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom"
-	${ECHO} >> ${MESSAGE_FILE} ""
-	${ECHO} >> ${MESSAGE_FILE} "and the BBC \"OS1.2\" ROM image to"
-	${ECHO} >> ${MESSAGE_FILE} ""
-	${ECHO} >> ${MESSAGE_FILE} "	${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom"
-	${ECHO} >> ${MESSAGE_FILE} ""
-	${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE.post >>${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xbeeb ${PREFIX}/bin/xbeeb
diff --git a/emulators/xbeeb/pkg/xbeeb.1 b/emulators/xbeeb/files/xbeeb.1
index dee8decefd0..b38fd4317a6 100644
--- a/emulators/xbeeb/pkg/xbeeb.1
+++ b/emulators/xbeeb/files/xbeeb.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: xbeeb.1,v 1.2 2000/06/05 18:12:57 skrll Exp $
+.\" $NetBSD: xbeeb.1,v 1.1 2001/01/29 11:34:26 wiz Exp $
 .\"
 .Dd May 27, 2000
 .Dt XBEEB 1
diff --git a/emulators/xbeeb/pkg/MESSAGE.post b/emulators/xbeeb/pkg/MESSAGE
index 432b5b0a01c..f82f2f36ee4 100644
--- a/emulators/xbeeb/pkg/MESSAGE.post
+++ b/emulators/xbeeb/pkg/MESSAGE
@@ -1,7 +1,18 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:26 wiz Exp $
+
+You must copy the BBC "BASIC2" ROM image to
+
+	${PREFIX}/${XBEEBROOT}/roms/BASIC2.rom
+
+and the BBC "OS1.2" ROM image to
+
+	${PREFIX}/${XBEEBROOT}/roms/OS1.2.rom
+
 You also need to ensure that your X session can access the fonts 
 needed. This can be done with:
 
-	$ xset fp+ @PREFIX@/lib/X11/fonts/xbeeb
+	$ xset fp+ ${PREFIX}/lib/X11/fonts/xbeeb
 
 To make the effect permanent for future X sessions, you can do this by
 editing certain files in your X installation. 
@@ -19,9 +30,11 @@ intlfonts install directory to the xfs/config file in the comma
 separated list of directories given for the "catalogue" setting.
 For example:
 
-	catalogue = @PREFIX@/lib/X11/fonts/misc/,
-		  @PREFIX@/lib/X11/fonts/Speedo/,
-		  @PREFIX@/lib/X11/fonts/Type1/,
-		  @PREFIX@/lib/X11/fonts/100dpi/,
-		  @PREFIX@/lib/X11/fonts/75dpi/,
-		  @PREFIX@/lib/X11/fonts/xbeeb/
+	catalogue = ${PREFIX}/lib/X11/fonts/misc/,
+		  ${PREFIX}/lib/X11/fonts/Speedo/,
+		  ${PREFIX}/lib/X11/fonts/Type1/,
+		  ${PREFIX}/lib/X11/fonts/100dpi/,
+		  ${PREFIX}/lib/X11/fonts/75dpi/,
+		  ${PREFIX}/lib/X11/fonts/xbeeb/
+
+======================================================================
diff --git a/emulators/xbeeb/pkg/PLIST b/emulators/xbeeb/pkg/PLIST
index 9e97326ccf4..36c91f53f83 100644
--- a/emulators/xbeeb/pkg/PLIST
+++ b/emulators/xbeeb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/06/01 20:47:02 skrll Exp $
+@comment $NetBSD: PLIST,v 1.3 2001/01/29 11:34:26 wiz Exp $
 bin/xbeeb
 lib/X11/fonts/xbeeb/ttext-grc-ldh.pcf
 lib/X11/fonts/xbeeb/ttext-std-udh.pcf
@@ -10,23 +10,23 @@ lib/X11/fonts/xbeeb/ttext-grc.pcf
 lib/X11/fonts/xbeeb/ttext-grc-udh.pcf
 lib/X11/fonts/xbeeb/ttext-std.pcf
 lib/X11/fonts/xbeeb/fonts.dir
-#XBEEBROOT#/roms/xdfs0.70.rom
-#XBEEBROOT#/docs/64doc
-#XBEEBROOT#/docs/Configuration
-#XBEEBROOT#/docs/DataXfer
-#XBEEBROOT#/docs/DiskEmulation
-#XBEEBROOT#/docs/Help
-#XBEEBROOT#/docs/Installation
-#XBEEBROOT#/docs/Keyboard
-#XBEEBROOT#/docs/KnownBugs
-#XBEEBROOT#/docs/MailingLists
-#XBEEBROOT#/docs/Options
-#XBEEBROOT#/docs/RomPatches
-#XBEEBROOT#/docs/SnapshotFormat
-#XBEEBROOT#/docs/Thanks
-#XBEEBROOT#/docs/WWWSites
-#XBEEBROOT#/docs/WorkingSoftware
+${XBEEBROOT}/roms/xdfs0.70.rom
+${XBEEBROOT}/docs/64doc
+${XBEEBROOT}/docs/Configuration
+${XBEEBROOT}/docs/DataXfer
+${XBEEBROOT}/docs/DiskEmulation
+${XBEEBROOT}/docs/Help
+${XBEEBROOT}/docs/Installation
+${XBEEBROOT}/docs/Keyboard
+${XBEEBROOT}/docs/KnownBugs
+${XBEEBROOT}/docs/MailingLists
+${XBEEBROOT}/docs/Options
+${XBEEBROOT}/docs/RomPatches
+${XBEEBROOT}/docs/SnapshotFormat
+${XBEEBROOT}/docs/Thanks
+${XBEEBROOT}/docs/WWWSites
+${XBEEBROOT}/docs/WorkingSoftware
 @dirrm lib/X11/fonts/xbeeb
-@dirrm #XBEEBROOT#/docs
-@dirrm #XBEEBROOT#/roms
-@dirrm #XBEEBROOT#
+@dirrm ${XBEEBROOT}/docs
+@dirrm ${XBEEBROOT}/roms
+@dirrm ${XBEEBROOT}