CVS commit: pkgsrc/sysutils/collectd

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Tue Dec 28 01:02:42 UTC 2021

Modified Files:
        pkgsrc/sysutils/collectd: Makefile Makefile.common

Log Message:
Fix installation of collectd plugins

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


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/sysutils/collectd/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/collectd/Makefile.common

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

Modified files:

Index: pkgsrc/sysutils/collectd/Makefile
diff -u pkgsrc/sysutils/collectd/Makefile:1.29 pkgsrc/sysutils/collectd/Makefile:1.30
--- pkgsrc/sysutils/collectd/Makefile:1.29      Mon May 24 19:54:09 2021
+++ pkgsrc/sysutils/collectd/Makefile   Tue Dec 28 01:02:42 2021
@@ -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 @@ CONFIGURE_ARGS+=      --enable-${option}
 
 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           \

Index: pkgsrc/sysutils/collectd/Makefile.common
diff -u pkgsrc/sysutils/collectd/Makefile.common:1.26 pkgsrc/sysutils/collectd/Makefile.common:1.27
--- pkgsrc/sysutils/collectd/Makefile.common:1.26       Sun Mar  7 14:19:41 2021
+++ pkgsrc/sysutils/collectd/Makefile.common    Tue Dec 28 01:02:42 2021
@@ -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 @@ DEPENDS+=           collectd>=${PKGVERSION_NOREV}
 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"