Update bkpupsd package to 2.2.0.

* Clean up copyright notice.
* Change timing of pid file creation.
* Stop using uu_lock().
* Add FREQUPS A seriese entry.

6 files changed, 17 insertions, 53 deletions

diff --git a/sysutils/bkpupsd/MESSAGE b/sysutils/bkpupsd/MESSAGE
index 497895e937b..0e13ded832e 100644
--- a/sysutils/bkpupsd/MESSAGE
+++ b/sysutils/bkpupsd/MESSAGE
@@ -1,15 +1,6 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.6 2005/01/04 13:37:30 taca Exp $
+$NetBSD: MESSAGE,v 1.7 2006/08/27 16:21:35 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.
-(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.
+See ${DOCDIR}/rc.conf.add.sample.
 
 ===========================================================================
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 2f30fccece3..f5dea40d2e4 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.20 2006/06/18 16:00:41 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2006/08/27 16:21:35 taca Exp $
 #
 
-DISTNAME=	bkpupsd-2.1.2
-PKGREVISION=	5
+DISTNAME=	bkpupsd-2.2.0
 CATEGORIES=	sysutils
-MASTER_SITES=	ftp://ftp.jone-system.com/pub/misc/ \
+MASTER_SITES=	ftp://ftp.SmartField.co.jp/pub/misc/ \
 		ftp://ftp.back-street.net/pub/misc/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	# not exist
-COMMENT=	Simple UPS daemon for BK-Pro, BK series and FREQUPS F series
+COMMENT=	Simple UPS daemon for BK-Pro, BK and FREQUPS A/F series
 
 # Original program assumes BSD code base.
 ONLY_FOR_PLATFORM= NetBSD-*-*
diff --git a/sysutils/bkpupsd/PLIST b/sysutils/bkpupsd/PLIST
index d5f1ce4d339..62a9debf1c9 100644
--- a/sysutils/bkpupsd/PLIST
+++ b/sysutils/bkpupsd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2005/05/02 20:34:05 reed Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/08/27 16:21:35 taca Exp $
 libexec/bkpupsd/battery.shutdown
 libexec/bkpupsd/line.lost
 libexec/bkpupsd/line.recover
@@ -12,7 +12,7 @@ man/man8/bkpupsd.8
 sbin/bkpupsd
 share/doc/bkpupsd/README
 share/doc/bkpupsd/README.ja
-share/doc/bkpupsd/rc.conf.d.sample
+share/doc/bkpupsd/rc.conf.add.sample
 share/examples/bkpupsd/upstab
 @dirrm share/examples/bkpupsd
 @dirrm share/doc/bkpupsd
diff --git a/sysutils/bkpupsd/distinfo b/sysutils/bkpupsd/distinfo
index bbc0d86beba..c1bc040e939 100644
--- a/sysutils/bkpupsd/distinfo
+++ b/sysutils/bkpupsd/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 13:40:51 agc Exp $
+$NetBSD: distinfo,v 1.13 2006/08/27 16:21:35 taca Exp $
 
-SHA1 (bkpupsd-2.1.2.tar.bz2) = 742e6d7bc99c777077b9e0cc8cf6016fc63d18a6
-RMD160 (bkpupsd-2.1.2.tar.bz2) = 1af640870a8afb5b743c2d329d2bcecb726d02d0
-Size (bkpupsd-2.1.2.tar.bz2) = 35054 bytes
+SHA1 (bkpupsd-2.2.0.tar.bz2) = 20d31059d0ab8b858d9c90e781d11b1aa97407fa
+RMD160 (bkpupsd-2.2.0.tar.bz2) = afac982d0370de88c3f4ea48bfd830e2ff5fcd4f
+Size (bkpupsd-2.2.0.tar.bz2) = 33808 bytes
 SHA1 (patch-aa) = 887254791ec11c45c9acca5d3250ca43dd47c4ee
-SHA1 (patch-ab) = 60d5d9e1e26df8cb12c6ab26709e488c113e741f
+SHA1 (patch-ab) = f17fb6b0da6d320a1adab0bec1a54c1298122c6a
 SHA1 (patch-ac) = 07b68a843f6369addaebb2ad1bb24684a734ab84
-SHA1 (patch-ad) = d1b146b6b2aa804bdb4d5e660f0fe797311a3a09
 SHA1 (patch-ae) = 409c352c643dd90dc68a2c853e5338e1b879301d
diff --git a/sysutils/bkpupsd/patches/patch-ab b/sysutils/bkpupsd/patches/patch-ab
index 6cca62f7f34..00fec23345c 100644
--- a/sysutils/bkpupsd/patches/patch-ab
+++ b/sysutils/bkpupsd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2003/07/31 11:07:31 jmmv Exp $
+$NetBSD: patch-ab,v 1.6 2006/08/27 16:21:36 taca Exp $
 
---- src/upstab.5.in.orig	2002-12-21 18:42:01.000000000 +0100
+--- src/upstab.5.in.orig	2006-08-22 13:37:55.000000000 +0900
 +++ src/upstab.5.in
-@@ -122,8 +122,8 @@ In this case, after setting serial port 
+@@ -124,8 +124,8 @@ In this case, after setting serial port 
  CTS and CAR are set.
  .Pp
  .Sh FILES
@@ -12,4 +12,4 @@ $NetBSD: patch-ab,v 1.5 2003/07/31 11:07:31 jmmv Exp $
 +.It Pa  %%pkg_sysconfdir%%/upstab
  .El
  .Sh SEE ALSO
- .Xr getcap 3 ,
+ .Xr getcap 3
diff --git a/sysutils/bkpupsd/patches/patch-ad b/sysutils/bkpupsd/patches/patch-ad
deleted file mode 100644
index 2cb944e7a85..00000000000
--- a/sysutils/bkpupsd/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$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.