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, 96 insertions, 106 deletions

diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index cebbd32bb4e..be4cc7feedd 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/01/26 05:21:45 hubertf Exp $
+# $NetBSD: Makefile,v 1.19 2001/01/29 11:34:30 wiz Exp $
 
 DISTNAME=	exim-3.20
 CATEGORIES=	mail net
@@ -11,12 +11,10 @@ MAINTAINER=	ad@netbsd.org
 HOMEPAGE=	http://www.exim.org/
 
 USE_PERL5=	yes
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 pre-patch:
 	${MKDIR} ${WRKSRC}/Local
 	${CP} ${WRKSRC}/src/EDITME ${WRKSRC}/Local/Makefile.netbsd
-	${SED} "s,@PREFIX@,${PREFIX}," < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 pre-configure:
 	${SED} -e 's:@PREFIX@:${PREFIX}:' \
diff --git a/mail/exim/pkg/MESSAGE b/mail/exim/pkg/MESSAGE
index be074818c04..0400ae5c020 100644
--- a/mail/exim/pkg/MESSAGE
+++ b/mail/exim/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2000/08/30 11:21:02 ad Exp $
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:30 wiz Exp $
 
 To use exim, you will need to perform the following steps manually; it is
 inappropriate for this package to make the changes for you.
@@ -7,13 +7,13 @@ inappropriate for this package to make the changes for you.
 1. Add a `mail' user: mail:*:8:6::0:0:Mail subsystem:/var/mail:/sbin/nologin
 2. Set the correct ownership and permissions on the exim log directory:
    chown mail:mail /var/log/exim && chmod 750 /var/log/exim
-3. Read the documentation. Edit @PREFIX@/etc/exim/configure to taste. Note
+3. Read the documentation. Edit ${PREFIX}/etc/exim/configure to taste. Note
    that depending on the version of NetBSD, the `aliases' file may be in
    /etc/mail and not /etc, as it was previously.
 4. Back-up /etc/mailer.conf to /etc/mailer.conf.sendmail.
-   Copy @PREFIX@/etc/exim/mailer.conf.exim to /etc/mailer.conf.
+   Copy ${PREFIX}/etc/exim/mailer.conf.exim to /etc/mailer.conf.
 5. Set sendmail=NO in /etc/rc.conf. Add the folllowing to /etc/rc.local:
-   echo -n ' exim'; @PREFIX@/etc/rc.d/exim.sh
+   echo -n ' exim'; ${PREFIX}/etc/rc.d/exim
 6. Configuring log rotation is dependant on personal taste and the version of
    NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats.
 
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 3f08ab69957..33d027f9cf4 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/01/13 18:39:44 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/01/29 11:34:30 wiz Exp $
 
 DISTNAME=       imap-2000a
 PKGNAME=        imap-uw-2000a
@@ -11,8 +11,6 @@ HOMEPAGE=	http://www.washington.edu/imap/
 
 USE_LIBTOOL=	# defined
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 INST_PROG=	${LIBTOOL} ${INSTALL_PROGRAM}
 INST_LIB=	${LIBTOOL} ${INSTALL_DATA}
 INC_DIR=	${PREFIX}/include/c-client
@@ -41,10 +39,6 @@ post-build:
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
 		< ${WRKSRC}/src/ipopd/ipopd.8c > ${WRKDIR}/ipopd.8
 
-pre-install:
-	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 do-install:
 	${INST_LIB} ${WRKSRC}/c-client/libimapuw.la ${PREFIX}/lib
 	${INST_PROG} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
diff --git a/mail/imap-uw/pkg/MESSAGE b/mail/imap-uw/pkg/MESSAGE
index 41e0f16a23c..428c87095c6 100644
--- a/mail/imap-uw/pkg/MESSAGE
+++ b/mail/imap-uw/pkg/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2000/12/17 18:25:44 jlam Exp $
+$NetBSD: MESSAGE,v 1.7 2001/01/29 11:34:31 wiz Exp $
 
 Add the following to /etc/services:
 
@@ -12,12 +12,13 @@ Add the following to /etc/services:
 
 Add the following to /etc/inetd.conf:
 
