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.

3 files changed, 17 insertions, 24 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 421afde4eca..9838c57c6b6 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/01/26 05:21:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/01/29 11:34:34 wiz Exp $
 #
 
 DISTNAME=		arla-0.34.5
@@ -29,14 +29,13 @@ CONFIGURE_ARGS+=	--with-krb4=${PREFIX}
 CONFIGURE_ARGS+=	--with-arlacachedir=${ARLA_CACHE}
 .endif
 
-PLIST_SRC=		${WRKDIR}/PLIST
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
-
 .if defined(ARLA_CACHE)
 CACHEDIR=		${ARLA_CACHE}
 .else
 CACHEDIR=		${LOCALBASE}/cache
 .endif
+MESSAGE_SUBST+=		ARLA_CACHE=${CACHEDIR}
+PLIST_SUBST+=		ARLA_CACHE=${CACHEDIR}
 
 post-patch:
 # This is ugly. Utterly ugly. Sigh.
@@ -87,15 +86,6 @@ do-configure:
 # while arla expects LDFLAGS=-R${LOCALBASE}
 	@(LDFLAGS= ; cd ${WRKSRC}; ./configure ${CONFIGURE_ARGS})
 
-pre-install:
-	@${SED} -e 's|@ARLA_CACHE@|${CACHEDIR}|g'                             \
-		<${PKGDIR}/PLIST                                              \
-		>${PLIST_SRC}
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		-e 's|@ARLA_CACHE@|${CACHEDIR}|g'                             \
-		<${PKGDIR}/MESSAGE                                            \
-		>${MESSAGE_FILE}
-
 post-install:
 	@${ECHO} " "
 	@if [ -e ${CACHEDIR} ]; then                                          \
diff --git a/net/arla/pkg/MESSAGE b/net/arla/pkg/MESSAGE
index 329e2a68af7..db9de211a65 100644
--- a/net/arla/pkg/MESSAGE
+++ b/net/arla/pkg/MESSAGE
@@ -1,21 +1,24 @@
 ===============================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:35 wiz Exp $
+
 Arla now has been installed on your system.
 
-The cache directory used by arla is @ARLA_CACHE@.
+The cache directory used by arla is ${ARLA_CACHE}.
 This directory should be on a local disk. You can change the location
 of the cache directory by setting the ARLA_CACHE environment variable
 (or by setting ARLA_CACHE in /etc/mk.conf) to the desired location prior
 to building arla.
 
 To complete the installation you'll have to configure arla.
-Default configuration files are installed in @PREFIX@/etc.
+Default configuration files are installed in ${PREFIX}/etc.
 
 At a minimum, to configure an arla client, copy
-@PREFIX@/etc/{CellServDB,SuidCells,ThisCell,arla.conf}.default to
-@PREFIX@/etc/{CellServDB,SuidCells,ThisCell,arla.conf} and customize them.
+${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf}.default to
+${PREFIX}/etc/{CellServDB,SuidCells,ThisCell,arla.conf} and customize them.
 Start arlad from rc.local, using the script provided in
-@PREFIX@/etc/rc.d/arlad.sh and include an entry for xfs in your /etc/fstab
-(see @PREFIX@/share/examples/arla/fstab).
-Also, append @PREFIX@/share/examples/arla/services to /etc/services and
-append @PREFIX@/share/examples/arla/lkm.conf to /etc/lkm.conf.
+${PREFIX}/etc/rc.d/arlad and include an entry for xfs in your /etc/fstab
+(see ${PREFIX}/share/examples/arla/fstab).
+Also, append ${PREFIX}/share/examples/arla/services to /etc/services and
+append ${PREFIX}/share/examples/arla/lkm.conf to /etc/lkm.conf.
+
 ===============================================================================
diff --git a/net/arla/pkg/PLIST b/net/arla/pkg/PLIST
index 548cc6984d1..c4e65a09609 100644
--- a/net/arla/pkg/PLIST
+++ b/net/arla/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/01/26 05:21:46 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/01/29 11:34:35 wiz Exp $
 include/atypes.h
 include/fs_errors.h
 include/base64.h
@@ -98,10 +98,10 @@ man/man3/cmd.3
 @unexec install-info --delete %D/info/arla.info %D/info/dir
 info/arla.info
 @exec install-info %D/info/arla.info %D/info/dir
-@exec if [ ! -e @ARLA_CACHE@ ] ; then /bin/mkdir -p @ARLA_CACHE@; /bin/chmod 700 @ARLA_CACHE@; chown root @ARLA_CACHE@; fi
+@exec if [ ! -e ${ARLA_CACHE} ] ; then /bin/mkdir -p ${ARLA_CACHE}; /bin/chmod 700 ${ARLA_CACHE}; chown root ${ARLA_CACHE}; fi
 @exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/bin/mount_xfs /sbin/mount_xfs; fi
 @exec if ! /usr/bin/grep xfs_mod /etc/lkm.conf 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/lkm.conf >> /etc/lkm.conf; fi
 @exec if ! /usr/bin/grep afs3-bos /etc/services 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/services >> /etc/services; fi
 @exec if ! /usr/bin/grep afs /etc/fstab 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/fstab >> /etc/fstab; fi
 @unexec /bin/rm -f /sbin/mount_xfs
-@unexec /bin/rm -rf @ARLA_CACHE@
+@unexec /bin/rm -rf ${ARLA_CACHE}