diff options
| author | abs <abs> | 2006-07-21 23:21:20 +0000 |
|---|---|---|
| committer | abs <abs> | 2006-07-21 23:21:20 +0000 |
| commit | 5e8984dc2b347778fc202974e140eadf8ba3f46e (patch) | |
| tree | 47d01586d8d622d20917ba24cc80f8484775c0d3 /sysutils/munin-server | |
| parent | da19b4a5e970cabfac65cd1b363e7972f2db33ec (diff) | |
| download | pkgsrc-5e8984dc2b347778fc202974e140eadf8ba3f46e.tar.gz | |
Use PKG_SYSCONFSUBDIR so PKG_SYSCONFBASE can be set. Bump PKGREVISION
Diffstat (limited to 'sysutils/munin-server')
| -rw-r--r-- | sysutils/munin-server/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/munin-server/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/munin-server/patches/patch-aa | 4 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/munin-server/Makefile b/sysutils/munin-server/Makefile index 31f073ca568..34b59082b5c 100644 --- a/sysutils/munin-server/Makefile +++ b/sysutils/munin-server/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.4 2006/07/21 16:23:42 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2006/07/21 23:21:20 abs Exp $ # -DISTNAME= ${PKGNAME:S:-server-:_:} +DISTNAME= ${PKGNAME_NOREV:S:-server-:_:} PKGNAME= munin-server-1.3.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} @@ -27,6 +27,7 @@ MUNIN_USER?= munin PKG_GROUPS= ${MUNIN_GROUP} PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}::Munin\\ user +PKG_SYSCONFSUBDIR?= munin STATEDIR= ${VARBASE}/munin/plugin-state @@ -52,6 +53,7 @@ BUILD_TARGET= build PERL5_SITELIB= ${PERL5_SUB_INSTALLVENDORLIB:Q} MAKE_ENV+= PERL5_SITELIB=${PREFIX}/${PERL5_SITELIB} +MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} MAKE_ENV+= MUNIN_USER=${MUNIN_USER} MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} MAKE_ENV+= PERL5=${PERL5:Q} @@ -67,9 +69,9 @@ MESSAGE_SUBST+= VARBASE=${VARBASE:Q} EGDIR= ${PREFIX}/share/examples/munin TMPL_EGDIR= ${EGDIR}/templates -INST_TMPL_DIR= ${PKG_SYSCONFDIR}/munin/templates +INST_TMPL_DIR= ${PKG_SYSCONFDIR}/templates -CONF_FILES+= ${EGDIR}/munin.conf ${PKG_SYSCONFDIR}/munin/munin.conf +CONF_FILES+= ${EGDIR}/munin.conf ${PKG_SYSCONFDIR}/munin.conf TMPL_FILES= definitions.html logo.png munin-comparison-day.tmpl \ munin-comparison-month.tmpl munin-comparison-week.tmpl \ diff --git a/sysutils/munin-server/distinfo b/sysutils/munin-server/distinfo index 2caf9067e1b..354fbb0ed82 100644 --- a/sysutils/munin-server/distinfo +++ b/sysutils/munin-server/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2006/07/21 16:23:42 wiz Exp $ +$NetBSD: distinfo,v 1.3 2006/07/21 23:21:20 abs Exp $ SHA1 (munin_1.3.1.tar.gz) = f7783b645abbb25524c3f1b6e0fe27185f1de3db RMD160 (munin_1.3.1.tar.gz) = a6ea4e1839f4c787457e4051d55007b7bcebd1d4 Size (munin_1.3.1.tar.gz) = 315743 bytes -SHA1 (patch-aa) = 7582a840614389f5fb4bf672cd4ea1e4b6822dd5 +SHA1 (patch-aa) = 4eca37dc4ee76bbd5b9e59a2eece06fcd7a9da2b SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 SHA1 (patch-ad) = f59ed32d7ca4acf72dfa32d8151b4ffa4c0f41a9 SHA1 (patch-ae) = ac8f4f5b7abf03c057ff293ab82c7176bc51a3f6 diff --git a/sysutils/munin-server/patches/patch-aa b/sysutils/munin-server/patches/patch-aa index 5a0a3e11f31..46dafb93ed3 100644 --- a/sysutils/munin-server/patches/patch-aa +++ b/sysutils/munin-server/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/06/08 19:16:24 he Exp $ +$NetBSD: patch-aa,v 1.2 2006/07/21 23:21:20 abs Exp $ --- Makefile.config.orig 2005-01-10 11:38:22.000000000 +0100 +++ Makefile.config @@ -15,7 +15,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2006/06/08 19:16:24 he Exp $ # Where Munin keeps its configurations (server.conf, client.conf, ++) -CONFDIR = $(DESTDIR)/etc/opt/munin -+CONFDIR = $(UPREFIX)/etc/munin ++CONFDIR ?= $(UPREFIX)/etc/munin + +# Where NetBSD pkgsrc installs example config files +EGDIR = $(UPREFIX)/share/examples/munin |