kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjust DESTDIR support so it no longer leaves installed files full of destdir references - bump pkgrevision

Browse source
This commit is contained in:
abs 2010-07-17 11:47:57 +00:00
parent ed2fae77d8
commit d23c5f2ad9
3 changed files with 45 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sysutils/munin-node/Makefile
View file

@ -1,10 +1,10 @@
# $NetBSD: Makefile,v 1.16 2010/07/16 22:04:11 abs Exp $
# $NetBSD: Makefile,v 1.17 2010/07/17 11:47:57 abs Exp $
#
DISTNAME= munin_${VER}
VER= 1.3.2
PKGNAME= munin-node-${VER}
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/}
@ -83,8 +83,7 @@ BUILD_TARGET= build
#MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB}
MAKE_ENV+= PREFIX=${PREFIX}
MAKE_ENV+= CONFDIR=${DESTDIR}${PKG_SYSCONFDIR}
INSTALL_MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
MAKE_ENV+= MUNIN_USER=${MUNIN_USER}
MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP}
MAKE_ENV+= PERL5=${PERL5:Q}

4
sysutils/munin-node/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.7 2010/07/11 18:15:47 joerg Exp $
$NetBSD: distinfo,v 1.8 2010/07/17 11:47:57 abs Exp $
SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
@ -6,7 +6,7 @@ Size (munin_1.3.2.tar.gz) = 309319 bytes
SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b
SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e
SHA1 (patch-ad) = a584035e8c2f1839e6dda2a9483004753db01e87
SHA1 (patch-ad) = d29f61134077f7875500af2e5671b67913fb2306
SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915
SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20
SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf

51
sysutils/munin-node/patches/patch-ad
View file

@ -1,25 +1,54 @@
$NetBSD: patch-ad,v 1.2 2006/12/05 15:07:34 xtraeme Exp $
$NetBSD: patch-ad,v 1.3 2010/07/17 11:47:57 abs Exp $
--- Makefile.orig 2005-04-15 22:37:29.000000000 +0200
+++ Makefile 2006-12-05 16:06:32.000000000 +0100
@@ -37,8 +37,6 @@
$(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
$(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
--- Makefile.orig 2005-04-15 20:37:29.000000000 +0000
+++ Makefile
@@ -17,7 +17,7 @@ install: install-main install-node insta
- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
install-main: build
$(CHECKUSER)
- mkdir -p $(CONFDIR)/templates
+ mkdir -p $(DESTDIR)$(CONFDIR)/templates
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(PERLLIB)
@@ -31,13 +31,11 @@ install-main: build
$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR)
for p in build/server/*.tmpl; do \
- $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
+ $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \
done
- $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/
- $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/
- $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/
-
- test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/
+ $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/
+ $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/
+ $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/
$(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/
$(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/
@@ -61,7 +59,6 @@
mkdir -p $(CONFDIR)/plugin-conf.d
@@ -57,11 +55,10 @@ install-node-snmp: build
install-node-non-snmp: build
$(CHECKGROUP)
- mkdir -p $(CONFDIR)/plugins
- mkdir -p $(CONFDIR)/plugin-conf.d
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugins
+ mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d
mkdir -p $(LIBDIR)/plugins
mkdir -p $(SBINDIR)
- mkdir -p $(PERLLIB)/Munin/Plugin
mkdir -p $(LOGDIR)
mkdir -p $(STATEDIR)
@@ -73,7 +70,6 @@
@@ -69,11 +66,10 @@ install-node-non-snmp: build
$(CHGRP) $(GROUP) $(PLUGSTATE)
$(CHMOD) 775 $(PLUGSTATE)
- $(CHMOD) 755 $(CONFDIR)/plugin-conf.d
+ $(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d
$(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/
$(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/