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.

5 files changed, 28 insertions, 36 deletions

diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 984cb04fbb6..258a638c447 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/10/19 04:26:39 hubertf Exp $
+# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:34 wiz Exp $
 # FreeBSD: ports/misc/fd/Makefile,v 1.14 1999/08/25 07:21:37 obrien Exp
 #
 
@@ -11,7 +11,6 @@ MASTER_SITES=	ftp://ftp.ics.es.osaka-u.ac.jp/pub/FDclone/ \
 MAINTAINER=	Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 
 MANLANG=	ja
-MAN1=		fd.1
 MAKE_ENV=	LANG=${MANLANG}
 DOCS=		README FAQ HISTORY ToAdmin
 
@@ -25,6 +24,5 @@ post-install:
 	@for i in ${DOCS}; do \
 		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
 	done
-	@${CAT} ${PKGDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index ee422cff3f2..9a7f56be437 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/12/08 09:43:06 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:34 wiz Exp $
 
 DISTNAME=	jitterbug-1.6.2
 WRKSRC=		${WRKDIR}/${PKGNAME}/source
@@ -20,7 +20,6 @@ ADDGROUP=		${LOCALBASE}/sbin/groupadd
 PLIST_SRC=	${WRKDIR}/PLIST-src
 INSTALL_FILE=	${WRKDIR}/INSTALL
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 CONFIGDIR=	${WRKDIR}/${PKGNAME}/config
 DOCSDIR=	${WRKDIR}/${PKGNAME}/docs
 CGIBINDIR=	libexec/cgi-bin
@@ -60,6 +59,10 @@ JB_EMAIL?=	${JB_LOCALMAIL}@${JB_FQHOSTNAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
+MESSAGE_SUBST+=	JB_USER=${JB_USER}		\
+		JB_PACKAGE=${JB_PACKAGE}	\
+		JB_LOCALMAIL=${JB_LOCALMAIL}
+
 pre-extract:
 .if ${JB_FQHOSTNAME} == "totally.unknown.domain"
 	@${ECHO}
@@ -161,13 +164,6 @@ pre-install:
 			>${WRKDIR}/NEWPACKAGE
 	@${SED}                                                               \
 		-e 's|@JB_USER@|${JB_USER}|g'                                 \
-		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
-		-e 's|@PREFIX@|${PREFIX}|g'                                   \
-		-e 's|@JB_LOCALMAIL@|${JB_LOCALMAIL}|g'                       \
-			<${PKGDIR}/MESSAGE                                    \
-			>${MESSAGE_FILE}
-	@${SED}                                                               \
-		-e 's|@JB_USER@|${JB_USER}|g'                                 \
 		-e 's|@JB_GROUP@|${JB_GROUP}|g'                               \
 		-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g'                           \
 		-e 's|@PREFIX@|${PREFIX}|g'                                   \
@@ -232,7 +228,7 @@ do-install:
 		${WRKDIR}/jitterbug.auth ${PREFIX}/${JB_USER}/etc
 	${MKDIR} ${PREFIX}/${JB_USER}/doc
 	${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
-		${MESSAGE_FILE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL
+		${MESSAGE} ${PREFIX}/${JB_USER}/doc/POSTINSTALL
 	${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
 		${WRKDIR}/NEWPACKAGE ${PREFIX}/${JB_USER}/doc
 	${INSTALL} -c -o ${JB_USER} -g ${JB_GROUP} -m 644                     \
diff --git a/misc/jitterbug/pkg/MESSAGE b/misc/jitterbug/pkg/MESSAGE
index 564d8a2e988..9c2d2ed3d32 100644
--- a/misc/jitterbug/pkg/MESSAGE
+++ b/misc/jitterbug/pkg/MESSAGE
@@ -1,29 +1,29 @@
-
 ===============================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:34 wiz Exp $
+
 Jitterbug now has successfully been installed on your system.
 
 Before using jitterbug you should perform the following steps:
 
-o Set a system password for the @JB_USER@ user (as root)
+o Set a system password for the ${JB_USER} user (as root)
 
-o Set a htpasswd for the @JB_USER@ user (using htpasswd):
-  htpasswd @PREFIX@/@JB_USER@/etc/jitterbug.auth @JB_USER@
+o Set a htpasswd for the ${JB_USER} user (using htpasswd):
+  htpasswd ${PREFIX}/${JB_USER}/etc/jitterbug.auth ${JB_USER}
 
 o Customize (if necessary)
-  @PREFIX@/etc/jitterbug/@JB_PACKAGE@     and
-  @PREFIX@/etc/jitterbug/@JB_PACKAGE@.private
+  ${PREFIX}/etc/jitterbug/${JB_PACKAGE}     and
+  ${PREFIX}/etc/jitterbug/${JB_PACKAGE}.private
 
 o Customize the html documents in the project's bug tracking directory:
-  @PREFIX@/@JB_USER@/@JB_PACKAGE@/bug_tracking
+  ${PREFIX}/${JB_USER}/${JB_PACKAGE}/bug_tracking
 
-o Add an alias for @JB_USER@ to your mail aliases:
+o Add an alias for ${JB_USER} to your mail aliases:
   The details on how to do this depend on which MTA you use. For standard
   sendmail, add the following lines to your aliases files
   (/etc/aliases or /etc/mail/aliases):
-  @JB_LOCALMAIL@: "|@PREFIX@/@JB_USER@/bin/new_message @JB_PACKAGE@"
+  ${JB_LOCALMAIL}: "|${PREFIX}/${JB_USER}/bin/new_message ${JB_PACKAGE}"
 
-o Append @PREFIX@/etc/jitterbug/httpd.conf.add to your httpd.conf
-  (typically @PREFIX@/etc/httpd/httpd.conf) and restart your httpd.
+o Append ${PREFIX}/etc/jitterbug/httpd.conf.add to your httpd.conf
+  (typically ${PREFIX}/etc/httpd/httpd.conf) and restart your httpd.
 
 ===============================================================================
-
diff --git a/misc/staroffice/Makefile b/misc/staroffice/Makefile
index 7eec9dd206c..e695b1226cd 100644
--- a/misc/staroffice/Makefile
+++ b/misc/staroffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/31 02:35:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:34 wiz Exp $
 #
 
 DISTNAME=		so51a_lnx_${LANGNO}
@@ -69,7 +69,6 @@ LANGSUB=		51AA9999
 
 PLIST_SUBST+=		LANGNO=${LANGNO}
 PLIST_SRC=		${WRKDIR}/PLIST
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 INSTALL_FILE=		${WRKDIR}/INSTALL
 
 do-fetch:
@@ -135,9 +134,7 @@ post-install:
 		>${WRKDIR}/${file}
 	${INSTALL_SCRIPT} ${WRKDIR}/${file} ${PREFIX}/bin
 .endfor
-.for file in MESSAGE INSTALL
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/${file} \
-		>${WRKDIR}/${file}
-.endfor
+	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${FILESDIR}/INSTALL \
+		>$WRKDIR}/INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/staroffice/pkg/MESSAGE b/misc/staroffice/pkg/MESSAGE
index 89ba9d84d3b..e17170b22ff 100644
--- a/misc/staroffice/pkg/MESSAGE
+++ b/misc/staroffice/pkg/MESSAGE
@@ -1,14 +1,15 @@
-$NetBSD: MESSAGE,v 1.1.1.1 1999/11/22 21:23:49 rh Exp $
-
 ==========================================================================
-  StarOffice has now been installed in @@PREFIX@@/Office51.
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:34 wiz Exp $
+
+  StarOffice has now been installed in ${PREFIX}/Office51.
 
   Before using this package for the first time, each user has to run
-  @@PREFIX@@/bin/sosetup.  Thereafter, StarOffice can be started using
-  the @@PREFIX@@/bin/soffice command.
+  ${PREFIX}/bin/sosetup.  Thereafter, StarOffice can be started using
+  the ${PREFIX}/bin/soffice command.
 
   Please note that under NetBSD the program will pop up a requester,
   complaining that it is unable to load the 'PluginManager' component.
   This is normal and can be ignored (you can simply click away the
   requester).
+
 ==========================================================================