diff options
| author | abs <abs@pkgsrc.org> | 2011-04-30 19:10:12 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2011-04-30 19:10:12 +0000 |
| commit | 8f7029befe1c28707a0f03d3438070384dc0fe5e (patch) | |
| tree | 22347e555f89722783025cd87c17d39064c910db /sysutils/munin-node | |
| parent | aa5447cd4c66fd08b49b7c0df82a2a014ec19bff (diff) | |
| download | pkgsrc-8f7029befe1c28707a0f03d3438070384dc0fe5e.tar.gz | |
Fix a "/usr/bin/env python" usage, bump pkgrevision
Diffstat (limited to 'sysutils/munin-node')
| -rw-r--r-- | sysutils/munin-node/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/munin-node/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/munin-node/patches/patch-aa | 11 |
3 files changed, 11 insertions, 9 deletions
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile index 2c0fde1db8e..fafdbece6c0 100644 --- a/sysutils/munin-node/Makefile +++ b/sysutils/munin-node/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.21 2010/12/11 12:09:23 abs Exp $ +# $NetBSD: Makefile,v 1.22 2011/04/30 19:10:12 abs Exp $ # DISTNAME= munin_${VER} VER= 1.3.2 PKGNAME= munin-node-${VER} -PKGREVISION= 8 +PKGREVISION= 9 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} @@ -87,6 +87,7 @@ MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} MAKE_ENV+= MUNIN_USER=${MUNIN_USER} MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} MAKE_ENV+= PERL5=${PERL5:Q} +MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} FILES_SUBST+= PERL=${PERL5:Q} FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} diff --git a/sysutils/munin-node/distinfo b/sysutils/munin-node/distinfo index a80e51bf7b7..9813a47e44c 100644 --- a/sysutils/munin-node/distinfo +++ b/sysutils/munin-node/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.8 2010/07/17 11:47:57 abs Exp $ +$NetBSD: distinfo,v 1.9 2011/04/30 19:10:12 abs Exp $ SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 Size (munin_1.3.2.tar.gz) = 309319 bytes -SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b +SHA1 (patch-aa) = 6c4517444cbcedadd276924c0ff417443618fd2b SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e SHA1 (patch-ad) = d29f61134077f7875500af2e5671b67913fb2306 diff --git a/sysutils/munin-node/patches/patch-aa b/sysutils/munin-node/patches/patch-aa index 4298be3c7d7..2891ac9dcb3 100644 --- a/sysutils/munin-node/patches/patch-aa +++ b/sysutils/munin-node/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2011/04/30 19:10:13 abs Exp $ ---- Makefile.config.orig 2005-01-10 10:38:22.000000000 +0000 +--- Makefile.config.orig 2005-04-15 20:29:18.000000000 +0000 +++ Makefile.config @@ -7,32 +7,32 @@ # @@ -44,7 +44,7 @@ $NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $ # Client only - Where plugins should put their states. Must be writable by # group "munin", and should be preserved between reboots -@@ -45,14 +49,14 @@ LOGDIR = $(DESTDIR)/var/log/munin +@@ -45,14 +45,14 @@ LOGDIR = $(DESTDIR)/var/log/munin # writable by the user "munin". STATEDIR = $(DESTDIR)/var/run/munin @@ -54,7 +54,8 @@ $NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $ +PERL = ${PERL5} # The python interpreter to use (used by some plugins) - PYTHON = /usr/bin/env python +-PYTHON = /usr/bin/env python ++PYTHON = ${PYTHONBIN} # Server only - Where to install the perl libraries -PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g") @@ -62,7 +63,7 @@ $NetBSD: patch-aa,v 1.3 2010/07/11 18:15:47 joerg Exp $ # Client only - Install plugins for this architecture OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]') -@@ -65,16 +69,15 @@ HOSTNAME = $(shell hostname) +@@ -65,16 +65,15 @@ HOSTNAME = $(shell hostname) VERSION = $(shell cat RELEASE) # User to run munin as |