From 2d4122dd4510b2d5b5c8f9a44012b9e24623aadf Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 23 Apr 2004 22:43:20 +0000 Subject: [PATCH] Fix references to rc.d scripts. This package uses RCD_SCRIPTS which installs to ${RCD_SCRIPTS_EXAMPLEDIR}. But the MESSAGE referred to wrong hard-coded location if the RCD_SCRIPTS_EXAMPLEDIR was not the default. So use RCD_SCRIPTS_EXAMPLEDIR instead. PKGREVISION not bumped because if someone had changed RCD_SCRIPTS_EXAMPLEDIR before recent change of autoregistration of rc.d script in PLIST, then it could not have been packaged in first place. Note that this commit does not imply that the MESSAGE is correct. In some cases, the MESSAGE is clearly wrong such as suggesting running the rc.d script from the example directory (which will work although). --- inputmethod/canna-server/MESSAGE | 4 ++-- mail/exim/MESSAGE | 4 ++-- mail/nullmailer/MESSAGE | 4 ++-- mail/teapop/MESSAGE | 4 ++-- net/delegate/MESSAGE | 4 ++-- net/pure-ftpd/MESSAGE | 4 ++-- net/snort/MESSAGE | 4 ++-- security/sfs/MESSAGE | 6 +++--- sysutils/bkpupsd/MESSAGE | 4 ++-- www/jakarta-tomcat/MESSAGE | 4 ++-- www/tinyproxy/MESSAGE | 4 ++-- www/wwwoffle/MESSAGE | 8 ++++---- x11/wdm/MESSAGE | 4 ++-- x11/xfstt/MESSAGE | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/inputmethod/canna-server/MESSAGE b/inputmethod/canna-server/MESSAGE index 131e9f610527..a45beb42bbd8 100644 --- a/inputmethod/canna-server/MESSAGE +++ b/inputmethod/canna-server/MESSAGE @@ -1,9 +1,9 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/09/23 15:14:55 uebayasi Exp $ +$NetBSD: MESSAGE,v 1.2 2004/04/23 22:43:20 reed Exp $ If you want Canna server to boot automatically, - 1) Copy ${PREFIX}/etc/rc.d/canna to /etc/rc.d/. + 1) Copy ${RCD_SCRIPTS_EXAMPLEDIR}/canna to /etc/rc.d/. 2) Add the following line to /etc/rc.conf. canna=YES canna_flags="-u ${CANNA_USER}" diff --git a/mail/exim/MESSAGE b/mail/exim/MESSAGE index c95e9d25ce73..8913c5058beb 100644 --- a/mail/exim/MESSAGE +++ b/mail/exim/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2004/02/13 23:46:25 snj Exp $ +$NetBSD: MESSAGE,v 1.6 2004/04/23 22:43:20 reed 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. @@ -11,7 +11,7 @@ inappropriate for this package to make the changes for you. Copy ${EXAMPLESDIR}/mailer.conf to /etc/mailer.conf. 4. Set 'sendmail=NO', 'exim=YES' and exim_flags to some sane value in /etc/rc.conf (previously it was "-bd -q15m"). - Copy ${PREFIX}/etc/rc.d/exim to /etc/rc.d. + Copy ${RCD_SCRIPTS_EXAMPLEDIR}/exim to /etc/rc.d. 5. Configuring log rotation is dependent on personal taste and the version of NetBSD in use. See weekly.conf(5), newsyslog(8), exicyclog and eximstats. diff --git a/mail/nullmailer/MESSAGE b/mail/nullmailer/MESSAGE index 965d91f6c4be..348ca7d3d8d3 100644 --- a/mail/nullmailer/MESSAGE +++ b/mail/nullmailer/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.2 2003/02/17 05:20:20 salo Exp $ +$NetBSD: MESSAGE,v 1.3 2004/04/23 22:43:20 reed Exp $ To use nullmailer, you will need to perform the following steps: @@ -13,7 +13,7 @@ To use nullmailer, you will need to perform the following steps: ${PREFIX}/share/examples/nullmailer/mailer.conf 3. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}etc/rc.d/nullmailer to /etc/rc.d/nullmailer and add + ${RCD_SCRIPTS_EXAMPLEDIR}/nullmailer to /etc/rc.d/nullmailer and add nullmailer=YES diff --git a/mail/teapop/MESSAGE b/mail/teapop/MESSAGE index b425a34e8bb8..434a7ecdd496 100644 --- a/mail/teapop/MESSAGE +++ b/mail/teapop/MESSAGE @@ -1,8 +1,8 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2002/07/15 22:57:28 heinz Exp $ +$NetBSD: MESSAGE,v 1.5 2004/04/23 22:43:20 reed Exp $ You may also wish to: - cp ${PREFIX}/etc/rc.d/teapop /etc/rc.d/teapop + cp ${RCD_SCRIPTS_EXAMPLEDIR}/teapop /etc/rc.d/teapop echo "teapop=YES" >> /etc/rc.conf =========================================================================== diff --git a/net/delegate/MESSAGE b/net/delegate/MESSAGE index b876bdd97460..5c00d1acb54a 100644 --- a/net/delegate/MESSAGE +++ b/net/delegate/MESSAGE @@ -1,7 +1,7 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2003/07/30 11:37:01 jmmv Exp $ +$NetBSD: MESSAGE,v 1.5 2004/04/23 22:43:20 reed Exp $ -Now copy the sample script in ${PREFIX}/etc/rc.d/delegated to +Now copy the sample script in ${RCD_SCRIPTS_EXAMPLEDIR}/delegated to /etc/rc.d/delegated and edit it according to your needs. Don't forget to specify a correct e-mail address for ADMIN. diff --git a/net/pure-ftpd/MESSAGE b/net/pure-ftpd/MESSAGE index 3ea75968e92b..825b7ffa90ea 100644 --- a/net/pure-ftpd/MESSAGE +++ b/net/pure-ftpd/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2003/07/12 14:43:08 salo Exp $ +$NetBSD: MESSAGE,v 1.2 2004/04/23 22:43:20 reed Exp $ To use pure-ftpd, you will need to perform the following steps: 1. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}/etc/rc.d/pure_ftpd to /etc/rc.d/pure_ftpd and add + ${RCD_SCRIPTS_EXAMPLEDIR}/pure_ftpd to /etc/rc.d/pure_ftpd and add pure_ftpd=YES diff --git a/net/snort/MESSAGE b/net/snort/MESSAGE index 3ccf77ce34b0..0e3f7c91e090 100644 --- a/net/snort/MESSAGE +++ b/net/snort/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/03/04 01:02:25 salo Exp $ +$NetBSD: MESSAGE,v 1.2 2004/04/23 22:43:20 reed Exp $ To use snort, you will need to perform the following steps: 1. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}/etc/rc.d/snort to /etc/rc.d/snort and add + ${RCD_SCRIPTS_EXAMPLEDIR}/snort to /etc/rc.d/snort and add snort=YES diff --git a/security/sfs/MESSAGE b/security/sfs/MESSAGE index 42f37d1a92ff..f37224692532 100644 --- a/security/sfs/MESSAGE +++ b/security/sfs/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2003/09/08 13:38:12 itojun Exp $ +$NetBSD: MESSAGE,v 1.5 2004/04/23 22:43:20 reed Exp $ Quick Client Setup: @@ -7,7 +7,7 @@ Quick Client Setup: sfscd=YES -2. Run: ${PREFIX}/etc/rc.d/sfscd start +2. Run: ${RCD_SCRIPTS_EXAMPLEDIR}/sfscd start 3. cd /sfs/sfs.fs.net:eu4cvv6wcnzscer98yn4qjpjnn9iv6pi 4. cat CONGRATULATIONS @@ -24,6 +24,6 @@ sfssd=YES ${PKG_SYSCONFDIR}/sfsrwsd_config and modify. 4. Modify /etc/exports to match your sfsrwsd_config. 5. Create the root directories in ${SFSDIR}/root. -6. Run ${PREFIX}/etc/rc.d/sfssd start +6. Run ${RCD_SCRIPTS_EXAMPLEDIR}/sfssd start =========================================================================== diff --git a/sysutils/bkpupsd/MESSAGE b/sysutils/bkpupsd/MESSAGE index 682ed8e6655b..45aa0851ed29 100644 --- a/sysutils/bkpupsd/MESSAGE +++ b/sysutils/bkpupsd/MESSAGE @@ -1,12 +1,12 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2003/07/31 11:07:30 jmmv Exp $ +$NetBSD: MESSAGE,v 1.4 2004/04/23 22:43:20 reed Exp $ ${DOCDIR}/rc.conf.d.sample contains some shell variables for helping bkpupsd start up. Simple way to install NetBSD 1.5 or later is below. -(1) Copy ${PREFIX}/etc/rc.d/bkpupsd to ${RCD_SCRIPTS_DIR}/rc.d/bkpupsd. +(1) Copy ${RCD_SCRIPTS_EXAMPLEDIR}/bkpupsd to ${RCD_SCRIPTS_DIR}/rc.d/bkpupsd. (2) Append ${DOCDIR}/rc.conf.d.sample to /etc/rc.conf. (3) Edit /etc/rc.conf for your needs, serial device and UPS type for example. diff --git a/www/jakarta-tomcat/MESSAGE b/www/jakarta-tomcat/MESSAGE index 865a1ac8e008..ee321fe6eb15 100644 --- a/www/jakarta-tomcat/MESSAGE +++ b/www/jakarta-tomcat/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/12/28 21:09:15 jlam Exp $ +$NetBSD: MESSAGE,v 1.4 2004/04/23 22:43:20 reed Exp $ For detailed instructions on how to run Tomcat, either as a standalone server or in conjunction with Apache (using the @@ -13,6 +13,6 @@ For more information on application development with Tomcat, see Note that tomcat may be started with the following command: - ${PREFIX}/etc/rc.d/tomcat start + ${RCD_SCRIPTS_EXAMPLEDIR}/tomcat start =========================================================================== diff --git a/www/tinyproxy/MESSAGE b/www/tinyproxy/MESSAGE index a4b0910663dc..582891cc9bfa 100644 --- a/www/tinyproxy/MESSAGE +++ b/www/tinyproxy/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1.1.1 2003/03/07 23:46:01 salo Exp $ +$NetBSD: MESSAGE,v 1.2 2004/04/23 22:43:20 reed Exp $ To use tinyproxy, you will need to perform the following steps: 1. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}/etc/rc.d/tinyproxy to /etc/rc.d/tinyproxy and add + ${RCD_SCRIPTS_EXAMPLEDIR}/tinyproxy to /etc/rc.d/tinyproxy and add tinyproxy=YES diff --git a/www/wwwoffle/MESSAGE b/www/wwwoffle/MESSAGE index 237ecf50189a..528e14e25b8d 100644 --- a/www/wwwoffle/MESSAGE +++ b/www/wwwoffle/MESSAGE @@ -1,13 +1,13 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:51 wiz Exp $ +$NetBSD: MESSAGE,v 1.4 2004/04/23 22:43:20 reed Exp $ 1) To enable "wwwwoffled" to start on boot on NetBSD-1.5 or newer, -please copy "${PREFIX}/etc/rc.d/wwwoffled" to "/etc/rc.d/" and add +please copy "${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffled" to "/etc/rc.d/" and add "wwwoffled=YES" to /etc/rc.conf. To do the same on older systems, add the following to /etc/rc.local: -if [ -x ${PREFIX}/etc/rc.d/wwwoffle ]; then - ${PREFIX}/etc/rc.d/wwwoffle +if [ -x ${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffle ]; then + ${RCD_SCRIPTS_EXAMPLEDIR}/wwwoffle fi 2) The hooks are present to to use the package version of "htdig", diff --git a/x11/wdm/MESSAGE b/x11/wdm/MESSAGE index 35cac08a1f1f..e101ff62b41e 100644 --- a/x11/wdm/MESSAGE +++ b/x11/wdm/MESSAGE @@ -1,10 +1,10 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.1 2003/02/23 17:33:31 salo Exp $ +$NetBSD: MESSAGE,v 1.2 2004/04/23 22:43:20 reed Exp $ To use wdm, you will need to perform the following steps: 1. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}/etc/rc.d/wdm to /etc/rc.d/wdm and add the following + ${RCD_SCRIPTS_EXAMPLEDIR}/wdm to /etc/rc.d/wdm and add the following line into your /etc/rc.conf wdm=YES diff --git a/x11/xfstt/MESSAGE b/x11/xfstt/MESSAGE index 0a52197b916d..25aae85d0e79 100644 --- a/x11/xfstt/MESSAGE +++ b/x11/xfstt/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2004/01/25 20:46:19 wiz Exp $ +$NetBSD: MESSAGE,v 1.5 2004/04/23 22:43:20 reed Exp $ To use xfstt, you will need to perform the following steps: @@ -10,7 +10,7 @@ To use xfstt, you will need to perform the following steps: ${PREFIX}/lib/X11/fonts/TTF/ 2. In case you don't have PKG_RCD_SCRIPTS set in your /etc/mk.conf, copy - ${PREFIX}/etc/rc.d/xfstt to /etc/rc.d/xfstt and add the following + ${RCD_SCRIPTS_EXAMPLEDIR}/xfstt to /etc/rc.d/xfstt and add the following line into your /etc/rc.conf xfstt=YES