diff options
| author | ghen <ghen@pkgsrc.org> | 2006-08-02 12:30:22 +0000 |
|---|---|---|
| committer | ghen <ghen@pkgsrc.org> | 2006-08-02 12:30:22 +0000 |
| commit | a6a6efd22a9d5e1f8eccbef00117c15300ecf887 (patch) | |
| tree | 0b5dda5d51d2d25fc037b039a39484032a384db6 | |
| parent | c7475da1eb5a58f62ffdc89ce28cd98f1eb1b99c (diff) | |
| download | pkgsrc-a6a6efd22a9d5e1f8eccbef00117c15300ecf887.tar.gz | |
Change NUT_STATEDIR from an absolute pathname /var/db/nut to ${VARBASE}/db/nut,
and make it user-settable. Bump PKGREVISION because VARBASE is not always /var.
| -rw-r--r-- | sysutils/ups-nut-cgi/Makefile | 9 | ||||
| -rw-r--r-- | sysutils/ups-nut/Makefile | 13 |
2 files changed, 14 insertions, 8 deletions
diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 649223b7c54..12b47881ecc 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.42 2006/08/02 12:11:00 ghen Exp $ +# $NetBSD: Makefile,v 1.43 2006/08/02 12:30:22 ghen Exp $ DISTNAME= nut-2.0.3 PKGNAME= ups-nut-cgi-2.0.3 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://random.networkupstools.org/source/2.0/ @@ -29,11 +30,13 @@ PKG_SYSCONFSUBDIR?= nut NUT_CONFDIR= ${PKG_SYSCONFDIR} NUT_DATADIR= ${PREFIX}/share/nut NUT_EGDIR= ${PREFIX}/share/examples/nut -NUT_STATEDIR= /var/db/nut +NUT_STATEDIR?= ${VARBASE}/db/nut NUT_CGIDIR= ${PREFIX}/libexec/cgi-bin +BUILD_DEFS+= NUT_STATEDIR + CONF_FILES= ${NUT_EGDIR}/hosts.conf.sample ${NUT_CONFDIR}/hosts.conf -CONF_FILES+= ${NUT_EGDIR}/upsset.conf.sample \ +CONF_FILES+= ${NUT_EGDIR}/upsset.conf.sample \ ${NUT_CONFDIR}/upsset.conf CONF_FILES+= ${NUT_EGDIR}/upsstats-single.html.sample \ ${NUT_CONFDIR}/upsstats-single.html diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 5a0e08f05ca..c7fa129b789 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.42 2006/04/23 00:12:42 jlam Exp $ +# $NetBSD: Makefile,v 1.43 2006/08/02 12:30:22 ghen Exp $ # DISTNAME= nut-2.0.3 PKGNAME= ups-nut-2.0.3 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://random.networkupstools.org/source/2.0/ @@ -13,8 +14,8 @@ COMMENT= Network UPS Tools GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR:Q} \ --datadir=${NUT_DATADIR:Q} \ - --localstatedir=${NUT_STATEDIR:Q} \ - --with-user=${NUT_USER:Q} \ + --localstatedir=${NUT_STATEDIR:Q} \ + --with-user=${NUT_USER:Q} \ --with-group=${NUT_GROUP:Q} \ --with-statepath=${NUT_STATEDIR:Q} \ --with-drvpath=${NUT_DRVDIR:Q} \ @@ -27,11 +28,13 @@ NUT_DATADIR= ${PREFIX}/share/nut NUT_DOCDIR= ${PREFIX}/share/doc/nut NUT_DRVDIR= ${PREFIX}/libexec/nut NUT_EGDIR= ${PREFIX}/share/examples/nut -NUT_STATEDIR= /var/db/nut +NUT_STATEDIR?= ${VARBASE}/db/nut NUT_USER?= nut NUT_GROUP?= nut +BUILD_DEFS+= NUT_STATEDIR NUT_USER NUT_GROUP + FILES_SUBST+= NUT_CONFDIR=${NUT_CONFDIR:Q} FILES_SUBST+= NUT_STATEDIR=${NUT_STATEDIR:Q} @@ -45,7 +48,7 @@ PKG_GECOS.${NUT_USER}= Network UPS Tools PKG_SHELL.${NUT_USER}= ${SH} CONF_FILES= ${NUT_EGDIR}/ups.conf.sample ${NUT_CONFDIR}/ups.conf -CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \ +CONF_FILES+= ${NUT_EGDIR}/upssched.conf.sample \ ${NUT_CONFDIR}/upssched.conf CONF_FILES_PERMS= ${NUT_EGDIR}/upsd.conf.sample \ |