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.

23 files changed, 87 insertions, 104 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}
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index dce7f653db7..f70fcc36f18 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/09/03 12:36:55 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:35 wiz Exp $
 #
 
 DISTNAME=	ddclient-2.3.1
@@ -10,11 +10,6 @@ HOMEPAGE=	http://burry.net/ddclient
 
 NO_BUILD=	yes
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
-pre-install:
-	${SED} -e "s,@PREFIX@,${PREFIX},g" ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
-
 do-install:
 	${SED} \
 		-e 's,@LOCALBASE@,${LOCALBASE},g' \
diff --git a/net/ddclient/pkg/MESSAGE b/net/ddclient/pkg/MESSAGE
index d5c2c022fa5..6aefbfd4ff6 100644
--- a/net/ddclient/pkg/MESSAGE
+++ b/net/ddclient/pkg/MESSAGE
@@ -1,6 +1,9 @@
-$NetBSD: MESSAGE,v 1.2 2000/09/03 12:36:55 wiz Exp $
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:35 wiz Exp $
 
 1. Please register at http://www.dyndns.org/
 
-2. Copy @PREFIX@/etc/ddclient.conf-example to @PREFIX@/etc/ddclient.conf
+2. Copy ${PREFIX}/etc/ddclient.conf-example to ${PREFIX}/etc/ddclient.conf
    and adjust to your needs.
+
+======================================================================
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index da7038d1ab4..703f7d8e267 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/09/03 12:40:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/01/29 11:34:35 wiz Exp $
 #
 
 DISTNAME=	dhid-4.0.1
@@ -10,15 +10,11 @@ HOMEPAGE=	http://www.dhis.org/
 
 DEPENDS+=	gmp-[0-9]*:../../devel/gmp
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 do-configure:
 	${SED} \
 		-e "s,@PREFIX@,${PREFIX},g" \
 		-e "s,@ECHO@,${ECHO},g" \
 		< ${FILESDIR}/dhid.sh > ${WRKDIR}/dhid.sh
-	${SED} -e "s,@PREFIX@,${PREFIX},g" \
-		< ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
diff --git a/net/dhid/pkg/MESSAGE b/net/dhid/pkg/MESSAGE
index 37534269129..82ea4eaa91f 100644
--- a/net/dhid/pkg/MESSAGE
+++ b/net/dhid/pkg/MESSAGE
@@ -1,11 +1,12 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2000/09/12 15:18:42 jlam Exp $
+$NetBSD: MESSAGE,v 1.5 2001/01/29 11:34:35 wiz Exp $
 
 If you don't already have a FQDN with dhis.org domain, you will need to
 register at http://www.dhis.org/dhis/register.html.
 
-You will need to setup @PREFIX@/etc/dhid.conf with settings for
+You will need to setup ${PREFIX}/etc/dhid.conf with settings for
 `idnumber', `fqdn', and `password' with your DHIS-provided host id
 number, FQDN with dhis.org domain, and update password, respectively.
 You receive these values when registering with dhis.org (see above).
+
 ===========================================================================
diff --git a/net/icsi-finger/Makefile b/net/icsi-finger/Makefile
index 4ace836fdf8..6f1fd74f9de 100644
--- a/net/icsi-finger/Makefile
+++ b/net/icsi-finger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/07/05 20:45:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:35 wiz Exp $
 #
 
 DISTNAME=	icsi-finger-1.0.27
@@ -11,8 +11,6 @@ MAINTAINER=	is@netbsd.org
 
 USE_X11=	yes
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 XMPLD=		${PREFIX}/share/examples/icsi-finger
 XMPLDT=		${XMPLD}/targets
 
@@ -39,8 +37,6 @@ pre-configure:
 				$$i.bak > $$i ; \
 			${RM} -f $$i.bak ; \
 		done
-		${SED} -e s@/usr/pkg@${PREFIX}@g ${PKGDIR}/MESSAGE | \
-			fmt >${WRKDIR}/MESSAGE
 
 do-${INSTALL}:
 		${INSTALL} -c -m 755 ${WRKSRC}/src/finger ${PREFIX}/bin/gfinger
