pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/bkpupsd - Fix install problem on recent NetBS...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d30fe7e8d364
branches: trunk
changeset: 548728:d30fe7e8d364
user: taca <taca%pkgsrc.org@localhost>
date: Wed Oct 22 03:28:22 2008 +0000
description:
- Fix install problem on recent NetBSD current.
- Add DESTDIR support.
Bump PKGREVISION.
diffstat:
sysutils/bkpupsd/Makefile | 8 +++++---
sysutils/bkpupsd/distinfo | 6 +++---
sysutils/bkpupsd/patches/patch-aa | 20 ++++++++++++++------
sysutils/bkpupsd/patches/patch-ae | 30 +++++++++++++++++++++++++++---
4 files changed, 49 insertions(+), 15 deletions(-)
diffs (136 lines):
diff -r 88c569690b36 -r d30fe7e8d364 sysutils/bkpupsd/Makefile
--- a/sysutils/bkpupsd/Makefile Wed Oct 22 02:37:21 2008 +0000
+++ b/sysutils/bkpupsd/Makefile Wed Oct 22 03:28:22 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/12/02 11:38:16 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2008/10/22 03:28:22 taca Exp $
#
DISTNAME= bkpupsd-2.2.1
+PKGREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.back-street.net/pub/misc/
EXTRACT_SUFX= .tar.bz2
@@ -10,6 +11,7 @@
HOMEPAGE= # not exist
COMMENT= Simple UPS daemon for BK-Pro, BK and FREQUPS A/F series
+PKG_DESTDIR_SUPPORT= user-destdir
INSTALLATION_DIRS= libexec/bkpupsd sbin ${PKGMANDIR}/cat5 \
${PKGMANDIR}/cat8 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
share/doc/bkpupsd share/examples/bkpupsd
@@ -34,7 +36,7 @@
RCD_SCRIPT_SRC.bkpupsd= # need to avoid automatic handling
pre-install:
- ${INSTALL_DATA} ${WRKSRC}/README ${DOCDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.ja ${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${DOCDIR}
+ ${INSTALL_DATA} ${WRKSRC}/README.ja ${DESTDIR}${DOCDIR}
.include "../../mk/bsd.pkg.mk"
diff -r 88c569690b36 -r d30fe7e8d364 sysutils/bkpupsd/distinfo
--- a/sysutils/bkpupsd/distinfo Wed Oct 22 02:37:21 2008 +0000
+++ b/sysutils/bkpupsd/distinfo Wed Oct 22 03:28:22 2008 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2006/09/29 15:16:50 taca Exp $
+$NetBSD: distinfo,v 1.15 2008/10/22 03:28:22 taca Exp $
SHA1 (bkpupsd-2.2.1.tar.bz2) = 23ea380ca6976e91e9e70daa7b7b500c38a75f01
RMD160 (bkpupsd-2.2.1.tar.bz2) = 0838a096e2ab3564ad1009c690123775c27b87c5
Size (bkpupsd-2.2.1.tar.bz2) = 33796 bytes
-SHA1 (patch-aa) = 887254791ec11c45c9acca5d3250ca43dd47c4ee
+SHA1 (patch-aa) = 7261b6862d38fb88b2973ebe3875172f1e1bdaeb
SHA1 (patch-ab) = f17fb6b0da6d320a1adab0bec1a54c1298122c6a
SHA1 (patch-ac) = 07b68a843f6369addaebb2ad1bb24684a734ab84
-SHA1 (patch-ae) = 409c352c643dd90dc68a2c853e5338e1b879301d
+SHA1 (patch-ae) = 920ade48299cdae87330cdacd810883d8d0f52c9
diff -r 88c569690b36 -r d30fe7e8d364 sysutils/bkpupsd/patches/patch-aa
--- a/sysutils/bkpupsd/patches/patch-aa Wed Oct 22 02:37:21 2008 +0000
+++ b/sysutils/bkpupsd/patches/patch-aa Wed Oct 22 03:28:22 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2003/07/31 11:07:31 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2008/10/22 03:28:22 taca Exp $
---- src/Makefile.orig 2002-12-21 18:34:12.000000000 +0100
+--- src/Makefile.orig 2006-08-22 15:07:36.000000000 +0900
+++ src/Makefile
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
OPSYS!=uname -s
PROG= bkpupsd
SRCS= bits.c main.c ups.c str2arg.c
@@ -11,7 +11,15 @@
.if exists(/usr/include/sys/com_ups.h)
CFLAGS+= -DHAVE_UPS_CONTROL -DDEBUG
-@@ -62,6 +62,7 @@ all: ${PROG} ${MAN8}
+@@ -46,6 +46,7 @@ LDADD+= -lutil
+ MAN5= upstab.5
+ MAN8= bkpupsd.8
+ .else
++MKHTML= no
+ WARNS= 1
+ MAN= upstab.5 bkpupsd.8
+ .endif
+@@ -62,6 +63,7 @@ all: ${PROG} ${MAN8}
upstab.5: upstab.5.in
@${SED} -e 's#%%prefix%%#${PREFIX}#g' \
@@ -19,11 +27,11 @@
${.CURDIR}/${.ALLSRC} > ${.TARGET}
bkpupsd.8: bkpupsd.8.in
-@@ -70,6 +71,6 @@ bkpupsd.8: bkpupsd.8.in
+@@ -70,6 +72,6 @@ bkpupsd.8: bkpupsd.8.in
afterinstall:
${INSTALL} -c -m 0644 -o ${BINOWN} -g ${BINGRP} ${.CURDIR}/upstab \
- ${UPSTAB}
-+ ${PREFIX}/share/examples/bkpupsd
++ ${DESTDIR}${PREFIX}/share/examples/bkpupsd
.include <bsd.prog.mk>
diff -r 88c569690b36 -r d30fe7e8d364 sysutils/bkpupsd/patches/patch-ae
--- a/sysutils/bkpupsd/patches/patch-ae Wed Oct 22 02:37:21 2008 +0000
+++ b/sysutils/bkpupsd/patches/patch-ae Wed Oct 22 03:28:22 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2005/01/04 14:13:59 taca Exp $
+$NetBSD: patch-ae,v 1.2 2008/10/22 03:28:22 taca Exp $
---- scripts/Makefile.orig 2002-12-22 02:32:59.000000000 +0900
+--- scripts/Makefile.orig 2006-08-22 13:15:58.000000000 +0900
+++ scripts/Makefile
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
#
SCRIPTS= battery.shutdown line.lost line.recover line.shutdown
FILESDIR?= ${PREFIX}/libexec/bkpupsd
@@ -11,3 +11,27 @@
DOCDIR?= ${PREFIX}/share/doc/bkpupsd
CLEANFILES+= ${RCFILE} ${RCDFILE}
OPSYS!=uname -s
+@@ -69,16 +69,16 @@ rc.conf.add: rc.conf.add.in
+ scriptsinstall:
+
+ install:
+- @test -d ${FILESDIR} || mkdir -p ${FILESDIR}
+- @test -d ${RCDIR} || mkdir -p ${RCDIR}
++ @test -d ${DESTDIR}${FILESDIR} || mkdir -p ${DESTDIR}${FILESDIR}
++ @test -d ${DESTDIR}${RCDIR} || mkdir -p ${DESTDIR}${RCDIR}
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+- ${SCRIPTS} ${FILESDIR}
++ ${SCRIPTS} ${DESTDIR}${FILESDIR}
+ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+- ${RCFILE} ${RCDIR}/${RCTARGET}
++ ${RCFILE} ${DESTDIR}${RCDIR}/${RCTARGET}
+ .if !empty(RCDFILE)
+- @test -d ${DOCDIR} || mkdir -p ${DOCDIR}
+- ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+- ${RCDFILE} ${DOCDIR}/${RCDTARGET}
++ @test -d ${DESTDIR}${DOCDIR} || mkdir -p ${DESTDIR}${DOCDIR}
++ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${NONBINMODE} \
++ ${RCDFILE} ${DESTDIR}${DOCDIR}/${RCDTARGET}
+ .endif
+
+ .include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index