From 3618cfd73cf0108007c0adafb531209059a3e228 Mon Sep 17 00:00:00 2001 From: bacon Date: Thu, 28 Jun 2018 01:05:01 +0000 Subject: parallel/ganglia-monitor-core: Unbreak linux build, add Linux rc files Add MESSAGE.Linux with instructions for init and systemd. Take ownership from pkgsrc-users. --- parallel/ganglia-monitor-core/Makefile | 51 +++++++++++++++++++--- parallel/ganglia-monitor-core/PLIST | 6 ++- parallel/ganglia-monitor-core/distinfo | 6 +-- .../ganglia-monitor-core/files/gmetad.service.in | 12 +++++ .../ganglia-monitor-core/files/gmond.service.in | 11 +++++ .../patches/patch-gmetad_data__thread.c | 8 ++-- .../patches/patch-gmetad_rrd__helpers.c | 8 ++-- 7 files changed, 86 insertions(+), 16 deletions(-) create mode 100644 parallel/ganglia-monitor-core/files/gmetad.service.in create mode 100644 parallel/ganglia-monitor-core/files/gmond.service.in (limited to 'parallel/ganglia-monitor-core') diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile index 0a26162f1c0..d661c46e398 100644 --- a/parallel/ganglia-monitor-core/Makefile +++ b/parallel/ganglia-monitor-core/Makefile @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.58 2018/04/16 14:35:04 wiz Exp $ +# $NetBSD: Makefile,v 1.59 2018/06/28 01:05:01 bacon Exp $ # DISTNAME= ganglia-3.7.2 PKGNAME= ganglia-monitor-core-3.7.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= net parallel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/} -MAINTAINER= pkgsrc-users@NetBSD.org +MAINTAINER= bacon@NetBSD.org HOMEPAGE= http://ganglia.sourceforge.net/ COMMENT= Ganglia cluster monitor, monitoring daemon LICENSE= modified-bsd @@ -23,6 +23,7 @@ PLIST_VARS+= python PKG_OPTIONS_VAR= PKG_OPTIONS.ganglia PKG_SUPPORTED_OPTIONS= python # Gmond support for python modules +BUILD_DEFS+= VARBASE .include "../../mk/bsd.prefs.mk" @@ -68,10 +69,34 @@ SUBST_FILES.paths= configure ganglia.html \ gmond/modules/conf.d/modpython.conf.in \ gmond/modules/python/README.in \ mans/gmetad.1 mans/gmetric.1 mans/gmond.1 -SUBST_SED.paths+= -e 's,/etc/ganglia,${PKG_SYSCONFDIR},g' -SUBST_SED.paths+= -e 's,/usr/lib/ganglia,${PREFIX}/lib/ganglia,g' +SUBST_SED.paths+= -e 's|/etc/ganglia|${PKG_SYSCONFDIR}|g' +SUBST_SED.paths+= -e 's|/usr/lib/ganglia|${PREFIX}/lib/ganglia|g' 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_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_FILES.linux_init= gmond/gmond.init +SUBST_FILES.linux_init+= gmetad/gmetad.init +SUBST_SED.linux_init= -e 's|/usr/sbin|${PREFIX}/sbin|g' +SUBST_SED.linux_init+= -e 's|/etc/sysconfig|${PREFIX}&|g' +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_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' + FILES_SUBST+= GANGLIA_VARBASE=${GANGLIA_VARBASE} DOCDIR= ${PREFIX}/share/doc/ganglia @@ -84,10 +109,24 @@ SMF_NAME= ganglia SMF_INSTANCES= ${RCD_SCRIPTS} INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 +INSTALLATION_DIRS+= var/lock/subsys + +post-extract: + ${CP} ${FILESDIR}/gmond.service.in ${WRKSRC}/gmond/gmond.service + ${CP} ${FILESDIR}/gmetad.service.in ${WRKSRC}/gmetad/gmetad.service post-install: ${WRKSRC}/gmond/gmond -t > ${DESTDIR}${EGDIR}/gmond.conf - ${INSTALL_DATA} ${WRKSRC}/gmond/modules/python/README ${DESTDIR}${DOCDIR}/ + ${INSTALL_DATA} ${WRKSRC}/gmond/modules/python/README \ + ${DESTDIR}${DOCDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/gmond/gmond.init \ + ${DESTDIR}${EGDIR}/gmond.init.linux + ${INSTALL_SCRIPT} ${WRKSRC}/gmond/gmond.service \ + ${DESTDIR}${EGDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/gmetad/gmetad.init \ + ${DESTDIR}${EGDIR}/gmetad.init.linux + ${INSTALL_SCRIPT} ${WRKSRC}/gmetad/gmetad.service \ + ${DESTDIR}${EGDIR} .include "../../databases/rrdtool/buildlink3.mk" .include "../../devel/apr/buildlink3.mk" diff --git a/parallel/ganglia-monitor-core/PLIST b/parallel/ganglia-monitor-core/PLIST index c99b06287dd..ffcf323b488 100644 --- a/parallel/ganglia-monitor-core/PLIST +++ b/parallel/ganglia-monitor-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:51 rillig Exp $ +@comment $NetBSD: PLIST,v 1.9 2018/06/28 01:05:01 bacon Exp $ bin/ganglia-config bin/gmetric bin/gstat @@ -31,4 +31,8 @@ sbin/gmond share/doc/ganglia/README ${PLIST.python}share/examples/ganglia/conf.d/modpython.conf share/examples/ganglia/gmetad.conf +share/examples/ganglia/gmetad.init.linux +share/examples/ganglia/gmetad.service share/examples/ganglia/gmond.conf +share/examples/ganglia/gmond.init.linux +share/examples/ganglia/gmond.service diff --git a/parallel/ganglia-monitor-core/distinfo b/parallel/ganglia-monitor-core/distinfo index 29a14e13174..ef13cd111e7 100644 --- a/parallel/ganglia-monitor-core/distinfo +++ b/parallel/ganglia-monitor-core/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2017/06/30 00:52:44 kamil Exp $ +$NetBSD: distinfo,v 1.16 2018/06/28 01:05:01 bacon Exp $ SHA1 (ganglia-3.7.2.tar.gz) = 5ea23da8e5b85da53216dd7c742c8154e7aa576e RMD160 (ganglia-3.7.2.tar.gz) = 9b5c48bcf2aa489caea689713dabb12804d9cee2 @@ -7,8 +7,8 @@ Size (ganglia-3.7.2.tar.gz) = 1302320 bytes SHA1 (patch-ac) = 09a96c391f185ddd5f7a64a8b030f38c36ffbc76 SHA1 (patch-configure) = d8f096263a8b2f04e30d4a053b4636ac5d1cd95f SHA1 (patch-gmetad_conf.c.in) = 75aa2d0c5d8af8a2864f7225444f1f263df4a60b -SHA1 (patch-gmetad_data__thread.c) = 8dedb930e54872dab97d659f7d911a540171dbfd -SHA1 (patch-gmetad_rrd__helpers.c) = 643c359f461e9616b547b276281bcc9a39a77a28 +SHA1 (patch-gmetad_data__thread.c) = 1af7a1c5b3f78bf65de42638e8ed595bf718107a +SHA1 (patch-gmetad_rrd__helpers.c) = e1afe61311b0df96f633983e673652b32a1938f4 SHA1 (patch-gmond_gmond.conf.5) = dfabfee6fb26cd5a384c1baed48fe631b957cf5b SHA1 (patch-gmond_modules_conf.d_modpython.conf.in) = 5b0d79efb34dae2f46dd911509759e8d75b4af96 SHA1 (patch-lib__gm_protocol_dr.c) = 9d17d79bb1a6426a2547c00006819483aff47363 diff --git a/parallel/ganglia-monitor-core/files/gmetad.service.in b/parallel/ganglia-monitor-core/files/gmetad.service.in new file mode 100644 index 00000000000..d7800655a69 --- /dev/null +++ b/parallel/ganglia-monitor-core/files/gmetad.service.in @@ -0,0 +1,12 @@ +[Unit] +Description=Ganglia Meta Daemon +After=network-online.target + +[Service] +Type=forking +PIDFile=@runstatedir@/gmetad.pid +ExecStart=@sbindir@/gmetad --pid-file=@runstatedir@/gmetad.pid +EnvironmentFile=-@envdir@/gmetad + +[Install] +WantedBy=multi-user.target diff --git a/parallel/ganglia-monitor-core/files/gmond.service.in b/parallel/ganglia-monitor-core/files/gmond.service.in new file mode 100644 index 00000000000..13774e80e6c --- /dev/null +++ b/parallel/ganglia-monitor-core/files/gmond.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=Ganglia Monitor Daemon +After=network-online.target + +[Service] +Type=forking +PIDFile=@runstatedir@/gmond.pid +ExecStart=@sbindir@/gmond --pid-file=@runstatedir@/gmond.pid + +[Install] +WantedBy=multi-user.target diff --git a/parallel/ganglia-monitor-core/patches/patch-gmetad_data__thread.c b/parallel/ganglia-monitor-core/patches/patch-gmetad_data__thread.c index 796dbdaac8a..21a26a4010e 100644 --- a/parallel/ganglia-monitor-core/patches/patch-gmetad_data__thread.c +++ b/parallel/ganglia-monitor-core/patches/patch-gmetad_data__thread.c @@ -1,14 +1,16 @@ -$NetBSD: patch-gmetad_data__thread.c,v 1.1 2016/02/16 12:48:18 fhajny Exp $ +$NetBSD: patch-gmetad_data__thread.c,v 1.2 2018/06/28 01:05:01 bacon Exp $ -Portability. +# Portability --- gmetad/data_thread.c.orig 2015-07-01 19:49:35.000000000 +0000 +++ gmetad/data_thread.c -@@ -1,6 +1,7 @@ +@@ -1,6 +1,9 @@ #include #include #include ++#ifndef __linux__ +#include ++#endif #include #include #include diff --git a/parallel/ganglia-monitor-core/patches/patch-gmetad_rrd__helpers.c b/parallel/ganglia-monitor-core/patches/patch-gmetad_rrd__helpers.c index 3040adb5f53..2a9dc0f52aa 100644 --- a/parallel/ganglia-monitor-core/patches/patch-gmetad_rrd__helpers.c +++ b/parallel/ganglia-monitor-core/patches/patch-gmetad_rrd__helpers.c @@ -1,14 +1,16 @@ -$NetBSD: patch-gmetad_rrd__helpers.c,v 1.1 2016/02/16 12:48:18 fhajny Exp $ +$NetBSD: patch-gmetad_rrd__helpers.c,v 1.2 2018/06/28 01:05:01 bacon Exp $ -Portability. +# Portability --- gmetad/rrd_helpers.c.orig 2015-07-01 19:49:35.000000000 +0000 +++ gmetad/rrd_helpers.c -@@ -2,6 +2,7 @@ +@@ -2,6 +2,9 @@ #include #include #include ++#ifndef __linux__ +#include ++#endif #include #include #include -- cgit v1.2.3