[pkgsrc/trunk]: pkgsrc/sysutils/collectd Fix installation of collectd plugins

[nros <nros%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/69b88868f1d6
branches:  trunk
changeset: 771819:69b88868f1d6
user:      nros <nros%pkgsrc.org@localhost>
date:      Tue Dec 28 01:02:42 2021 +0000

description:
Fix installation of collectd plugins

Fix installation of collectd plugins
by installing using libtool directly
instead of using the Makefile target.

diffstat:

 sysutils/collectd/Makefile        |   4 +++-
 sysutils/collectd/Makefile.common |  17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 9c35028785c1 -r 69b88868f1d6 sysutils/collectd/Makefile
--- a/sysutils/collectd/Makefile        Tue Dec 28 00:34:03 2021 +0000
+++ b/sysutils/collectd/Makefile        Tue Dec 28 01:02:42 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/05/24 19:54:09 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2021/12/28 01:02:42 nros Exp $
 
 PKGREVISION= 1
 .include "../../sysutils/collectd/Makefile.common"
@@ -27,6 +27,8 @@
 
 INSTALL_MAKE_FLAGS+=   sysconfdir=${PREFIX}/share/examples/collectd
 
+PKGCONFIG_OVERRIDE=    src/libcollectdclient/libcollectdclient.pc.in
+
 .include "options.mk"
 
 CONF_FILES+=           share/examples/collectd/collectd.conf           \
diff -r 9c35028785c1 -r 69b88868f1d6 sysutils/collectd/Makefile.common
--- a/sysutils/collectd/Makefile.common Tue Dec 28 00:34:03 2021 +0000
+++ b/sysutils/collectd/Makefile.common Tue Dec 28 01:02:42 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2021/03/07 14:19:41 wiz Exp $
+# $NetBSD: Makefile.common,v 1.27 2021/12/28 01:02:42 nros Exp $
 #
 # used by sysutils/collectd/Makefile
 # used by sysutils/collectd-amqp/Makefile
@@ -60,11 +60,24 @@
 COLLECTD_PLUGINS?=     ${COLLECTD_PACKAGE:S/-/_/}
 
 BUILD_TARGET=          ${COLLECTD_PLUGINS:S/$/.la/}
-INSTALL_TARGET=                install-pkglibLTLIBRARIES
+
 .  for plugin in ${COLLECTD_PLUGINS}
 CONFIGURE_ARGS+=       --enable-${plugin}
 GENERATE_PLIST+=       ${ECHO} "lib/collectd/${plugin}.la";
 .  endfor
+
+INSTALLATION_DIRS+=    lib/collectd
+
+.  if ${COLLECTD_PLUGINS} == "perl"
+post-install:
+.  else
+do-install:
+.  endif
+.  for plugin in ${COLLECTD_PLUGINS}
+       cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} \
+               ${LIBTOOL} --mode=install ${INSTALL_LIB} ${plugin}.la \
+               ${DESTDIR}${PREFIX}/lib/collectd/${plugin}.la
+.  endfor
 .endif
 
 .include "../../mk/bsd.prefs.mk"