pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/bkpupsd - make lines of MESSAGE shorter.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7a455029894b
branches:  trunk
changeset: 486855:7a455029894b
user:      taca <taca%pkgsrc.org@localhost>
date:      Tue Jan 04 13:37:30 2005 +0000

description:
- make lines of MESSAGE shorter.
- Cast (void *) second argument to cgetent(3) to compile on NetBSD
  current and prior.
- Remove blank line of manual page.

diffstat:

 sysutils/bkpupsd/MESSAGE          |   5 +++--
 sysutils/bkpupsd/Makefile         |   4 ++--
 sysutils/bkpupsd/distinfo         |   5 +++--
 sysutils/bkpupsd/patches/patch-ac |  22 ++++++++--------------
 sysutils/bkpupsd/patches/patch-ad |  25 +++++++++++++++++++++++++
 5 files changed, 41 insertions(+), 20 deletions(-)

diffs (107 lines):

diff -r fdb052cf3c31 -r 7a455029894b sysutils/bkpupsd/MESSAGE
--- a/sysutils/bkpupsd/MESSAGE  Tue Jan 04 13:31:17 2005 +0000
+++ b/sysutils/bkpupsd/MESSAGE  Tue Jan 04 13:37:30 2005 +0000
@@ -1,12 +1,13 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2004/10/11 22:14:51 reed Exp $
+$NetBSD: MESSAGE,v 1.6 2005/01/04 13:37:30 taca 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}/${RCD_SCRIPTS_EXAMPLEDIR}/bkpupsd to ${RCD_SCRIPTS_DIR}/rc.d/bkpupsd.
+(1) Copy ${PREFIX}/${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 -r fdb052cf3c31 -r 7a455029894b sysutils/bkpupsd/Makefile
--- a/sysutils/bkpupsd/Makefile Tue Jan 04 13:31:17 2005 +0000
+++ b/sysutils/bkpupsd/Makefile Tue Jan 04 13:37:30 2005 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/12/31 14:36:57 taca Exp $
+# $NetBSD: Makefile,v 1.15 2005/01/04 13:37:30 taca Exp $
 #
 
 DISTNAME=      bkpupsd-2.1.2
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    sysutils
 MASTER_SITES=  ftp://ftp.jone-system.com/pub/misc/ \
                ftp://ftp.back-street.net/pub/misc/
diff -r fdb052cf3c31 -r 7a455029894b sysutils/bkpupsd/distinfo
--- a/sysutils/bkpupsd/distinfo Tue Jan 04 13:31:17 2005 +0000
+++ b/sysutils/bkpupsd/distinfo Tue Jan 04 13:37:30 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2004/12/31 14:36:57 taca Exp $
+$NetBSD: distinfo,v 1.10 2005/01/04 13:37:30 taca Exp $
 
 SHA1 (bkpupsd-2.1.2.tar.bz2) = 742e6d7bc99c777077b9e0cc8cf6016fc63d18a6
 Size (bkpupsd-2.1.2.tar.bz2) = 35054 bytes
 SHA1 (patch-aa) = 887254791ec11c45c9acca5d3250ca43dd47c4ee
 SHA1 (patch-ab) = 60d5d9e1e26df8cb12c6ab26709e488c113e741f
-SHA1 (patch-ac) = 59401c70175ed9c71350053bca827505a8f4bc51
+SHA1 (patch-ac) = 07b68a843f6369addaebb2ad1bb24684a734ab84
+SHA1 (patch-ad) = d1b146b6b2aa804bdb4d5e660f0fe797311a3a09
diff -r fdb052cf3c31 -r 7a455029894b sysutils/bkpupsd/patches/patch-ac
--- a/sysutils/bkpupsd/patches/patch-ac Tue Jan 04 13:31:17 2005 +0000
+++ b/sysutils/bkpupsd/patches/patch-ac Tue Jan 04 13:37:30 2005 +0000
@@ -1,19 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/12/31 14:36:57 taca Exp $
+$NetBSD: patch-ac,v 1.2 2005/01/04 13:37:31 taca Exp $
 
 --- src/ups.c.orig     2003-01-21 20:49:06.000000000 +0900
 +++ src/ups.c
-@@ -90,11 +90,11 @@ ups_new(name, device, timeout, grace)
-       int timeout;
-       int grace;
- {
--      static char *file[] = { UPSTAB,
-+      static const char *file[] = { UPSTAB,
- #ifdef DEBUG
--                              "upstab",
-+                                    "upstab",
- #endif
--                              NULL, };
-+                                    NULL, };
-       char *ups_cap;
+@@ -99,7 +99,7 @@ ups_new(name, device, timeout, grace)
        UPS ups;
        char *s, *how;
+ 
+-      if (cgetent(&ups_cap, file, name) != 0) {
++      if (cgetent(&ups_cap, (void *)file, name) != 0) {
+               perror("ups_new: can't read upstab");
+               return NULL;
+       }
diff -r fdb052cf3c31 -r 7a455029894b sysutils/bkpupsd/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/bkpupsd/patches/patch-ad Tue Jan 04 13:37:30 2005 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2005/01/04 13:37:31 taca Exp $
+
+--- src/bkpupsd.8.in.orig      2002-12-22 02:42:01.000000000 +0900
++++ src/bkpupsd.8.in
+@@ -62,7 +62,6 @@ section.
+ For FREQUPS,
+ the bundled cable is tested to work and dip switch #2 of FREQUPS
+ must be set to on.
+-
+ Other type cables aren't tested at all.
+ Current specifications cable are follows:
+ .Bl -tag -width -flag
+@@ -81,12 +80,10 @@ signal.
+ starts with ups name specified in the
+ .Xr upstab 5
+ file on startup, and read parameter for corresponding ups.
+-
+ Then
+ .Nm
+ opens the serial port specified with command line option, and sets its
+ status if needed.
+-
+ .Pp
+ .Nm
+ checks the serial port, changing of modem control bits  periodcally.



Home | Main Index | Thread Index | Old Index