Sun Mar 22 18:48:07 2020 UTC ()
sysutils/munin-common: fix location of REPLACE_PERL

In Makefile.common, the WRKSRC is redirected.


(rillig)
diff -r1.1 -r1.2 pkgsrc/sysutils/munin-common/Makefile
diff -r1.1 -r1.2 pkgsrc/sysutils/munin-common/Makefile.common
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/munin-common/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/munin-common/Makefile 2019/09/09 12:21:44 1.1
+++ pkgsrc/sysutils/munin-common/Makefile 2020/03/22 18:48:06 1.2
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.1 2019/09/09 12:21:44 tm Exp $ 1# $NetBSD: Makefile,v 1.2 2020/03/22 18:48:06 rillig Exp $
2# 2#
3 3
4PKGNAME= ${DISTNAME:S/munin/munin-common/} 4PKGNAME= ${DISTNAME:S/munin/munin-common/}
 5PKGREVISION= 1
5COMMENT= Common components between a munin node and master 6COMMENT= Common components between a munin node and master
6 7
7.include "../../sysutils/munin-common/Makefile.common" 8.include "../../sysutils/munin-common/Makefile.common"
8 9
9# Adjust WRKSRC for the Perl module framework, but keep the same 10# Adjust WRKSRC for the Perl module framework, but keep the same
10# patch base directory 11# patch base directory
11WRKSRC= ${WRKDIR}/${DISTNAME}/common 12WRKSRC= ${WRKDIR}/${DISTNAME}/common
12PATCH_ARGS= -d ${WRKSRC}/.. --forward -E ${PATCH_STRIP} 13PATCH_ARGS= -d ${WRKSRC}/.. --forward -E ${PATCH_STRIP}
13 14
14PERL5_MODULE_TYPE= Module::Build 15PERL5_MODULE_TYPE= Module::Build
15PERL5_PACKLIST= auto/Munin/Common/.packlist 16PERL5_PACKLIST= auto/Munin/Common/.packlist
16 17
17SUBST_CLASSES+= paths 18SUBST_CLASSES+= paths
cvs diff -r1.1 -r1.2 pkgsrc/sysutils/munin-common/Makefile.common (expand / switch to unified diff)

--- pkgsrc/sysutils/munin-common/Makefile.common 2019/09/09 12:21:44 1.1
+++ pkgsrc/sysutils/munin-common/Makefile.common 2020/03/22 18:48:06 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.1 2019/09/09 12:21:44 tm Exp $ 1# $NetBSD: Makefile.common,v 1.2 2020/03/22 18:48:06 rillig Exp $
2# 2#
3# used by sysutils/munin-common/Makefile 3# used by sysutils/munin-common/Makefile
4# used by sysutils/munin-master/Makefile 4# used by sysutils/munin-master/Makefile
5# used by sysutils/munin-node/Makefile 5# used by sysutils/munin-node/Makefile
6 6
7VERSION= 2.0.49 7VERSION= 2.0.49
8DISTNAME= munin-${VERSION} 8DISTNAME= munin-${VERSION}
9CATEGORIES= sysutils 9CATEGORIES= sysutils
10MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/ 10MASTER_SITES= http://downloads.munin-monitoring.org/munin/stable/${VERSION}/
11 11
12MAINTAINER= tm@NetBSD.org 12MAINTAINER= tm@NetBSD.org
13HOMEPAGE= http://munin-monitoring.org/ 13HOMEPAGE= http://munin-monitoring.org/
14LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
@@ -41,27 +41,27 @@ MUNIN_WWWDIR?= ${PREFIX}/www @@ -41,27 +41,27 @@ MUNIN_WWWDIR?= ${PREFIX}/www
41 41
42PKG_GROUPS_VARS+= MUNIN_GROUP 42PKG_GROUPS_VARS+= MUNIN_GROUP
43PKG_USERS_VARS+= MUNIN_USER 43PKG_USERS_VARS+= MUNIN_USER
44PKG_GROUPS= ${MUNIN_GROUP} 44PKG_GROUPS= ${MUNIN_GROUP}
45PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP} 45PKG_USERS= ${MUNIN_USER}:${MUNIN_GROUP}
46PKG_GECOS.${MUNIN_USER}= Munin user 46PKG_GECOS.${MUNIN_USER}= Munin user
47PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR} 47PKG_HOME.${MUNIN_USER}= ${MUNIN_DBDIR}
48PKG_SHELL.${MUNIN_USER}= ${BASH} 48PKG_SHELL.${MUNIN_USER}= ${BASH}
49 49
50PKG_SYSCONFSUBDIR?= munin 50PKG_SYSCONFSUBDIR?= munin
51 51
52EGDIR= ${PREFIX}/share/examples/munin 52EGDIR= ${PREFIX}/share/examples/munin
53 53
54REPLACE_PERL= master/_bin/munin-update.in 54REPLACE_PERL= ${WRKDIR}/${DISTNAME}/master/_bin/munin-update.in
55 55
56FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP} 56FILES_SUBST+= MUNIN_GROUP=${MUNIN_GROUP}
57FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q} 57FILES_SUBST+= MUNIN_RUN=${MUNIN_RUN:Q}
58FILES_SUBST+= MUNIN_USER=${MUNIN_USER} 58FILES_SUBST+= MUNIN_USER=${MUNIN_USER}
59FILES_SUBST+= PERL=${PERL5:Q} 59FILES_SUBST+= PERL=${PERL5:Q}
60FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} 60FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
61FILES_SUBST+= STATEDIR=${STATEDIR} 61FILES_SUBST+= STATEDIR=${STATEDIR}
62 62
63MAKE_ENV+= PERL_USE_UNSAFE_INC=1 63MAKE_ENV+= PERL_USE_UNSAFE_INC=1
64MAKE_ENV+= BASH=${BASH:Q} 64MAKE_ENV+= BASH=${BASH:Q}
65MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR} 65MAKE_ENV+= CONFDIR=${PKG_SYSCONFDIR}
66MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR} 66MAKE_ENV+= MUNIN_DBDIR=${MUNIN_DBDIR}
67MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP} 67MAKE_ENV+= MUNIN_GROUP=${MUNIN_GROUP}