rrdtool: Use release tarball; fixes version number

The previous 1.8.0 version of this port used an automatically generated tarball. The git repository contains an outdated configure script and associated files that were not updated for the 1.8.0 release so the program misidentified itself as 1.7.2, among who knows how many other unintended differences. By switching to the release tarball we pick up the version number change and any other bugfixes or changes that the developers made in configure.ac, m4 files, and Makefile.in files. oetiker/rrdtool-1.x#1163 Also fix implicit declaration of functions in configure script. oetiker/rrdtool-1.x#1162
macports · Mar 20, 2022 · 75d7770 · 75d7770
1 parent 3fd4710
commit 75d7770
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 9 deletions.
diff --git a/net/rrdtool/Portfile b/net/rrdtool/Portfile
@@ -5,8 +5,12 @@ PortGroup           github 1.0
 PortGroup           perl5 1.0
 
 github.setup        oetiker rrdtool-1.x 1.8.0 v
+revision            1
+checksums           rmd160  b2db238049ea8c04d87c8af9e741aec874676478 \
+                    sha256  bd37614137d7a8dc523359648eb2a81631a34fd91a82ed5581916a52c08433f4 \
+                    size    2955398
+
 name                rrdtool
-revision            0
 categories          net
 license             GPL-2+
 maintainers         nomaintainer
@@ -15,10 +19,8 @@ description         Round Robin Database
 long_description    RRDtool is a system to store and display time-series data
 
 homepage            http://oss.oetiker.ch/rrdtool/
-
-checksums           rmd160  c13072ec6e176918ffef5c9e06a587f68d9c0069 \
-                    sha256  8521934b2977a0797dc64c97d7ff69fe727bdbffb9df929b67fdb4e0e8abe330 \
-                    size    1202861
+github.tarball_from releases
+distname            ${name}-${version}
 
 perl5.branches      5.30
 
@@ -37,6 +39,7 @@ depends_run         port:dejavu-fonts \
                     port:perl${perl5.major}
 
 patchfiles-append   configure-remove-cute-output.patch \
+                    implicit.patch \
                     patch-doc-Makefile.in.diff
 
 configure.perl      ${perl5.bin}

diff --git a/net/rrdtool/files/configure-remove-cute-output.patch b/net/rrdtool/files/configure-remove-cute-output.patch
@@ -1,7 +1,7 @@
---- configure.orig	2021-10-02 15:22:53.135895187 -0400
-+++ configure	2021-10-02 15:25:39.486362292 -0400
 Remove pointless configure output and delays.
-@@ -28696,23 +28696,6 @@
+--- configure.orig	2022-03-14 09:29:38.000000000 -0500
++++ configure	2022-03-20 16:36:28.000000000 -0500
+@@ -28802,23 +28802,6 @@
  fi
 
 
@@ -25,7 +25,7 @@ Remove pointless configure output and delays.
  echo
  echo "----------------------------------------------------------------"
  echo "Config is DONE!"
-@@ -28760,9 +28743,8 @@
+@@ -28868,9 +28851,8 @@
  echo "Type 'make etc-install' to install systemd support for rrdcached"
  fi
  echo

diff --git a/net/rrdtool/files/implicit.patch b/net/rrdtool/files/implicit.patch
@@ -0,0 +1,21 @@
+Fix:
+conftest.c:124:33: error: implicitly declaring library function 'exit' with type 'void (int) __attribute__((noreturn))'
+https://github.com/oetiker/rrdtool-1.x/pull/1162
+--- configure.orig	2022-03-14 09:29:38.000000000 -0500
++++ configure	2022-03-20 16:34:54.000000000 -0500
+@@ -19223,6 +19223,7 @@
+   gq_cv_have_tm_gmtoff=no
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ #include <time.h>
+                                 #include <$ac_cv_struct_tm>
+
+@@ -19255,6 +19256,7 @@
+   gq_cv_have___tm_gmtoff=no
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
++#include <stdlib.h>
+ #include <time.h>
+                                 #include <$ac_cv_struct_tm>
+