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.

16 files changed, 53 insertions, 67 deletions

diff --git a/security/amavis/Makefile b/security/amavis/Makefile
index f6f872db427..afae0d3f0b2 100644
--- a/security/amavis/Makefile
+++ b/security/amavis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/10/23 14:52:53 rh Exp $
+# $NetBSD: Makefile,v 1.4 2001/01/29 11:34:40 wiz Exp $
 #
 
 DISTNAME=	amavis-0.2.1-pre3
@@ -30,14 +30,10 @@ CONFIGURE_ENV+=	procmail="/usr/libexec/mail.local"
 CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR}
 CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO}
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/zipsecure/zipsecure ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/src/securetar/securetar ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/src/scanmails/scanmails ${PREFIX}/sbin
-	${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE \
-		>${WRKDIR}/MESSAGE
 	${SED} -e 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/amavis.m4 \
 		>${WRKDIR}/amavis.m4
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/amavis
diff --git a/security/amavis/pkg/MESSAGE b/security/amavis/pkg/MESSAGE
index af25cdeee0b..cfc8556ec09 100644
--- a/security/amavis/pkg/MESSAGE
+++ b/security/amavis/pkg/MESSAGE
@@ -1,9 +1,9 @@
-$NetBSD: MESSAGE,v 1.3 2000/10/23 14:57:16 rh Exp $
-
 ==========================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:40 wiz Exp $
+
   AMaViS has now been installed on your system.  In order to integrate
   the virus scanner with sendmail, copy
-  @PREFIX@/share/examples/amavis/amavis.m4 to the 'mailer' sendmail
+  ${PREFIX}/share/examples/amavis/amavis.m4 to the 'mailer' sendmail
   configuration directory.  Then use 'amavis' instead of 'local' for
   local mail delivery.  Alternatively, you can simply replace
 
@@ -16,7 +16,8 @@ Mlocal, P=/usr/libexec/mail.local, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40,
   in your installed "sendmail.cf" by
 
 
-Mlocal, P=@PREFIX@/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40,
+Mlocal, P=${PREFIX}/sbin/scanmails, F=lsDFMAw5:/|@qrmn9, S=10/30, R=20/40,
 	T=DNS/RFC822/X-Unix,
 	A=scanmails -d $u
+
 ==========================================================================
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 8c4becb2844..e4a1ba94cbb 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/10/11 16:28:53 wennmach Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:41 wiz Exp $
 #
 
 DISTNAME=		krb4-1.0.1
@@ -13,19 +13,12 @@ CRYPTO=			yes
 GNU_CONFIGURE=		yes
 #USE_GTEXINFO=		yes #not currently needed
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
-
 post-patch:
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
 		<${WRKSRC}/lib/kafs/kafs.h                                    \
 		>${WRKSRC}/lib/kafs/kafs.h.sed
 	@${MV} ${WRKSRC}/lib/kafs/kafs.h.sed ${WRKSRC}/lib/kafs/kafs.h
 
-pre-install:
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		<${PKGDIR}/MESSAGE                                            \
-		>${MESSAGE_FILE}
-
 post-install:
 	@${MKDIR} ${PREFIX}/share/examples/kth-krb4
 	${INSTALL_DATA} ${WRKSRC}/etc/krb.conf ${PREFIX}/share/examples/kth-krb4
diff --git a/security/kth-krb4/pkg/MESSAGE b/security/kth-krb4/pkg/MESSAGE
index ee8e173e9c4..a291d383b71 100644
--- a/security/kth-krb4/pkg/MESSAGE
+++ b/security/kth-krb4/pkg/MESSAGE
@@ -1,13 +1,16 @@
 ===============================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $
+
 Kth-krb4 now has been installed on your system.
 
 To complete the installation you'll have to configure Kerberos.
 More information on how to configure Kerberos is available via the "info"
 command. Sample configuration files are installed in
-@PREFIX@/share/examples/kth-krb4.
+${PREFIX}/share/examples/kth-krb4.
 
 At a minimum, to configure a Kerberos client, copy 
-@PREFIX@/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and
+${PREFIX}/share/examples/kth-krb4/{krb.conf,krb.realms} to /etc and
 customize them. Also, apply the patches provided in services.diff to
 /etc/services.
+
 ===============================================================================
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 1e61af28863..2427e92f471 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2001/01/10 16:05:52 tron Exp $
+# $NetBSD: Makefile,v 1.35 2001/01/29 11:34:41 wiz Exp $
 
 DISTNAME=		openssh-2.3.0p1
 CATEGORIES=		security
@@ -48,7 +48,6 @@ BUILD_DEFS+=		SSH_CONF_DIR
 
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 INSTALL_FILE=		${WRKDIR}/INSTALL
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 
 # matches what's in `Configure' (except sparc64 and alpha, see PR 10984)
 ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 \
@@ -60,6 +59,8 @@ ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 \
 
 SSH_CONF_DIR?=		/etc
 
+MESSAGE_SUBST+=		SSH_CONF_DIR=${SSH_CONF_DIR}
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${SSH_CONF_DIR}
 CONFIGURE_ARGS+=	--with-ssl-dir=${SSLBASE}
@@ -87,7 +88,6 @@ post-build:
 		${PKGDIR}/DEINSTALL	\
 		${PKGDIR}/INSTALL	\
 		${PKGDIR}/INSTALL.SunOS	\
-		${PKGDIR}/MESSAGE	\
 		${FILESDIR}/sshd.sh;	\
 	do \
 		${SED}	-e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
diff --git a/security/openssh/pkg/MESSAGE b/security/openssh/pkg/MESSAGE
index 4ff54dcc806..1a754dc9bc5 100644
--- a/security/openssh/pkg/MESSAGE
+++ b/security/openssh/pkg/MESSAGE
@@ -1,13 +1,13 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/09/28 09:25:15 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $
 
-If "starter" configuration files were installed (in @SSH_CONF_DIR@)
+If "starter" configuration files were installed (in ${SSH_CONF_DIR})
 when the package was installed, be sure to examine them (and the man pages
 for ssh and sshd) to determine whether you want to make any changes.
 
 Copies of the example configuration files are installed in
-@PREFIX@/share/examples/ssh, so those can still be used for reference
-after you have made changes to those installed in @SSH_CONF_DIR@, or if
+${PREFIX}/share/examples/ssh, so those can still be used for reference
+after you have made changes to those installed in ${SSH_CONF_DIR}, or if
 you had existing configuration files, which would not be overwritten in
 the installation process.
 
@@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot
 time.  Something like the following should do the job:
 
 # Run sshd if installed and configured
-@PREFIX@/etc/rc.d/sshd
+${PREFIX}/etc/rc.d/sshd
+
 ==========================================================================
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index 2d34c46d6fe..a84f4a8ddd9 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/09/03 13:22:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:41 wiz Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -11,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.obtuse.com/smtpd.html
 
 SPOOL=		/var/spool/smtpd
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 pre-install:
 		-${MKDIR} ${SPOOL}/etc
@@ -20,8 +19,4 @@ pre-install:
 		${CHMOD} -R g=,o= ${SPOOL}
 		${CP} /etc/localtime /etc/resolv.conf ${SPOOL}/etc
 
-post-build:
-		${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \
-			>${MESSAGE_FILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/smtpd/pkg/MESSAGE b/security/smtpd/pkg/MESSAGE
index ceac3b1a2d6..65fa24e97e8 100644
--- a/security/smtpd/pkg/MESSAGE
+++ b/security/smtpd/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/09/03 13:22:31 wiz Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:41 wiz Exp $
 
 The necessary spool and configuration directories were created
 under /var/spool/smtpd. Please edit /var/spool/smtpd/etc/smtp_check_rules
@@ -7,7 +7,8 @@ according to your taste.
 
 You will want to start smtpfwdd in rc.local, and add a line like
 
-smtp	stream	tcp	nowait	root	@PREFIX@/sbin/smtpd	smtpd
+smtp	stream	tcp	nowait	root	${PREFIX}/sbin/smtpd	smtpd
 
 to your /etc/inetd.conf when you are done.
+
 ==========================================================================
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 9002f76f2a2..023613925a5 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2000/09/26 19:59:54 fredb Exp $
+# $NetBSD: Makefile,v 1.85 2001/01/29 11:34:42 wiz Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -147,9 +147,10 @@ ROOT_GROUP?=	wheel
 .endif
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 PLIST_SRC=	${WRKDIR}/PLIST
-PLIST_SUBST+=	INSTALL="${INSTALL}" ROOT_GROUP="${ROOT_GROUP}"
+PLIST_SUBST+=	INSTALL="${INSTALL}"		\
+		ROOT_GROUP="${ROOT_GROUP}"
+MESSAGE_SUBST+=	SSH_CONF_DIR="${SSH_CONF_DIR}"
 
 pre-patch:
 	@${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \
@@ -178,7 +179,7 @@ post-patch:
 
 post-build:
 	@cd ${PKGDIR}; \
-	for FILE in DEINSTALL MESSAGE PLIST ${FILESDIR}/sshd.sh; do \
+	for FILE in DEINSTALL PLIST ${FILESDIR}/sshd.sh; do \
 	  ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
 	    -e 's#@PREFIX@#${PREFIX}#g' \
 	    <$${FILE} >${WRKDIR}/`basename $${FILE}`; \
diff --git a/security/ssh/pkg/MESSAGE b/security/ssh/pkg/MESSAGE
index b99e81a15ee..f4c7d464fca 100644
--- a/security/ssh/pkg/MESSAGE
+++ b/security/ssh/pkg/MESSAGE
@@ -1,13 +1,13 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.4 2000/09/28 09:25:16 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:42 wiz Exp $
 
-If "starter" configuration files were installed (in @SSH_CONF_DIR@)
+If "starter" configuration files were installed (in ${SSH_CONF_DIR})
 when the package was installed, be sure to examine them (and the man pages
 for ssh and sshd) to determine whether you want to make any changes.
 
 Copies of the example configuration files are installed in
-@PREFIX@/share/examples/ssh, so those can still be used for reference
-after you have made changes to those installed in @SSH_CONF_DIR@, or if
+${PREFIX}/share/examples/ssh, so those can still be used for reference
+after you have made changes to those installed in ${SSH_CONF_DIR}, or if
 you had existing configuration files, which would not be overwritten in
 the installation process.
 
@@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot
 time.  Something like the following should do the job:
 
 # Run sshd if installed and configured
-@PREFIX@/etc/rc.d/sshd
+${PREFIX}/etc/rc.d/sshd
+
 ==========================================================================
diff --git a/security/ssh6/Makefile b/security/ssh6/Makefile
index 10c0ca3b85e..6d76edc6a76 100644
--- a/security/ssh6/Makefile
+++ b/security/ssh6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/10/10 09:52:00 itojun Exp $
+# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:42 wiz Exp $
 # FreeBSD Id: Makefile,v 1.47 1997/11/10 22:04:42 dima Exp
 #
 
@@ -145,8 +145,8 @@ CFLAGS+=		-m68060
 .endif
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 PLIST_SRC=	${WRKDIR}/PLIST
+MESSAGE_SUBST+=	SSH_CONF_DIR=${SSH_CONF_DIR}
 
 pre-patch:
 	@${MV} -f ${WRKSRC}/make-ssh-known-hosts.pl \
@@ -175,7 +175,7 @@ post-patch:
 
 post-build:
 	@cd ${PKGDIR}; \
-	for FILE in DEINSTALL MESSAGE PLIST ${FILESDIR}/sshd.sh; do \
+	for FILE in DEINSTALL PLIST ${FILESDIR}/sshd.sh; do \
 	  ${SED} -e 's#@SSH_CONF_DIR@#${SSH_CONF_DIR}#g' \
 	    -e 's#@PREFIX@#${PREFIX}#g' \
 	    <$${FILE} >${WRKDIR}/`basename $${FILE}`; \
diff --git a/security/ssh6/pkg/MESSAGE b/security/ssh6/pkg/MESSAGE
index 35edbe53f41..ba81750658f 100644
--- a/security/ssh6/pkg/MESSAGE
+++ b/security/ssh6/pkg/MESSAGE
@@ -1,13 +1,13 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.2 2000/09/28 09:25:16 jlam Exp $
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:42 wiz Exp $
 
-If "starter" configuration files were installed (in @SSH_CONF_DIR@)
+If "starter" configuration files were installed (in ${SSH_CONF_DIR})
 when the package was installed, be sure to examine them (and the man pages
 for ssh and sshd) to determine whether you want to make any changes.
 
 Copies of the example configuration files are installed in
-@PREFIX@/share/examples/ssh, so those can still be used for reference
-after you have made changes to those installed in @SSH_CONF_DIR@, or if
+${PREFIX}/share/examples/ssh, so those can still be used for reference
+after you have made changes to those installed in ${SSH_CONF_DIR}, or if
 you had existing configuration files, which would not be overwritten in
 the installation process.
 
@@ -15,5 +15,6 @@ In general, you will want to set up /etc/rc.local to start sshd at boot
 time.  Something like the following should do the job:
 
 # Run sshd if installed and configured
-@PREFIX@/etc/rc.d/sshd
+${PREFIX}/etc/rc.d/sshd
+
 ==========================================================================
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 4ad1acbfdd6..a29f34823b2 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/12/06 16:27:39 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2001/01/29 11:34:42 wiz Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/11/12 03:24:41 obrien Exp
 #
 
@@ -43,7 +43,6 @@ CONFIGURE_ARGS+=	--with-nbsdops --disable-path-info
 
 PLIST_SRC=		${PKGDIR}/PLIST.common
 PLIST_SRC+=		${PKGDIR}/PLIST.${LOWER_OPSYS}
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 
 DOCDIR=			${PREFIX}/share/doc/sudo
 EGDIR=			${PREFIX}/share/examples/sudo
@@ -51,10 +50,6 @@ EGDIR=			${PREFIX}/share/examples/sudo
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-post-build:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 post-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA} ${WRKSRC}/UPGRADE ${DOCDIR}
diff --git a/security/sudo/pkg/MESSAGE b/security/sudo/pkg/MESSAGE
index f1ff8fa5979..d691cdc6dc4 100644
--- a/security/sudo/pkg/MESSAGE
+++ b/security/sudo/pkg/MESSAGE
@@ -1,9 +1,9 @@
 =============================================================================
-$NetBSD: MESSAGE,v 1.1 2000/12/06 06:33:40 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:42 wiz Exp $
 
 If you are upgrading from a version of sudo prior to 1.6, then please read
 
-	@PREFIX@/share/doc/sudo/UPGRADE
+	${PREFIX}/share/doc/sudo/UPGRADE
 
 on how to modify your sudoers file appropriately.
 
diff --git a/security/xdm-krb4/Makefile b/security/xdm-krb4/Makefile
index e627b78b7ed..d27c594c2fd 100644
--- a/security/xdm-krb4/Makefile
+++ b/security/xdm-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/26 05:21:48 hubertf Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:43 wiz Exp $
 #
 
 DISTNAME=		xdm-krb4-3.3.6.2
@@ -13,8 +13,6 @@ DEPENDS+=               kth-krb4-1.0.1:../../security/kth-krb4
 USE_X11BASE=		yes
 USE_IMAKE=		yes
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
-
 .include "../../mk/bsd.prefs.mk"
 
 post-patch:
@@ -24,9 +22,6 @@ post-patch:
 
 pre-install:
 	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
-		<${PKGDIR}/MESSAGE                                            \
-		>${MESSAGE_FILE}
-	@${SED} -e 's|@PREFIX@|${PREFIX}|g'                                   \
 		<${FILESDIR}/xdm-krb4.sh                                      \
 		>${WRKDIR}/xdm-krb4.sh
 
diff --git a/security/xdm-krb4/pkg/MESSAGE b/security/xdm-krb4/pkg/MESSAGE
index 2526f764a48..e5cae9c1577 100644
--- a/security/xdm-krb4/pkg/MESSAGE
+++ b/security/xdm-krb4/pkg/MESSAGE
@@ -1,6 +1,9 @@
 ===============================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:43 wiz Exp $
+
 xdm-krb4 now has been installed on your system.
 
 A startup file (e.g. for inclusion into your /etc/rc.local) is provided
-in @PREFIX@/etc/rc.d/xdm-krb4.sh
+in ${PREFIX}/etc/rc.d/xdm-krb4.sh
+
 ===============================================================================