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.

2 files changed, 39 insertions, 36 deletions

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!
+
+===========================================================================