Skip to content

collectd5: add share/ prefix for manual pages#1531

Open
autumnjolitz wants to merge 1 commit into
DragonFlyBSD:masterfrom
autumnjolitz:collectd5-doc-plist-fix
Open

collectd5: add share/ prefix for manual pages#1531
autumnjolitz wants to merge 1 commit into
DragonFlyBSD:masterfrom
autumnjolitz:collectd5-doc-plist-fix

Conversation

@autumnjolitz

@autumnjolitz autumnjolitz commented Mar 11, 2026

Copy link
Copy Markdown

Tried to reverse what the delta port fix should be from

sudo -H git -C /usr/dports diff net-mgmt/collectd5 | tee collectd5.patch:

diff --git a/net-mgmt/collectd5/pkg-plist b/net-mgmt/collectd5/pkg-plist
index 24488267013..f4a76dc258e 100644
--- a/net-mgmt/collectd5/pkg-plist
+++ b/net-mgmt/collectd5/pkg-plist
@@ -118,20 +118,20 @@ libdata/pkgconfig/libcollectdclient.pc
 %%PERL%%%%SITE_PERL%%/Collectd/Plugins/OpenVZ.pm
 %%PERL%%%%SITE_PERL%%/Collectd.pm
 %%PERL%%%%SITE_PERL%%/Collectd/Unixsock.pm
-man/man1/collectd-nagios.1.gz
-man/man1/collectd-tg.1.gz
-man/man1/collectd.1.gz
-man/man1/collectdctl.1.gz
-man/man1/collectdmon.1.gz
-man/man5/collectd-email.5.gz
-man/man5/collectd-exec.5.gz
-man/man5/collectd-java.5.gz
-man/man5/collectd-lua.5.gz
-man/man5/collectd-perl.5.gz
-man/man5/collectd-python.5.gz
-man/man5/collectd-snmp.5.gz
-man/man5/collectd-threshold.5.gz
-man/man5/collectd-unixsock.5.gz
-man/man5/collectd.conf.5.gz
-man/man5/types.db.5.gz
+share/man/man1/collectd-nagios.1.gz
+share/man/man1/collectd-tg.1.gz
+share/man/man1/collectd.1.gz
+share/man/man1/collectdctl.1.gz
+share/man/man1/collectdmon.1.gz
+share/man/man5/collectd-email.5.gz
+share/man/man5/collectd-exec.5.gz
+share/man/man5/collectd-java.5.gz
+share/man/man5/collectd-lua.5.gz
+share/man/man5/collectd-perl.5.gz
+share/man/man5/collectd-python.5.gz
+share/man/man5/collectd-snmp.5.gz
+share/man/man5/collectd-threshold.5.gz
+share/man/man5/collectd-unixsock.5.gz
+share/man/man5/collectd.conf.5.gz
+share/man/man5/types.db.5.gz
 @dir /var/db/collectd

@daftaupe daftaupe self-assigned this Mar 16, 2026
@tuxillo

tuxillo commented Mar 27, 2026

Copy link
Copy Markdown
Member

will check, thanks!

@daftaupe

daftaupe commented Apr 7, 2026

Copy link
Copy Markdown
Member

@autumnjolitz thanks for the contribution and sorry for the delay.
Tryingo to build net-mgmt/collectd5, I get an error with the dependency net/libpfctl being not found as it's also the case on https://ironman.dragonflybsd.org/dports/logs/Report/
I'm trying this with latest master commit and 2026Q1 branch of FreeBSD ports.

Should this be applied to the current DPorts master branch maybe ?

@autumnjolitz

Copy link
Copy Markdown
Author

This PR was developed on a 6.4 box, then tested on a 6.5-master box later that week.

Both had dports commit sha: 8b0934971b34061da1d920727008 c70c1dbf1e42

So between now and then, net/libpfctl was either added or was not enabled for DragonFly. I confirmed that such library neither exists on my boxes nor was the pf module built in collectd5 itself.

Can you disable the pf/libpfctl option instead?

@daftaupe

Copy link
Copy Markdown
Member

I'm able to build the port with the following diff

diff --git a/ports/net-mgmt/collectd5/Makefile.DragonFly b/ports/net-mgmt/collectd5/Makefile.DragonFly
index 4c100643a15..837eda2ea1b 100644
--- a/ports/net-mgmt/collectd5/Makefile.DragonFly
+++ b/ports/net-mgmt/collectd5/Makefile.DragonFly
@@ -2,3 +2,5 @@ CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N--enable-zfs_arc}
 CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N--enable-disk}
 CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N--enable-ipstats}
 CONFIGURE_ARGS:= ${CONFIGURE_ARGS:N--enable-tcpconns}
+
+OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:NPF}
diff --git a/ports/net-mgmt/collectd5/dragonfly/patch-src_pf.c b/ports/net-mgmt/collectd5/dragonfly/patch-src_pf.c
deleted file mode 100644
index 25e0ae920c0..00000000000
--- a/ports/net-mgmt/collectd5/dragonfly/patch-src_pf.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/pf.c.orig      2018-10-23 06:57:09 UTC
-+++ src/pf.c
-@@ -34,7 +34,11 @@
- #include <netinet/in.h>
- #endif
-
-+#if HAVE_NET_PFVAR_H
- #include <net/pfvar.h>
-+#elif HAVE_NET_PF_PFVAR_H
-+#include <net/pf/pfvar.h>
-+#endif
-
- #ifndef FCNT_NAMES
- #if FCNT_MAX != 3

Also the manpages are going to the right place

-rw-r--r--  1 root  wheel  3544 10-Apr-2026 13:40 SL00/construction/net-mgmt/collectd5/stage/usr/local/share/man/man1/collectd-nagios.1.gz
-rw-r--r--  1 root  wheel  2463 10-Apr-2026 13:40 SL00/construction/net-mgmt/collectd5/stage/usr/local/share/man/man1/collectd-tg.1.gz
-rw-r--r--  1 root  wheel  4112 10-Apr-2026 13:40 SL00/construction/net-mgmt/collectd5/stage/usr/local/share/man/man1/collectd.1.gz
-rw-r--r--  1 root  wheel  3866 10-Apr-2026 13:40 SL00/construction/net-mgmt/collectd5/stage/usr/local/share/man/man1/collectdctl.1.gz
-rw-r--r--  1 root  wheel  2527 10-Apr-2026 13:40 SL00/construction/net-mgmt/collectd5/stage/usr/local/share/man/man1/collectdmon.1.gz

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants