Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/ganglia-monitor-core ganglia-monitor-core: ad...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f8885879c264
branches: trunk
changeset: 435729:f8885879c264
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jul 13 18:40:47 2020 +0000
description:
ganglia-monitor-core: add buildlink3.mk
>From Edgar Fuß in PR 55479.
Some pkglint cleanup while here.
diffstat:
parallel/ganglia-monitor-core/Makefile | 11 +-
parallel/ganglia-monitor-core/buildlink3.mk | 18 +++++
parallel/ganglia-monitor-core/distinfo | 4 +-
parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c | 31 ---------
parallel/ganglia-monitor-core/patches/patch-lib_gm__protocol__xdr.c | 32 ++++++++++
5 files changed, 57 insertions(+), 39 deletions(-)
diffs (141 lines):
diff -r 43c416d70187 -r f8885879c264 parallel/ganglia-monitor-core/Makefile
--- a/parallel/ganglia-monitor-core/Makefile Mon Jul 13 18:37:22 2020 +0000
+++ b/parallel/ganglia-monitor-core/Makefile Mon Jul 13 18:40:47 2020 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.69 2020/06/02 08:24:37 adam Exp $
-#
+# $NetBSD: Makefile,v 1.70 2020/07/13 18:40:47 wiz Exp $
DISTNAME= ganglia-3.7.2
PKGNAME= ganglia-monitor-core-3.7.2
PKGREVISION= 11
-CATEGORIES= net parallel
+CATEGORIES= parallel net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ganglia/}
MAINTAINER= bacon%NetBSD.org@localhost
@@ -70,9 +69,9 @@
## doing so requires perl installed in the build stage.
SUBST_CLASSES+= etcdir
SUBST_STAGE.etcdir= pre-configure
-SUBST_FILES.etcdir= ${WRKSRC}/README \
- ${WRKSRC}/mans/gmetad.1 \
- ${WRKSRC}/mans/gmond.1
+SUBST_FILES.etcdir+= README
+SUBST_FILES.etcdir+= mans/gmetad.1
+SUBST_FILES.etcdir+= mans/gmond.1
SUBST_SED.etcdir= -e "s|/etc/ganglia/\(gm.*d\.conf\)|${PREFIX}/etc/\1|g"
SUBST_CLASSES+= linux_init
diff -r 43c416d70187 -r f8885879c264 parallel/ganglia-monitor-core/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/ganglia-monitor-core/buildlink3.mk Mon Jul 13 18:40:47 2020 +0000
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2020/07/13 18:40:47 wiz Exp $
+
+BUILDLINK_TREE+= ganglia-monitor-core
+
+.if !defined(GANGLIA_MONITOR_CORE_BUILDLINK3_MK)
+GANGLIA_MONITOR_CORE_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.ganglia-monitor-core+= ganglia-monitor-core>=3.7.2nb8
+BUILDLINK_PKGSRCDIR.ganglia-monitor-core?= ../../parallel/ganglia-monitor-core
+
+.include "../../devel/apr/buildlink3.mk"
+.include "../../devel/confuse/buildlink3.mk"
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+.endif # GANGLIA_MONITOR_CORE_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -ganglia-monitor-core
diff -r 43c416d70187 -r f8885879c264 parallel/ganglia-monitor-core/distinfo
--- a/parallel/ganglia-monitor-core/distinfo Mon Jul 13 18:37:22 2020 +0000
+++ b/parallel/ganglia-monitor-core/distinfo Mon Jul 13 18:40:47 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2018/06/28 01:05:01 bacon Exp $
+$NetBSD: distinfo,v 1.17 2020/07/13 18:40:47 wiz Exp $
SHA1 (ganglia-3.7.2.tar.gz) = 5ea23da8e5b85da53216dd7c742c8154e7aa576e
RMD160 (ganglia-3.7.2.tar.gz) = 9b5c48bcf2aa489caea689713dabb12804d9cee2
@@ -11,8 +11,8 @@
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
SHA1 (patch-lib__update_pidfile.c) = a8ed4fbeabf5d46a523c5cd3b891e5752d74187b
SHA1 (patch-lib_default__conf.h.in) = 70dbcbc39226369c9fb4f59240b8568854ac4e87
+SHA1 (patch-lib_gm__protocol__xdr.c) = 2e9d30dfb552a266728aafdfab5c82b0018936b0
SHA1 (patch-libmetrics__solaris__metrics.c) = 2b6ad945ed7eafa05fe4c24a535b00deba46173d
SHA1 (patch-libmetrics_freebsd_metrics.c) = acb3485a603c13fd4a9f7d7af621988f777ede6e
diff -r 43c416d70187 -r f8885879c264 parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c
--- a/parallel/ganglia-monitor-core/patches/patch-lib__gm_protocol_dr.c Mon Jul 13 18:37:22 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-lib__gm_protocol_dr.c,v 1.1 2012/03/13 12:36:25 fhajny Exp $
-
-Use INT32 macros, LONG ones were taken out of LP64 on Solaris.
---- lib/gm_protocol_xdr.c.orig 2009-01-28 23:23:20.000000000 +0000
-+++ lib/gm_protocol_xdr.c
-@@ -53,9 +53,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
- return FALSE;
-
- } else {
-- IXDR_PUT_U_LONG(buf, objp->slope);
-- IXDR_PUT_U_LONG(buf, objp->tmax);
-- IXDR_PUT_U_LONG(buf, objp->dmax);
-+ IXDR_PUT_U_INT32(buf, objp->slope);
-+ IXDR_PUT_U_INT32(buf, objp->tmax);
-+ IXDR_PUT_U_INT32(buf, objp->dmax);
- }
- if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
- sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
-@@ -78,9 +78,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
- return FALSE;
-
- } else {
-- objp->slope = IXDR_GET_U_LONG(buf);
-- objp->tmax = IXDR_GET_U_LONG(buf);
-- objp->dmax = IXDR_GET_U_LONG(buf);
-+ objp->slope = IXDR_GET_U_INT32(buf);
-+ objp->tmax = IXDR_GET_U_INT32(buf);
-+ objp->dmax = IXDR_GET_U_INT32(buf);
- }
- if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
- sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
diff -r 43c416d70187 -r f8885879c264 parallel/ganglia-monitor-core/patches/patch-lib_gm__protocol__xdr.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/ganglia-monitor-core/patches/patch-lib_gm__protocol__xdr.c Mon Jul 13 18:40:47 2020 +0000
@@ -0,0 +1,32 @@
+$NetBSD: patch-lib_gm__protocol__xdr.c,v 1.1 2020/07/13 18:40:47 wiz Exp $
+
+Use INT32 macros, LONG ones were taken out of LP64 on Solaris.
+
+--- lib/gm_protocol_xdr.c.orig 2009-01-28 23:23:20.000000000 +0000
++++ lib/gm_protocol_xdr.c
+@@ -53,9 +53,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
+ return FALSE;
+
+ } else {
+- IXDR_PUT_U_LONG(buf, objp->slope);
+- IXDR_PUT_U_LONG(buf, objp->tmax);
+- IXDR_PUT_U_LONG(buf, objp->dmax);
++ IXDR_PUT_U_INT32(buf, objp->slope);
++ IXDR_PUT_U_INT32(buf, objp->tmax);
++ IXDR_PUT_U_INT32(buf, objp->dmax);
+ }
+ if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
+ sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
+@@ -78,9 +78,9 @@ xdr_Ganglia_metadata_message (XDR *xdrs,
+ return FALSE;
+
+ } else {
+- objp->slope = IXDR_GET_U_LONG(buf);
+- objp->tmax = IXDR_GET_U_LONG(buf);
+- objp->dmax = IXDR_GET_U_LONG(buf);
++ objp->slope = IXDR_GET_U_INT32(buf);
++ objp->tmax = IXDR_GET_U_INT32(buf);
++ objp->dmax = IXDR_GET_U_INT32(buf);
+ }
+ if (!xdr_array (xdrs, (char **)&objp->metadata.metadata_val, (u_int *) &objp->metadata.metadata_len, ~0,
+ sizeof (Ganglia_extra_data), (xdrproc_t) xdr_Ganglia_extra_data))
Home |
Main Index |
Thread Index |
Old Index