*/*: sync with upstream

Taken from: FreeBSD
2024-02-21 15:23:29 +01:00 · 2024-02-21 15:23:29 +01:00 · b9be77d29c
parent 715a4ebe5f
commit b9be77d29c
186 changed files with 2898 additions and 1932 deletions
--- a/accessibility/yasr/Makefile
+++ b/accessibility/yasr/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	yasr
 PORTVERSION=	0.6.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	accessibility
 MASTER_SITES=	SF

@ -13,6 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		gmake
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 PORTDOCS=	AUTHORS BUGS CREDITS ChangeLog NEWS README TODO \
 		README-br README-de README-es README-fr README-ru
 SUB_FILES=	pkg-message
@ -23,7 +24,7 @@ OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

 PLIST_FILES=	bin/yasr \
-		man/man1/yasr.1.gz \
+		share/man/man1/yasr.1.gz \
 		%%DATADIR%%/yasr.conf \
 		%%NLS%%share/locale/es/LC_MESSAGES/yasr.mo \
 		%%NLS%%share/locale/fr/LC_MESSAGES/yasr.mo
--- a/archivers/advancecomp/Makefile
+++ b/archivers/advancecomp/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	advancecomp
 DISTVERSION=	2.6
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/amadvance/advancecomp/releases/download/v${DISTVERSION}/

@ -16,6 +17,7 @@ USES=		autoreconf cpe
 CPE_VENDOR=	advancemame

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 TEST_TARGET=	check
 MAKE_ARGS=	zopfli_SOURCES="" am__objects_3="" \
 		libdeflate_SOURCES="" am__objects_2=""
--- a/archivers/advancecomp/pkg-plist
+++ b/archivers/advancecomp/pkg-plist
@ -2,7 +2,7 @@ bin/advdef
 bin/advmng
 bin/advpng
 bin/advzip
-man/man1/advdef.1.gz
-man/man1/advmng.1.gz
-man/man1/advpng.1.gz
-man/man1/advzip.1.gz
+share/man/man1/advdef.1.gz
+share/man/man1/advmng.1.gz
+share/man/man1/advpng.1.gz
+share/man/man1/advzip.1.gz
--- a/archivers/apache-commons-compress/Makefile
+++ b/archivers/apache-commons-compress/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	commons-compress
-PORTVERSION=	1.25.0
+PORTVERSION=	1.26.0
 CATEGORIES=	archivers java
 MASTER_SITES=	APACHE_COMMONS_BINARIES
 PKGNAMEPREFIX=	apache-
--- a/archivers/apache-commons-compress/distinfo
+++ b/archivers/apache-commons-compress/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1700232800
-SHA256 (commons-compress-1.25.0-bin.tar.gz) = 8acc55fe04ce8d5416dfbd7a72bf19ae52e73a7f18596afaa75487625c2176f0
-SIZE (commons-compress-1.25.0-bin.tar.gz) = 104969220
+TIMESTAMP = 1708454659
+SHA256 (commons-compress-1.26.0-bin.tar.gz) = 017764a8caf34ed511a4f5ca3a65f1a344677c5b5f95c0dfea69959aa545cf99
+SIZE (commons-compress-1.26.0-bin.tar.gz) = 117599203
--- a/archivers/atool/Makefile
+++ b/archivers/atool/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	atool
 PORTVERSION=	0.39.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH

@ -10,6 +11,7 @@ WWW=		https://www.nongnu.org/atool/
 LICENSE=	GPLv2

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		gmake perl5
 USE_PERL5=	build run
 NO_ARCH=	yes
--- a/archivers/atool/pkg-plist
+++ b/archivers/atool/pkg-plist
@ -5,10 +5,10 @@ bin/apack
 bin/arepack
 bin/atool
 bin/aunpack
-man/man1/acat.1.gz
-man/man1/adiff.1.gz
-man/man1/als.1.gz
-man/man1/apack.1.gz
-man/man1/arepack.1.gz
-man/man1/atool.1.gz
-man/man1/aunpack.1.gz
+share/man/man1/acat.1.gz
+share/man/man1/adiff.1.gz
+share/man/man1/als.1.gz
+share/man/man1/apack.1.gz
+share/man/man1/arepack.1.gz
+share/man/man1/atool.1.gz
+share/man/man1/aunpack.1.gz
--- a/archivers/fastjar/Makefile
+++ b/archivers/fastjar/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	fastjar
 PORTVERSION=	0.93.20060808
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	archivers java
 MASTER_SITES=	LOCAL/maho/fastjar

@ -13,12 +13,13 @@ LICENSE=	GPLv2
 USES=		gmake makeinfo perl5 tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

 WRKSRC=		${WRKDIR}/${PORTNAME}
 PORTDOCS=	CHANGES ChangeLog NEWS README
 PLIST_FILES=	bin/fastjar bin/grepjar \
-		man/man1/fastjar.1.gz \
-		man/man1/grepjar.1.gz
+		share/man/man1/fastjar.1.gz \
+		share/man/man1/grepjar.1.gz

 INFO=		fastjar

--- a/archivers/gzip/Makefile
+++ b/archivers/gzip/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	gzip
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	GNU

@ -11,6 +12,7 @@ LICENSE=	GPLv3+

 USES=		cpe charsetfix makeinfo tar:xz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

 CONFLICTS_INSTALL=	zutils # bin/zcat bin/zcmp bin/zdiff bin/zgrep

--- a/archivers/gzip/pkg-plist
+++ b/archivers/gzip/pkg-plist
@ -12,14 +12,14 @@ bin/zgrep
 bin/zless
 bin/zmore
 bin/znew
-man/man1/gunzip.1.gz
-man/man1/gzexe.1.gz
-man/man1/gzip.1.gz
-man/man1/zcat.1.gz
-man/man1/zcmp.1.gz
-man/man1/zdiff.1.gz
-man/man1/zforce.1.gz
-man/man1/zgrep.1.gz
-man/man1/zless.1.gz
-man/man1/zmore.1.gz
-man/man1/znew.1.gz
+share/man/man1/gunzip.1.gz
+share/man/man1/gzexe.1.gz
+share/man/man1/gzip.1.gz
+share/man/man1/zcat.1.gz
+share/man/man1/zcmp.1.gz
+share/man/man1/zdiff.1.gz
+share/man/man1/zforce.1.gz
+share/man/man1/zgrep.1.gz
+share/man/man1/zless.1.gz
+share/man/man1/zmore.1.gz
+share/man/man1/znew.1.gz
--- a/archivers/libdynamite/Makefile
+++ b/archivers/libdynamite/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libdynamite
 PORTVERSION=	0.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	archivers
 MASTER_SITES=	SF/synce/Dynamite/${PORTVERSION}

@ -12,6 +12,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		libtool pathfix
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
--- a/archivers/libdynamite/pkg-plist
+++ b/archivers/libdynamite/pkg-plist
@ -5,4 +5,4 @@ lib/libdynamite.so
 lib/libdynamite.so.0
 lib/libdynamite.so.0.0.0
 libdata/pkgconfig/libdynamite.pc
-man/man1/dynamite.1.gz
+share/man/man1/dynamite.1.gz
--- a/archivers/lrzip/Makefile
+++ b/archivers/lrzip/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	lrzip
 PORTVERSION=	0.651
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ck.kolivas.org/apps/lrzip/

@ -15,6 +16,7 @@ LIB_DEPENDS=	liblz4.so:archivers/liblz4 \
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	ac_cv_prog_ASM_PROG='no '
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 LDFLAGS+=	-L${LOCALBASE}/lib
 USES=		alias cpe libtool pathfix perl5 shebangfix tar:xz
 SHEBANG_FILES=	${WRKSRC}/lrztar
@ -22,6 +24,6 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 CPE_VENDOR=	lrzip_project

-CONFLICTS_INSTALL=	lrzsz # bin/lrz man/man1/lrz.1.gz
+CONFLICTS_INSTALL=	lrzsz # bin/lrz share/man/man1/lrz.1.gz

 .include <bsd.port.mk>
--- a/archivers/lrzip/pkg-plist
+++ b/archivers/lrzip/pkg-plist
@ -24,10 +24,10 @@ bin/lrz
 bin/lrzip
 bin/lrztar
 bin/lrzuntar
-man/man1/lrunzip.1.gz
-man/man1/lrz.1.gz
-man/man1/lrzcat.1.gz
-man/man1/lrzip.1.gz
-man/man1/lrztar.1.gz
-man/man1/lrzuntar.1.gz
-man/man5/lrzip.conf.5.gz
+share/man/man1/lrunzip.1.gz
+share/man/man1/lrz.1.gz
+share/man/man1/lrzcat.1.gz
+share/man/man1/lrzip.1.gz
+share/man/man1/lrztar.1.gz
+share/man/man1/lrzuntar.1.gz
+share/man/man5/lrzip.conf.5.gz
--- a/archivers/lzip/Makefile
+++ b/archivers/lzip/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	lzip
 DISTVERSION=	1.23
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH/lzip

@ -11,9 +12,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

 PLIST_FILES=	bin/lzip \
-		man/man1/lzip.1.gz
+		share/man/man1/lzip.1.gz

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	CXX="${CXX}" \
 		CXXFLAGS="${CXXFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	lzop
 DISTVERSION=	1.04
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.lzop.org/download/ \
 		LOCAL/mandree
@ -13,6 +14,7 @@ LICENSE=	GPLv2+
 LIB_DEPENDS=	liblzo2.so:archivers/lzo2

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

--- a/archivers/lzop/pkg-plist
+++ b/archivers/lzop/pkg-plist
@ -1,5 +1,5 @@
 bin/lzop
-man/man1/lzop.1.gz
+share/man/man1/lzop.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
--- a/archivers/par2cmdline-turbo/Makefile
+++ b/archivers/par2cmdline-turbo/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	par2cmdline-turbo
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	archivers

@ -14,6 +15,7 @@ ONLY_FOR_ARCHS_REASON=	untested on other archs

 USES=		autoreconf compiler:c++11-lang
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 LDFLAGS+=	-lpthread

 USE_GITHUB=	yes
@ -23,7 +25,7 @@ PORTDOCS=	README.md
 CONFLICTS=	par2cmdline

 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify \
-	man/man1/par2.1.gz
+	share/man/man1/par2.1.gz

 OPTIONS_DEFINE=	DOCS

--- a/archivers/par2cmdline/Makefile
+++ b/archivers/par2cmdline/Makefile
@ -1,7 +1,7 @@
 PORTNAME=	par2cmdline
 PORTVERSION=	0.8.1
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers

 MAINTAINER=	martymac@FreeBSD.org
@ -12,6 +12,7 @@ LICENSE=	GPLv2

 USES=		autoreconf compiler:c++11-lang
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

 USE_GITHUB=	yes
 GH_ACCOUNT=	Parchive
@ -20,7 +21,7 @@ PORTDOCS=	README
 CONFLICTS=	par2cmdline-turbo

 PLIST_FILES=	bin/par2 bin/par2create bin/par2repair bin/par2verify \
-	man/man1/par2.1.gz
+	share/man/man1/par2.1.gz

 OPTIONS_DEFINE=	DOCS

--- a/archivers/plzip/Makefile
+++ b/archivers/plzip/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	plzip
 PORTVERSION=	1.11
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH/lzip/${PORTNAME}

@ -12,12 +13,13 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	lzlib>=1.1:archivers/lzlib

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	CXXFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALL_TARGET=	install-strip
 INFO=		plzip

 PLIST_FILES=	bin/plzip \
-		man/man1/plzip.1.gz
+		share/man/man1/plzip.1.gz

 .include <bsd.port.mk>
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	rar
 PORTVERSION=	6.24
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	archivers
 MASTER_SITES=	https://www.rarlab.com/rar/
@ -22,7 +23,7 @@ USES=		cpe
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/rar

-PLIST_FILES=	bin/rar etc/rarfiles.lst lib/default.sfx man/cat1/rar.1.gz
+PLIST_FILES=	bin/rar etc/rarfiles.lst lib/default.sfx share/man/cat1/rar.1.gz

 CPE_VENDOR=	rarlab

@ -30,7 +31,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rar ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/rarfiles.lst ${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/default.sfx ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/rar.txt ${STAGEDIR}${PREFIX}/man/cat1/rar.1
+	${INSTALL_MAN} ${WRKSRC}/rar.txt ${STAGEDIR}${PREFIX}/share/man/cat1/rar.1

 # maintainer section:

--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	rpm
 PORTVERSION=	4.18.2
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	http://ftp.rpm.org/releases/rpm-${PORTVERSION:R}.x/
 PKGNAMESUFFIX=	4
@ -34,6 +35,7 @@ SHEBANG_FILES=	scripts/brp-compress scripts/check-prereqs \
 		scripts/perl.req scripts/pkgconfigdeps.sh \
 		scripts/rpm_macros_provides.sh
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-sqlite=yes \
 		--localstatedir=/var \
 		--sysconfdir=${PREFIX}/etc \
--- a/archivers/rpm4/pkg-plist
+++ b/archivers/rpm4/pkg-plist
@ -183,40 +183,40 @@ lib/rpm/rpmuncompress
 lib/rpm/script.req
 lib/rpm/tgpg
 libdata/pkgconfig/rpm.pc
-man/fr/man8/rpm.8.gz
-man/ja/man8/rpm.8.gz
-man/ja/man8/rpm2cpio.8.gz
-man/ja/man8/rpmbuild.8.gz
-man/ja/man8/rpmgraph.8.gz
-man/ko/man8/rpm.8.gz
-man/ko/man8/rpm2cpio.8.gz
-man/man1/gendiff.1.gz
-man/man8/rpm-misc.8.gz
-%%PLUGINS%%man/man8/rpm-plugin-dbus-announce.8.gz
-%%PLUGINS%%man/man8/rpm-plugin-prioreset.8.gz
-%%PLUGINS%%man/man8/rpm-plugin-syslog.8.gz
-%%PLUGINS%%man/man8/rpm-plugin-systemd-inhibit.8.gz
-%%PLUGINS%%man/man8/rpm-plugins.8.gz
-man/man8/rpm.8.gz
-man/man8/rpm2archive.8.gz
-man/man8/rpm2cpio.8.gz
-man/man8/rpmbuild.8.gz
-man/man8/rpmdb.8.gz
-man/man8/rpmdeps.8.gz
-man/man8/rpmgraph.8.gz
-man/man8/rpmkeys.8.gz
-man/man8/rpmlua.8.gz
-man/man8/rpmsign.8.gz
-man/man8/rpmspec.8.gz
-man/pl/man1/gendiff.1.gz
-man/pl/man8/rpm.8.gz
-man/pl/man8/rpm2cpio.8.gz
-man/pl/man8/rpmbuild.8.gz
-man/pl/man8/rpmdeps.8.gz
-man/pl/man8/rpmgraph.8.gz
-man/ru/man8/rpm.8.gz
-man/ru/man8/rpm2cpio.8.gz
-man/sk/man8/rpm.8.gz
+share/man/fr/man8/rpm.8.gz
+share/man/ja/man8/rpm.8.gz
+share/man/ja/man8/rpm2cpio.8.gz
+share/man/ja/man8/rpmbuild.8.gz
+share/man/ja/man8/rpmgraph.8.gz
+share/man/ko/man8/rpm.8.gz
+share/man/ko/man8/rpm2cpio.8.gz
+share/man/man1/gendiff.1.gz
+share/man/man8/rpm-misc.8.gz
+%%PLUGINS%%share/man/man8/rpm-plugin-dbus-announce.8.gz
+%%PLUGINS%%share/man/man8/rpm-plugin-prioreset.8.gz
+%%PLUGINS%%share/man/man8/rpm-plugin-syslog.8.gz
+%%PLUGINS%%share/man/man8/rpm-plugin-systemd-inhibit.8.gz
+%%PLUGINS%%share/man/man8/rpm-plugins.8.gz
+share/man/man8/rpm.8.gz
+share/man/man8/rpm2archive.8.gz
+share/man/man8/rpm2cpio.8.gz
+share/man/man8/rpmbuild.8.gz
+share/man/man8/rpmdb.8.gz
+share/man/man8/rpmdeps.8.gz
+share/man/man8/rpmgraph.8.gz
+share/man/man8/rpmkeys.8.gz
+share/man/man8/rpmlua.8.gz
+share/man/man8/rpmsign.8.gz
+share/man/man8/rpmspec.8.gz
+share/man/pl/man1/gendiff.1.gz
+share/man/pl/man8/rpm.8.gz
+share/man/pl/man8/rpm2cpio.8.gz
+share/man/pl/man8/rpmbuild.8.gz
+share/man/pl/man8/rpmdeps.8.gz
+share/man/pl/man8/rpmgraph.8.gz
+share/man/ru/man8/rpm.8.gz
+share/man/ru/man8/rpm2cpio.8.gz
+share/man/sk/man8/rpm.8.gz
 %%NLS%%share/locale/ar/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/br/LC_MESSAGES/rpm.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/rpm.mo
--- a/archivers/rvm/Makefile
+++ b/archivers/rvm/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	rvm
 PORTVERSION=	1.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	archivers
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	an
@ -19,10 +19,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 USES=		compiler:c++11-lang
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-default-config-file=${PREFIX}/etc/rvm.conf \
 		--enable-assume-stl-memory-exception
 MAKE_ARGS=	CXXFLAGS="${CXXFLAGS}"

-PLIST_FILES=	bin/rvm man/man1/rvm.1.gz
+PLIST_FILES=	bin/rvm share/man/man1/rvm.1.gz

 .include <bsd.port.mk>
--- a/archivers/xar/Makefile
+++ b/archivers/xar/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xar
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	https://github.com/downloads/mackyle/xar/ \
 		GENTOO
@ -23,6 +23,7 @@ USE_GNOME=	libxml2
 USE_LDCONFIG=	yes

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ENV=	ac_cv_lib_crypto_OpenSSL_add_all_ciphers=yes

 post-install:
--- a/archivers/xar/pkg-plist
+++ b/archivers/xar/pkg-plist
@ -3,4 +3,4 @@ include/xar/xar.h
 lib/libxar.a
 lib/libxar.so
 lib/libxar.so.1
-man/man1/xar.1.gz
+share/man/man1/xar.1.gz
--- a/archivers/zutils/Makefile
+++ b/archivers/zutils/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	zutils
 PORTVERSION=	1.12
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SAVANNAH/zutils

@ -11,8 +12,9 @@ LICENSE=	GPLv2

 USES=		cpe tar:lz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

-CONFLICTS_INSTALL=	gzip # bin/zcat bin/zcmp bin/zdiff bin/zgrep man/man1/ztest.1.gz
+CONFLICTS_INSTALL=	gzip # bin/zcat bin/zcmp bin/zdiff bin/zgrep share/man/man1/ztest.1.gz

 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	nongnu
--- a/archivers/zutils/pkg-plist
+++ b/archivers/zutils/pkg-plist
@ -7,9 +7,9 @@ bin/zgrep
 bin/zupdate
 bin/ztest
 etc/zutils.conf
-man/man1/zcat.1.gz
-man/man1/zcmp.1.gz
-man/man1/zdiff.1.gz
-man/man1/zgrep.1.gz
-man/man1/zupdate.1.gz
-man/man1/ztest.1.gz
+share/man/man1/zcat.1.gz
+share/man/man1/zcmp.1.gz
+share/man/man1/zdiff.1.gz
+share/man/man1/zgrep.1.gz
+share/man/man1/zupdate.1.gz
+share/man/man1/ztest.1.gz
--- a/astro/gpxloggerd/Makefile
+++ b/astro/gpxloggerd/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	gpxloggerd
 PORTVERSION=	0.2.5
+PORTREVISION=	1
 CATEGORIES=	astro
 USE_GITHUB=	yes
 GH_ACCOUNT=	glebius
@ -11,12 +12,12 @@ LIB_DEPENDS=	libgps.so:astro/gpsd

 USE_RC_SUBR=	${PORTNAME}
 PLIST_FILES=	sbin/${PORTNAME} \
-		man/man8/${PORTNAME}.8.gz
+		share/man/man8/${PORTNAME}.8.gz

 LDFLAGS+=	-lm

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/
-	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${PREFIX}/share/man/man8/

 .include <bsd.port.mk>
--- a/astro/jday/Makefile
+++ b/astro/jday/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	jday
 PORTVERSION=	2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro
 MASTER_SITES=	SF

@ -10,6 +10,7 @@ WWW=		https://jday.sourceforge.net/

 USES=		pathfix libtool
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

@ -19,6 +20,6 @@ PLIST_FILES=	bin/dbd bin/j2d bin/jday \
 		include/jday.h lib/libjday.a \
 		lib/libjday.so lib/libjday.so.2 \
 		lib/libjday.so.2.0.4 libdata/pkgconfig/jday.pc \
-		man/man1/jday.1.gz
+		share/man/man1/jday.1.gz

 .include <bsd.port.mk>
--- a/astro/match/Makefile
+++ b/astro/match/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	match
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	http://spiff.rit.edu/match/

@ -11,7 +12,8 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

-CONFLICTS_INSTALL=	avenger # man/man1/match.1.gz
+CONFLICTS_INSTALL=	avenger # share/man/man1/match.1.gz

 .include <bsd.port.mk>
--- a/astro/match/pkg-plist
+++ b/astro/match/pkg-plist
@ -1,4 +1,4 @@
 bin/apply_match
 bin/match
 bin/project_coords
-man/man1/match.1.gz
+share/man/man1/match.1.gz
--- a/astro/mkgmap/Makefile
+++ b/astro/mkgmap/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	mkgmap
-PORTVERSION=	r4916
+PORTVERSION=	r4917
 CATEGORIES=	astro converters java
 MASTER_SITES=	https://www.mkgmap.org.uk/download/

--- a/astro/mkgmap/distinfo
+++ b/astro/mkgmap/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1697455530
-SHA256 (mkgmap-r4916.tar.gz) = ae2647971862c38aefe02b47af6fb20fa0bae4b0a803edf164c3e8ef474ea4e7
-SIZE (mkgmap-r4916.tar.gz) = 3524996
+TIMESTAMP = 1708450193
+SHA256 (mkgmap-r4917.tar.gz) = 91a4ebe557f06d80e4cb158cc15bdb42fda9d2776ed32f3147933b9fa06f7287
+SIZE (mkgmap-r4917.tar.gz) = 3525257
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	rmap
 PORTVERSION=	1.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	astro geography
 MASTER_SITES=	http://rmap.sourceforge.net/

@ -15,11 +15,12 @@ LIB_DEPENDS=	libgd.so:graphics/gd

 USES=		gmake
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

-PLIST_FILES=	bin/rmap man/man1/rmap.1.gz %%DATADIR%%/earth.rez \
+PLIST_FILES=	bin/rmap share/man/man1/rmap.1.gz %%DATADIR%%/earth.rez \
 		%%DATADIR%%/rmap.colors

 .include <bsd.port.mk>
--- a/astro/sextractor/Makefile
+++ b/astro/sextractor/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sextractor
 PORTVERSION=	2.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/ \
 		http://download.gna.org/kanicule/freebsd/distfiles/
@ -13,6 +13,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		gmake

 CONFLICTS_INSTALL=	sex # bin/sex
--- a/astro/sextractor/pkg-plist
+++ b/astro/sextractor/pkg-plist
@ -1,3 +1,3 @@
 bin/sex
-man/man1/sex.1.gz
-man/manx/sex.x.gz
+share/man/man1/sex.1.gz
+share/man/manx/sex.x.gz
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	starplot
 PORTVERSION=	0.95.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	astro
 MASTER_SITES=	http://starplot.org/downloads/

@ -14,6 +14,7 @@ USES=		compiler:c++11-lang gmake gnome localbase:ldflags pathfix \
 		gettext pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

 post-patch:
 	@${REINPLACE_CMD} -e \
--- a/astro/starplot/pkg-plist
+++ b/astro/starplot/pkg-plist
@ -1,9 +1,9 @@
 bin/starconvert
 bin/starpkg
 bin/starplot
-man/man1/starconvert.1.gz
-man/man1/starpkg.1.gz
-man/man1/starplot.1.gz
+share/man/man1/starconvert.1.gz
+share/man/man1/starpkg.1.gz
+share/man/man1/starplot.1.gz
 share/applications/starplot.desktop
 %%PORTDOCS%%%%DOCSDIR%%/html/ch0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ch1.html
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	wcslib
 PORTVERSION=	8.2.2
+PORTREVISION=	1
 CATEGORIES=	astro
 MASTER_SITES=	ftp://ftp.atnf.csiro.au/pub/software/wcslib/

@ -12,6 +13,7 @@ LICENSE=	GPLv3
 USES=		tar:bzip2 gmake fortran

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	 --docdir=${DOCSDIR}

 MAKEFILE=	GNUmakefile
--- a/astro/wcslib/pkg-plist
+++ b/astro/wcslib/pkg-plist
@ -59,12 +59,12 @@ lib/libwcs.so
 lib/libwcs.so.8
 lib/libwcs.so.%%VERSION%%
 libdata/pkgconfig/wcslib.pc
-%%CFITSIO%%man/man1/HPXcvt.1.gz
-man/man1/fitshdr.1.gz
-man/man1/sundazel.1.gz
-man/man1/tofits.1.gz
-%%CFITSIO%%%%PGPLOT%%man/man1/wcsgrid.1.gz
-%%CFITSIO%%man/man1/wcsware.1.gz
+%%CFITSIO%%share/man/man1/HPXcvt.1.gz
+share/man/man1/fitshdr.1.gz
+share/man/man1/sundazel.1.gz
+share/man/man1/tofits.1.gz
+%%CFITSIO%%%%PGPLOT%%share/man/man1/wcsgrid.1.gz
+%%CFITSIO%%share/man/man1/wcsware.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LESSER
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	wmspaceweather
 PORTVERSION=	1.04
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro windowmaker
 MASTER_SITES=	https://api.opensuse.org/public/source/openSUSE:Factory/WindowMaker-applets/ \
 		ftp://ftp.canadatux.org/linux/windowmaker/
@ -23,6 +23,6 @@ ALL_TARGET=	clean all
 MAKE_JOBS_UNSAFE=	yes

 PLIST_FILES=	bin/GetKp bin/wmSpaceWeather \
-		man/man1/wmSpaceWeather.1.gz
+		share/man/man1/wmSpaceWeather.1.gz

 .include <bsd.port.mk>
--- a/astro/wmspaceweather/files/patch-Makefile
+++ b/astro/wmspaceweather/files/patch-Makefile
@ -39,5 +39,5 @@
 -	install    -m 0644 wmSpaceWeather.1 $(DESTDIR)/man/man1 
 +	${BSD_INSTALL_PROGRAM} wmSpaceWeather $(DESTDIR)$(PREFIX)/bin
 +	${BSD_INSTALL_SCRIPT} GetKp $(DESTDIR)$(PREFIX)/bin
-+	${BSD_INSTALL_MAN} wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/man/man1 
+	${BSD_INSTALL_MAN} wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1 
 
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xmoontool
 PORTVERSION=	3.0.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	astro
 MASTER_SITES=	http://www.senax.net/xmoontool/

@ -11,7 +11,7 @@ WWW=		http://www.senax.net/xmoontool/xmoontool.html
 USES=		motif xorg
 USE_XORG=	x11 xt

-PLIST_FILES=	bin/xmoontool man/man1/xmoontool.1.gz
+PLIST_FILES=	bin/xmoontool share/man/man1/xmoontool.1.gz
 PORTDOCS=	NOTES

 OPTIONS_DEFINE=	DOCS LIBNOVA
@ -23,7 +23,7 @@ LIBNOVA_LIB_DEPENDS=	libnova.so:astro/libnova

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmoontool ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/xmoontool.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/xmoontool.1 ${STAGEDIR}${PREFIX}/share/man/man1

 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	xplanet
 PORTVERSION=	1.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	astro geography
 MASTER_SITES=	SF

@ -9,6 +9,7 @@ COMMENT=	Draw pictures of the earth textured by an image
 WWW=		https://xplanet.sourceforge.net/

 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 USES=		iconv:wchar_t localbase xorg
 USE_XORG=	x11 xext xt xscrnsaver
 CONFIGURE_ARGS=	--with-map-extension=jpg
--- a/astro/xplanet/pkg-plist
+++ b/astro/xplanet/pkg-plist
@ -1,5 +1,5 @@
 bin/xplanet
-man/man1/xplanet.1.gz
+share/man/man1/xplanet.1.gz
 %%DATADIR%%/arcs/README
 %%DATADIR%%/arcs/constellations
 %%DATADIR%%/config/README
--- a/audio/Makefile
+++ b/audio/Makefile
@ -604,7 +604,6 @@
    SUBDIR += plasma6-ocean-sound-theme
    SUBDIR += plasma6-oxygen-sounds
    SUBDIR += plasma6-plasma-pa
-    SUBDIR += play
    SUBDIR += playgsf
    SUBDIR += playmidi
    SUBDIR += playumidi
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@ -1,39 +0,0 @@
-PORTNAME=	play
-PORTVERSION=	1.0
-PORTREVISION=	3
-CATEGORIES=	audio
-MASTER_SITES=	PORTS_JP
-
-MAINTAINER=	bofh@FreeBSD.org
-COMMENT=	Simple audio file player
-
-LICENSE=	NONE
-
-DEPRECATED=	Upstream vaporized and last release was in 2000
-EXPIRATION_DATE=	2024-02-19
-
-USES=		uidfix
-
-MAKE_ARGS=	CFLAGS="${CFLAGS}" MANDIR="${PREFIX}/share/man/ja/man" BINDIR="${PREFIX}/bin"
-# XXX PIE static libraries are not supported by base system /usr/share/mk
-MAKE_ARGS+=	WITHOUT_PIE=true
-
-CONFLICTS=	sox
-
-PLIST_FILES=	bin/play share/man/ja/man1/play.1.gz
-
-.include <bsd.port.pre.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-CFLAGS+=	-Wno-error=int-conversion
-.if ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )
-CFLAGS+=	-Wno-error=incompatible-function-pointer-types
-.endif
-.endif
-
-post-patch:
-.for file in play_audio.c mixer_ctl.c encode_sun.c speed.c
-	@${REINPLACE_CMD} '/soundcard\.h/s,machine,sys,' ${WRKSRC}/${file}
-.endfor
-
-.include <bsd.port.post.mk>
--- a/audio/play/distinfo
+++ b/audio/play/distinfo
@ -1,2 +0,0 @@
-SHA256 (play-1.0.tar.gz) = 13d0af4be4e22a267b1b3c195b5bdfaefd1b10d9f51df9c0fa4b25edecbb3d7b
-SIZE (play-1.0.tar.gz) = 6301
--- a/audio/play/files/patch-encode__riff.c
+++ b/audio/play/files/patch-encode__riff.c
@ -1,54 +0,0 @@
--- encode_riff.c.orig	1997-03-25 15:25:07 UTC
-+++ encode_riff.c
-@@ -11,7 +11,7 @@ static char rcsid[] =
- #include <signal.h>
- #include <err.h>
- 
-#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- 
- #include "play.h"
- #include "encode_riff.h"
-@@ -74,7 +74,7 @@ int play_riff(char *audio_file, riff_hea
-     char *bufp;
-     char *device;
-     int devfd, filefd;
-    int stat, len, buf_size, format, data_length;
-+    int stat, len, buf_size, format = 0, data_length;
- 
-     if (!f_hasdsp) {
- 	fprintf(stderr, "%s: %s: needs DSP for play\n", myname, audio_file);
-@@ -109,7 +109,12 @@ int play_riff(char *audio_file, riff_hea
- 	warn("%s", device);
- 	stat = FAIL; goto failplay0;
-     }
-+#if 0
-+    /* this (at least under fbsd) means that you want to set play format
-+     * to headerp->sample_size which is a nonsense */
-     if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &headerp->sample_size) < 0) {
-+#endif
-+    if (ioctl(devfd, SNDCTL_DSP_SAMPLESIZE, &format) < 0) {
- 	warn("%s", device);
- 	stat = FAIL; goto failplay0;
-     }
-@@ -121,11 +126,6 @@ int play_riff(char *audio_file, riff_hea
- 	warn("%s", device);
- 	stat = FAIL; goto failplay0;
-     }
-    /* XXX */
-    if (ioctl(devfd, SNDCTL_DSP_SETFMT, &format) < 0) {
-	warn("%s", device);
-	stat = FAIL; goto failplay0;
-    }
-     if (headerp->channels > 1) {
- 	int ch = headerp->channels;
- 	if (ioctl(devfd, SNDCTL_DSP_STEREO, &ch) < 0) {
-@@ -163,6 +163,8 @@ int play_riff(char *audio_file, riff_hea
- 	    warn("read");
- 	    stat = FAIL; goto failplay2;
- 	}
-+/*	printf("len = %10d, len = %10d\n", stat, len); */
-+	stat = (len < stat)? len : stat;
- 	if (write(devfd, bufp, stat) < 0) {
- 	    warn("write");
- 	    stat = FAIL; goto failplay2;
--- a/audio/play/files/patch-play.c
+++ b/audio/play/files/patch-play.c
@ -1,10 +0,0 @@
--- play.c.orig	1997-03-25 15:25:12 UTC
-+++ play.c
-@@ -4,6 +4,7 @@ static char rcsid[] = "$Id: play.c,v 1.7
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include <fcntl.h>
- #include <err.h>
- #include <signal.h>
--- a/audio/play/pkg-descr
+++ b/audio/play/pkg-descr
@ -1,2 +0,0 @@
-play is a command-line based audio player.
-supported formats: RIFF and U-Law.
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	libimobiledevice
 PORTVERSION=	1.3.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	comms
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/

@ -15,6 +15,7 @@ SLAVE_PORT?=	no

 USES+=		cpe libtool localbase:ldflags pathfix pkgconfig ssl tar:bzip2
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS+=openssl_CFLAGS="-I${OPENSSLINC}" \
 		openssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 INSTALL_TARGET=	install-strip
--- a/comms/libimobiledevice/pkg-plist
+++ b/comms/libimobiledevice/pkg-plist
@ -46,21 +46,21 @@ lib/libimobiledevice-1.0.so
 lib/libimobiledevice-1.0.so.6
 lib/libimobiledevice-1.0.so.6.0.0
 libdata/pkgconfig/libimobiledevice-1.0.pc
-man/man1/idevice_id.1.gz
-man/man1/idevicebackup.1.gz
-man/man1/idevicebackup2.1.gz
-man/man1/idevicecrashreport.1.gz
-man/man1/idevicedate.1.gz
-man/man1/idevicedebug.1.gz
-man/man1/idevicedebugserverproxy.1.gz
-man/man1/idevicediagnostics.1.gz
-man/man1/ideviceenterrecovery.1.gz
-man/man1/ideviceimagemounter.1.gz
-man/man1/ideviceinfo.1.gz
-man/man1/idevicename.1.gz
-man/man1/idevicenotificationproxy.1.gz
-man/man1/idevicepair.1.gz
-man/man1/ideviceprovision.1.gz
-man/man1/idevicescreenshot.1.gz
-man/man1/idevicesetlocation.1.gz
-man/man1/idevicesyslog.1.gz
+share/man/man1/idevice_id.1.gz
+share/man/man1/idevicebackup.1.gz
+share/man/man1/idevicebackup2.1.gz
+share/man/man1/idevicecrashreport.1.gz
+share/man/man1/idevicedate.1.gz
+share/man/man1/idevicedebug.1.gz
+share/man/man1/idevicedebugserverproxy.1.gz
+share/man/man1/idevicediagnostics.1.gz
+share/man/man1/ideviceenterrecovery.1.gz
+share/man/man1/ideviceimagemounter.1.gz
+share/man/man1/ideviceinfo.1.gz
+share/man/man1/idevicename.1.gz
+share/man/man1/idevicenotificationproxy.1.gz
+share/man/man1/idevicepair.1.gz
+share/man/man1/ideviceprovision.1.gz
+share/man/man1/idevicescreenshot.1.gz
+share/man/man1/idevicesetlocation.1.gz
+share/man/man1/idevicesyslog.1.gz
--- a/databases/sqlitestudio/Makefile
+++ b/databases/sqlitestudio/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	sqlitestudio
 DISTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	databases

 MAINTAINER=	yuri@FreeBSD.org
@ -23,16 +24,28 @@ OPTIONS_DEFAULT=	${OPTIONS_GROUP_PLUGINS}
 OPTIONS_SUB=		yes
 PLUGINS_DESC=			Install plugins:

-ALL_PLUGINS=		CsvImport CsvExport DbSqliteCipher HtmlExport JsonExport MultiEditorImage PdfExport Printing \
-			RegExpImport SqlFormatterSimple SqlExport SqlEnterpriseFormatter XmlExport
+ALL_PLUGINS=		ConfigMigration CsvExport CsvImport DbAndroid DbSqliteCipher \
+			DbSqliteWx FusionDarkStyle HtmlExport JsonExport MultiEditorImage \
+			PdfExport Printing PythonSyntaxHighlighter RegExpImport ScriptingPython \
+			ScriptingTcl SqlEnterpriseFormatter SqlExport SqlFormatterSimple XmlExport
+
 .for p in ${ALL_PLUGINS}
 OPTIONS_GROUP_PLUGINS+=		PLUGIN${p:C/([A-Z])/_\1/g:tu}
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_DESC=		${p} plugin
 PLUGIN${p:C/([A-Z])/_\1/g:tu}_VARS=	PLUGIN_DIRS+=${p}
 .endfor

-PLUGIN_DB_SQLITE_CIPHER_USES=		ssl
-PLUGIN_PRINTING_USE=			QT=printsupport
+PLUGIN_DB_SQLITE_CIPHER_USES=				ssl
+PLUGIN_PRINTING_USE=					QT=printsupport
+
+PLUGIN_PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER_USES=		python
+PLUGIN_PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER_CXXFLAGS=	-I${PYTHON_INCLUDEDIR}
+
+PLUGIN_SCRIPTING_PYTHON_USES=				python
+PLUGIN_SCRIPTING_PYTHON_CXXFLAGS=			-I${PYTHON_INCLUDEDIR}
+
+PLUGIN_SCRIPTING_TCL_USES=				tcl:87
+PLUGIN_SCRIPTING_TCL_CXXFLAGS=				-I${TCL_INCLUDEDIR}

 WRKSRC_SUBDIR=	SQLiteStudio3

--- a/databases/sqlitestudio/pkg-plist
+++ b/databases/sqlitestudio/pkg-plist
@ -9,17 +9,24 @@ lib/libguiSQLiteStudio.so
 lib/libguiSQLiteStudio.so.1
 lib/libguiSQLiteStudio.so.1.0
 lib/libguiSQLiteStudio.so.1.0.0
-%%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so
+%%PLUGIN_CONFIG_MIGRATION%%lib/sqlitestudio/libConfigMigration.so
 %%PLUGIN_CSV_EXPORT%%lib/sqlitestudio/libCsvExport.so
+%%PLUGIN_CSV_IMPORT%%lib/sqlitestudio/libCsvImport.so
+%%PLUGIN_DB_ANDROID%%lib/sqlitestudio/libDbAndroid.so
 %%PLUGIN_DB_SQLITE_CIPHER%%lib/sqlitestudio/libDbSqliteCipher.so
+%%PLUGIN_DB_SQLITE_WX%%lib/sqlitestudio/libDbSqliteWx.so
+%%PLUGIN_FUSION_DARK_STYLE%%lib/sqlitestudio/libFusionDarkStyle.so
 %%PLUGIN_HTML_EXPORT%%lib/sqlitestudio/libHtmlExport.so
 %%PLUGIN_JSON_EXPORT%%lib/sqlitestudio/libJsonExport.so
 %%PLUGIN_MULTI_EDITOR_IMAGE%%lib/sqlitestudio/libMultiEditorImage.so
 %%PLUGIN_PDF_EXPORT%%lib/sqlitestudio/libPdfExport.so
 %%PLUGIN_PRINTING%%lib/sqlitestudio/libPrinting.so
+%%PLUGIN_PYTHON_SYNTAX_HIGHLIGHTER%%lib/sqlitestudio/libPythonSyntaxHighlighter.so
 %%PLUGIN_REG_EXP_IMPORT%%lib/sqlitestudio/libRegExpImport.so
+%%PLUGIN_SCRIPTING_PYTHON%%lib/sqlitestudio/libScriptingPython.so
+%%PLUGIN_SCRIPTING_TCL%%lib/sqlitestudio/libScriptingTcl.so
 %%PLUGIN_SQL_FORMATTER_SIMPLE%%lib/sqlitestudio/libSqlFormatterSimple.so
-%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so
 %%PLUGIN_SQL_ENTERPRISE_FORMATTER%%lib/sqlitestudio/libSqlEnterpriseFormatter.so
+%%PLUGIN_SQL_EXPORT%%lib/sqlitestudio/libSqlExport.so
 %%PLUGIN_XML_EXPORT%%lib/sqlitestudio/libXmlExport.so
 share/icons/hicolor/scalable/apps/SQLiteStudio.svg
--- a/devel/Makefile
+++ b/devel/Makefile
@ -3757,6 +3757,7 @@
    SUBDIR += p5-Types-Core
    SUBDIR += p5-Types-Path-Tiny
    SUBDIR += p5-Types-Serialiser
+    SUBDIR += p5-Types-Self
    SUBDIR += p5-Types-URI
    SUBDIR += p5-Types-UUID
    SUBDIR += p5-UDCode
--- a/devel/cdecl/Makefile
+++ b/devel/cdecl/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	cdecl
-PORTVERSION=	16.2
+PORTVERSION=	16.2.1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	devel

--- a/devel/cdecl/distinfo
+++ b/devel/cdecl/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1706674507
-SHA256 (paul-j-lucas-cdecl-cdecl-16.2_GH0.tar.gz) = a21040ee6ebdc70b3fcad323f675b89e3e980f1602337bc16d99886311ee44bf
-SIZE (paul-j-lucas-cdecl-cdecl-16.2_GH0.tar.gz) = 960967
+TIMESTAMP = 1708489233
+SHA256 (paul-j-lucas-cdecl-cdecl-16.2.1_GH0.tar.gz) = 09b0ad9cf39f651dd07732c7baf46ef88c1c93e5dc2b0cd665c6887ccb852100
+SIZE (paul-j-lucas-cdecl-cdecl-16.2.1_GH0.tar.gz) = 963144
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@ -1,5 +1,6 @@
 PORTNAME=	cdk
 DISTVERSION=	5.0-20230201
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://invisible-island.net/archives/${PORTNAME}/\
@ -14,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 USES=		gmake ncurses tar:tgz
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 PORTDOCS=	README
 MAKE_JOBS_UNSAFE=	yes

--- a/devel/cdk/pkg-plist
+++ b/devel/cdk/pkg-plist
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	jenkins
-PORTVERSION=	2.445
+PORTVERSION=	2.446
 CATEGORIES=	devel java
 MASTER_SITES=	https://get.jenkins.io/war/${PORTVERSION}/
 DISTNAME=	jenkins
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1707836842
-SHA256 (jenkins/2.445/jenkins.war) = e505d4d41e775691292ff3a0323fee1064ff0219901acc47476acd65f87b3099
-SIZE (jenkins/2.445/jenkins.war) = 86461711
+TIMESTAMP = 1708457897
+SHA256 (jenkins/2.446/jenkins.war) = ce0aee7be11cc5af961c1eceac6c6db24055fc53ff67a27e8572a65a9c377ded
+SIZE (jenkins/2.446/jenkins.war) = 86466583
--- a/devel/mold/files/patch-Makefile
+++ b/devel/mold/files/patch-Makefile
@ -1,44 +0,0 @@
--- Makefile.orig	2022-04-28 09:51:29 UTC
-+++ Makefile
-@@ -4,7 +4,7 @@
- 
- VERSION = 1.2.1
- 
-PREFIX = /usr/local
-+PREFIX = %%PREFIX%%
- BINDIR = $(PREFIX)/bin
- LIBDIR = $(PREFIX)/lib
- LIBEXECDIR = $(PREFIX)/libexec
-@@ -27,7 +27,7 @@ PKG_CONFIG = pkg-config
- 
- # If you want to keep symbols in the installed binary, run make with
- # `STRIP=true` to run /bin/true instead of the strip command.
-STRIP = strip
-+STRIP = $(STRIP_CMD)
- 
- SRCS = $(wildcard *.cc elf/*.cc macho/*.cc)
- OBJS = $(SRCS:%.cc=out/%.o)
-@@ -103,8 +103,8 @@ ifneq ($(OS), Darwin)
- endif
- 
- ifeq ($(NEEDS_LIBCRYPTO), 1)
-  MOLD_CXXFLAGS += $(shell $(PKG_CONFIG) --cflags-only-I openssl)
-  MOLD_LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L openssl) -lcrypto
-+  MOLD_CXXFLAGS += -I${OPENSSLINC}
-+  MOLD_LDFLAGS += -L${OPENSSLLIB} -lcrypto
- endif
- 
- # '-latomic' flag is needed building on riscv64 system
-@@ -205,11 +205,7 @@ install: all
- 
- 	$(INSTALL) -d $D$(LIBEXECDIR)/mold
- 
-# We want to make a symblink with a relative path, so that users can
-# move the entire directory to other place without breaking the reference.
-# GNU ln supports `--relative` to do that, but that's not supported by
-# non-GNU systems. So we use Python to compute a relative path.
-	ln -sf `python3 -c "import os.path; print(os.path.relpath('$(BINDIR)/mold', '$(LIBEXECDIR)/mold'))"` $D$(LIBEXECDIR)/mold/ld
-+	ln -sf ../../bin/mold $D$(LIBEXECDIR)/mold/ld
- 
- 	$(INSTALL) -d $D$(MANDIR)/man1
- 	$(INSTALL_DATA) docs/mold.1 $D$(MANDIR)/man1
--- a/devel/p5-Module-Extract-VERSION/Makefile
+++ b/devel/p5-Module-Extract-VERSION/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	Module-Extract-VERSION
-PORTVERSION=	1.116
+PORTVERSION=	1.117
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
--- a/devel/p5-Module-Extract-VERSION/distinfo
+++ b/devel/p5-Module-Extract-VERSION/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1666701509
-SHA256 (Module-Extract-VERSION-1.116.tar.gz) = 41903a0685178285345f5da855d925b9454ee710a9795e3c4c327bae2f557698
-SIZE (Module-Extract-VERSION-1.116.tar.gz) = 12653
+TIMESTAMP = 1708468268
+SHA256 (Module-Extract-VERSION-1.117.tar.gz) = 82719e373c120d1b940a76ebcc01ce17c4fe9434f7545d0e1e386f85f3464daf
+SIZE (Module-Extract-VERSION-1.117.tar.gz) = 12701
--- a/devel/p5-OrePAN2/Makefile
+++ b/devel/p5-OrePAN2/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	OrePAN2
-PORTVERSION=	0.49
-PORTREVISION=	1
+PORTVERSION=	0.52
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OALDERS
@ -18,6 +17,7 @@ RUN_DEPENDS=	p5-Archive-Extract>=0.72:archivers/p5-Archive-Extract \
 		p5-Class-Accessor-Lite>=0.05:devel/p5-Class-Accessor-Lite \
 		p5-IO-File-AtomicChange>=0:devel/p5-IO-File-AtomicChange \
 		p5-IO-Socket-SSL>=1.42:security/p5-IO-Socket-SSL \
+		p5-libwww>=0:www/p5-libwww \
 		p5-List-Compare>=0:misc/p5-List-Compare \
 		p5-MetaCPAN-Client>=2.000000:devel/p5-MetaCPAN-Client \
 		p5-Moo>=1.007000:devel/p5-Moo \
@ -29,12 +29,15 @@ RUN_DEPENDS=	p5-Archive-Extract>=0.72:archivers/p5-Archive-Extract \
 		p5-Ref-Util>=0:devel/p5-Ref-Util \
 		p5-Try-Tiny>=0:lang/p5-Try-Tiny \
 		p5-Type-Tiny>=0:devel/p5-Type-Tiny \
-		p5-Types-URI>=0:devel/p5-Types-URI \
-		p5-libwww>=0:www/p5-libwww
-TEST_DEPENDS=	p5-File-Touch>=0:devel/p5-File-Touch \
+		p5-Types-URI>=0:devel/p5-Types-URI
+TEST_DEPENDS=	p5-File-pushd>0:devel/p5-File-pushd \
+		p5-File-Touch>=0:devel/p5-File-Touch \
 		p5-File-Which>=0:sysutils/p5-File-Which \
+		p5-namespace-clean>0:devel/p5-namespace-clean \
 		p5-Path-Class>=0:devel/p5-Path-Class \
-		p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet
+		p5-Role-Hooks>0:devel/p5-Role-Hooks \
+		p5-Test-RequiresInternet>=0:devel/p5-Test-RequiresInternet \
+		p5-Types-Self>0:devel/p5-Types-Self

 USES=		perl5
 USE_PERL5=	modbuildtiny
--- a/devel/p5-OrePAN2/distinfo
+++ b/devel/p5-OrePAN2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1662558140
-SHA256 (OrePAN2-0.49.tar.gz) = ed23062ec9f715e0b8e7afad681b26bd6b323dd4dfc3728e0b48a0b884eff339
-SIZE (OrePAN2-0.49.tar.gz) = 51736
+TIMESTAMP = 1708469911
+SHA256 (OrePAN2-0.52.tar.gz) = 90d11fd7cce960b82d87fb330830849ab5959ec9519bab37333ef5cbb9cecf82
+SIZE (OrePAN2-0.52.tar.gz) = 52017
--- a/devel/p5-Types-Self/Makefile
+++ b/devel/p5-Types-Self/Makefile
@ -0,0 +1,25 @@
+PORTNAME=	Types-Self
+PORTVERSION=	0.002
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:TOBYINK
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	perl@FreeBSD.org
+COMMENT=	Perl Self type to constrains values to be blessed objects
+WWW=		https://metacpan.org/release/OrePAN2
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+
+TEST_DEPENDS=	p5-Role-Hooks>0:devel/p5-Role-Hooks \
+		p5-Role-Tiny>0:devel/p5-Role-Tiny \
+		p5-Type-Tiny>0:devel/p5-Type-Tiny
+
+USES=		perl5
+USE_PERL5=	configure
+NO_ARCH=	YES
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/p5-Types-Self/distinfo
+++ b/devel/p5-Types-Self/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1708505165
+SHA256 (Types-Self-0.002.tar.gz) = 9c017076c99429ea0fd41f2ba07462fe96bc533b06f07a96ab7cdf3518bb4989
+SIZE (Types-Self-0.002.tar.gz) = 15307
--- a/devel/p5-Types-Self/pkg-descr
+++ b/devel/p5-Types-Self/pkg-descr
@ -0,0 +1,4 @@
+This module exports a Self type constraint which constrains values
+to be blessed objects in the same class as the package it was
+imported into, or blessed objects which consume the role it was
+imported into. It should do the right thing with inheritance.
--- a/devel/p5-Types-Self/pkg-plist
+++ b/devel/p5-Types-Self/pkg-plist
@ -0,0 +1,2 @@
+%%SITE_PERL%%/Types/Self.pm
+%%PERL5_MAN3%%/Types::Self.3.gz
--- a/devel/py-jsonpickle/Makefile
+++ b/devel/py-jsonpickle/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	jsonpickle
-DISTVERSION=	3.0.2
+DISTVERSION=	3.0.3
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -14,7 +14,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}feedparser>0:textproc/py-feedparser@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}gmpy2>0:math/py-gmpy2@${PY_FLAVOR}\
 		${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/py-pymongo@${PY_FLAVOR} \
--- a/devel/py-jsonpickle/distinfo
+++ b/devel/py-jsonpickle/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1692033259
-SHA256 (jsonpickle-3.0.2.tar.gz) = e37abba4bfb3ca4a4647d28bb9f4706436f7b46c8a8333b4a718abafa8e46b37
-SIZE (jsonpickle-3.0.2.tar.gz) = 266361
+TIMESTAMP = 1708508703
+SHA256 (jsonpickle-3.0.3.tar.gz) = 5691f44495327858ab3a95b9c440a79b41e35421be1a6e09a47b6c9b9421fd06
+SIZE (jsonpickle-3.0.3.tar.gz) = 264902
--- a/devel/py-sexpdata/Makefile
+++ b/devel/py-sexpdata/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	sexpdata
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.1
+DISTVERSION=	1.0.2
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

--- a/devel/py-sexpdata/distinfo
+++ b/devel/py-sexpdata/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1686149550
-SHA256 (jd-boyd-sexpdata-v1.0.1_GH0.tar.gz) = c949981a0e14977725500dea86a2231945d86aded25d1ec33eee9912cac5f9b4
-SIZE (jd-boyd-sexpdata-v1.0.1_GH0.tar.gz) = 17298
+TIMESTAMP = 1708444894
+SHA256 (jd-boyd-sexpdata-v1.0.2_GH0.tar.gz) = a36c99143e778718b33d06db46d8f842736296f44358504c48fc8732663943a8
+SIZE (jd-boyd-sexpdata-v1.0.2_GH0.tar.gz) = 17687
--- a/devel/py-types-Pillow/Makefile
+++ b/devel/py-types-Pillow/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-Pillow
-PORTVERSION=	10.1.0.2
+PORTVERSION=	10.2.0.20240213
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-Pillow/distinfo
+++ b/devel/py-types-Pillow/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1699953962
-SHA256 (types-Pillow-10.1.0.2.tar.gz) = 525c1c5ee67b0ac1721c40d2bc618226ef2123c347e527e14e05b920721a13b9
-SIZE (types-Pillow-10.1.0.2.tar.gz) = 31663
+TIMESTAMP = 1708444934
+SHA256 (types-Pillow-10.2.0.20240213.tar.gz) = 4800b61bf7eabdae2f1b17ade0d080709ed33e9f26a2e900e470e8b56ebe2387
+SIZE (types-Pillow-10.2.0.20240213.tar.gz) = 33696
--- a/devel/py-types-psycopg2/Makefile
+++ b/devel/py-types-psycopg2/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	types-psycopg2
-PORTVERSION=	2.9.21.16
+PORTVERSION=	2.9.21.20240218
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-types-psycopg2/distinfo
+++ b/devel/py-types-psycopg2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1700585258
-SHA256 (types-psycopg2-2.9.21.16.tar.gz) = 44a3ae748173bb637cff31654d6bd12de9ad0c7ad73afe737df6152830ed82ed
-SIZE (types-psycopg2-2.9.21.16.tar.gz) = 20742
+TIMESTAMP = 1708452576
+SHA256 (types-psycopg2-2.9.21.20240218.tar.gz) = 3084cd807038a62c80fb5be78b41d855b48a060316101ea59fd85c302efb57d4
+SIZE (types-psycopg2-2.9.21.20240218.tar.gz) = 21213
--- a/devel/simpleini/Makefile
+++ b/devel/simpleini/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	simpleini
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.20
+DISTVERSION=	4.22
 CATEGORIES=	devel

 MAINTAINER=	amdmi3@FreeBSD.org
@ -14,6 +14,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	brofield
 NO_BUILD=	yes
 NO_ARCH=	yes
+CMAKE_ON=	SIMPLEINI_USE_SYSTEM_GTEST

 PORTDOCS=	*

--- a/devel/simpleini/distinfo
+++ b/devel/simpleini/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1689599866
-SHA256 (brofield-simpleini-v4.20_GH0.tar.gz) = 727239096a7a3df701e1704c8402292de6198c071f89ae5e4ac16c63234a8bbc
-SIZE (brofield-simpleini-v4.20_GH0.tar.gz) = 64807
+TIMESTAMP = 1708445050
+SHA256 (brofield-simpleini-v4.22_GH0.tar.gz) = b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8
+SIZE (brofield-simpleini-v4.22_GH0.tar.gz) = 65923
--- a/games/NBlood/Makefile
+++ b/games/NBlood/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	NBlood
-DISTVERSION=	r13939
+DISTVERSION=	r13984
 CATEGORIES=	games

 MAINTAINER=	pkubaj@FreeBSD.org
--- a/games/NBlood/distinfo
+++ b/games/NBlood/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1707162843
-SHA256 (nukeykt-NBlood-r13939_GH0.tar.gz) = b99dc98c0da7a0dac9013f5c947e5dd3bd467d405766eee84117da10adecda84
-SIZE (nukeykt-NBlood-r13939_GH0.tar.gz) = 37514872
+TIMESTAMP = 1708459381
+SHA256 (nukeykt-NBlood-r13984_GH0.tar.gz) = 17912bed9366116e557244d12dfd93f42eb9e540fa6f1e9f366458eab684d430
+SIZE (nukeykt-NBlood-r13984_GH0.tar.gz) = 37501518
--- a/games/dxx-rebirth/Makefile
+++ b/games/dxx-rebirth/Makefile
@ -36,7 +36,8 @@ MAKE_ARGS+=	lto=1

 .if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc
 CXXFLAGS+=	-Wno-error=missing-field-initializers -Wno-error=maybe-uninitialized
-USES+=		compiler:gcc-c++11-lib
+USES+=		compiler:c++11-lib
+USE_GCC=	12
 .endif

 post-install:
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@ -1,8 +1,8 @@
-PORTNAME=	gemrb
-PORTVERSION=	0.9.2
-CATEGORIES=	games emulators
-MASTER_SITES=	SF/${PORTNAME}/Releases/${PORTVERSION}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-sources
+PORTNAME=		gemrb
+DISTVERSIONPREFIX=	v
+DISTVERSION=		0.9.2
+PORTREVISION=		1
+CATEGORIES=		games emulators

 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	GemRB (Game engine made with preRendered Background)
@ -11,27 +11,76 @@ WWW=		https://www.gemrb.org/
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libpng.so:graphics/png \
-		libvorbis.so:audio/libvorbis \
-		libfreetype.so:print/freetype2
-
-USES=		cmake compiler:c11 gnome iconv localbase openal:al,alut \
-		python sdl shebangfix
+USES=		cmake compiler:c++11-lang iconv python sdl shebangfix
 SHEBANG_FILES=	admin/extend2da.py
-USE_SDL=	sdl2
+USE_GCC=	yes # https://github.com/gemrb/gemrb/issues/1786
+USE_GITHUB=	yes
 USE_LDCONFIG=	yes
+USE_SDL=	sdl2

-OPTIONS_DEFINE=	DOCS
-OPTIONS_SUB=	yes
+CMAKE_ARGS=	-DCMAKE_BUILD_TYPE=Release \
+		-DHAVE_LDEXPF=1 \
+		-DLAYOUT=fhs \
+		-DPYTHON_VERSION=Auto \
+		-DSANITIZE=None \
+		-DSDL_BACKEND=SDL2
+CMAKE_OFF=	DISABLE_WERROR \
+		INSOURCEBUILD \
+		STATIC_LINK \
+		USE_LIBVLC \
+		USE_SDL_CONTROLLER_API

-CMAKE_ARGS=	-DDOC_DIR="${DOCSDIR}" \
-		-DMAN_DIR="${PREFIX}/share/man/man6/" \
-		-DSDL_BACKEND=SDL2 \
-		-DUSE_OPENAL=ON \
-		-DUSE_LIBVLC=OFF \
-		-DHAVE_LDEXPF=1
+SUB_FILES=	pkg-message
+
+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	DEMO FREETYPE OPENAL OPENGL PNG SDLMIXER VORBIS
+
+OPTIONS_GROUP=		AUDIO RESOURCE VIDEO
+OPTIONS_GROUP_AUDIO=	OPENAL SDLMIXER
+OPTIONS_GROUP_RESOURCE=	DEMO FREETYPE PNG VORBIS
+OPTIONS_GROUP_VIDEO=	OPENGL RESIND
+
+OPTIONS_SUB=		yes
+
+DEMO_DESC=		Optional demo assets
+DEMO_GH_ACCOUNT=	gemrb:demo
+DEMO_GH_PROJECT=	gemrb-assets:demo
+DEMO_GH_TAGNAME=	5b5dcde:demo
+
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
+FREETYPE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt
+FREETYPE_CMAKE_BOOL=	USE_FREETYPE
+
+OPENAL_USES=		openal:al,alut
+OPENAL_CMAKE_BOOL=	USE_OPENAL
+
+OPENGL_USES=		gl
+OPENGL_USE=		gl=egl
+OPENGL_CMAKE_ON=	-DOPENGL_BACKEND=OpenGL
+OPENGL_CMAKE_OFF=	-DOPENGL_BACKEND=None
+
+PNG_LIB_DEPENDS=	libpng.so:graphics/png
+PNG_CMAKE_BOOL=		USE_PNG
+
+RESIND_DESC=		Scale to screensize with pixelscaling
+RESIND_CMAKE_BOOL=	SDL_RESOLUTION_INDEPENDANCE
+
+SDLMIXER_DESC=		Audio support via SDL_mixer
+SDLMIXER_USE=		sdl=mixer2
+SDLMIXER_CMAKE_BOOL=	USE_SDLMIXER
+
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+VORBIS_CMAKE_BOOL=	USE_VORBIS

 PLIST_SUB=	PORTVERSION=${PORTVERSION}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
+post-extract-DEMO-on:
+	${MKDIR} ${WRKSRC}/demo/music/mx0100
+	${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/whispers-seamless.ogg ${WRKSRC}/demo/music/mx0100/mx0100a.ogg
+	${MKDIR} ${WRKSRC}/demo/music/theme
+	${INSTALL_DATA} ${WRKSRC_demo}/demo/audio/themea.ogg ${WRKSRC}/demo/music/theme
+
+post-install:
+	${RM} ${STAGEDIR}${ETCDIR}/GemRB.cfg

 .include <bsd.port.mk>
--- a/games/gemrb/distinfo
+++ b/games/gemrb/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1705483350
-SHA256 (gemrb-0.9.2-sources.tar.gz) = 5206d7e3fee45d21030caac92bc799b12ec011f90e59d7408c4b0eb4a8330d40
-SIZE (gemrb-0.9.2-sources.tar.gz) = 16123769
+TIMESTAMP = 1708291230
+SHA256 (gemrb-gemrb-v0.9.2_GH0.tar.gz) = ea614c067483606dab680ab18cd50527f56803bd46e0888e3c786eec05d3bb7d
+SIZE (gemrb-gemrb-v0.9.2_GH0.tar.gz) = 14327547
+SHA256 (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 3e180e3ae063651bfabaab5795a946183212fd451986e3f4cac9203278283d23
+SIZE (gemrb-gemrb-assets-5b5dcde_GH0.tar.gz) = 11161448
--- a/games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt
+++ b/games/gemrb/files/extra-patch-gemrb_plugins_TTFImporter_CMakeLists.txt
--- a/games/gemrb/files/pkg-message.in
+++ b/games/gemrb/files/pkg-message.in
@ -1,14 +1,24 @@
 [
 { type: install
  message: <<EOM
-To use GemRB, you must copy the Chitin.key from your respective Infinity Engine
-game CD to the GemRB directory.  If you do not copy this file, GemRB will not
-work. Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the
-Infinity Engine game installation directory. Games can be installed with
-emulators/wine-devel, archivers/unshield, or the custom GemRB game installer:
-http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers/
+You will need one of the original Infinity Engine games or the free Baldur's Gate II
+demo. GemRB does not support the Enhanced Edition versions of the games. GemRB comes
+with its own short demo.

-Please see http://www.gemrb.org/ for additional help and instructions.
+GemRB needs access to game files. You have several options to provide the files:
+  - copy from a Windows system
+  - install with emulators/wine
+  - extract with archivers/unshield and archivers/cabextract
+    (https://github.com/gemrb/gemrb/wiki/Unshield:-alternative-game-install-method)
+  - use the custom GemRB games installers
+    (http://git.njw.name/cgit/cgit.cgi/gemrb-gameinstallers)
+
+Additionally, %%ETCDIR%%/GemRB.cfg needs to be edited to point to the Infinity
+Engine game installation directory, i.e. the directory where you provide the game
+files from above. If it doesn't point to a valid game directory then GemRB will
+start its demo instead.
+
+Please see https://www.gemrb.org for additional help and instructions.
 EOM
 }
 ]
--- a/games/gemrb/pkg-plist
+++ b/games/gemrb/pkg-plist
@ -1,8 +1,7 @@
 bin/extend2da.py
 bin/gemrb
-%%ETCDIR%%/GemRB.cfg
 %%ETCDIR%%/GemRB.cfg.noinstall.sample
-%%ETCDIR%%/GemRB.cfg.sample
+@sample %%ETCDIR%%/GemRB.cfg.sample
 lib/gemrb/libgemrb_core.so
 lib/gemrb/libgemrb_core.so.%%PORTVERSION%%
 lib/gemrb/plugins/2DAImporter.so
@ -31,20 +30,21 @@ lib/gemrb/plugins/MUSImporter.so
 lib/gemrb/plugins/MVEPlayer.so
 lib/gemrb/plugins/NullSound.so
 lib/gemrb/plugins/NullSource.so
-lib/gemrb/plugins/OGGReader.so
-lib/gemrb/plugins/OpenALAudio.so
+%%VORBIS%%lib/gemrb/plugins/OGGReader.so
+%%OPENAL%%lib/gemrb/plugins/OpenALAudio.so
 lib/gemrb/plugins/PLTImporter.so
-lib/gemrb/plugins/PNGImporter.so
+%%PNG%%lib/gemrb/plugins/PNGImporter.so
 lib/gemrb/plugins/PROImporter.so
 lib/gemrb/plugins/PSTOpcodes.so
 lib/gemrb/plugins/PVRZImporter.so
 lib/gemrb/plugins/SAVImporter.so
+%%SDLMIXER%%lib/gemrb/plugins/SDLAudio.so
 lib/gemrb/plugins/SDLVideo.so
 lib/gemrb/plugins/SPLImporter.so
 lib/gemrb/plugins/STOImporter.so
 lib/gemrb/plugins/TISImporter.so
 lib/gemrb/plugins/TLKImporter.so
-lib/gemrb/plugins/TTFImporter.so
+%%FREETYPE%%lib/gemrb/plugins/TTFImporter.so
 lib/gemrb/plugins/WAVReader.so
 lib/gemrb/plugins/WEDImporter.so
 lib/gemrb/plugins/WMPImporter.so
@ -336,9 +336,9 @@ share/applications/gemrb.desktop
 %%DATADIR%%/demo/gem-demo.ini
 %%DATADIR%%/demo/keymap.ini
 %%DATADIR%%/demo/music/mx0100.mus
-%%DATADIR%%/demo/music/mx0100/mx0100a.ogg
+%%DEMO%%%%DATADIR%%/demo/music/mx0100/mx0100a.ogg
 %%DATADIR%%/demo/music/theme.mus
-%%DATADIR%%/demo/music/theme/themea.ogg
+%%DEMO%%%%DATADIR%%/demo/music/theme/themea.ogg
 %%DATADIR%%/demo/override/AMB_D18.ogg
 %%DATADIR%%/demo/override/AR0100.WED
 %%DATADIR%%/demo/override/AR0100HT.BMP
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -200,7 +200,7 @@
    SUBDIR += flphoto
    SUBDIR += fly
    SUBDIR += fortytwo
-    SUBDIR += fotoxx
+    SUBDIR += fotocx
    SUBDIR += founts
    SUBDIR += fracplanet
    SUBDIR += fractgen
@ -594,6 +594,7 @@
    SUBDIR += nurbs++
    SUBDIR += nvidia-drm-510-kmod
    SUBDIR += nvidia-drm-515-kmod
+    SUBDIR += nvidia-drm-61-kmod
    SUBDIR += nvidia-drm-kmod
    SUBDIR += nvidia-texture-tools
    SUBDIR += ocaml-cairo
--- a/graphics/cimg/Makefile
+++ b/graphics/cimg/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	cimg
 DISTVERSIONPREFIX=	v.
-DISTVERSION=	3.3.3
+DISTVERSION=	3.3.4
 PORTEPOCH=	3
 CATEGORIES=	graphics devel

@ -18,7 +18,7 @@ LICENSE_PERMS_CeCILL_C=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LICENSE_PERMS_CeCILL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

 USE_GITHUB=	yes
-GH_ACCOUNT=	dtschump
+GH_ACCOUNT=	GreycLab
 GH_PROJECT=	CImg

 BUILD_WRKSRC=	${WRKSRC}/examples
--- a/graphics/cimg/distinfo
+++ b/graphics/cimg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1705246100
-SHA256 (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 13bf5467952a5973d50d043c270b23c172de8cb89d8202d30d189aef1e506749
-SIZE (dtschump-CImg-v.3.3.3_GH0.tar.gz) = 12663036
+TIMESTAMP = 1708461480
+SHA256 (GreycLab-CImg-v.3.3.4_GH0.tar.gz) = 60d5f58e181f2fd6dd3f7d2c2bab96b32a5d7449056c5a4ed4f88677711ce6e7
+SIZE (GreycLab-CImg-v.3.3.4_GH0.tar.gz) = 12665519
--- a/graphics/fotocx/Makefile
+++ b/graphics/fotocx/Makefile
@ -1,13 +1,12 @@
-PORTNAME=	fotoxx
-PORTVERSION=	23.82
-PORTREVISION=	1
+PORTNAME=	fotocx
+PORTVERSION=	24.11
 CATEGORIES=	graphics
 MASTER_SITES=	https://kornelix.net/downloads/downloads/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source

 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Image editing and collection management program
-WWW=		https://kornelix.net/fotoxx/fotoxx.html
+WWW=		https://kornelix.net/fotocx/fotocx.html

 LICENSE=	GPLv3+

@ -22,7 +21,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \

 USES=		desktop-file-utils gmake gnome jpeg pkgconfig
 USE_GNOME=	cairo glib20 gdkpixbuf2 gtk30
-ALL_TARGET=	fotoxx
+ALL_TARGET=	${PORTNAME}
 CXXFLAGS+=	-Wno-register -Wno-writable-strings

 WRKSRC=		${WRKDIR}/${PORTNAME}
@ -31,11 +30,7 @@ PORTDOCS=	*

 OPTIONS_DEFINE=	DOCS

-post-patch:
-	@${REINPLACE_CMD} -e \
-		'/#include/s,wait\.h,sys/&,' ${WRKSRC}/fotoxx.h
-
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}

 .include <bsd.port.mk>
--- a/graphics/fotocx/distinfo
+++ b/graphics/fotocx/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1707302474
+SHA256 (fotocx-24.11-source.tar.gz) = bc3e12a7ae2deb80ff41b14d392f15010eed93eb383dd184d605967c47a78b95
+SIZE (fotocx-24.11-source.tar.gz) = 16322678
--- a/graphics/fotocx/files/patch-Makefile
+++ b/graphics/fotocx/files/patch-Makefile
--- a/graphics/fotocx/files/patch-f.file.cc
+++ b/graphics/fotocx/files/patch-f.file.cc
--- a/graphics/fotocx/files/patch-f.refine.cc
+++ b/graphics/fotocx/files/patch-f.refine.cc
--- a/graphics/fotocx/files/patch-fotocx.cc
+++ b/graphics/fotocx/files/patch-fotocx.cc
@ -1,19 +1,19 @@
--- fotoxx.cc.orig	2023-12-02 22:45:44 UTC
-+++ fotoxx.cc
-@@ -294,7 +294,7 @@ int main(int argc, ch *argv[])                        
-    //  delete fotoxx temp files if owner process is no longer running
-    
+--- fotocx.cc.orig	2024-02-07 10:14:27 UTC
+++ fotocx.cc
+@@ -317,7 +317,7 @@ int main(int argc, ch *argv[])
+    //  delete fotocx temp files if owner process is no longer running
+ 
    pidlist = 0;
-   snprintf(buff,200,"pidof fotoxx fotoxx.x");                                   //  get active fotoxx PIDs                23.3
-+   snprintf(buff,200,"pgrep -d\\  fotoxx fotoxx.x");
+-   snprintf(buff,200,"pidof fotocx fotocx.x");                                   //  get active fotocx PIDs                23.3
+   snprintf(buff,200,"pgrep -d\\  fotocx fotocx.x");
    fid = popen(buff,"r");
    if (fid) {
-       pp = fgets_trim(buff,200,fid);                                           
-@@ -432,13 +432,15 @@ int main(int argc, ch *argv[])                        
+       pp = fgets_trim(buff,200,fid);
+@@ -455,13 +455,15 @@ int main(int argc, ch *argv[])
 
    //  get SMP thread count                                                      //  23.3
 
-   NSMP = 0;                                                                     //  assume at least 4 threads   
+-   NSMP = 0;                                                                     //  assume at least 4 threads
 +   NSMP = get_nprocs();
 +#if 0
    fid = popen("lscpu | grep 'CPU(s):'","r");
@ -23,6 +23,6 @@
       if (pp && strmatchN(pp,"CPU(s):",7)) NSMP = atoi(pp+8);                    //  default: 2 per P-core + 1 per E-core
    }
 +#endif
-    if (NSMP < 1) {                                                               //  23.80 
+    if (NSMP < 1) {                                                               //  23.80
       Plog(1,"cannot get SMP thread count, assume 4 \n");
       NSMP = 4;
--- a/graphics/fotocx/files/patch-zfuncs.cc
+++ b/graphics/fotocx/files/patch-zfuncs.cc
--- a/Show More
+++ b/Show More