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, 21 insertions, 20 deletions

diff --git a/fonts/intlfonts/Makefile b/fonts/intlfonts/Makefile
index 097f5deb03d..cc4d23f4ac7 100644
--- a/fonts/intlfonts/Makefile
+++ b/fonts/intlfonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/06/28 21:50:24 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/01/29 11:34:27 wiz Exp $
 
 DISTNAME=	intlfonts-1.2
 CATEGORIES=	fonts x11
@@ -33,7 +33,6 @@ MISC_FILES=	README.split
 
 DIST_SUBDIR=	${PKGNAME}
 EXTRACT_ONLY=	${FONT_SETS:S/$/${EXTRACT_SUFX}/}
-MESSAGE_FILE=	${WRKSRC}/MESSAGE
 USE_X11BASE=	yes
 
 GNU_CONFIGURE=	yes
@@ -56,7 +55,4 @@ post-extract:
 	${CP} ${_DISTDIR}/${FILE} ${WRKSRC}
 .endfor
 
-do-build:
-	${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/intlfonts/pkg/MESSAGE b/fonts/intlfonts/pkg/MESSAGE
index 697ab57c864..3f1d8dbd1d8 100644
--- a/fonts/intlfonts/pkg/MESSAGE
+++ b/fonts/intlfonts/pkg/MESSAGE
@@ -1,7 +1,10 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:27 wiz Exp $
+
 You can tell one existing X session on the installed host to use the
 new "intlfonts" fonts with:
 
-	$ xset +fp @PREFIX@/lib/X11/fonts/intlfonts
+	$ xset +fp ${PREFIX}/lib/X11/fonts/intlfonts
 
 To make the effect permanent for future X sessions, you will have to
 edit certain files in yout X installation. 
@@ -19,9 +22,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/intlfonts/
+	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/intlfonts/
+
+======================================================================
diff --git a/fonts/jmk-fonts/Makefile b/fonts/jmk-fonts/Makefile
index 1662a5f126e..3a7f380e66c 100644
--- a/fonts/jmk-fonts/Makefile
+++ b/fonts/jmk-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/05/27 14:52:07 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:27 wiz Exp $
 #
 
 DISTNAME=	jmk-x11-fonts-3.0
@@ -10,10 +10,5 @@ MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.ntrnet.net/~jmknoble/fonts/
 
 USE_IMAKE=	yes
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
-post-build:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' \
-		< ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/jmk-fonts/pkg/MESSAGE b/fonts/jmk-fonts/pkg/MESSAGE
index ac021eae565..136d27e44b9 100644
--- a/fonts/jmk-fonts/pkg/MESSAGE
+++ b/fonts/jmk-fonts/pkg/MESSAGE
@@ -1,10 +1,15 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:27 wiz Exp $
+
 To use the fonts you have just installed, add
 the line:
 
-    FontPath @PREFIX@/lib/X11/fonts/jmk
+    FontPath ${PREFIX}/lib/X11/fonts/jmk
 
 to your X window configuration file, or run the
 following command:
 
-    xset +fp @PREFIX@/lib/X11/fonts/jmk
+    xset +fp ${PREFIX}/lib/X11/fonts/jmk
     xset fp rehash
+
+======================================================================