On 2024/04/12 16:08, Theo Buehler wrote:
> While working on a protobuf update, I ran into these wo consumers.
> riemann-c-client moved away from github, so switch to its new home.
> At some point the library was renamed, so adjust the collectd port for
> that.
>
> I don't use this, I only checked that this builds both on -current and
> and with the WIP protobuf 5.26 update.
I don't use it either. LGTM though.
> Index: sysutils/riemann-c-client/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/riemann-c-client/Makefile,v
> diff -u -p -r1.10 Makefile
> --- sysutils/riemann-c-client/Makefile 30 Sep 2023 21:09:55 -0000
> 1.10
> +++ sysutils/riemann-c-client/Makefile 12 Apr 2024 14:25:05 -0000
> @@ -1,31 +1,28 @@
> COMMENT = c client library for the Riemann monitoring system
>
> -V = 1.9.1
> -GH_ACCOUNT = algernon
> -GH_PROJECT = riemann-c-client
> -GH_TAGNAME = riemann-c-client-${V}
> -DISTNAME = ${GH_PROJECT}-${V}
> -REVISION = 4
> +DISTNAME = riemann-c-client-2.2.0
>
> -SHARED_LIBS += riemann-client 0.0 # 0.0
> +SHARED_LIBS += riemann-client-gnutls 0.0 # 0.0
>
> CATEGORIES = sysutils
>
> -HOMEPAGE = https://github.com/algernon/riemann-c-client
> +HOMEPAGE =
> https://git.madhouse-project.org/algernon/riemann-c-client
> +SITES =
> https://git.madhouse-project.org/algernon/riemann-c-client/archive/
>
> -# LGPLv3
> +# EUPL 1.2
> PERMIT_PACKAGE = Yes
>
> -WANTLIB = brotlidec brotlienc c gmp gnutls hogweed iconv idn2 intl
> -WANTLIB += json-c m nettle p11-kit protobuf-c pthread tasn1 unistring z
> -WANTLIB += zstd
> +WRKDIST = ${WRKDIR}/riemann-c-client
> +
> +WANTLIB = c gmp gnutls hogweed iconv idn2 intl
> +WANTLIB += json-c m nettle p11-kit protobuf-c pthread tasn1 unistring
>
> LIB_DEPENDS = devel/protobuf-c \
> security/gnutls \
> devel/json-c
>
> -AUTOCONF_VERSION = 2.67
> -AUTOMAKE_VERSION = 1.11
> +AUTOCONF_VERSION = 2.71
> +AUTOMAKE_VERSION = 1.16
>
> CONFIGURE_STYLE = autoreconf
>
> Index: sysutils/riemann-c-client/distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/riemann-c-client/distinfo,v
> diff -u -p -r1.1.1.1 distinfo
> --- sysutils/riemann-c-client/distinfo 30 Nov 2016 07:44:29 -0000
> 1.1.1.1
> +++ sysutils/riemann-c-client/distinfo 12 Apr 2024 14:25:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (riemann-c-client-1.9.1.tar.gz) =
> bIJ5NiOE4O4By4ShL2Rb9yKcfWH1ZRWP5OzILDbOjcA=
> -SIZE (riemann-c-client-1.9.1.tar.gz) = 74563
> +SHA256 (riemann-c-client-2.2.0.tar.gz) =
> 9pCuoCo2UsncYjcsQwXQuehpzYt9nCK5ZJkaS9+V0r4=
> +SIZE (riemann-c-client-2.2.0.tar.gz) = 68880
> Index: sysutils/riemann-c-client/patches/patch-Makefile_am
> ===================================================================
> RCS file: /cvs/ports/sysutils/riemann-c-client/patches/patch-Makefile_am,v
> diff -u -p -r1.2 patch-Makefile_am
> --- sysutils/riemann-c-client/patches/patch-Makefile_am 11 Mar 2022
> 19:57:56 -0000 1.2
> +++ sysutils/riemann-c-client/patches/patch-Makefile_am 12 Apr 2024
> 14:25:05 -0000
> @@ -1,11 +0,0 @@
> ---- Makefile.am.orig Wed Nov 16 05:35:31 2016
> -+++ Makefile.am Wed Nov 16 05:36:37 2016
> -@@ -83,7 +83,7 @@ AM_TESTS_ENVIRONMENT = \
> - TESTS_ENVIRONMENT ?= ${AM_TESTS_ENVIRONMENT}
> -
> - tests/check_%: CFLAGS += ${CHECK_CFLAGS}
> --tests/check_%: LDADD += ${CHECK_LIBS} -ldl
> -+tests/check_%: LDADD += ${CHECK_LIBS}
> - tests/check_%: LDFLAGS += -no-install
> -
> - check_PROGRAMS = ${TESTS}
> Index: sysutils/riemann-c-client/patches/patch-src_cmd-send_c
> ===================================================================
> RCS file: /cvs/ports/sysutils/riemann-c-client/patches/patch-src_cmd-send_c,v
> diff -u -p -r1.2 patch-src_cmd-send_c
> --- sysutils/riemann-c-client/patches/patch-src_cmd-send_c 11 Mar 2022
> 19:57:56 -0000 1.2
> +++ sysutils/riemann-c-client/patches/patch-src_cmd-send_c 12 Apr 2024
> 14:25:05 -0000
> @@ -1,29 +0,0 @@
> ---- src/cmd-send.c.orig Fri Sep 30 18:44:30 2016
> -+++ src/cmd-send.c Thu Nov 10 22:31:26 2016
> -@@ -138,7 +138,7 @@ client_send (int argc, char *argv[])
> - char *keyfn;
> - char *priorities;
> - } tls = {NULL, NULL, NULL, NULL};
> -- int stdin = 0;
> -+ int rie_stdin = 0;
> -
> - event = riemann_event_new ();
> -
> -@@ -263,7 +263,7 @@ client_send (int argc, char *argv[])
> - break;
> -
> - case '0':
> -- stdin = 1;
> -+ rie_stdin = 1;
> - break;
> -
> - case '?':
> -@@ -312,7 +312,7 @@ client_send (int argc, char *argv[])
> - goto end;
> - }
> -
> -- if (stdin)
> -+ if (rie_stdin)
> - {
> - e = _send_continously (client_type, client, event);
> -
> Index: sysutils/riemann-c-client/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/riemann-c-client/pkg/PLIST,v
> diff -u -p -r1.2 PLIST
> --- sysutils/riemann-c-client/pkg/PLIST 11 Mar 2022 19:57:56 -0000
> 1.2
> +++ sysutils/riemann-c-client/pkg/PLIST 12 Apr 2024 14:25:05 -0000
> @@ -2,6 +2,7 @@
> include/riemann/
> include/riemann/attribute.h
> include/riemann/client.h
> +include/riemann/communicate.h
> include/riemann/event.h
> include/riemann/message.h
> include/riemann/proto/
> @@ -9,8 +10,8 @@ include/riemann/proto/riemann.pb-c.h
> include/riemann/query.h
> include/riemann/riemann-client.h
> include/riemann/simple.h
> -lib/libriemann-client.a
> -lib/libriemann-client.la
> -@lib lib/libriemann-client.so.${LIBriemann-client_VERSION}
> +@static-lib lib/libriemann-client-gnutls.a
> +lib/libriemann-client-gnutls.la
> +@lib lib/libriemann-client-gnutls.so.${LIBriemann-client-gnutls_VERSION}
> lib/pkgconfig/riemann-client.pc
> @man man/man1/riemann-client.1
> Index: sysutils/collectd/Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/collectd/Makefile,v
> diff -u -p -r1.78 Makefile
> --- sysutils/collectd/Makefile 30 Sep 2023 21:25:14 -0000 1.78
> +++ sysutils/collectd/Makefile 12 Apr 2024 14:30:52 -0000
> @@ -40,7 +40,7 @@ REVISION-ping = 0
> REVISION-prometheus = 0
> REVISION-python = 1
> REVISION-redis = 0
> -REVISION-riemann = 0
> +REVISION-riemann = 1
> REVISION-rrdtool = 0
> REVISION-snmp = 0
> REVISION-virt = 0
> @@ -100,7 +100,7 @@ WANTLIB-nut = crypto pthread ssl upscli
>
> LIB_DEPENDS-riemann = sysutils/riemann-c-client
> WANTLIB-riemann = gmp gnutls hogweed intl iconv idn2 nettle \
> - protobuf-c p11-kit pthread riemann-client tasn1 \
> + protobuf-c p11-kit pthread riemann-client-gnutls tasn1 \
> unistring brotlidec brotlienc z zstd
> RUN_DEPENDS-riemann = collectd-$V:${BASE_PKGPATH},-main
>
>
