Update bkpupsd to 2.1.

Fri Jun 15 16:27:52 2001  Takahiro Kambe  <taca@kyoto.jepro.co.jp>

	* Add files for NEWLAYOUT style FreeBSD ports contributed by
	  yrsh2scp@mbox.nc.kyushu-u.ac.jp (Yoshifumi R. Shimizu).

	* remove package support for NetBSD since bkpupsd is now included
	  in NetBSD package collection.

Mon Mar  5 15:00:03 2001  Takahiro Kambe  <taca@kyoto.jepro.co.jp>

	* bump version, now 2.1.

	* now parameter for shutdown(8) may be specified in upstab.
	  Inspired by proposal from yrsh2scp@mbox.nc.kyushu-u.ac.jp
	  (Yoshifumi R. Shimizu).

	* correct spelling mistake noted from
	  yrsh2scp@mbox.nc.kyushu-u.ac.jp (Yoshifumi R. Shimizu)

6 files changed, 37 insertions, 33 deletions

diff --git a/sysutils/bkpupsd/MESSAGE b/sysutils/bkpupsd/MESSAGE
new file mode 100644
index 00000000000..ee64d336014
--- /dev/null
+++ b/sysutils/bkpupsd/MESSAGE
@@ -0,0 +1,15 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2001/12/19 15:37:59 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 bellow.
+
+(1) Copy ${PKGRCDIR}/bkpupsd to ${ETCDIR}/rc.d/bkpupsd.
+(2) Copy ${DOCDIR}/rc.conf.d.sample to
+    ${ETCDIR}/rc.conf.d/bkpupsd.
+(3) Edit ${ETCDIR}/rc.conf.d/bkpupsd for your needs, serial
+    device and UPS type for example.
+
+===========================================================================
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile
index 5d5d34892b2..516b013a458 100644
--- a/sysutils/bkpupsd/Makefile
+++ b/sysutils/bkpupsd/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/07/29 14:40:26 taca Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/19 15:38:00 taca Exp $
 #
 
-DISTNAME=	bkpupsd-2.0pl3
-PKGNAME=	${DISTNAME:S/pl/./}
+DISTNAME=	bkpupsd-2.1
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.jepro.co.jp/pub/jepro/misc/
 
@@ -12,6 +11,15 @@ COMMENT=	simple UPS daemon for BK-Pro, BK series and FREQUPS F series
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_ENV+=	DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE}
+DOCDIR=		${PREFIX}/share/doc/bkpupsd
+PKGRCDIR=	${PREFIX}/etc/rc.d
+ETCDIR=		${DESTDIR}/etc
+MAKE_ENV+=	DEFAULT_DEVICE=${DEFAULT_SERIAL_DEVICE} DOCDIR=${DOCDIR}
+
+MESSAGE_SUBST+=	DOCDIR=${DOCDIR} ETCDIR=${ETCDIR} PKGRCDIR=${PKGRCDIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/bkpupsd/PLIST b/sysutils/bkpupsd/PLIST
index 03983662b4c..a9fa28bc935 100644
--- a/sysutils/bkpupsd/PLIST
+++ b/sysutils/bkpupsd/PLIST
@@ -1,13 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:52:55 zuntum Exp $
-etc/rc.d/bkpupsd.sample
+@comment $NetBSD: PLIST,v 1.2 2001/12/19 15:38:00 taca Exp $
+etc/rc.d/bkpupsd
 etc/upstab
 libexec/bkpupsd/battery.shutdown
 libexec/bkpupsd/line.lost
 libexec/bkpupsd/line.recover
 libexec/bkpupsd/line.shutdown
+@dirrm libexec/bkpupsd
 man/cat5/upstab.0
 man/cat8/bkpupsd.0
 man/man5/upstab.5
 man/man8/bkpupsd.8
 sbin/bkpupsd
-@dirrm libexec/bkpupsd
+share/doc/bkpupsd/README
+share/doc/bkpupsd/README.ja
+share/doc/bkpupsd/rc.conf.d.sample
+@dirrm share/doc/bkpupsd
diff --git a/sysutils/bkpupsd/distinfo b/sysutils/bkpupsd/distinfo
index 05180ab164f..a70e19b0b96 100644
--- a/sysutils/bkpupsd/distinfo
+++ b/sysutils/bkpupsd/distinfo
@@ -1,5 +1,4 @@
+$NetBSD: distinfo,v 1.3 2001/12/19 15:38:00 taca Exp $
 
-SHA1 (bkpupsd-2.0pl3.tar.gz) = 0f7a057b9e3d7d62022422458d4ea816d76f02b5
-Size (bkpupsd-2.0pl3.tar.gz) = 33609 bytes
-SHA1 (patch-aa) = 3480f2edf91678adabf093fd057839b13bbcae5c
-SHA1 (patch-ab) = 05bf74aca950a7378e47912487665c67bd0e3057
+SHA1 (bkpupsd-2.1.tar.gz) = 0110d3d9522c3e920c883f8af214d68a48355bae
+Size (bkpupsd-2.1.tar.gz) = 35585 bytes
diff --git a/sysutils/bkpupsd/patches/patch-aa b/sysutils/bkpupsd/patches/patch-aa
deleted file mode 100644
index bea85227e46..00000000000
--- a/sysutils/bkpupsd/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/05/07 03:28:11 dmcmahill Exp $
-
---- src/main.c.orig	Fri Nov 17 01:09:33 2000
-+++ src/main.c	Sun May  6 23:16:55 2001
-@@ -236,5 +236,5 @@
- 		syslog(LOG_INFO,
- 		       "No battery low status checking, "
--		       "use default timeout %ld seconds", ups->fail_timeout);
-+		       "use default timeout %ld seconds", (long int) (ups->fail_timeout));
- 	}
- 
diff --git a/sysutils/bkpupsd/patches/patch-ab b/sysutils/bkpupsd/patches/patch-ab
deleted file mode 100644
index 2d3d1b533fc..00000000000
--- a/sysutils/bkpupsd/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/05/07 03:28:12 dmcmahill Exp $
-
---- Makefile.inc.NetBSD.orig	Thu Oct  5 01:09:04 2000
-+++ Makefile.inc.NetBSD	Sun May  6 23:22:11 2001
-@@ -6,5 +6,5 @@
- PREFIX?=	/usr/local
- BINDIR=		${PREFIX}/sbin
--DEFAULT_DEVICE=	/dev/dty00
-+DEFAULT_DEVICE?=	/dev/dty00
- MANDIR=		${PREFIX}/man
- SED?=		sed