- imap   stream  tcp     nowait  root    @PREFIX@/libexec/imapd    imapd
- imaps  stream  tcp     nowait  root    @PREFIX@/libexec/imapd    imapd
- pop2   stream  tcp     nowait  root    @PREFIX@/libexec/ipop2d   ipop2d
- pop3   stream  tcp     nowait  root    @PREFIX@/libexec/ipop3d   ipop3d
- pop3s  stream  tcp     nowait  root    @PREFIX@/libexec/ipop3d   ipop3d
+ imap   stream  tcp     nowait  root    ${PREFIX}/libexec/imapd    imapd
+ imaps  stream  tcp     nowait  root    ${PREFIX}/libexec/imapd    imapd
+ pop2   stream  tcp     nowait  root    ${PREFIX}/libexec/ipop2d   ipop2d
+ pop3   stream  tcp     nowait  root    ${PREFIX}/libexec/ipop3d   ipop3d
+ pop3s  stream  tcp     nowait  root    ${PREFIX}/libexec/ipop3d   ipop3d
 
 To put the changes into effect, reboot the machine or "kill -HUP"
 your inetd.
+
 ===========================================================================
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 713834e86d5..ec278a47977 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/12/28 10:34:03 rh Exp $
+# $NetBSD: Makefile,v 1.10 2001/01/29 11:34:31 wiz Exp $
 
 DISTNAME=		majordomo-1.94.4
 CATEGORIES=		mail
@@ -26,7 +26,6 @@ NO_BIN_ON_CDROM=	${NO_BIN_ON_FTP}
 ALL_TARGET=		wrapper
 INSTALL_TARGET=		install install-wrapper
 
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 INSTALL_FILE=		${WRKDIR}/INSTALL
 DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
 MAKEFILE=		Makefile.netbsd
@@ -36,8 +35,11 @@ MAJORDOMO_HOMEDIR?=	/home
 MAJORDOMO_USER?=	majordom
 MAJORDOMO_GROUP?=	majordom
 
-PLIST_SUBST=		HOME=${MAJORDOMO_HOMEDIR}	\
+PLIST_SUBST=		HOME=${MAJORDOMO_HOMEDIR}		\
 			MAJORDOMO_USER=${MAJORDOMO_USER}
+MESSAGE_SUBST+=		HOME=${MAJORDOMO_HOMEDIR}		\
+			MAJORDOMO_USER=${MAJORDOMO_USER}	\
+			MAJORDOMO_GROUP=${MAJORDOMO_GROUP}
 
 DOCDIR=			${PREFIX}/share/doc/majordomo
 DOCFILES=		Changelog FUTURE INSTALL LICENSE NEWLIST README
@@ -128,12 +130,6 @@ do-configure:
 		< ${FILESDIR}/aliases.majordomo > ${WRKSRC}/aliases.majordomo
 
 pre-install:
