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, 27 insertions, 17 deletions

diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 47287034cb0..ad1c192a282 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/15 09:26:21 agc Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:28 wiz Exp $
 
 DISTNAME=	NetBSD1.3I-jman-19990531
 PKGNAME=	ja-man-19990531
@@ -17,9 +17,6 @@ MAKE_ENV+=	JAMANDIR=${JAMANDIR}
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
-MESSAGE_SRC=    ${PKGDIR}/MESSAGE
-MESSAGE_FILE=   ${WRKDIR}/.MESSAGE
-
 MANCOMPRESSED_IF_MANZ=	yes
 
 .include "../../mk/bsd.prefs.mk"
@@ -47,7 +44,6 @@ do-build:
 MKCATPAGES?=	yes
 
 pre-install:
-	@${SED} -e 's|$${PREFIX}|${PREFIX}|' ${MESSAGE_SRC} > ${MESSAGE_FILE}
 .if ${MKCATPAGES} == no
 	@${SED} -e '/\/cat[1-9]\//d' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .if exists(${PKGDIR}/PLIST.${MACHINE})
diff --git a/japanese/man/pkg/MESSAGE b/japanese/man/pkg/MESSAGE
index 961c6ed6afa..4f09a7e9fff 100644
--- a/japanese/man/pkg/MESSAGE
+++ b/japanese/man/pkg/MESSAGE
@@ -1 +1,6 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:28 wiz Exp $
+
 Please read ${PREFIX}/share/doc/jman/README.
+
+======================================================================
diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
index b487593fe63..77a9f5e706c 100644
--- a/japanese/skkfep/Makefile
+++ b/japanese/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/09 05:14:27 itohy Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:28 wiz Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
@@ -16,12 +16,10 @@ MAKE_ENV=	MAKE_FLAGS='EXECBASE=${LOCALBASE} CC=${CC}'
 
 DESCR_SRC=	${WRKDIR}/DESCR
 INSTALL_FILE=	${WRKDIR}/INSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-build:
 	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR	>${DESCR_SRC}
 	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL	>${INSTALL_FILE}
-	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/MESSAGE	>${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/skkfep ${PREFIX}/bin/skkfep
diff --git a/japanese/skkfep/pkg/MESSAGE b/japanese/skkfep/pkg/MESSAGE
index 16f6a2db563..bddfd7695e2 100644
--- a/japanese/skkfep/pkg/MESSAGE
+++ b/japanese/skkfep/pkg/MESSAGE
@@ -1,4 +1,9 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:28 wiz Exp $
+
     To use skkfep, the dictionary server (skkserv) is almost
 required.  Use "skkserv" pkg, or, if you have another machine
-running skkserv, put the hostname in @PKGBASE@/etc/skk.conf
+running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf
 file, and skkfep will connect to the host.
+
+======================================================================
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index ddf8697778e..82fa7c62a07 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/11/09 05:14:27 itohy Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:28 wiz Exp $
 
 DISTNAME=	skkinput-2.03
 CATEGORIES=	japanese
@@ -17,12 +17,10 @@ PLIST_SUBST=	PKGBASE=${LOCALBASE}
 
 DESCR_SRC=	${WRKDIR}/DESCR
 INSTALL_FILE=	${WRKDIR}/INSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 post-build:
 	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/DESCR	>${DESCR_SRC}
 	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/INSTALL	>${INSTALL_FILE}
-	${SED} 's#@PKGBASE@#${LOCALBASE}#g' ${PKGDIR}/MESSAGE	>${MESSAGE_FILE}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/skkinput.man ${PREFIX}/man/ja_JP.EUC/man1/skkinput.1
diff --git a/japanese/skkinput/pkg/MESSAGE b/japanese/skkinput/pkg/MESSAGE
index 868dfc7e6e4..553c395fcfc 100644
--- a/japanese/skkinput/pkg/MESSAGE
+++ b/japanese/skkinput/pkg/MESSAGE
@@ -1,4 +1,9 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:29 wiz Exp $
+
     To use skkinput, the dictionary server (skkserv) is almost
 required.  Use "skkserv" pkg, or, if you have another machine
-running skkserv, put the hostname in @PKGBASE@/etc/skk.conf
+running skkserv, put the hostname in ${LOCALBASE}/etc/skk.conf
 file, and skkinput will connect to the host.
+
+======================================================================
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index ac64ca6535e..ce922cecf0c 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/26 05:21:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:29 wiz Exp $
 
 DISTNAME=	skk9.6
 PKGNAME=	skkserv-3.9.4nb1
@@ -19,7 +19,6 @@ DIST_SUBDIR=	skk
 
 GNU_CONFIGURE=	YES
 INSTALL_FILE=	${WRKDIR}/INSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -43,7 +42,6 @@ post-build:
 	${SED} -e 's#@PREFIX@#${PREFIX}#g' <${FILESDIR}/skkserv.sh	\
 		>${WRKDIR}/skkserv.sh
 	${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/INSTALL	>${INSTALL_FILE}
-	${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE	>${MESSAGE_FILE}
 	:
 	: Merging dictionaries....
 	:
diff --git a/japanese/skkserv/pkg/MESSAGE b/japanese/skkserv/pkg/MESSAGE
index 00734702a59..3f24478abd5 100644
--- a/japanese/skkserv/pkg/MESSAGE
+++ b/japanese/skkserv/pkg/MESSAGE
@@ -1 +1,6 @@
-Please add "@PREFIX@/etc/rc.d/skkserv.sh" to "/etc/rc.local".
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:29 wiz Exp $
+
+Please add ${PREFIX}/etc/rc.d/skkserv to /etc/rc.local.
+
+======================================================================