diff --git a/net/icsi-finger/pkg/MESSAGE b/net/icsi-finger/pkg/MESSAGE
index 31b99d1fae3..fd2467195f8 100644
--- a/net/icsi-finger/pkg/MESSAGE
+++ b/net/icsi-finger/pkg/MESSAGE
@@ -1,3 +1,6 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:36 wiz Exp $
+
 This is the NetBSD package for ICSI-finger, a more advanced version of
 GNU finger.
 
@@ -5,12 +8,14 @@ This needs a log of configuration to be useful. Therefore it isn't activated
 when installed.
 
 You'll find example configuration files in
-/usr/pkg/share/examples/icsi-finger and
-/usr/pkg/share/examples/icsi-finger/targets, and are strongly advised
+${PREFIX}/share/examples/icsi-finger and
+${PREFIX}/share/examples/icsi-finger/targets, and are strongly advised
 to read the gfingerd and cfingerd man pages.
 
 Also, if you activate the package, you'll need to append 
-/usr/pkg/share/examples/icsi-finger/inetd.conf-add to /etc/inetd.conf,
-/usr/pkg/share/examples/icsi-finger/services-add to /etc/services, and
+${PREFIX}/share/examples/icsi-finger/inetd.conf-add to /etc/inetd.conf,
+${PREFIX}/share/examples/icsi-finger/services-add to /etc/services, and
 (on the master finger server) 
-/usr/pkg/share/examples/icsi-finger/rc.local-add to /etc/rc.local.
+${PREFIX}/share/examples/icsi-finger/rc.local-add to /etc/rc.local.
+
+======================================================================
diff --git a/net/ispman/Makefile b/net/ispman/Makefile
index 574b267a592..1c215eeef1a 100644
--- a/net/ispman/Makefile
+++ b/net/ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/25 10:46:40 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 11:34:36 wiz Exp $
 #
 
 DISTNAME=	ispman-0.5
@@ -19,7 +19,6 @@ DEPENDS+=	postfix>=19991231pl08:../../mail/postfix
 .endif
 
 USE_PERL5=	YES
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
 ISPMAN_HTDOCS?=	${PREFIX}/share/ispman/virtual
 ISPMAN_IP?=	127.0.0.1
@@ -47,7 +46,5 @@ do-build:
 do-install:
 	cd ${WRKSRC} && ${PERL5} ./pkginstall.pl &&			\
 	${INSTALL_DATA} ispman.ldif ${PREFIX}/etc/ispman
-	${SED} -e 's#@@PREFIX@@#${PREFIX}#g' < ${PKGDIR}/MESSAGE	\
-		> ${WRKDIR}/MESSAGE
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ispman/pkg/MESSAGE b/net/ispman/pkg/MESSAGE
index aec2b54e639..e8dfa026215 100644
--- a/net/ispman/pkg/MESSAGE
+++ b/net/ispman/pkg/MESSAGE
@@ -1,27 +1,28 @@
-$NetBSD: MESSAGE,v 1.1.1.1 2000/10/21 19:02:32 rh Exp $
-
 ==========================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:36 wiz Exp $
+
   ISPMan has now been installed on your system.
 
   Before using this package, copy the default configuration from
-  '@@PREFIX@@/etc/ispman/ispman.conf.default' to
-  '@@PREFIX@@/etc/ispman/ispman.conf' (and edit it accordingly).
+  '${PREFIX}/etc/ispman/ispman.conf.default' to
+  '${PREFIX}/etc/ispman/ispman.conf' (and edit it accordingly).
   
   You also need to create the appropriate template files in