-	@${SED} \
-		-e 's:@PREFIX@:${PREFIX}:g' \
-		-e 's:@HOME@:${MAJORDOMO_HOMEDIR}:g' \
-		-e 's:@MAJORDOMO_USER@:${MAJORDOMO_USER}:g' \
-		-e 's:@MAJORDOMO_GROUP@:${MAJORDOMO_GROUP}:g' \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 # for safety's sake, if the user/group got deleted since configuration
 	@${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
@@ -146,7 +142,7 @@ post-install:
 .for file in ${DOCDOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${DOCDIR}/${file}
 .endfor
-	@${INSTALL_DATA} ${MESSAGE_FILE} ${DOCDIR}/post-install-notes
+	@${INSTALL_DATA} ${MESSAGE} ${DOCDIR}/post-install-notes
 	${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}
 .for dir in ${EXDIRS}
 	@${INSTALL} -d -m 775 -o ${MAJORDOMO_USER} -g ${MAJORDOMO_GROUP} ${EXDIR}/${dir}
@@ -171,7 +167,7 @@ post-install:
 		${WRKSRC}/majordomo.cf ${EXDIR}/majordomo.cf
 
 # verify installation; requires interaction
-check test: install
+test: install
 	${PREFIX}/libexec/majordomo/wrapper config-test
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/majordomo/pkg/MESSAGE b/mail/majordomo/pkg/MESSAGE
index 2a85dec6d74..b99ca6bafe6 100644
--- a/mail/majordomo/pkg/MESSAGE
+++ b/mail/majordomo/pkg/MESSAGE
@@ -1,27 +1,31 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:31 wiz Exp $
+
 Post-Install Notes for Majordomo
 ================================
 
-Before you can use Majordomo, you will need to complete a few steps manually:
+Before you can use Majordomo, you will need to complete a few steps
+manually:
 
-	- install majordomo.cf in @HOME@/@MAJORDOMO_USER@.
-	  Look in @PREFIX@/share/examples/majordomo for an example and be sure
-	  to change instances of @HOSTNAME@ as appropriate.
+	- install majordomo.cf in ${HOME}/${MAJORDOMO_USER}.
+	  Look in ${PREFIX}/share/examples/majordomo for an example and
+	  be sure to change instances of ${HOSTNAME} as appropriate.
 
-	- create lists in @HOME@/@MAJORDOMO_USER@.
-	  Look in @PREFIX@/share/doc/majordomo for information and see the
-	  files and directories for an example list (example-l) in
-	  @PREFIX@/share/examples/majordomo.  Pay attention to the permissions
-	  on the files and directories.
+	- create lists in ${HOME}/${MAJORDOMO_USER}.
+	  Look in ${PREFIX}/share/doc/majordomo for information and see
+	  the files and directories for an example list (example-l) in
+	  ${PREFIX}/share/examples/majordomo.  Pay attention to the
+	  permissions on the files and directories.
 
-	- add a .forward file in @HOME@/@MAJORDOMO_USER@ (or an appropriate
-	  alias) so administrative mail to @MAJORDOMO_USER@ gets redirected
-	  properly.
+	- add a .forward file in ${HOME}/${MAJORDOMO_USER} (or an
+	  appropriate alias) so administrative mail to
+	  ${MAJORDOMO_USER} gets redirected properly.
 
 	- install majordomo aliases for sendmail.
-	  For example, create /etc/aliases.majordomo following the example in
-	  @PREFIX@/share/examples/majordomo and add it to your sendmail
-	  configuration.  This can be done by adding a line similar to the
-	  following to /etc/sendmail.cf :
+	  For example, create /etc/aliases.majordomo following the
+	  example in ${PREFIX}/share/examples/majordomo and add it to
+	  your sendmail configuration.  This can be done by adding a
+	  line similar to the following to /etc/sendmail.cf :
 
 	  OA/etc/aliases.majordomo (for 8.6.x Sendmail),
 
@@ -31,21 +35,24 @@ Before you can use Majordomo, you will need to complete a few steps manually:
 
 	  define(`ALIAS_FILE',/etc/aliases,/etc/aliases.majordomo')
 
-	- if the group for @MAJORDOMO_USER@ (@MAJORDOMO_GROUP@) is not daemon,
-	  add @MAJORDOMO_USER@ as a trusted user for sendmail.  This can be
-	  done by adding a line similar to the following in /etc/sendmail.cf :
+	- if the group for ${MAJORDOMO_USER} (${MAJORDOMO_GROUP}) is not
+	  daemon, add ${MAJORDOMO_USER} as a trusted user for sendmail.
+	  This can be done by adding a line similar to the following
+	  in /etc/sendmail.cf:
 
-	  T@MAJORDOMO_USER@
+	  T${MAJORDOMO_USER}
 
 	  or a line similar to the following to your m4 macros file:
 
-	  define(`confTRUSTED_USERS', @MAJORDOMO_USER@)dnl
+	  define(`confTRUSTED_USERS', ${MAJORDOMO_USER})dnl
 
-	- be sure to run `newaliases' to create the sendmail database, and
-	  be sure that sendmail knows about any changes to /etc/sendmail.cf
-	  (e.g., reboot or rerun sendmail)
+	- be sure to run `newaliases' to create the sendmail database,
+	  and be sure that sendmail knows about any changes to
+	  /etc/sendmail.cf (e.g., reboot or restart sendmail)
 
 	- add entries in /etc/newsyslog.conf to rotate the log in
-	  @HOME@/@MAJORDOMO_USER@/Log if necessary
+	  ${HOME}/${MAJORDOMO_USER}/Log if necessary.
 
 Enjoy Majordomo!
+
+===========================================================================
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 2bd2c613ab7..48e4ee1edfe 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/26 14:26:57 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2001/01/29 11:34:31 wiz Exp $
 # FreeBSD Id: Makefile,v 1.24 1997/05/14 14:40:34 ache Exp
 #
 
@@ -12,8 +12,6 @@ HOMEPAGE=	http://www.procmail.org/
 INSTALL_TARGET=	install-suid install.man
 MAKE_ENV=	SHELL=/bin/sh
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 post-patch:
 	${MV} ${WRKSRC}/config.h ${WRKSRC}/config.h-orig
 	${SED} -e 's|@LOCALBASE@|${LOCALBASE}|g' < ${WRKSRC}/config.h-orig \
@@ -23,9 +21,6 @@ post-patch:
 		< ${WRKSRC}/man/procmail.man-orig \
 		> ${WRKSRC}/man/procmail.man
 
-pre-install:
-	${SED} -e 's,@PREFIX@,${PREFIX},g' ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/mail/procmail/pkg/MESSAGE b/mail/procmail/pkg/MESSAGE
index 16be21a6674..711a80abf6f 100644
--- a/mail/procmail/pkg/MESSAGE
+++ b/mail/procmail/pkg/MESSAGE
@@ -1,12 +1,12 @@
-$NetBSD: MESSAGE,v 1.3 2000/08/26 14:26:59 wiz Exp $
-
 =============================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:31 wiz Exp $
+
 Please note the following:
 
-    - The system-wide procmailrc is expected in @PREFIX@/etc
-      (e.g. @PREFIX@/etc/procmailrc).
+    - The system-wide procmailrc is expected in ${PREFIX}/etc
+      (e.g. ${PREFIX}/etc/procmailrc).
 
     - The system-wide procmailrc directory is expected in
-      @PREFIX@/etc (e.g. @PREFIX@/etc/procmailrcs/*).
+      ${PREFIX}/etc (e.g. ${PREFIX}/etc/procmailrcs/*).
 
 =============================================================
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 9661d9bb90d..456bca1b54b 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2001/01/21 05:58:50 itojun Exp $
+# $NetBSD: Makefile,v 1.28 2001/01/29 11:34:31 wiz Exp $
 
 DISTNAME=	sendmail.8.11.2
 PKGNAME=	sendmail-8.11.2
@@ -24,7 +24,6 @@ NO_CONFIGURE=	yes
 MAKE_ENV+=	BSD_BINOWN="${BINOWN}" BSD_BINGRP="${BINGRP}" \
 		BSD_MANOWN="${MANOWN}" BSD_MANGRP="${MANGRP}"
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 WRKSRC=		${WRKDIR}/${PKGNAME}
 SITECONFIG=	${WRKSRC}/devtools/Site/site.config.m4
 
@@ -38,6 +37,7 @@ USE_DB2?=	YES
 USE_DB2?=	NO
 .endif
 
+MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 DESCR_SRC=	${WRKDIR}/.DESCR_SRC
 
@@ -86,14 +86,13 @@ do-build:
 post-build:
 	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' \
 	  <${FILESDIR}/mailer.conf >${WRKDIR}/mailer.conf.sendmail
-	${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
-	  -e 's#@@PREFIX@@#${PREFIX}#g' \
-	  <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
 	${CAT} ${PKGDIR}/PLIST.common ${PKGDIR}/PLIST.${LOWER_OPSYS} > ${PLIST_SRC}
+test-build:
+	${CP} ${PKGDIR}/MESSAGE ${MESSAGE_SRC}
 .if ${USE_DB2} == YES
-	${ECHO} >>${MESSAGE_FILE} ""
-	${ECHO} >>${MESSAGE_FILE} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all"
-	${ECHO} >>${MESSAGE_FILE} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"."
+	${ECHO} "" >> ${MESSAGE_SRC}
+	${ECHO} "If you are upgrading from \"sendmail\" 8.8.x don't forget to rebuild all" >> ${MESSAGE_SRC}
+	${ECHO} "databases with \"${PREFIX}/bin/newaliases\" and \"${PREFIX}/sbin/makemap\"." >> ${MESSAGE_SRC}
 	${ECHO} >>${PLIST_SRC} "@exec mv -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || true"
 	${ECHO} >>${PLIST_SRC} "@unexec mv -f /usr/sbin/makemap.8.8 /usr/sbin/makemap || true"
 .endif
diff --git a/mail/sendmail/pkg/MESSAGE b/mail/sendmail/pkg/MESSAGE
index a0d6221c0fd..2db816bdbd0 100644
--- a/mail/sendmail/pkg/MESSAGE
+++ b/mail/sendmail/pkg/MESSAGE
@@ -1,5 +1,7 @@
-To use "@@PKGNAME@@" as the system's mail transport agent you have
-to install "@@PREFIX@@/etc/mailer.conf.sendmail" as global mailwrapper
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:32 wiz Exp $
+
+To use "${PKGNAME}" as the system's mail transport agent you have
+to install "${PREFIX}/etc/mailer.conf.sendmail" as global mailwrapper
 configuration file. The command below will do that for you:
 
-ln -fs @@PREFIX@@/etc/mailer.conf.sendmail /etc/mailer.conf
+ln -fs ${PREFIX}/etc/mailer.conf.sendmail /etc/mailer.conf
diff --git a/mail/sendmail88/Makefile b/mail/sendmail88/Makefile
index d17d29b92dd..709f733c628 100644
--- a/mail/sendmail88/Makefile
+++ b/mail/sendmail88/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/13 00:14:48 tron Exp $
+# $NetBSD: Makefile,v 1.2 2001/01/29 11:34:32 wiz Exp $
 
 DISTNAME=	sendmail.8.8.8
 PKGNAME=	sendmail-8.8.8
@@ -11,7 +11,6 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.sendmail.org/
 
 MANCOMPRESSED_IF_MANZ= YES
-MESSAGE_FILE=	${WRKSRC}/MESSAGE
 WRKSRC=		${WRKDIR}/${PKGNAME}
 
 M4DIR=		${PREFIX}/share/sendmail
@@ -110,11 +109,11 @@ post-extract:
 do-configure:
 	cd ${WRKSRC}; \
 	for FILE in ${FILESDIR}/${MAKEFILE} ${FILESDIR}/${MAKEFILE}.inc \
-	  ${FILESDIR}/mailer.conf ${PKGDIR}/MESSAGE; do \
+	  ${FILESDIR}/mailer.conf; do \
 	  ${CP} $${FILE} .; \
 	done; \
 	${CP} ${FILESDIR}/netbsd-proto.mc ${WRKSRC}/cf/cf; \
-	for FILE in MESSAGE cf/README cf/feature/smrsh.m4 mailer.conf; do \
+	for FILE in cf/README cf/feature/smrsh.m4 mailer.conf; do \
 	  ${CP} $${FILE} tempfile; \
 	  ${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
 	    -e 's#@@PREFIX@@#${PREFIX}#g' \
diff --git a/mail/sendmail88/pkg/MESSAGE b/mail/sendmail88/pkg/MESSAGE
index a0d6221c0fd..0ef122a12c8 100644
--- a/mail/sendmail88/pkg/MESSAGE
+++ b/mail/sendmail88/pkg/MESSAGE
@@ -1,5 +1,10 @@
-To use "@@PKGNAME@@" as the system's mail transport agent you have
-to install "@@PREFIX@@/etc/mailer.conf.sendmail" as global mailwrapper
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:32 wiz Exp $
+
+To use "${PKGNAME}" as the system's mail transport agent you have
+to install "${PREFIX}/etc/mailer.conf.sendmail" as global mailwrapper
 configuration file. The command below will do that for you:
 
-ln -fs @@PREFIX@@/etc/mailer.conf.sendmail /etc/mailer.conf
+ln -fs ${PREFIX}/etc/mailer.conf.sendmail /etc/mailer.conf
+
+======================================================================
diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile
index c8c75862652..787e001b91d 100644
--- a/mail/smtpfeed/Makefile
+++ b/mail/smtpfeed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/01/21 06:02:27 itojun Exp $
+# $NetBSD: Makefile,v 1.11 2001/01/29 11:34:32 wiz Exp $
 # Based on FreeBSD Id: Makefile,v 1.27 1999/04/03 08:25:18 itojun Exp
 #
 
@@ -21,8 +21,6 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec
 # use bind8?
 #CONFIGURE_ARGS+=	--with-bind8
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 DOCS=	COPYRIGHT FEATURES FEATURES.j FYI FYI.j INSTALL INSTALL.j \
 	ML-ADMIN ML-ADMIN.j OPTIONS OPTIONS.j README README.j \
 	RELEASE.NOTE SIGNAL SIGNAL.j TODO
@@ -36,11 +34,6 @@ BUILD_DEFS+=    USE_INET6
 CONFIGURE_ARGS+=--enable-ipv6
 .endif
 
-post-build:
-	${SED} -e 's#@@PKGNAME@@#${PKGNAME}#g' \
-		-e 's#@@PREFIX@@#${PREFIX}#g' \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCDIR}
diff --git a/mail/smtpfeed/pkg/MESSAGE b/mail/smtpfeed/pkg/MESSAGE
index 119f76db6d9..9110659d0db 100644
--- a/mail/smtpfeed/pkg/MESSAGE
+++ b/mail/smtpfeed/pkg/MESSAGE
@@ -1,8 +1,11 @@
-**************************************************************
-Executable for @@PKGNAME@@ is installed into
-@@PREFIX@@/libexec/smtpfeed.
+======================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:32 wiz Exp $
+
+The executable for ${PKGNAME} is installed into
+${PREFIX}/libexec/smtpfeed.
 
 You'll need to prepare (1) sendmail with WIDE patch applied,
 and (2) properly configured sendmail.cf.
-(1) is included in mail/sendmail pkgsrc.
-**************************************************************
+(1) is done in the mail/sendmail package.
+
+======================================================================
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index f9ae0f98df1..89d8c260a79 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/25 17:52:51 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:32 wiz Exp $
 
 DISTNAME=	squirrelmail-1.0pre3
 PKGNAME=	squirrelmail-0.9.3
@@ -17,10 +17,10 @@ NO_BUILD=	# defined
 
 DEINSTALL_FILE=	${WRKDIR}/DEINSTALL
 INSTALL_FILE=	${WRKDIR}/INSTALL
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 SM_SUBDIR=	share/squirrelmail
 SMDIR=		${PREFIX}/${SM_SUBDIR}
+MESSAGE_SUBST+=	SMDIR=${SMDIR}
 
 post-extract:
 	cd ${WRKSRC};							\
@@ -47,8 +47,6 @@ pre-install:
 		-e "s|@CP@|${CP}|g"					\
 		-e "s|@MKDIR@|${MKDIR}|g"				\
 		${PKGDIR}/INSTALL > ${INSTALL_FILE}
-	${SED}	-e "s|@SMDIR@|${SMDIR}|g"				\
-		${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
 do-install:
diff --git a/mail/squirrelmail/pkg/MESSAGE b/mail/squirrelmail/pkg/MESSAGE
index 26750448402..0d6b5637124 100644
--- a/mail/squirrelmail/pkg/MESSAGE
+++ b/mail/squirrelmail/pkg/MESSAGE
@@ -1,16 +1,16 @@
 ==========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2001/01/24 22:44:13 jlam Exp $
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:33 wiz Exp $
 
 You will need to make SquirrelMail accessible through your HTTP server.
 If you are running Apache and ap-php, then you may either symlink
 	
-	@SMDIR@
+	${SMDIR}
 
 into DocumentRoot, or add the following lines to httpd.conf:
 
-	Alias /mail/ "@SMDIR@"
+	Alias /mail/ "${SMDIR}"
 
-	<Directory "@SMDIR@">
+	<Directory "${SMDIR}">
 		Options Indexes MultiViews
 		AllowOverride None
 		Order allow,deny