collectd: fix tokyotyrant and libupsclient detection

[Edgar Fuß <ef%math.uni-bonn.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Edgar Fuß <ef%math.uni-bonn.de@localhost>
Pushed By:	ef
Date:		Fri Jul 17 16:42:18 2020 +0200
Changeset:	e896208395595aca92477cec4df4371a16e8fa4c

Modified Files:
	collectd/distinfo
	collectd/patches/patch-configure.ac

Log Message:
collectd: fix tokyotyrant and libupsclient detection

Fix detection of tokyotyrant (https://github.com/collectd/collectd/issues/3311)
and libupsclient (https://github.com/collectd/collectd/issues/3312) libraries.
Don't generate configure.ac patch with diff -p.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e896208395595aca92477cec4df4371a16e8fa4c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 collectd/distinfo                   |  2 +-
 collectd/patches/patch-configure.ac | 30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

diffs:
diff --git a/collectd/distinfo b/collectd/distinfo
index 1d5fccc632..75a506fb56 100644
--- a/collectd/distinfo
+++ b/collectd/distinfo
@@ -5,7 +5,7 @@ RMD160 (collectd-5.8.0.tar.bz2) = 7b812b1046d57a9047213bb182b8744d98606547
 SHA512 (collectd-5.8.0.tar.bz2) = 1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008
 Size (collectd-5.8.0.tar.bz2) = 1686017 bytes
 SHA1 (patch-Makefile.am) = 110cce600c66226bb02291349e76433555418edd
-SHA1 (patch-configure.ac) = a98505a285635e54810597604c610541f4cdb5e3
+SHA1 (patch-configure.ac) = 2442de0e4640fd68b2ba10cd566ac95d8602a47d
 SHA1 (patch-src_bind.c) = 4aa7742c8e24ee6bd7293abc56fc95a605d0a2c7
 SHA1 (patch-src_collectd.conf.in) = f0b35085cf0ddfd766e140b145177ab1f1326f5f
 SHA1 (patch-src_cpu.c) = e645ae6b05c051c3c878f88a493fbbd7d548bb66
diff --git a/collectd/patches/patch-configure.ac b/collectd/patches/patch-configure.ac
index bc95f4e66c..6fac35d7c4 100644
--- a/collectd/patches/patch-configure.ac
+++ b/collectd/patches/patch-configure.ac
@@ -3,10 +3,12 @@ $NetBSD: patch-configure.ac,v 1.12 2020/03/19 06:26:26 rillig Exp $
 Add KERNEL_NETBSD, add entry and disk plugins for NetBSD,
 and also do swap for "have_swapctl_three_args" (as for NetBSD).
 Also, the start of process support, but that's not yet finished.
+Correct tokyotyrant detection (add lib, not include, for -L).
+Correct libupsclient detection (argument may be a searchable directory).
 
 --- configure.ac.orig	2017-11-18 09:03:27.330751467 +0000
 +++ configure.ac
-@@ -110,6 +110,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test "x$
+@@ -110,6 +110,7 @@
  AM_CONDITIONAL([BUILD_FREEBSD], [test "x$ac_system" = "xFreeBSD"])
  AM_CONDITIONAL([BUILD_LINUX], [test "x$ac_system" = "xLinux"])
  AM_CONDITIONAL([BUILD_OPENBSD], [test "x$ac_system" = "xOpenBSD"])
@@ -14,7 +16,25 @@ Also, the start of process support, but that's not yet finished.
  AM_CONDITIONAL([BUILD_SOLARIS], [test "x$ac_system" = "xSolaris"])
  
  if test "x$ac_system" = "xSolaris"; then
-@@ -6136,6 +6137,7 @@ plugin_log_logstash="no"
+@@ -5209,7 +5210,7 @@
+       with_libtokyotyrant="$withval"
+     else
+       with_libtokyotyrant_cppflags="-I$withval/include"
+-      with_libtokyotyrant_ldflags="-L$withval/include"
++      with_libtokyotyrant_ldflags="-L$withval/lib"
+       with_libtokyotyrant_libs="-ltokyotyrant"
+       with_libtokyotyrant="yes"
+     fi
+@@ -5328,7 +5329,7 @@
+     else if test "x$withval" = "xyes"; then
+       with_libupsclient="use_pkgconfig"
+     else
+-      if test -x "$withval"; then
++      if test -f "$withval" && test -x "$withval"; then
+         with_libupsclient_config="$withval"
+         with_libupsclient="use_libupsclient_config"
+       else if test -x "$withval/bin/libupsclient-config"; then
+@@ -6136,6 +6137,7 @@
  plugin_mcelog="no"
  plugin_memory="no"
  plugin_multimeter="no"
@@ -22,7 +42,7 @@ Also, the start of process support, but that's not yet finished.
  plugin_nfs="no"
  plugin_numa="no"
  plugin_ovs_events="no"
-@@ -6229,6 +6231,7 @@ if test "x$ac_system" = "xNetBSD"; then
+@@ -6229,6 +6231,7 @@
    plugin_entropy="yes"
    plugin_irq="yes"
    plugin_processes="yes"
@@ -30,7 +50,7 @@ Also, the start of process support, but that's not yet finished.
  fi
  
  # Mac OS X devices
-@@ -6568,6 +6571,7 @@ AC_PLUGIN([multimeter],          [$plugi
+@@ -6568,6 +6571,7 @@
  AC_PLUGIN([mysql],               [$with_libmysql],          [MySQL statistics])
  AC_PLUGIN([netapp],              [$with_libnetapp],         [NetApp plugin])
  AC_PLUGIN([netlink],             [$with_libmnl],            [Enhanced Linux network statistics])
@@ -38,7 +58,7 @@ Also, the start of process support, but that's not yet finished.
  AC_PLUGIN([network],             [yes],                     [Network communication plugin])
  AC_PLUGIN([nfs],                 [$plugin_nfs],             [NFS statistics])
  AC_PLUGIN([nginx],               [$with_libcurl],           [nginx statistics])
-@@ -6987,6 +6991,7 @@ AC_MSG_RESULT([    multimeter  . . . . .
+@@ -6987,6 +6991,7 @@
  AC_MSG_RESULT([    mysql . . . . . . . . $enable_mysql])
  AC_MSG_RESULT([    netapp  . . . . . . . $enable_netapp])
  AC_MSG_RESULT([    netlink . . . . . . . $enable_netlink])