From b40c5c23c2b84ae3bd4db567ed4d5f9963a2fe50 Mon Sep 17 00:00:00 2001 From: dmcmahill Date: Mon, 7 May 2001 03:28:11 +0000 Subject: fix on alpha. (type mismatch). while here use the DEFAULT_SERIAL_DEVICE setting to hopefully have a better default on most machines. --- sysutils/bkpupsd/Makefile | 6 +++++- sysutils/bkpupsd/distinfo | 2 ++ sysutils/bkpupsd/patches/patch-aa | 11 +++++++++++ sysutils/bkpupsd/patches/patch-ab | 11 +++++++++++ 4 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 sysutils/bkpupsd/patches/patch-aa create mode 100644 sysutils/bkpupsd/patches/patch-ab (limited to 'sysutils/bkpupsd') diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile index cfe9d6303dc..a28f5773cfb 100644 --- a/sysutils/bkpupsd/Makefile +++ b/sysutils/bkpupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/05/04 11:06:03 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2001/05/07 03:28:11 dmcmahill Exp $ # DISTNAME= bkpupsd-2.0pl3 @@ -10,4 +10,8 @@ MAINTAINER= taca@kyoto.jepro.co.jp HOMEPAGE= http://www.jepro.co.jp/ 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} + .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/bkpupsd/distinfo b/sysutils/bkpupsd/distinfo index 493b81f1c41..05180ab164f 100644 --- a/sysutils/bkpupsd/distinfo +++ b/sysutils/bkpupsd/distinfo @@ -1,3 +1,5 @@ SHA1 (bkpupsd-2.0pl3.tar.gz) = 0f7a057b9e3d7d62022422458d4ea816d76f02b5 Size (bkpupsd-2.0pl3.tar.gz) = 33609 bytes +SHA1 (patch-aa) = 3480f2edf91678adabf093fd057839b13bbcae5c +SHA1 (patch-ab) = 05bf74aca950a7378e47912487665c67bd0e3057 diff --git a/sysutils/bkpupsd/patches/patch-aa b/sysutils/bkpupsd/patches/patch-aa new file mode 100644 index 00000000000..bea85227e46 --- /dev/null +++ b/sysutils/bkpupsd/patches/patch-aa @@ -0,0 +1,11 @@ +$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 new file mode 100644 index 00000000000..2d3d1b533fc --- /dev/null +++ b/sysutils/bkpupsd/patches/patch-ab @@ -0,0 +1,11 @@ +$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 -- cgit v1.2.3