From bcb86199fb4e73a42f0fbfd64e2aadf031841c0e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 26 Mar 2024 12:06:28 +0100
Subject: [PATCH] */*: sync with upstream

Taken from: FreeBSD
---
 misc/clifm/Makefile                          |  4 ++--
 misc/clifm/distinfo                          | 10 +++++-----
 net-mgmt/pnp/Makefile                        |  4 ++--
 net-mgmt/pnp/pkg-plist                       |  2 +-
 www/h2o/files/patch-deps_quicly_lib_quicly.c | 10 ----------
 5 files changed, 10 insertions(+), 20 deletions(-)
 delete mode 100644 www/h2o/files/patch-deps_quicly_lib_quicly.c

diff --git a/misc/clifm/Makefile b/misc/clifm/Makefile
index 0ae98d7c676..b58e97233d6 100644
--- a/misc/clifm/Makefile
+++ b/misc/clifm/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	clifm
-PORTVERSION=	1.17
+PORTVERSION=	1.18
 DISTVERSIONPREFIX=	v
 CATEGORIES=	misc
 
@@ -16,7 +16,7 @@ USES=		desktop-file-utils gettext-runtime python:run \
 USE_GITHUB=	yes
 GH_ACCOUNT=	leo-arch
 GH_PROJECT=	${PORTNAME}-colors:cfmc
-GH_TAGNAME=	v0.4.3:cfmc
+GH_TAGNAME=	0413430:cfmc
 ALL_TARGET=	build
 MAKE_ENV=	LIBS_FreeBSD="-I${LOCALBASE}/include -L${LOCALBASE}/lib \
 		-lreadline -lintl -lmagic" MANDIR=${PREFIX}/share/man
diff --git a/misc/clifm/distinfo b/misc/clifm/distinfo
index 3d19f196171..278d3c6227b 100644
--- a/misc/clifm/distinfo
+++ b/misc/clifm/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1707460246
-SHA256 (leo-arch-clifm-v1.17_GH0.tar.gz) = c6b64bbbdb4f1c7a752db004150ac3a773696624ec62d8d33204b259e810421f
-SIZE (leo-arch-clifm-v1.17_GH0.tar.gz) = 1525172
-SHA256 (leo-arch-clifm-colors-v0.4.3_GH0.tar.gz) = a7eee0f000d065d3af1b6f710aa83160a0d3b90a17c7d81f0036595a656f9700
-SIZE (leo-arch-clifm-colors-v0.4.3_GH0.tar.gz) = 1538673
+TIMESTAMP = 1711227461
+SHA256 (leo-arch-clifm-v1.18_GH0.tar.gz) = b3293074a62542c0ba54bd246391f9e38e0d48ea80c222bf8112469cb97a550c
+SIZE (leo-arch-clifm-v1.18_GH0.tar.gz) = 1542813
+SHA256 (leo-arch-clifm-colors-0413430_GH0.tar.gz) = c77cef316675f1bec5d7ae5f4365ed30948ce4b1e1b11c58008ad8b9a7f39156
+SIZE (leo-arch-clifm-colors-0413430_GH0.tar.gz) = 1538886
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index 2f254f8a47b..864f05331f5 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	pnp
 PORTVERSION=	0.6.26
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/pnp4nagios/PNP-0.6
 DISTNAME=	pnp4nagios-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -92,12 +92,12 @@ post-patch:
   "${WRKSRC}/sample-config/${f}.in"
 .endfor
 	@${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
+	${REINPLACE_CMD} -e 's|$${prefix}/man|$${prefix}/share/man|' ${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ${SAMPLE_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/sample-config/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
-	${INSTALL_MAN} ${WRKSRC}/man/npcd.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pnp/pkg-plist b/net-mgmt/pnp/pkg-plist
index 336b458d670..774ef45eddf 100644
--- a/net-mgmt/pnp/pkg-plist
+++ b/net-mgmt/pnp/pkg-plist
@@ -271,10 +271,10 @@ libexec/check_pnp_rrds.pl
 libexec/process_perfdata.pl
 libexec/rrd_convert.pl
 libexec/rrd_modify.pl
-man/man8/npcd.8.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/httpd.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/lighttpd.pnp4nagios.conf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/nginx.pnp4nagios.conf
+share/man/man8/npcd.8.gz
 %%WWWDIR%%/application/config/config.php
 %%WWWDIR%%/application/config/locale.php
 %%WWWDIR%%/application/config/routes.php
diff --git a/www/h2o/files/patch-deps_quicly_lib_quicly.c b/www/h2o/files/patch-deps_quicly_lib_quicly.c
deleted file mode 100644
index b105a79ab8b..00000000000
--- a/www/h2o/files/patch-deps_quicly_lib_quicly.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- deps/quicly/lib/quicly.c.orig	2023-11-11 22:44:34 UTC
-+++ deps/quicly/lib/quicly.c
-@@ -21,6 +21,7 @@
-  */
- #include <assert.h>
- #include <inttypes.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <netinet/ip.h>
- #include <pthread.h>