diff options
author | taca <taca@pkgsrc.org> | 2008-10-22 03:28:22 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2008-10-22 03:28:22 +0000 |
commit | 8ce81d8e489646486ad98b45506b4d7615bc82a3 (patch) | |
tree | 338902b23a5ff68512ab7a2abcfd75740d149103 /sysutils | |
parent | daf108fff9f0cf14bc2451de05e0a620efa2e604 (diff) | |
download | pkgsrc-8ce81d8e489646486ad98b45506b4d7615bc82a3.tar.gz |
- Fix install problem on recent NetBSD current.
- Add DESTDIR support.
Bump PKGREVISION.
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/bkpupsd/Makefile | 8 | ||||
-rw-r--r-- | sysutils/bkpupsd/distinfo | 6 | ||||
-rw-r--r-- | sysutils/bkpupsd/patches/patch-aa | 20 | ||||
-rw-r--r-- | sysutils/bkpupsd/patches/patch-ae | 30 |
4 files changed, 49 insertions, 15 deletions
diff --git a/sysutils/bkpupsd/Makefile b/sysutils/bkpupsd/Makefile index 34c87d297dc..94a43e8cc9f 100644 --- a/sysutils/bkpupsd/Makefile +++ b/sysutils/bkpupsd/Makefile @@ -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 @@ MAINTAINER= taca@NetBSD.org 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_SCRIPTS= bkpupsd 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 --git a/sysutils/bkpupsd/distinfo b/sysutils/bkpupsd/distinfo index 0f8008e01db..aa68788106c 100644 --- a/sysutils/bkpupsd/distinfo +++ b/sysutils/bkpupsd/distinfo @@ -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 --git a/sysutils/bkpupsd/patches/patch-aa b/sysutils/bkpupsd/patches/patch-aa index b827722aa91..9a8202096c6 100644 --- a/sysutils/bkpupsd/patches/patch-aa +++ b/sysutils/bkpupsd/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.5 2003/07/31 11:07:31 jmmv Exp $ .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 @@ $NetBSD: patch-aa,v 1.5 2003/07/31 11:07:31 jmmv Exp $ ${.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 --git a/sysutils/bkpupsd/patches/patch-ae b/sysutils/bkpupsd/patches/patch-ae index 64bfccf8787..4754fb97aa6 100644 --- a/sysutils/bkpupsd/patches/patch-ae +++ b/sysutils/bkpupsd/patches/patch-ae @@ -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 @@ $NetBSD: patch-ae,v 1.1 2005/01/04 14:13:59 taca Exp $ 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> |