From fd5819c44bdc1f22ecc2cea4bfa8f1327112d60b Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Mon, 30 May 2005 00:54:46 +0000 Subject: [PATCH] Handle renaming of battd.1 to battd.8 --- etc/Makefile | 3 +- share/man/man5/rc.conf.5 | 6 +- usr.sbin/battd/Makefile | 4 +- usr.sbin/battd/battd.1 | 128 --------------------------------------- usr.sbin/battd/battd.8 | 6 +- 5 files changed, 10 insertions(+), 137 deletions(-) delete mode 100644 usr.sbin/battd/battd.1 diff --git a/etc/Makefile b/etc/Makefile index b2f88a9f47..7e26779fc2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.58 2005/05/30 00:42:39 swildner Exp $ +# $DragonFly: src/etc/Makefile,v 1.59 2005/05/30 00:54:46 swildner Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -249,6 +249,7 @@ upgrade_etc: preupgrade rm -rf ${DESTDIR}/usr/share/misc/fonts rm -rf ${DESTDIR}/usr/share/misc/pcvtfonts rm -rf ${DESTDIR}/usr/share/pcvt + rm -f ${DESTDIR}/usr/share/man/{man,cat}1/battd.1.gz ldconfig -R distribution: diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 3b8f31b91a..518e5d161d 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.197 2003/07/28 13:56:00 mbr Exp $ -.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.11 2005/05/07 17:38:33 swildner Exp $ +.\" $DragonFly: src/share/man/man5/rc.conf.5,v 1.12 2005/05/30 00:54:46 swildner Exp $ .Dd March 3, 2002 .Dt RC.CONF 5 .Os @@ -121,7 +121,7 @@ these are the flags to pass to the daemon. .It Va battd_enable Enable -.Xr battd 1 +.Xr battd 8 to monitor the status of batteries present in the system. This also enables support for APM. .It Va battd_flags @@ -131,7 +131,7 @@ If is set to .Dq Li YES , these are the flags to pass to the -.Xr battd 1 +.Xr battd 8 daemon. .It Va devd_enable .Pq Vt bool diff --git a/usr.sbin/battd/Makefile b/usr.sbin/battd/Makefile index 919e5d1847..fa1a543a11 100644 --- a/usr.sbin/battd/Makefile +++ b/usr.sbin/battd/Makefile @@ -1,8 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $DragonFly: src/usr.sbin/battd/Makefile,v 1.1 2005/02/01 17:16:36 liamfoy Exp $ +# $DragonFly: src/usr.sbin/battd/Makefile,v 1.2 2005/05/30 00:54:46 swildner Exp $ PROG= battd -MAN= battd.1 +MAN= battd.8 WARNS?= 6 diff --git a/usr.sbin/battd/battd.1 b/usr.sbin/battd/battd.1 deleted file mode 100644 index 8547e4ad8c..0000000000 --- a/usr.sbin/battd/battd.1 +++ /dev/null @@ -1,128 +0,0 @@ -.\" Copyright (c) 2005 The DragonFly Project. All rights reserved. -.\" -.\" This code is derived from software contributed to The DragonFly Project -.\" by Maxime Labelle. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in -.\" the documentation and/or other materials provided with the -.\" distribution. -.\" 3. Neither the name of The DragonFly Project nor the names of its -.\" contributors may be used to endorse or promote products derived -.\" from this software without specific, prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -.\" LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -.\" FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -.\" COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -.\" INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING, -.\" BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -.\" AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -.\" OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -.\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $DragonFly: src/usr.sbin/battd/Attic/battd.1,v 1.5 2005/04/03 19:31:33 swildner Exp $ -.Dd January 31, 2005 -.Dt BATTD 1 -.Os -.Sh NAME -.Nm battd -.Nd Battery status monitoring daemon -.Sh SYNOPSIS -.Nm -.Op Fl hEdT -.Op Fl p Ar percentage -.Op Fl t Ar minutes -.Op Fl s Ar status -.Op Fl f Ar device -.Op Fl c Ar seconds -.Sh DESCRIPTION -The -.Nm -daemon monitors the status of the battery or batteries present in the system. -The daemon will alert all users on the system and may execute a supplied -command once a particular criteria has been met. The criterias are based -on the percentage remaining, the time remaining and the status of the battery. -.Pp -The options are as follows: -.Bl -tag -width indent -.It Fl c Ar seconds -Interval in seconds for checking the battery status. Default is -.Ar 30 -seconds. -.It Fl d -Start -.Nm -in debug mode. -.It Fl e Ar command -Execute -.Ar command -once condition has been met. -.It Fl E -Execute command only once after a condition has been met. -.It Fl f Ar device -Specifies a different device path to be used. Default is -.Ar /dev/apm . -.It Fl h -Print -.Nm -command line usage and exit. -.It Fl p Ar percent -Alert the user when the remaining battery life has reached approximately -.Ar percent . -.It Fl s Ar status -Alert the user when the remaining battery has reached a given status. The status specified can either be -.Ar high -, -.Ar low -or -.Ar critical . -.It Fl t Ar minutes -Alert the user when the remaining battery time has reached approximately -.Ar minutes. -.It Fl T -Use as default along with percentage default alert. This will alert you once -the system has roughly 10 minutes remaining. -.El -.Pp -By default, -.Nm -will alert users once the battery or batteries have roughly 10% of power remaining. -.Pp -.Sh EXAMPLES -.Bl -tag -width indent -.It Li "battd -p 50 -s low" -Alert users when the battery percentage has reached 50% and once again when the status -reaches low. -.It Li "battd -t 15" -Alert users when the battery has 15 minutes worth of power remaining. -.It Li "battd -p 30 -e program -c 10" -Alert users when the battery percentage has reached 30% and execute the command 'program'. -Increase the interval between checking the battery to 10 seconds. -.El -.Sh SEE ALSO -.Xr zzz 4 , -.Xr viapm 4 , -.Xr apm 8 , -.Xr apmd 8 , -.Xr syslogd 8 -.Sh HISTORY -The -.Nm -command first appeared in -.Dx 1.1 . -.Sh AUTHORS -.An Liam J. Foy Aq liamfoy@dragonflybsd.org -.Pp -Man page contributions by: -.An Maxime Labelle Aq mlabelle@vt220.com -.An Sarunas Vancevicius Aq svan@redbrick.dcu.ie diff --git a/usr.sbin/battd/battd.8 b/usr.sbin/battd/battd.8 index d05c9b5aad..43f8e4c4ad 100644 --- a/usr.sbin/battd/battd.8 +++ b/usr.sbin/battd/battd.8 @@ -30,9 +30,9 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $DragonFly: src/usr.sbin/battd/battd.8,v 1.5 2005/04/03 19:31:33 swildner Exp $ -.Dd January 31, 2005 -.Dt BATTD 1 +.\" $DragonFly: src/usr.sbin/battd/battd.8,v 1.6 2005/05/30 00:54:46 swildner Exp $ +.Dd May 29, 2005 +.Dt BATTD 8 .Os .Sh NAME .Nm battd -- 2.32.0