-  '@@PREFIX@@/etc/ispman/templates' (or copy them from the
+  '${PREFIX}/etc/ispman/templates' (or copy them from the
   corresponding .default files that can be found there).
 
   Finally, you need a working apache, cyrus-imapd, postfix, openldap,
   PAM, and pam-ldap setup.
 
   ISPMan configuration templates for openldap can be found under
-  '@@PREFIX@@/etc/openldap/ldap.conf.ispman' and
-  '@@PREFIX@@/etc/openldap/slapd.conf.ispman'.  Thereafter, you can
+  '${PREFIX}/etc/openldap/ldap.conf.ispman' and
+  '${PREFIX}/etc/openldap/slapd.conf.ispman'.  Thereafter, you can
   initialize openldap by issuing the following command:
 
-	@@PREFIX@@/sbin/ldif2ldbm -i @@PREFIX@@/etc/ispman/ispman.ldif
+	${PREFIX}/sbin/ldif2ldbm -i ${PREFIX}/etc/ispman/ispman.ldif
 
   On the machine(s) you are running cyrus on, you need to have pam-ldap
   and an PAM-enabled cyrus-sasl installed and configured (see the
   corresponding packages for more information).
+
 ==========================================================================
diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile
index aee8810ac10..4969e22c458 100644
--- a/net/mrtg/Makefile
+++ b/net/mrtg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/10/23 13:47:53 bouyer Exp $
+# $NetBSD: Makefile,v 1.21 2001/01/29 11:34:36 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/12/16 19:42:17 vanilla Exp
 #
 
@@ -33,8 +33,6 @@ CONFIGURE_ARGS+=	--with-png-lib=${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--with-png-inc=${LOCALBASE}/include
 .endif
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/mrtg.conf.example \
 	    >${WRKDIR}/mrtg.conf.example
@@ -42,8 +40,6 @@ post-build:
 	    >${WRKDIR}/netstat2mrtg
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/sys2mrtg \
 	    >${WRKDIR}/sys2mrtg
-	${SED} s#@PREFIX@#${PREFIX}#g <${PKGDIR}/MESSAGE \
-	    >${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/etc/mrtg
diff --git a/net/mrtg/pkg/MESSAGE b/net/mrtg/pkg/MESSAGE
index 48b2cb7e537..ef2e8d5c3c7 100644
--- a/net/mrtg/pkg/MESSAGE
+++ b/net/mrtg/pkg/MESSAGE
@@ -1,6 +1,5 @@
 =============================================================================
-
-$NetBSD: MESSAGE,v 1.6 2000/10/20 16:07:01 bouyer Exp $
+$NetBSD: MESSAGE,v 1.7 2001/01/29 11:34:36 wiz Exp $
 
 The Multi Router Traffic Grapher is now installed.  Do note that three
 programs have changed names to more readily reflect their MRTG-specific
@@ -9,10 +8,10 @@ function; make sure to prefix them with "mrtg":
     cfgmaker -> mrtgcfgmaker
     indexmaker -> mrtgindexmaker
 
-The documentation can be found at @PREFIX@/share/doc/mrtg/manual.html;
+The documentation can be found at ${PREFIX}/share/doc/mrtg/manual.html;
 there is a .txt version there as well.
 
 A sample config file collecting various datas from a NetBSD machine can
-be found in @PREFIX@/etc/mrtg/.
+be found in ${PREFIX}/etc/mrtg/.
 
 =============================================================================
diff --git a/net/netsaint-base/Makefile b/net/netsaint-base/Makefile
index c3e943a626a..790b5b2e7ce 100644
--- a/net/netsaint-base/Makefile
+++ b/net/netsaint-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/16 16:23:07 rh Exp $
+# $NetBSD: Makefile,v 1.3 2001/01/29 11:34:36 wiz Exp $
 #
 
 DISTNAME=	netsaint-0.0.6
@@ -13,13 +13,10 @@ DEPENDS+=	gd>1.8.1:../../graphics/gd
 
 .include "Makefile.common"
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
 post-configure:
 	${SED} <${FILESDIR}/netsaint-setup.sh >${WRKDIR}/netsaint-setup.sh \
 		-e 's:@@USER@@:${NETSAINT_USER}:g'			\
 		-e 's:@@GROUP@@:${NETSAINT_GROUP}:g'
-	${SED} -e 's:@@PREFIX@@:${PREFIX}:g' <${PKGDIR}/MESSAGE >${MESSAGE_FILE}
 
 post-install:
 	cd ${WRKSRC} && ${MAKE} install-config
diff --git a/net/netsaint-base/pkg/MESSAGE b/net/netsaint-base/pkg/MESSAGE
index 37671b23bda..cf738de7a05 100644
--- a/net/netsaint-base/pkg/MESSAGE
+++ b/net/netsaint-base/pkg/MESSAGE
@@ -1,9 +1,9 @@
-$NetBSD: MESSAGE,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
-
 ==========================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:37 wiz Exp $
+
   netsaint-base has now been installed.  Before using this package for
   the first time, you need to run 'netsaint-setup.sh' and then set up the
-  configuration files in @@PREFIX@@/etc/netsaint (simply copy over the
+  configuration files in ${PREFIX}/etc/netsaint (simply copy over the
   sample configuration files you find there and edit them accordingly).
 
   If you want to use the web frontend, you need to make sure that the
@@ -14,4 +14,5 @@ $NetBSD: MESSAGE,v 1.1.1.1 2001/01/16 15:39:43 rh Exp $
   Please note that without plug-ins, this package will not do anything
   useful.  It is therefore recommended to install the 'netsaint-plugins'
   package as well.
+
 ==========================================================================
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 5ab9d8a629d..1deb7c2d457 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/08/18 19:39:53 fredb Exp $
+# $NetBSD: Makefile,v 1.14 2001/01/29 11:34:37 wiz Exp $
 #
 
 DISTNAME=	ntp-4.0.99k
@@ -17,10 +17,6 @@ CONFIGURE_ENV+=	"LIBS=-ltermcap"	# for ntpdc
 
 DOCDIR=		${PREFIX}/share/doc
 EXAMPLESDIR=	${PREFIX}/share/examples
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
-
-post-build:
-	${SED} 's|@PREFIX@|${PREFIX}|g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 post-install:
 	cd ${WRKSRC}; \
diff --git a/net/ntp4/pkg/MESSAGE b/net/ntp4/pkg/MESSAGE
index 501c9dca36f..97bcdd807dd 100644
--- a/net/ntp4/pkg/MESSAGE
+++ b/net/ntp4/pkg/MESSAGE
@@ -1,7 +1,10 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.3 2001/01/29 11:34:37 wiz Exp $
+
 THERE ARE NO MAN PAGES. All installed documentation
 is accessible through
 
-	file:/@PREFIX@/share/doc/ntp4/index.htm
+	file:/${PREFIX}/share/doc/ntp4/index.htm
 
 User to user support is available at
 
@@ -12,3 +15,5 @@ and online docs are viewable through NTP's home at
 	http://www.ntp.org/
 or
 	http://www.eecis.udel.edu/~ntp/
+
+======================================================================
diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile
index b4fca85358d..d66d9aec4b8 100644
--- a/net/ra-rtsp-proxy/Makefile
+++ b/net/ra-rtsp-proxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/01/26 05:21:46 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:37 wiz Exp $
 
 DISTNAME=	rtspd-src-1.0.0.0
 PKGNAME=	ra-rtsp-proxy-1.0.0.0
@@ -19,7 +19,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 DOWNLOAD=	http://proforma.real.com/mario/devzone/rtspproxyform.html
 
-MESSAGE_FILE=	${WRKDIR}/MESSAGE
 WRKSRC=		${WRKDIR}/rtspd-1.0.0.0a
 
 do-fetch:
@@ -34,8 +33,6 @@ do-fetch:
 
 post-build:
 	${SED} s#@PREFIX@#${PREFIX}#g <${FILESDIR}/rtspd.sh >${WRKDIR}/rtspd.sh
-	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \
-	  >${MESSAGE_FILE}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/rtspd.sh ${PREFIX}/etc/rc.d/rtspd
diff --git a/net/ra-rtsp-proxy/pkg/MESSAGE b/net/ra-rtsp-proxy/pkg/MESSAGE
index 4f5856aaec8..c90996b061e 100644
--- a/net/ra-rtsp-proxy/pkg/MESSAGE
+++ b/net/ra-rtsp-proxy/pkg/MESSAGE
@@ -1 +1,6 @@
-Please add "@PREFIX@/etc/rc.d/rtspd.sh" to "/etc/rc.local".
+======================================================================
+$NetBSD
+
+Please add "${PREFIX}/etc/rc.d/rtspd" to "/etc/rc.local".
+
+======================================================================
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 5638fde120f..76dd500d9f4 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/02/29 01:13:35 kim Exp $
+# $NetBSD: Makefile,v 1.16 2001/01/29 11:34:38 wiz Exp $
 #
 # Tempted to install another radius package?
 #
@@ -37,7 +37,6 @@ MAKE_ENV+=	RADLIBS="${RADLIBS} -lskey" LIBS=-lcrypt \
 		INSTALL="${INSTALL} -c"
 
 INSTALL_TARGET=	man-install install util-install config-install
-MESSAGE_FILE=   ${WRKDIR}/MESSAGE
 WRKSRC=		${WRKDIR}
 
 pre-patch:
@@ -47,8 +46,4 @@ pre-patch:
 	${PATCH} -s
 .endfor
 
-post-build:
-	@${SED} -e 's#@PREFIX@#${PREFIX}#g' <${PKGDIR}/MESSAGE \
-	  >${MESSAGE_FILE}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/radius/pkg/MESSAGE b/net/radius/pkg/MESSAGE
index afb65c8154b..a41a65e2f92 100644
--- a/net/radius/pkg/MESSAGE
+++ b/net/radius/pkg/MESSAGE
@@ -1,2 +1,8 @@
-To use the The Merit AAA Server you have to copy the contents of the directory
-"@PREFIX@/share/examples/radius" to "/etc/raddb" and to customize it.
+======================================================================
+$NetBSD: MESSAGE,v 1.2 2001/01/29 11:34:38 wiz Exp $
+
+To use the The Merit AAA Server you have to copy the contents of
+the directory "${PREFIX}/share/examples/radius" to "/etc/raddb"
+and to customize it.
+
+======================================================================
diff --git a/net/upclient/Makefile b/net/upclient/Makefile
index 2b251fca546..44034fb68a5 100644
--- a/net/upclient/Makefile
+++ b/net/upclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/01/26 04:45:33 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/01/29 11:34:38 wiz Exp $
 #
 
 DISTNAME=	upclient-4.09
@@ -10,7 +10,6 @@ MASTER_SITES=	http://www.atomicvoid.net/uptimes/ \
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.uptimes.net/
 
-MESSAGE_FILE=	${WRKDIR}/.MESSAGE
 ALL_TARGET=	upclient
 
 .if !defined(UPCLIENT_LOGIN) || \
@@ -19,11 +18,6 @@ ALL_TARGET=	upclient
 IS_INTERACTIVE=	yes
 .endif
 
-post-extract:
-	${SED} \
-		-e 's|@PREFIX@|${PREFIX}|g' \
-		${PKGDIR}/MESSAGE >${MESSAGE_FILE}
-
 post-patch:
 	${MV} ${WRKSRC}/upchk ${WRKSRC}/upchk.bak
 	${SED} \
diff --git a/net/upclient/pkg/MESSAGE b/net/upclient/pkg/MESSAGE
index 4bfad100d36..01ea137b3e2 100644
--- a/net/upclient/pkg/MESSAGE
+++ b/net/upclient/pkg/MESSAGE
@@ -1,2 +1,7 @@
-To start the Uptime Client, run the @PREFIX@/etc/rc.d/upclient.sh
+======================================================================
+$NetBSD: MESSAGE,v 1.4 2001/01/29 11:34:38 wiz Exp $
+
+To start the Uptime Client, run the ${PREFIX}/etc/rc.d/upclient
 script either manually or via /etc/rc.local.
+
+======================================================================