diff options
| author | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2018-07-04 13:40:07 +0000 |
| commit | 3cc59ce5299d6358f3c1487cc9da3d48ef0a0647 (patch) | |
| tree | 4b7c9cc25a344fafc9d2f536ba6e474a9bb281e6 /parallel/ganglia-monitor-core | |
| parent | 063580a062ba10ffba035c8d96b541b5ce7a426d (diff) | |
| download | pkgsrc-3cc59ce5299d6358f3c1487cc9da3d48ef0a0647.tar.gz | |
*: Move SUBST_STAGE from post-patch to pre-configure
Performing substitutions during post-patch breaks tools such as mkpatches,
making it very difficult to regenerate correct patches after making changes,
and often leading to substituted string replacements being committed.
Diffstat (limited to 'parallel/ganglia-monitor-core')
| -rw-r--r-- | parallel/ganglia-monitor-core/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile index d661c46e398..26a6547a4d1 100644 --- a/parallel/ganglia-monitor-core/Makefile +++ b/parallel/ganglia-monitor-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2018/06/28 01:05:01 bacon Exp $ +# $NetBSD: Makefile,v 1.60 2018/07/04 13:40:31 jperkin Exp $ # DISTNAME= ganglia-3.7.2 @@ -76,14 +76,14 @@ SUBST_VARS.paths+= GANGLIA_VARBASE ## gmond.conf.5 and gmond.conf.html can be generated from conf.pod, but ## doing so requires perl installed in the build stage. SUBST_CLASSES+= etcdir -SUBST_STAGE.etcdir= post-patch +SUBST_STAGE.etcdir= pre-configure SUBST_FILES.etcdir= ${WRKSRC}/README \ ${WRKSRC}/mans/gmetad.1 \ ${WRKSRC}/mans/gmond.1 SUBST_SED.etcdir= -e "s|/etc/ganglia/\(gm.*d\.conf\)|${PREFIX}/etc/\1|g" SUBST_CLASSES+= linux_init -SUBST_STAGE.linux_init= post-patch +SUBST_STAGE.linux_init= pre-configure SUBST_FILES.linux_init= gmond/gmond.init SUBST_FILES.linux_init+= gmetad/gmetad.init SUBST_SED.linux_init= -e 's|/usr/sbin|${PREFIX}/sbin|g' @@ -92,7 +92,7 @@ SUBST_SED.linux_init+= -e 's|/etc/ganglia|${PREFIX}&|g' SUBST_SED.linux_init+= -e 's|/var/lock/subsys|${PREFIX}&|g' SUBST_CLASSES+= systemd -SUBST_STAGE.systemd= post-patch +SUBST_STAGE.systemd= pre-configure SUBST_FILES.systemd= gmond/gmond.service gmetad/gmetad.service SUBST_SED.systemd= -e 's|@runstatedir@|${PREFIX}/var/run|g' SUBST_SED.systemd+= -e 's|@sbindir@|${PREFIX}/sbin|g' |