update to rrdtool-1.8.0

add pre-test target to use GNU seq to avoid test failures due to some different behaviour with ours: $ seq 1300000020 750 1300003020 1.3e+09 1.3e+09 1.3e+09 1.3e+09 1.3e+09 1.3e+09 $ gseq 1300000020 750 1300003020 1300000020 1300000770 1300001520 1300002270 1300003020
2022-11-11 20:51:28 +00:00 · 2022-11-11 20:51:28 +00:00 · 528717c7be
parent 96ec35ff08
commit 528717c7be
10 changed files with 28 additions and 29 deletions
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@ -2,14 +2,13 @@ COMMENT-main=	system to store and display time-series data
 COMMENT-update=	lightweight update-only tool for rrdtool
 COMMENT-ruby=	ruby interface to librrd

-V=		1.7.2
-REVISION=	5
+V=		1.8.0
 DISTNAME=	rrdtool-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-update=	rrdupdate-$V
 PKGNAME-ruby=	ruby${MODRUBY_BINREV}-rrd-$V

-SHARED_LIBS +=	rrd                  5.3      # 10.0
+SHARED_LIBS +=	rrd                  6.0      # 11.0

 CATEGORIES=	net databases

@ -86,7 +85,8 @@ LIB_DEPENDS-ruby=	rrdtool-$V:net/rrdtool \
 			${MODRUBY_LIB_DEPENDS}
 RUN_DEPENDS-ruby=	${MODRUBY_RUN_DEPENDS}

-TEST_DEPENDS=		shells/bash
+TEST_DEPENDS=		shells/bash \
+			sysutils/coreutils

 pre-configure:
 	${SUBST_CMD} ${WRKSRC}/src/librrd.pc.in
@ -94,6 +94,7 @@ pre-configure:
 pre-test:
 	find ${WRKSRC}/tests -type f -perm -0111 \
 	    -exec sed -i '1s,#!.*bash,#!${LOCALBASE}/bin/bash,' {} +
+	ln -fs ${LOCALBASE}/bin/gseq ${WRKDIR}/bin/seq

 post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} CHANGES COPYRIGHT \
--- a/net/rrdtool/distinfo
+++ b/net/rrdtool/distinfo
@ -1,2 +1,2 @@
-SHA256 (rrdtool-1.7.2.tar.gz) = oZn6637/fK/Eb6wlPmgtgz0Iky89uTpVCkpa8YDKWNs=
-SIZE (rrdtool-1.7.2.tar.gz) = 2883737
+SHA256 (rrdtool-1.8.0.tar.gz) = vTdhQTfXqNxSM1lkjrKoFjGjT9kagu1VgZFqUsCEM/Q=
+SIZE (rrdtool-1.8.0.tar.gz) = 2955398
--- a/net/rrdtool/patches/patch-bindings_Makefile_in
+++ b/net/rrdtool/patches/patch-bindings_Makefile_in
@ -1,11 +1,11 @@
 Index: bindings/Makefile.in
 --- bindings/Makefile.in.orig
 +++ bindings/Makefile.in
-@@ -738,6 +738,7 @@ install-data-local:
+@@ -741,6 +741,7 @@ install-data-local:
            && ( cd ${builddir}/python \
                 && env BUILDLIBDIR=${abs_top_builddir}/src/.libs \
                   $(PYTHON) ${abs_srcdir}/python/setup.py install \
 +                     --single-version-externally-managed \
-                      --skip-build --root=$(DESTDIR) --prefix=$(prefix) \
+                      --skip-build --root=$(DESTDIR)/// --prefix=$(prefix) \
                      --exec-prefix=$(exec_prefix)) \
            || true
--- a/net/rrdtool/patches/patch-configure
+++ b/net/rrdtool/patches/patch-configure
@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -28696,23 +28696,6 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
+@@ -28802,23 +28802,6 @@ $as_echo "$as_me: WARNING: unrecognized options: $ac_u
 fi
 
 
--- a/net/rrdtool/patches/patch-doc_Makefile_in
+++ b/net/rrdtool/patches/patch-doc_Makefile_in
@ -1,7 +1,7 @@
 Index: doc/Makefile.in
 --- doc/Makefile.in.orig
 +++ doc/Makefile.in
-@@ -276,7 +276,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
+@@ -278,7 +278,7 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
 PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
--- a/net/rrdtool/patches/patch-src_Makefile_in
+++ b/net/rrdtool/patches/patch-src_Makefile_in
@ -1,7 +1,7 @@
 Index: src/Makefile.in
 --- src/Makefile.in.orig
 +++ src/Makefile.in
-@@ -550,7 +550,7 @@ include_HEADERS = rrd.h rrd_format.h rrd_client.h
+@@ -597,7 +597,7 @@ include_HEADERS = rrd.h rrd_format.h rrd_client.h
 rrdcgi_SOURCES = rrd_cgi.c
 rrdcgi_LDADD = librrd.la librrdupd.la
 rrdupdate_SOURCES = rrdupdate.c
