Fri Feb 19 19:05:26 2010 UTC ()
Really use root for the config files. Bump revision.


(joerg)
diff -r1.59 -r1.60 pkgsrc/sysutils/apcupsd/Makefile
cvs diff -r1.59 -r1.60 pkgsrc/sysutils/apcupsd/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/apcupsd/Makefile 2008/12/07 22:54:00 1.59
+++ pkgsrc/sysutils/apcupsd/Makefile 2010/02/19 19:05:26 1.60
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.59 2008/12/07 22:54:00 bouyer Exp $ 1# $NetBSD: Makefile,v 1.60 2010/02/19 19:05:26 joerg Exp $
2 2
3DISTNAME= apcupsd-3.14.3 3DISTNAME= apcupsd-3.14.3
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=apcupsd/}
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8MAINTAINER= bouyer@NetBSD.org 8MAINTAINER= bouyer@NetBSD.org
9HOMEPAGE= http://www.apcupsd.org/ 9HOMEPAGE= http://www.apcupsd.org/
10COMMENT= UPS power management for APCC Products 10COMMENT= UPS power management for APCC Products
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= msgfmt sh makedepend 14USE_TOOLS+= msgfmt sh makedepend
15USE_LANGUAGES= c c++ 15USE_LANGUAGES= c c++
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18 18
19PKG_SYSCONFSUBDIR= apcupsd 19PKG_SYSCONFSUBDIR= apcupsd
@@ -44,36 +44,36 @@ CONFIGURE_ARGS+= --with-log-dir=${VARBAS @@ -44,36 +44,36 @@ CONFIGURE_ARGS+= --with-log-dir=${VARBAS
44# NOTE: You want the /dev/ttyXX for smart cables such as 940-0024C, 44# NOTE: You want the /dev/ttyXX for smart cables such as 940-0024C,
45# but probably the /dev/dtyXX for a basic smart-custom cable 45# but probably the /dev/dtyXX for a basic smart-custom cable
46CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01 46CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01
47CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} 47CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
48# configure sets sbindir to '${prefix}/sbin' without expanding $prefix 48# configure sets sbindir to '${prefix}/sbin' without expanding $prefix
49# this breaks .in files that uses @sbindir@ 49# this breaks .in files that uses @sbindir@
50CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin 50CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin
51 51
52CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q} 52CONFIGURE_ENV+= SCRIPTSHELL=${TOOLS_SH:Q}
53CONFIGURE_ENV+= ac_cv_path_MAKE=${MAKE:Q} 53CONFIGURE_ENV+= ac_cv_path_MAKE=${MAKE:Q}
54 54
55EGDIR= ${PREFIX}/share/examples/apcupsd 55EGDIR= ${PREFIX}/share/examples/apcupsd
56 56
57CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${ROOT_USER} ${ROOT_GROUP} 644 57CONF_FILES_PERMS+= ${EGDIR}/apcupsd.conf ${PKG_SYSCONFDIR}/apcupsd.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
58CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${ROOT_USER} ${ROOT_GROUP} 644 58CONF_FILES_PERMS+= ${EGDIR}/apcupsd.css ${PKG_SYSCONFDIR}/apcupsd.css ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 644
59CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${ROOT_USER} ${ROOT_GROUP} 755 59CONF_FILES_PERMS+= ${EGDIR}/changeme ${PKG_SYSCONFDIR}/changeme ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
60CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${ROOT_USER} ${ROOT_GROUP} 755 60CONF_FILES_PERMS+= ${EGDIR}/commfailure ${PKG_SYSCONFDIR}/commfailure ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
61CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${ROOT_USER} ${ROOT_GROUP} 755 61CONF_FILES_PERMS+= ${EGDIR}/commok ${PKG_SYSCONFDIR}/commok ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
62CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${ROOT_USER} ${ROOT_GROUP} 755 62CONF_FILES_PERMS+= ${EGDIR}/multimon.conf ${PKG_SYSCONFDIR}/multimon.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
63CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${ROOT_USER} ${ROOT_GROUP} 755 63CONF_FILES_PERMS+= ${EGDIR}/hosts.conf ${PKG_SYSCONFDIR}/hosts.conf ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
64CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${ROOT_USER} ${ROOT_GROUP} 755 64CONF_FILES_PERMS+= ${EGDIR}/offbattery ${PKG_SYSCONFDIR}/offbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
65CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${ROOT_USER} ${ROOT_GROUP} 755 65CONF_FILES_PERMS+= ${EGDIR}/onbattery ${PKG_SYSCONFDIR}/onbattery ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
66CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${ROOT_USER} ${ROOT_GROUP} 755 66CONF_FILES_PERMS+= ${EGDIR}/apccontrol ${PKG_SYSCONFDIR}/apccontrol ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 755
67RCD_SCRIPTS= apcupsd 67RCD_SCRIPTS= apcupsd
68RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${OPSYS:tl}/apcupsd 68RCD_SCRIPT_SRC.apcupsd= ${WRKSRC}/platforms/${OPSYS:tl}/apcupsd
69 69
70EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \ 70EGFILES= netbsd/apccontrol etc/changeme etc/commfailure etc/commok \
71 etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf 71 etc/offbattery etc/onbattery etc/multimon.conf etc/hosts.conf
72MANFILES= apcupsd apctest 72MANFILES= apcupsd apctest
73 73
74INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \ 74INSTALLATION_DIRS= share/examples/apcupsd share/examples/rc.d \
75 share/doc/html/apcupsd 75 share/doc/html/apcupsd
76 76
77SUBST_CLASSES+= strip 77SUBST_CLASSES+= strip
78SUBST_STAGE.strip= pre-configure 78SUBST_STAGE.strip= pre-configure
79SUBST_FILES.strip= autoconf/install-sh autoconf/targets.mak 79SUBST_FILES.strip= autoconf/install-sh autoconf/targets.mak