Adjust DESTDIR support so it no longer leaves installed files full of destdir references - bump pkgrevisiondiff -r1.16 -r1.17 pkgsrc/sysutils/munin-node/Makefile
(abs)
@@ -1,20 +1,20 @@ | @@ -1,20 +1,20 @@ | |||
1 | # $NetBSD: Makefile,v 1.16 2010/07/16 22:04:11 abs Exp $ | 1 | # $NetBSD: Makefile,v 1.17 2010/07/17 11:47:57 abs Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= munin_${VER} | 4 | DISTNAME= munin_${VER} | |
5 | VER= 1.3.2 | 5 | VER= 1.3.2 | |
6 | PKGNAME= munin-node-${VER} | 6 | PKGNAME= munin-node-${VER} | |
7 | PKGREVISION= 3 | 7 | PKGREVISION= 4 | |
8 | CATEGORIES= sysutils | 8 | CATEGORIES= sysutils | |
9 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} | 9 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} | |
10 | 10 | |||
11 | MAINTAINER= pkgsrc-users@NetBSD.org | 11 | MAINTAINER= pkgsrc-users@NetBSD.org | |
12 | HOMEPAGE= http://munin.sourceforge.net/ | 12 | HOMEPAGE= http://munin.sourceforge.net/ | |
13 | COMMENT= System monitoring tool, client version | 13 | COMMENT= System monitoring tool, client version | |
14 | 14 | |||
15 | PKG_DESTDIR_SUPPORT= destdir | 15 | PKG_DESTDIR_SUPPORT= destdir | |
16 | 16 | |||
17 | DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server | 17 | DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server | |
18 | DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay | 18 | DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay | |
19 | DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc | 19 | DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc | |
20 | 20 | |||
@@ -73,28 +73,27 @@ OWN_DIRS+= ${VARBASE}/log/munin | @@ -73,28 +73,27 @@ OWN_DIRS+= ${VARBASE}/log/munin | |||
73 | OWN_DIRS+= ${VARBASE}/munin/plugin-state | 73 | OWN_DIRS+= ${VARBASE}/munin/plugin-state | |
74 | 74 | |||
75 | OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | 75 | OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | |
76 | OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | 76 | OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | |
77 | OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | 77 | OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 | |
78 | OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775 | 78 | OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775 | |
79 | 79 | |||
80 | INSTALL_TARGET= install-node install-node-plugins | 80 | INSTALL_TARGET= install-node install-node-plugins | |
81 | 81 | |||
82 | BUILD_TARGET= build | 82 | BUILD_TARGET= build | |
83 | 83 | |||
84 | #MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB} | 84 | #MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB} | |
85 | MAKE_ENV+= PREFIX=${PREFIX} | 85 | MAKE_ENV+= PREFIX=${PREFIX} | |
86 | MAKE_ENV+= CONFDIR=${DESTDIR}${PKG_SYSCONFDIR} | 86 | MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} | |
87 | INSTALL_MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} | |||
88 | MAKE_ENV+= MUNIN_USER=${MUNIN_USER} | 87 | MAKE_ENV+= MUNIN_USER=${MUNIN_USER} | |
89 | MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} | 88 | MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} | |
90 | MAKE_ENV+= PERL5=${PERL5:Q} | 89 | MAKE_ENV+= PERL5=${PERL5:Q} | |
91 | 90 | |||
92 | FILES_SUBST+= PERL=${PERL5:Q} | 91 | FILES_SUBST+= PERL=${PERL5:Q} | |
93 | FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} | 92 | FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} | |
94 | FILES_SUBST+= STATEDIR=${STATEDIR} | 93 | FILES_SUBST+= STATEDIR=${STATEDIR} | |
95 | FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} | 94 | FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} | |
96 | FILES_SUBST+= MUNIN_USER=${MUNIN_USER:Q} | 95 | FILES_SUBST+= MUNIN_USER=${MUNIN_USER:Q} | |
97 | FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q} | 96 | FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q} | |
98 | 97 | |||
99 | MESSAGE_SUBST+= VARBASE=${VARBASE:Q} | 98 | MESSAGE_SUBST+= VARBASE=${VARBASE:Q} | |
100 | 99 |
@@ -1,13 +1,13 @@ | @@ -1,13 +1,13 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2010/07/11 18:15:47 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.8 2010/07/17 11:47:57 abs Exp $ | |
2 | 2 | |||
3 | SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a | 3 | SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a | |
4 | RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 | 4 | RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 | |
5 | Size (munin_1.3.2.tar.gz) = 309319 bytes | 5 | Size (munin_1.3.2.tar.gz) = 309319 bytes | |
6 | SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b | 6 | SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b | |
7 | SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 | 7 | SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 | |
8 | SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e | 8 | SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e | |
9 | SHA1 (patch-ad) = a584035e8c2f1839e6dda2a9483004753db01e87 | 9 | SHA1 (patch-ad) = d29f61134077f7875500af2e5671b67913fb2306 | |
10 | SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915 | 10 | SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915 | |
11 | SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20 | 11 | SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20 | |
12 | SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf | 12 | SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf | |
13 | SHA1 (patch-ah) = bd2516b8961c04dd418677f7efb2b6589db15d2e | 13 | SHA1 (patch-ah) = bd2516b8961c04dd418677f7efb2b6589db15d2e |
@@ -1,29 +1,58 @@ | @@ -1,29 +1,58 @@ | |||
1 | $NetBSD: patch-ad,v 1.2 2006/12/05 15:07:34 xtraeme Exp $ | 1 | $NetBSD: patch-ad,v 1.3 2010/07/17 11:47:57 abs Exp $ | |
2 | 2 | |||
3 | --- Makefile.orig 2005-04-15 22:37:29.000000000 +0200 | 3 | --- Makefile.orig 2005-04-15 20:37:29.000000000 +0000 | |
4 | +++ Makefile 2006-12-05 16:06:32.000000000 +0100 | 4 | +++ Makefile | |
5 | @@ -37,8 +37,6 @@ | 5 | @@ -17,7 +17,7 @@ install: install-main install-node insta | |
6 | $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ | |||
7 | $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ | |||
8 | 6 | |||
9 | - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ | 7 | install-main: build | |
8 | $(CHECKUSER) | |||
9 | - mkdir -p $(CONFDIR)/templates | |||
10 | + mkdir -p $(DESTDIR)$(CONFDIR)/templates | |||
11 | mkdir -p $(LIBDIR) | |||
12 | mkdir -p $(BINDIR) | |||
13 | mkdir -p $(PERLLIB) | |||
14 | @@ -31,13 +31,11 @@ install-main: build | |||
15 | $(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(RUNDIR) $(HTMLDIR) $(DBDIR) | |||
16 | ||||
17 | for p in build/server/*.tmpl; do \ | |||
18 | - $(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \ | |||
19 | + $(INSTALL) -m 0644 "$$p" $(DESTDIR)$(CONFDIR)/templates/ ; \ | |||
20 | done | |||
21 | - $(INSTALL) -m 0644 server/logo.png $(CONFDIR)/templates/ | |||
22 | - $(INSTALL) -m 0644 server/style.css $(CONFDIR)/templates/ | |||
23 | - $(INSTALL) -m 0644 server/definitions.html $(CONFDIR)/templates/ | |||
10 | - | 24 | - | |
25 | - test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/server/munin.conf $(CONFDIR)/ | |||
26 | + $(INSTALL) -m 0644 server/logo.png $(DESTDIR)$(CONFDIR)/templates/ | |||
27 | + $(INSTALL) -m 0644 server/style.css $(DESTDIR)$(CONFDIR)/templates/ | |||
28 | + $(INSTALL) -m 0644 server/definitions.html $(DESTDIR)$(CONFDIR)/templates/ | |||
29 | ||||
11 | $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ | 30 | $(INSTALL) -m 0755 build/server/munin-cron $(BINDIR)/ | |
12 | 31 | |||
13 | $(INSTALL) -m 0755 build/server/munin-update $(LIBDIR)/ | 32 | @@ -57,11 +55,10 @@ install-node-snmp: build | |
14 | @@ -61,7 +59,6 @@ | 33 | ||
15 | mkdir -p $(CONFDIR)/plugin-conf.d | 34 | install-node-non-snmp: build | |
35 | $(CHECKGROUP) | |||
36 | - mkdir -p $(CONFDIR)/plugins | |||
37 | - mkdir -p $(CONFDIR)/plugin-conf.d | |||
38 | + mkdir -p $(DESTDIR)$(CONFDIR)/plugins | |||
39 | + mkdir -p $(DESTDIR)$(CONFDIR)/plugin-conf.d | |||
16 | mkdir -p $(LIBDIR)/plugins | 40 | mkdir -p $(LIBDIR)/plugins | |
17 | mkdir -p $(SBINDIR) | 41 | mkdir -p $(SBINDIR) | |
18 | - mkdir -p $(PERLLIB)/Munin/Plugin | 42 | - mkdir -p $(PERLLIB)/Munin/Plugin | |
19 | 43 | |||
20 | mkdir -p $(LOGDIR) | 44 | mkdir -p $(LOGDIR) | |
21 | mkdir -p $(STATEDIR) | 45 | mkdir -p $(STATEDIR) | |
22 | @@ -73,7 +70,6 @@ | 46 | @@ -69,11 +66,10 @@ install-node-non-snmp: build | |
47 | ||||
48 | $(CHGRP) $(GROUP) $(PLUGSTATE) | |||
49 | $(CHMOD) 775 $(PLUGSTATE) | |||
50 | - $(CHMOD) 755 $(CONFDIR)/plugin-conf.d | |||
51 | + $(CHMOD) 755 $(DESTDIR)$(CONFDIR)/plugin-conf.d | |||
23 | 52 | |||
24 | $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ | 53 | $(INSTALL) -m 0755 build/node/munin-node $(SBINDIR)/ | |
25 | $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ | 54 | $(INSTALL) -m 0755 build/node/munin-node-configure $(SBINDIR)/ | |
26 | - test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ | 55 | - test -f "$(CONFDIR)/munin-node.conf" || $(INSTALL) -m 0644 build/node/munin-node.conf $(CONFDIR)/ | |
27 | $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ | 56 | $(INSTALL) -m 0755 build/node/munin-run $(SBINDIR)/ | |
28 | 57 | |||
29 | install-node-plugins: build | 58 | install-node-plugins: build |