--- a/net/rrdtool/patches/patch-src_rrd_graph_helper_c
+++ b/net/rrdtool/patches/patch-src_rrd_graph_helper_c
@ -3,16 +3,12 @@ Correctly print time_t.
 Index: src/rrd_graph_helper.c
 --- src/rrd_graph_helper.c.orig
 +++ src/rrd_graph_helper.c
-@@ -1459,11 +1459,7 @@ static int parse_shift(enum gf_en gf,parsedargs_t* pa,
-   if (gdp->shidx>=0) {
-     dprintf("SHIFTBY : %s (%i)\n",im->gdes[gdp->shidx].vname,gdp->shidx);
-   } else {
-#if defined _WIN32 && SIZEOF_TIME_T == 8    /* in case of __MINGW64__, _WIN64 and _MSC_VER >= 1400 (ifndef _USE_32BIT_TIME_T) */
-    dprintf("SHIFTBY : %lli\n",gdp->shval); /* argument 3 has type 'time_t {aka long long int}' */
-#else
-    dprintf("SHIFTBY : %li\n",gdp->shval);
-#endif
-+    dprintf("SHIFTBY : %lli\n",(long long)gdp->shval); /* argument 3 has type 'time_t {aka long long int}' */
-   }
-   dprintf("=================================\n");
-   /* and return */
+@@ -1904,7 +1904,7 @@ static int parse_shift(
+ #if defined _WIN32 && SIZEOF_TIME_T == 8    /* in case of __MINGW64__, _WIN64 and _MSC_VER >= 1400 (ifndef _USE_32BIT_TIME_T) */
+         dprintf("SHIFTBY : %lli\n", gdp->shval);    /* argument 3 has type 'time_t {aka long long int}' */
+ #else
+-        dprintf("SHIFTBY : %li\n", gdp->shval);
+        dprintf("SHIFTBY : %lli\n",(long long)gdp->shval); /* argument 3 has type 'time_t' */
+ #endif
+     }
+     dprintf("=================================\n");
--- a/net/rrdtool/patches/patch-src_rrd_tool_c
+++ b/net/rrdtool/patches/patch-src_rrd_tool_c
@ -3,7 +3,7 @@ Correctly print time_t.
 Index: src/rrd_tool.c
 --- src/rrd_tool.c.orig
 +++ src/rrd_tool.c
-@@ -717,19 +717,11 @@ static int HandleInputLine(
+@@ -723,19 +723,11 @@ static int HandleInputLine(
     else if (strcmp("resize", argv[1]) == 0)
         rrd_resize(argc - 1, &argv[1]);
     else if (strcmp("last", argv[1]) == 0)
@ -25,7 +25,7 @@ Index: src/rrd_tool.c
     else if (strcmp("update", argv[1]) == 0)
         rrd_update(argc - 1, &argv[1]);
     else if (strcmp("fetch", argv[1]) == 0) {
-@@ -747,11 +739,7 @@ static int HandleInputLine(
+@@ -753,11 +745,7 @@ static int HandleInputLine(
                 printf("%20s", ds_namv[i]);
             printf("\n\n");
             for (ti = start + step; ti <= end; ti += step) {
--- a/net/rrdtool/pkg/PLIST-main
+++ b/net/rrdtool/pkg/PLIST-main
@ -10,7 +10,7 @@
 include/rrd.h
 include/rrd_client.h
 include/rrd_format.h
-lib/librrd.a
+@static-lib lib/librrd.a
 lib/librrd.la
@lib lib/librrd.so.${LIBrrd_VERSION}
 lib/pkgconfig/librrd.pc
@ -19,7 +19,7 @@ libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/RRDs.pm
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
 libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/
-libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
+@so libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/RRDs/RRDs.so
@man man/man1/bin_dec_hex.1
@man man/man1/cdeftutorial.1
@man man/man1/rpntutorial.1
@ -68,6 +68,7 @@ share/examples/rrdtool/rrdcached/rrdcached-size.pl
 share/examples/rrdtool/rrdtool-chroot
 share/examples/rrdtool/shared-demo.pl
 share/examples/rrdtool/stripes.pl
+share/examples/rrdtool/stripes.py
 share/locale/fr/LC_MESSAGES/rrdtool.mo
 share/locale/hu/LC_MESSAGES/rrdtool.mo
@mode 770
--- a/net/rrdtool/pkg/PLIST-ruby
+++ b/net/rrdtool/pkg/PLIST-ruby
@ -1 +1,2 @@
-${MODRUBY_SITEARCHDIR}/RRD.so
+@so ${MODRUBY_SITEARCHDIR}/RRD.so
+@man man/man1/rrdruby.1