Sat Jul 17 11:47:57 2010 UTC ()
Adjust DESTDIR support so it no longer leaves installed files full of destdir references - bump pkgrevision


(abs)
diff -r1.16 -r1.17 pkgsrc/sysutils/munin-node/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/munin-node/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/munin-node/patches/patch-ad
cvs diff -r1.16 -r1.17 pkgsrc/sysutils/munin-node/Makefile (switch to unified diff)

--- pkgsrc/sysutils/munin-node/Makefile 2010/07/16 22:04:11 1.16
+++ pkgsrc/sysutils/munin-node/Makefile 2010/07/17 11:47:57 1.17
@@ -1,117 +1,116 @@ @@ -1,117 +1,116 @@
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
4DISTNAME= munin_${VER} 4DISTNAME= munin_${VER}
5VER= 1.3.2 5VER= 1.3.2
6PKGNAME= munin-node-${VER} 6PKGNAME= munin-node-${VER}
7PKGREVISION= 3 7PKGREVISION= 4
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} 9MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/}
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://munin.sourceforge.net/ 12HOMEPAGE= http://munin.sourceforge.net/
13COMMENT= System monitoring tool, client version 13COMMENT= System monitoring tool, client version
14 14
15PKG_DESTDIR_SUPPORT= destdir 15PKG_DESTDIR_SUPPORT= destdir
16 16
17DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server 17DEPENDS+= p5-Net-Server>=0:../../net/p5-Net-Server
18DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay 18DEPENDS+= p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
19DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc 19DEPENDS+= munin-doc>=1.3.1:../../sysutils/munin-doc
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23USE_TOOLS+= perl:run tar 23USE_TOOLS+= perl:run tar
24USE_TOOLS+= gmake 24USE_TOOLS+= gmake
25USE_PKGINSTALL= YES 25USE_PKGINSTALL= YES
26 26
27WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:} 27WRKSRC= ${WRKDIR}/${DISTNAME:S:_:-:}
28 28
29PLIST_VARS+= sunos not-sunos netbsd not-netbsd linux not-linux 29PLIST_VARS+= sunos not-sunos netbsd not-netbsd linux not-linux
30 30
31.if ${OPSYS} == "Linux" 31.if ${OPSYS} == "Linux"
32PLIST.linux= yes 32PLIST.linux= yes
33.else 33.else
34PLIST.not-linux= yes 34PLIST.not-linux= yes
35.endif 35.endif
36 36
37.if ${OPSYS} == "NetBSD" 37.if ${OPSYS} == "NetBSD"
38PLIST.netbsd= yes 38PLIST.netbsd= yes
39.else 39.else
40PLIST.not-netbsd= yes 40PLIST.not-netbsd= yes
41.endif 41.endif
42 42
43.if ${OPSYS} == "SunOS" 43.if ${OPSYS} == "SunOS"
44PLIST.sunos= yes 44PLIST.sunos= yes
45.else 45.else
46PLIST.not-sunos= yes 46PLIST.not-sunos= yes
47.endif 47.endif
48 48
49PKG_GROUPS_VARS+= MUNIN_GROUP 49PKG_GROUPS_VARS+= MUNIN_GROUP
50PKG_USERS_VARS+= MUNIN_USER 50PKG_USERS_VARS+= MUNIN_USER
51USERGROUP_PHASE= pre-install 51USERGROUP_PHASE= pre-install
52 52
53MUNIN_GROUP?= munin 53MUNIN_GROUP?= munin
54MUNIN_USER?= munin 54MUNIN_USER?= munin
55 55
56PKG_GROUPS= ${MUNIN_GROUP} 56PKG_GROUPS= ${MUNIN_GROUP}
57PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} 57PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}
58PKG_GECOS.${MUNIN_USER}= Munin user 58PKG_GECOS.${MUNIN_USER}= Munin user
59PKG_SYSCONFSUBDIR?= munin 59PKG_SYSCONFSUBDIR?= munin
60REPLACE_PERL+= node/node.d/*.in 60REPLACE_PERL+= node/node.d/*.in
61 61
62STATEDIR?= ${VARBASE}/munin/plugin-state 62STATEDIR?= ${VARBASE}/munin/plugin-state
63MUNIN_RUN?= ${VARBASE}/run/munin 63MUNIN_RUN?= ${VARBASE}/run/munin
64 64
65MAKE_DIRS= ${VARBASE}/munin 65MAKE_DIRS= ${VARBASE}/munin
66MAKE_DIRS+= ${VARBASE}/run/munin 66MAKE_DIRS+= ${VARBASE}/run/munin
67MAKE_DIRS+= ${VARBASE}/log/munin 67MAKE_DIRS+= ${VARBASE}/log/munin
68MAKE_DIRS+= ${STATEDIR} 68MAKE_DIRS+= ${STATEDIR}
69 69
70OWN_DIRS= ${VARBASE}/munin 70OWN_DIRS= ${VARBASE}/munin
71OWN_DIRS+= ${VARBASE}/run/munin 71OWN_DIRS+= ${VARBASE}/run/munin
72OWN_DIRS+= ${VARBASE}/log/munin 72OWN_DIRS+= ${VARBASE}/log/munin
73OWN_DIRS+= ${VARBASE}/munin/plugin-state 73OWN_DIRS+= ${VARBASE}/munin/plugin-state
74 74
75OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 75OWN_DIRS_PERMS+=${VARBASE}/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
76OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 76OWN_DIRS_PERMS+=${VARBASE}/run/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
77OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755 77OWN_DIRS_PERMS+=${VARBASE}/log/munin ${MUNIN_USER} ${MUNIN_GROUP} 0755
78OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775 78OWN_DIRS_PERMS+=${VARBASE}/munin/plugin-state ${MUNIN_USER} ${MUNIN_GROUP} 0775
79 79
80INSTALL_TARGET= install-node install-node-plugins 80INSTALL_TARGET= install-node install-node-plugins
81 81
82BUILD_TARGET= build 82BUILD_TARGET= build
83 83
84#MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB} 84#MAKE_ENV+= PERL5_SITELIB=${PERL5_SITELIB}
85MAKE_ENV+= PREFIX=${PREFIX} 85MAKE_ENV+= PREFIX=${PREFIX}
86MAKE_ENV+= CONFDIR=${DESTDIR}${PKG_SYSCONFDIR} 86MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
87INSTALL_MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} 
88MAKE_ENV+= MUNIN_USER=${MUNIN_USER} 87MAKE_ENV+= MUNIN_USER=${MUNIN_USER}
89MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} 88MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP}
90MAKE_ENV+= PERL5=${PERL5:Q} 89MAKE_ENV+= PERL5=${PERL5:Q}
91 90
92FILES_SUBST+= PERL=${PERL5:Q} 91FILES_SUBST+= PERL=${PERL5:Q}
93FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 92FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
94FILES_SUBST+= STATEDIR=${STATEDIR} 93FILES_SUBST+= STATEDIR=${STATEDIR}
95FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} 94FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q}
96FILES_SUBST+= MUNIN_USER=${MUNIN_USER:Q} 95FILES_SUBST+= MUNIN_USER=${MUNIN_USER:Q}
97FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q} 96FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP:Q}
98 97
99MESSAGE_SUBST+= VARBASE=${VARBASE:Q} 98MESSAGE_SUBST+= VARBASE=${VARBASE:Q}
100 99
101BUILD_DEFS+= VARBASE 100BUILD_DEFS+= VARBASE
102 101
103RCD_SCRIPTS+= munin-node 102RCD_SCRIPTS+= munin-node
104 103
105EGDIR= ${PREFIX}/share/examples/munin 104EGDIR= ${PREFIX}/share/examples/munin
106 105
107CONF_FILES+= ${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf 106CONF_FILES+= ${EGDIR}/munin-node.conf ${PKG_SYSCONFDIR}/munin-node.conf
108INSTALLATION_DIRS+= ${EGDIR} 107INSTALLATION_DIRS+= ${EGDIR}
109 108
110pre-configure: 109pre-configure:
111 cd ${FILESDIR}; ${TAR} cf - . | (cd ${WRKSRC}; ${TAR} xfp -) 110 cd ${FILESDIR}; ${TAR} cf - . | (cd ${WRKSRC}; ${TAR} xfp -)
112 111
113post-install: 112post-install:
114 ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${DESTDIR}${EGDIR} 113 ${INSTALL_DATA} ${WRKSRC}/build/node/munin-node.conf ${DESTDIR}${EGDIR}
115 114
116.include "../../lang/python/application.mk" 115.include "../../lang/python/application.mk"
117.include "../../mk/bsd.pkg.mk" 116.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/munin-node/Attic/distinfo (switch to unified diff)

--- pkgsrc/sysutils/munin-node/Attic/distinfo 2010/07/11 18:15:47 1.7
+++ pkgsrc/sysutils/munin-node/Attic/distinfo 2010/07/17 11:47:57 1.8
@@ -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
3SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a 3SHA1 (munin_1.3.2.tar.gz) = 575c1dc3373e2e001accd1920fd815d9b875c95a
4RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4 4RMD160 (munin_1.3.2.tar.gz) = 7bcc16d00ad28731041015ef240144ed0c4fdeb4
5Size (munin_1.3.2.tar.gz) = 309319 bytes 5Size (munin_1.3.2.tar.gz) = 309319 bytes
6SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b 6SHA1 (patch-aa) = 5eaf9bdf345cddb8af221b6c0bc34f84b27c4f1b
7SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80 7SHA1 (patch-ab) = bb0f63cdef893d8c224cdd03a4a4125d03f85f80
8SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e 8SHA1 (patch-ac) = 9ef503b4d20f65e990c332c7789188a6fbad618e
9SHA1 (patch-ad) = a584035e8c2f1839e6dda2a9483004753db01e87 9SHA1 (patch-ad) = d29f61134077f7875500af2e5671b67913fb2306
10SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915 10SHA1 (patch-ae) = 63b6acf126bc8baaed0ff429cfa0fa63945e5915
11SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20 11SHA1 (patch-af) = 094aa38a177778e6df7310a0e61839c08de7dc20
12SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf 12SHA1 (patch-ag) = d33ff87fae5bef1fb2dd1f12838471b7a7a42fbf
13SHA1 (patch-ah) = bd2516b8961c04dd418677f7efb2b6589db15d2e 13SHA1 (patch-ah) = bd2516b8961c04dd418677f7efb2b6589db15d2e
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/munin-node/patches/Attic/patch-ad (switch to unified diff)

--- pkgsrc/sysutils/munin-node/patches/Attic/patch-ad 2006/12/05 15:07:34 1.2
+++ pkgsrc/sysutils/munin-node/patches/Attic/patch-ad 2010/07/17 11:47:57 1.3
@@ -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