diff --git a/archivers/ccmix/Makefile b/archivers/ccmix/Makefile
index 7bae252ed46b..3f79a0bb8e00 100644
--- a/archivers/ccmix/Makefile
+++ b/archivers/ccmix/Makefile
@@ -1,45 +1,46 @@
 PORTNAME=	ccmix
 PORTVERSION=	g20170612
+PORTREVISION=	1
 CATEGORIES=	archivers games
 MASTER_SITES=	SF/xccu/XCC%20Mixer/XCC%20Mixer%201.44:dat
 DISTFILES=	XCC_Mixer-1.44.zip:dat
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Westwood Studios MIX format file manipulator
 WWW=		https://github.com/OmniBlade/ccmix
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 USES=		gmake pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	OmniBlade
 GH_TAGNAME=	4369c8f
 
 PLIST_FILES=	bin/ccmix bin/gmdedit bin/mixkey \
 		${DATADIR_REL}/global\ mix\ database.dat
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/ccmix program usage/s,/n,\\n, ; \
 		/gmd_dir/s,/usr/share/ccmix,${DATADIR},' \
 			${WRKSRC}/src/ccmix.cpp
 	@${REINPLACE_CMD} -e '/char2num/s,const static,& signed,' \
 		${WRKSRC}/src/mixkey/mix_dexoder.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/build/* \
 		${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/global\ mix\ database.dat \
 		${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${INSTALL_WRKSRC}/,} \
 		${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-client/Makefile b/archivers/urbackup-client/Makefile
index 0cff8d776a4a..a413f9ce015a 100644
--- a/archivers/urbackup-client/Makefile
+++ b/archivers/urbackup-client/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	urbackup-client
 DISTVERSION=	2.5.20.0
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Client/${DISTVERSION:R}/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Client component of the UrBackup backup system
 WWW=		https://www.urbackup.org
 
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 USES=		autoreconf compiler:c++11-lang dos2unix gettext libtool \
 		localbase pkgconfig sqlite:3
 USE_RC_SUBR=	urbackup_client
 
 USERS=		urbackup
 GROUPS=		urbackup
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-clientupdate \
 		--without-embedded-sqlite3
-CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
 
 SUB_FILES=	pkg-message urbackupclient.conf.sample-daemon
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 OPTIONS_DEFINE=	GUI
 OPTIONS_SUB=	yes
 
 GUI_DESC=		GTK2 Tray Icon
 GUI_USE=		WX=3.0+
 GUI_CONFIGURE_ON=	--with-wx-config=${WX_CONFIG}
 GUI_CONFIGURE_OFF=	--enable-headless
 
 CONFFILES=	mariadbdump.conf mariadbxtrabackup.conf postgresbase.conf \
 		postgresqldump.conf
 
 post-patch:
 	@${SED} -i "" -e "s:%%PREFIX%%:${PREFIX}:g" \
 		${WRKSRC}/urbackupclient/backup_scripts/postgresqldump
 
 post-stage:
 	${INSTALL_DATA} ${WRKDIR}/urbackupclient.conf.sample-daemon \
 		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupclient.conf.sample
 
 	${INSTALL_DATA} ${FILESDIR}/urbackupclient.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupclient.conf
 
 	${INSTALL_MAN} ${WRKSRC}/docs/urbackupclientbackend.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1
 
 .for f in ${CONFFILES}
 	${MV} ${STAGEDIR}${PREFIX}/etc/urbackup/${f} ${STAGEDIR}${PREFIX}/etc/urbackup/${f}.sample
 .endfor
 
 	${RM} ${STAGEDIR}/var/urbackup/version.txt
 	${RM} ${STAGEDIR}${PREFIX}/share/urbackup/urbackup_ecdsa409k1.pub
 
 .include <bsd.port.mk>
diff --git a/archivers/urbackup-server/Makefile b/archivers/urbackup-server/Makefile
index 87d6c189a8be..05e8969b1d46 100644
--- a/archivers/urbackup-server/Makefile
+++ b/archivers/urbackup-server/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	urbackup-server
 DISTVERSION=	2.5.26
+PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	https://hndl.urbackup.org/Server/${DISTVERSION}/
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	Server component of the UrBackup backup system
 WWW=		https://www.urbackup.org
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/server-license.txt
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp \
 		libcurl.so:ftp/curl \
 		liblmdb.so:databases/lmdb
 
 USES=		autoreconf compiler:c++11-lang dos2unix fakeroot fuse \
 		libtool lua:53+ pkgconfig sqlite:3
 DOS2UNIX_GLOB=	*.c *.cpp *.h *.am
 USE_RC_SUBR=	urbackup_server
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-packaging --with-mountvhd --without-embedded-sqlite3 --without-embedded-lmdb --without-embedded-lua
-CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message urbackupsrv.conf.sample-daemon
 
 USERS=		urbackup
 GROUPS=		urbackup
 
 post-patch:
 	@(cd ${WRKSRC} && ${REINPLACE_CMD} -e 's|/etc/urbackup|${PREFIX}/etc/urbackup|g' \
 		mount_helper/main.cpp \
 		urbackupserver/server.cpp \
 		urbackupserver/serverinterface/settings.cpp \
 		urbackupserver/dllmain.cpp \
 		snapshot_helper/main.cpp \
 	)
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/urbackup
 	${INSTALL_DATA} ${WRKDIR}/urbackupsrv.conf.sample-daemon \
 		${STAGEDIR}${PREFIX}/etc/urbackup/urbackupsrv.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${FILESDIR}/urbackupsrv.conf-newsyslog \
 		${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/urbackupsrv.conf
 
 	${INSTALL_MAN} ${WRKSRC}/docs/urbackupsrv.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index cba6a9c5622d..e94a2994d91f 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -1,200 +1,200 @@
 PORTNAME=	gdal
 PORTVERSION=	3.5.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 MASTER_SITES=	https://download.osgeo.org/gdal/${PORTVERSION}/ \
 		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Translator library for raster geospatial data formats
 WWW=		https://gdal.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
 BUILD_DEPENDS=	libgeotiff>=1.5.0:graphics/libgeotiff \
 		proj>=6,1:graphics/proj
 LIB_DEPENDS=	libgeotiff.so:graphics/libgeotiff \
 		libgif.so:graphics/giflib \
 		libjson-c.so:devel/json-c \
 		libpng.so:graphics/png \
 		libproj.so:graphics/proj \
 		libqhull_r.so:math/qhull \
 		libtiff.so:graphics/tiff
 
 USES=		compiler:c++17-lang cpe gmake iconv jpeg localbase pkgconfig ssl tar:xz
 
 CFLAGS+=	-fPIC
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share \
 		--enable-static=yes \
 		--with-cpp14 \
 		--with-crypto=yes \
 		--with-geotiff=yes \
 		--with-gif=yes \
 		--with-gnm=yes \
 		--with-jpeg=yes \
 		--with-libjson-c=yes \
 		--with-liblzma=yes \
 		--with-libtiff=yes \
 		--with-libz=/usr \
 		--with-msg=no \
 		--with-pcidsk=internal \
 		--with-pcraster=internal \
 		--with-png=yes \
 		--with-proj=yes \
 		--with-qhull=yes \
 		--with-threads=yes \
 		--without-jpeg12 \
 		--without-libtool \
 		${ICONV_CONFIGURE_ARG}
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${WRKSRC} ${ICONV_LIB}
 MAKEFILE=	GNUmakefile
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 SLAVEDIRS=	graphics/py-gdal
 
 CPE_VENDOR=	osgeo
 
 HEADER_FILES=	alg/gdalwarpkernel_opencl.h \
 		alg/gvgcpfit.h \
 		alg/internal_qhull_headers.h \
 		alg/thinplatespline.h\
 		gcore/gdalexif.h \
 		gcore/gdaljp2metadatagenerator.h \
 		gcore/gdalsse_priv.h \
 		gnm/gnm_priv.h \
 		port/cpl_aws.h \
 		port/cpl_cpu_features.h \
 		port/cpl_google_cloud.h \
 		port/cpl_sha1.h \
 		port/cpl_sha256.h \
 		port/cpl_vsil_curl_priv.h \
 		port/cpl_worker_thread_pool.h
 
 OPTIONS_DEFINE=	ARMADILLO BRUNSLI CFITSIO CRYPTOPP CURL DEFLATE ECW EXPAT EXR FREEXL GEOS GTA HDF5 HEIF KML LERC LIBXML2 LZ4 MYSQL NETCDF ODBC OPENJPEG PCRE PCRE2 PGSQL RASTERLITE2 SFCGAL SPATIALITE SQLITE TILEDB WEBP XERCES ZSTD
 OPTIONS_RADIO=	PDF
 OPTIONS_RADIO_PDF=	PODOFO POPPLER
 OPTIONS_DEFAULT=CURL EXPAT FREEXL GEOS LIBXML2 LZ4 OPENJPEG PCRE2 PGSQL POPPLER WEBP ZSTD \
 		HDF5 KML NETCDF SPATIALITE SFCGAL SQLITE XERCES
 OPTIONS_SUB=	yes
 BRUNSLI_DESC=	Brunsli support via libbrunsli library
 CRYPTOPP_DESC=	Cryptopp support
 DEFLATE_DESC=	Faster deflate support via libdeflate library
 EXR_DESC=	EXR support via OpenEXR library
 LERC_DESC=	LERC (Limited Error Raster Compression) support
 PCRE_DESC=	Regular expression support for SQLite
 PCRE2_DESC=	Regular expression support for SQLite
 RASTERLITE2_DESC=	RasterLite2 support
 TILEDB_DESC=	TileDB support
 
 ARMADILLO_CONFIGURE_OFF=--with-armadillo=no
 ARMADILLO_CONFIGURE_ON=	--with-armadillo=${LOCALBASE}
 ARMADILLO_LIB_DEPENDS=	libarmadillo.so:math/armadillo
 BRUNSLI_CONFIGURE_WITH=	brunsli
 BRUNSLI_LIB_DEPENDS=	libbrunslidec-c.so:graphics/brunsli
 CFITSIO_CONFIGURE_WITH=	cfitsio
 CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 CRYPTOPP_CONFIGURE_OFF=	--with-cryptopp=no
 CRYPTOPP_CONFIGURE_ON=	--with-cryptopp=${LOCALBASE}
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CURL_CONFIGURE_OFF=	--with-curl=no
 CURL_CONFIGURE_ON=	--with-curl=${LOCALBASE}/bin/curl-config
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 DEFLATE_CONFIGURE_WITH=	libdeflate
 DEFLATE_LIB_DEPENDS=	libdeflate.so:archivers/libdeflate
 ECW_CONFIGURE_WITH=	ecw
 ECW_LIB_DEPENDS=	libNCSEcw.so:graphics/libecwj2
 EXPAT_CONFIGURE_WITH=	expat
 EXPAT_LIB_DEPENDS=	libexpat.so:textproc/expat2
 EXR_CONFIGURE_WITH=	exr
 EXR_LIB_DEPENDS=	libImath.so:math/Imath \
 			libOpenEXR.so:graphics/openexr
 EXR_CFLAGS=		-DInt64=uint64_t
 FREEXL_CONFIGURE_WITH=	freexl
 FREEXL_LIB_DEPENDS=	libfreexl.so:textproc/freexl
 GEOS_CONFIGURE_OFF=	--with-geos=no
 GEOS_CONFIGURE_ON=	--with-geos=${LOCALBASE}/bin/geos-config
 GEOS_LIB_DEPENDS=	libgeos.so:graphics/geos
 GTA_CONFIGURE_WITH=	gta
 GTA_LIB_DEPENDS=	libgta.so:devel/libgta
 HDF5_CONFIGURE_WITH=	hdf5
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HEIF_CONFIGURE_WITH=	heif
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 KML_CONFIGURE_WITH=	libkml
 KML_LIB_DEPENDS=	libkmlbase.so:science/libkml
 LERC_CONFIGURE_OFF=	--with-lerc=no
 LERC_CONFIGURE_ON=	--with-lerc=${LOCALBASE}
 LERC_LIB_DEPENDS=	libLerc.so:graphics/lerc
 LIBXML2_CONFIGURE_OFF=	--with-xml2=no
 LIBXML2_CONFIGURE_ON=	--with-xml2=yes
 LIBXML2_LIB_DEPENDS=	libxml2.so:textproc/libxml2
 LZ4_CONFIGURE_OFF=	--with-lz4=no
 LZ4_CONFIGURE_ON=	--with-lz4=yes
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 MYSQL_CONFIGURE_OFF=	--with-mysql=no
 MYSQL_CONFIGURE_ON=	--with-mysql=${LOCALBASE}/bin/mysql_config
 MYSQL_USES=		mysql
 NETCDF_CONFIGURE_WITH=	netcdf
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 ODBC_CONFIGURE_WITH=	odbc
 ODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 OPENJPEG_BUILD_DEPENDS=	openjpeg>=2.1.0:graphics/openjpeg
 OPENJPEG_CONFIGURE_WITH=openjpeg
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 PCRE_CONFIGURE_WITH=	pcre
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE2_CONFIGURE_WITH=	pcre2
 PCRE2_LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 PGSQL_CONFIGURE_WITH=	pg
 PGSQL_USES=		pgsql
 PODOFO_CONFIGURE_WITH=	podofo
 PODOFO_LIB_DEPENDS=	libpodofo.so:graphics/podofo
 POPPLER_CONFIGURE_WITH=	poppler=${LOCALBASE}
 POPPLER_LIB_DEPENDS=	libpoppler.so:graphics/poppler
 RASTERLITE2_CONFIGURE_OFF=	--with-rasterlite2=no
 RASTERLITE2_CONFIGURE_ON=	--with-rasterlite2=${LOCALBASE}
 RASTERLITE2_LIB_DEPENDS=librasterlite2.so:graphics/librasterlite2
 SFCGAL_CONFIGURE_OFF=	--with-sfcgal=no
 SFCGAL_CONFIGURE_ON=	--with-sfcgal=${LOCALBASE}/bin/sfcgal-config
 SFCGAL_LIB_DEPENDS=	libSFCGAL.so:databases/sfcgal
 SPATIALITE_CONFIGURE_WITH=	spatialite
 SPATIALITE_LIB_DEPENDS=	libspatialite.so:databases/spatialite
 SQLITE_CONFIGURE_WITH=	sqlite3
 SQLITE_USES=		sqlite
 TILEDB_CONFIGURE_OFF=	--with-tiledb=no
 TILEDB_CONFIGURE_ON=	--with-tiledb=${LOCALBASE}
 TILEDB_LIB_DEPENDS=	libtiledb.so:databases/tiledb
 WEBP_CONFIGURE_WITH=	webp
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 XERCES_CONFIGURE_WITH=	xerces
 XERCES_LIB_DEPENDS=	libxerces-c.so:textproc/xerces-c3
 ZSTD_CONFIGURE_WITH=	zstd
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
 
 post-patch:
 # Clean up bundled libraries
 	@${RM} -r ${WRKSRC}/alg/internal_libqhull/
 	@${RM} -r ${WRKSRC}/frmts/gif/giflib/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libgeotiff/
 	@${RM} -r ${WRKSRC}/frmts/gtiff/libtiff/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg/
 	@${RM} -r ${WRKSRC}/frmts/jpeg/libjpeg12/
 	@${RM} -r ${WRKSRC}/frmts/png/libpng/
 	@${RM} -r ${WRKSRC}/frmts/zlib/
 	@${RM} -r ${WRKSRC}/ogr/ogrsf_frmts/geojson/libjson/
 	@${RM} -r ${WRKSRC}/third_party/LercLib/
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/scripts/gdal-bash-completion.sh ${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${HEADER_FILES} ${STAGEDIR}${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
 	${INSTALL_DATA} ${WRKSRC}/GDALmake.opt ${STAGEDIR}${DATADIR}/
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdal.so
 
 .include <bsd.port.mk>
diff --git a/multimedia/kvazaar/Makefile b/multimedia/kvazaar/Makefile
index 86a97b5f862d..35e585ddf1e5 100644
--- a/multimedia/kvazaar/Makefile
+++ b/multimedia/kvazaar/Makefile
@@ -1,43 +1,44 @@
 PORTNAME=	kvazaar
 DISTVERSIONPREFIX=	v
 DISTVERSION?=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	H.265/HEVC encoder implemented in C
 WWW=		http://ultravideo.cs.tut.fi/ #encoder
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ultravideo
 GH_TUPLE=	silentbicycle:greatest:v1.0.0:greatest/greatest
 
 CONFLICTS_INSTALL?=	${PORTNAME}-devel
 
 USES=		autoreconf compiler:c11 libtool pathfix
 GNU_CONFIGURE=	yes
 TEST_TARGET=	check
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	ASM CRYPTOPP DOCS
 OPTIONS_DEFAULT=ASM
 
 ASM_BUILD_DEPENDS=	${ASM_BUILD_DEPENDS_${ARCH}}
 ASM_BUILD_DEPENDS_amd64=yasm:devel/yasm
 ASM_BUILD_DEPENDS_i386=	yasm:devel/yasm
 ASM_CONFIGURE_ENABLE=	asm
 
 CRYPTOPP_DESC=		Selective encryption via Crypto++ library
 CRYPTOPP_LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 CRYPTOPP_USES=		pkgconfig
 CRYPTOPP_CONFIGURE_WITH=cryptopp
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/x86_64/&|amd64/' \
 		-e '/AM_INIT_AUTOMAKE/s/])/ serial-tests&/' \
 		${WRKSRC}/configure.ac
 
 .include <bsd.port.mk>
diff --git a/net-p2p/amule-devel/Makefile b/net-p2p/amule-devel/Makefile
index 910ffaafb2b4..71b0133156cb 100644
--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@@ -1,115 +1,114 @@
 PORTNAME=	amule
 PORTVERSION=	11065
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	aMule-SVN-r${PORTVERSION}
 
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	All-platform eMule p2p client
 WWW=		https://www.amule.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 CONFLICTS=	amule
 
 USES=		bison compiler:c++11-lang cpe desktop-file-utils desktop-file-utils \
 		gmake localbase:ldflags perl5 pkgconfig shebangfix tar:bzip2
 USE_PERL5=	build
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
 
 SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
 		docdir='$${prefix}/${DOCSDIR_REL}'
 
-CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
 LDFLAGS+=	-lpthread
 
 OPTIONS_DEFINE=	ALC ALCC AMULECMD AMULEDAEMON AMULEGUI BOOST CAS DEBUG DOCS \
 	ED2K FILEVIEW MMAP MONOLITHIC NLS OPTIMIZED_CFLAGS UPNP \
 	WEBSERVER WXCAS XAS
 ALC_DESC=		Compile aMule Link Creator for GUI
 ALCC_DESC=		Compile aMule Link Creator for console
 AMULECMD_DESC=		Compile aMule command line client
 AMULEDAEMON_DESC=	Compile aMule daemon version
 AMULEGUI_DESC=		Compile aMule remote GUI
 CAS_DESC=		Compile aMule Statistics for console
 ED2K_DESC=		Compile aMule ed2k links handler
 FILEVIEW_DESC=		Compile file viewer for console
 MMAP_DESC=		Use mapped memory
 MONOLITHIC_DESC=	Compile monolithic aMule
 WXCAS_DESC=		Compile aMule Statistics for GUI
 XAS_DESC=		Install XChat2 plugin
 OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \
 	FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS
 
 OPTIONS_SUB=	yes
 
 DEBUG_CONFIGURE_ON=	--enable-debug
 
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 ALC_CONFIGURE_ON=	--enable-alc
 
 ALCC_CONFIGURE_ON=	--enable-alcc
 
 AMULECMD_CONFIGURE_ON=	--enable-amulecmd
 AMULECMD_USES=		readline
 
 AMULEDAEMON_CONFIGURE_ON=	--enable-amule-daemon
 AMULEDAEMON_USE=	RC_SUBR=amuled
 
 AMULEGUI_CONFIGURE_ON=	--enable-amule-gui
 
 BOOST_CONFIGURE_ON=	--with-boost
 BOOST_LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 
 CAS_CONFIGURE_ON=	--enable-cas
 CAS_LIB_DEPENDS=	libgd.so:graphics/gd
 
 ED2K_CONFIGURE_OFF=	--disable-ed2k
 ED2K_CONFLICTS=		ed2k-hash*
 
 FILEVIEW_CONFIGURE_ON=	--enable-fileview
 
 MMAP_CONFIGURE_ON=	--enable-mmap
 
 MONOLITHIC_CONFIGURE_OFF=	--disable-monolithic
 
 UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
 
 WEBSERVER_CONFIGURE_ON=	--enable-webserver
 WEBSERVER_LIB_DEPENDS=	libpng.so:graphics/png
 WEBSERVER_USES=		readline
 
 WXCAS_CONFIGURE_ON=	--enable-wxcas
 
 XAS_CONFIGURE_ON=	--enable-xas
 XAS_USE=	PERL5+=run
 
 OPTIMIZED_CFLAGS_CONFIGURE_ON=	--enable-optimize
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
 		-e '/if.*test/s/==/=/' \
 		${WRKSRC}/configure
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
 		${WRKSRC}/docs/Makefile.in
 
 post-install-FILEVIEW-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net-p2p/amule/Makefile b/net-p2p/amule/Makefile
index b8554e095498..b035ad7d4426 100644
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@@ -1,118 +1,117 @@
 PORTNAME=	amule
 PORTVERSION=	2.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
 
 MAINTAINER=	bar@FreeBSD.org
 COMMENT=	All-platform eMule p2p client
 WWW=		https://www.amule.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/docs/COPYING
 
 LIB_DEPENDS=	libcryptopp.so:security/cryptopp
 
 USES=		bison compiler:c++11-lang cpe desktop-file-utils gmake \
 		localbase:ldflags perl5 pkgconfig shebangfix tar:xz
 USE_PERL5=	build
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-denoise-level=0
 
 CONFIGURE_ENV=	LEX="${FLEX}" PKG_CONFIG="${PKG_CONFIG}" \
 		docdir='$${prefix}/${DOCSDIR_REL}'
 
-CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
 LDFLAGS+=	-lpthread
 
 SHEBANG_FILES=	src/utils/scripts/*.pl src/utils/xas/*.pl src/libs/ec/*.pl
 
 CONFLICTS_INSTALL=	amule-devel
 
 OPTIONS_DEFINE=	ALC ALCC AMULECMD AMULEDAEMON AMULEGUI BOOST CAS DEBUG \
 	DOCS ED2K FILEVIEW MMAP MONOLITHIC NLS UPNP WEBSERVER WXCAS XAS
 ALC_DESC=		Compile aMule Link Creator for GUI
 ALCC_DESC=		Compile aMule Link Creator for console
 AMULECMD_DESC=		Compile aMule command line client
 AMULEDAEMON_DESC=	Compile aMule daemon version
 AMULEGUI_DESC=		Compile aMule remote GUI
 CAS_DESC=		Compile aMule Statistics for console
 ED2K_DESC=		Compile aMule ed2k links handler
 FILEVIEW_DESC=		Compile file viewer for console (EXPERIMENTAL)
 MMAP_DESC=		Use mapped memory
 MONOLITHIC_DESC=	Compile monolithic aMule
 WXCAS_DESC=		Compile aMule Statistics for GUI
 XAS_DESC=		Install XChat2 plugin
 OPTIONS_DEFAULT=ALC ALCC AMULECMD AMULEDAEMON AMULEGUI CAS ED2K \
 	FILEVIEW MONOLITHIC WEBSERVER WXCAS XAS
 
 OPTIONS_SUB=	yes
 
 DEBUG_CONFIGURE_OFF=	--disable-debug
 
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
 ALC_CONFIGURE_ON=	--enable-alc
 
 ALCC_CONFIGURE_ON=	--enable-alcc
 
 AMULECMD_CONFIGURE_ON=	--enable-amulecmd
 AMULECMD_USES=		readline
 
 AMULEDAEMON_CONFIGURE_ON=	--enable-amule-daemon
 AMULEDAEMON_USE=	RC_SUBR=amuled
 
 AMULEGUI_CONFIGURE_ON=	--enable-amule-gui
 
 BOOST_CONFIGURE_ON=	--with-boost
 BOOST_LIB_DEPENDS+=	libboost_system.so:devel/boost-libs
 
 CAS_CONFIGURE_ON=	--enable-cas
 CAS_LIB_DEPENDS=	libgd.so:graphics/gd
 
 ED2K_CONFIGURE_OFF=	--disable-ed2k
 ED2K_CONFLICTS=		ed2k-hash*
 
 FILEVIEW_CONFIGURE_ON=	--enable-fileview
 
 MMAP_CONFIGURE_ON=	--enable-mmap
 
 MONOLITHIC_CONFIGURE_OFF=	--disable-monolithic
 
 UPNP_LIB_DEPENDS=	libupnp.so:devel/upnp
 UPNP_CONFIGURE_OFF=	--disable-upnp
 
 WEBSERVER_CONFIGURE_ON=	--enable-webserver
 WEBSERVER_LIB_DEPENDS=	libpng.so:graphics/png
 WEBSERVER_USES=		readline
 
 WXCAS_CONFIGURE_ON=	--enable-wxcas
 
 XAS_CONFIGURE_ON=	--enable-xas
 XAS_USE=	PERL5+=run
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAMULEGUI} || ${PORT_OPTIONS:MMONOLITHIC}
 PLIST_SUB+=	AMULESKIN=""
 .else
 PLIST_SUB+=	AMULESKIN="@comment "
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/test.*-print-file-name.*`/true/' \
 		-e '/if.*test/s/==/=/' \
 		${WRKSRC}/configure
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
 		${WRKSRC}/docs/Makefile.in
 
 post-install-FILEVIEW-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/net/ceph14/Makefile b/net/ceph14/Makefile
index 5d74b82bdf7e..211c3c8abc07 100644
--- a/net/ceph14/Makefile
+++ b/net/ceph14/Makefile
@@ -1,180 +1,180 @@
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	14.2.22
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 PKGNAMESUFFIX=	14
 
 MAINTAINER=	wjw@digiware.nl
 COMMENT=	Ceph delivers object, block, and file storage in a unified system
 WWW=		https://ceph.com/
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
 # even though i386 will build, it is not really advised.
 ONLY_FOR_ARCHS=	amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	\
 	bash:shells/bash \
 	git:devel/git \
 	gperf:devel/gperf \
 	yasm:devel/yasm \
 	${PYTHON_PKGNAMEPREFIX}sphinx>=2.1.2,1:textproc/py-sphinx@${PY_FLAVOR} \
 	${LOCALBASE}/lib/libatomic_ops.a:devel/libatomic_ops \
 	${LOCALBASE}/bin/ld:devel/binutils
 LIB_DEPENDS=	\
 	${PY_BOOST} \
 	libboost_thread.so:devel/boost-libs \
 	libnss3.so:security/nss \
 	libcryptopp.so:security/cryptopp \
 	liboath.so:security/oath-toolkit \
 	libsnappy.so:archivers/snappy \
 	libcurl.so:ftp/curl \
 	libxml2.so:textproc/libxml2 \
 	libexpat.so:textproc/expat2 \
 	liblz4.so:archivers/liblz4 \
 	libplds4.so:devel/nspr \
 	libtcmalloc.so:devel/google-perftools \
 	librabbitmq.so:net/rabbitmq-c \
 	libfmt.so:devel/libfmt
 RUN_DEPENDS=	\
 	bash:shells/bash \
 	flock:sysutils/flock \
 	jq:textproc/jq \
 	smartctl:sysutils/smartmontools \
 	xml:textproc/xmlstarlet \
 	${LOCALBASE}/bin/getopt:misc/getopt \
 	${PYTHON_PKGNAMEPREFIX}grpcio>=0:devel/py-grpcio@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}prettytable>=0:devel/py-prettytable@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}protobuf>=0:devel/py-protobuf@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pyjwt1>=0:www/py-pyjwt1@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}cherrypy>=0:www/py-cherrypy@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}pecan>=0:www/py-pecan@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
 
 USES=		cmake:noninja compiler:c++17-lang cpe dos2unix fuse gettext-runtime gmake ncurses \
 		pkgconfig python:3.8-3.9 readline shebangfix ssl
 CPE_VENDOR=	linuxfoundation
 USE_PYTHON=	cython py3kplist
 USE_OPENLDAP=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	ceph:DEFAULT
 DOS2UNIX_FILES=	src/pybind/mgr/diskprediction_cloud/common/__init__.py
 
 CONFLICTS_INSTALL=	ceph
 PORTSCOUT=	limit:^v14\.
 
 GH_TUPLE+=	ceph:ceph-erasure-code-corpus:2d7d78b:ceph_erasure_code_corpus/ceph-erasure-code-corpus
 GH_TUPLE+=	ceph:ceph-object-corpus:e32bf8c:ceph_object_corpus/ceph-object-corpus
 GH_TUPLE+=	ceph:civetweb:bb99e93:civetweb/src/civetweb
 GH_TUPLE+=	01org:isa-l_crypto:603529a:isa_l_crypto/src/crypto/isa-l/isa-l_crypto
 GH_TUPLE+=	ceph:dmclock:4496dbc:dmclock/src/dmclock
 GH_TUPLE+=	ceph:gf-complete:7e61b44:gf_complete/src/erasure-code/jerasure/gf-complete
 GH_TUPLE+=	ceph:jerasure:96c76b8:jerasure/src/erasure-code/jerasure/jerasure
 GH_TUPLE+=	ceph:googletest:fdb8504:googletest/src/googletest
 GH_TUPLE+=	ceph:isa-l:7e1a337:isa_l/src/isa-l
 GH_TUPLE+=	ceph:lua:1fce39c:lua/src/lua
 GH_TUPLE+=	ceph:rapidjson:f54b0e4:rapidjson/src/rapidjson
 GH_TUPLE+=	ceph:rocksdb:4c736f1:rocksdb/src/rocksdb
 GH_TUPLE+=	ceph:xxHash:1f40c65:xxHash/src/xxHash
 GH_TUPLE+=	facebook:zstd:b706286:zstd/src/zstd
 GH_TUPLE+=	ceph:spawn:5f4742f:spawn/src/spawn
 
 OPTIONS_DEFINE=	TESTS
 OPTIONS_SUB=	yes
 
 CMAKE_BUILD_TYPE=	Release
 CMAKE_ON=	WITH_SYSTEM_BOOST WITH_BOOST_CONTEXT WITH_FUSE WITH_PYTHON3
 CMAKE_OFF=	WITH_LTTNG WITH_BABELTRACE WITH_KRBD WITH_XFS WITH_LEVELDB \
 		WITH_SPDK WITH_RDMA WITH_MGR_DASHBOARD_FRONTEND WITH_PYTHON2 \
 		WITH_RADOSGW_KAFKA_ENDPOINT WITH_LEVELDB
 CMAKE_ARGS=	-DMGR_PYTHON_VERSION=${PYTHON_VER} \
 		-DCEPH_MAN_DIR:STRING=man
 
 SHEBANG_FILES=	src/rbdmap src/ceph-post-file.in src/rbd-replay-many \
 		src/tools/ceph-monstore-update-crush.sh src/mount.fuse.ceph \
 		src/ceph-create-keys
 
 TESTS_DESC=	Build test/debug tools
 TESTS_CMAKE_ON=	-DWITH_TESTS:BOOL=ON
 TESTS_CMAKE_OFF=-DWITH_TESTS:BOOL=OFF
 
 USE_RC_SUBR=	ceph
 USE_LDCONFIG=	yes
 
 USERS=		ceph
 GROUPS=		ceph
 
 BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 
 # PLIST_SUB=CMAKE_BUILD_TYPE_regex="[[:<:]]debug[[:>:]]"
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64
 PLIST_SUB+=	NO_AMD64="@comment "
 .else
 PLIST_SUB+=	NO_AMD64=""
 .endif
 
 pre-configure:
 	[ -e ${WRKSRC}/build ] || ${LN} -s ${CONFIGURE_WRKSRC} ${WRKSRC}/build
 	${CP} files/file-git_version ${WRKSRC}/src/.git_version
 	# Use the module finders that come with Cmake for Boost and Python
 	${RM} ${WRKSRC}/cmake/modules/FindBoost.cmake || true
 	# Cleanup after patching
 	${RM} ${WRKSRC}/src/pybind/mgr/diskprediction_cloud/common/__init__.py.orig
 
 post-install:
 	# To install a ceph.conf sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/ceph
 	${INSTALL_DATA} ${WRKSRC}/src/sample.ceph.conf ${STAGEDIR}${PREFIX}/etc/ceph/ceph.conf.sample
 	# Get logging and rotation working
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} files/file-newsyslog_ceph-log.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	# Create directories used bij daemons
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-rgw
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/bootstrap-mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mds
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mon
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/osd
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/mgr
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/tmp
 	${MKDIR} ${STAGEDIR}/var/lib/ceph/radosgw
 	# For PID files and command sockets and log files
 	${MKDIR} ${STAGEDIR}/var/log/ceph
 	${MKDIR} ${STAGEDIR}/var/run/ceph
 	# Use the Ceph init.d script as the interface to regular
 	# starting and stopping daemons. rc.d work is done thru
 	# a separate rc.d/ceph script calling init-ceph again.
 	${MV} ${STAGEDIR}${PREFIX}/etc/init.d/ceph ${STAGEDIR}${PREFIX}/bin/init-ceph
 	# remove files not packaged
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.fetch_config
 	${RM} ${STAGEDIR}${DOCSDIR}/sample.ceph.conf
 	${RMDIR} ${STAGEDIR}${DOCSDIR}
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_bench_log
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_multi_stress_watch
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_perf*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_psim
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_scratchtoolpp
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_smalliobench*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_test*
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_tpbench
 	${RM} ${STAGEDIR}${PREFIX}/bin/ceph_xattr_bench
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-disk-udev
 	${RM} ${STAGEDIR}${PREFIX}/sbin/ceph-volume-systemd
 	${RM} -rf ${STAGEDIR}${PREFIX}/libexec/systemd
 	${RMDIR} ${STAGEDIR}${PREFIX}/etc/init.d
 
 .include <bsd.port.mk>
diff --git a/net/megacmd/Makefile b/net/megacmd/Makefile
index c5bfa0264a4d..184f9f9623f0 100644
--- a/net/megacmd/Makefile
+++ b/net/megacmd/Makefile
@@ -1,102 +1,101 @@
 PORTNAME=	megacmd
 DISTVERSION=	1.5.0
+PORTREVISION=	1
 DISTVERSIONSUFFIX=	_Linux
 CATEGORIES=	net
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command Line Interactive and Scriptable Application to access MEGA
 WWW=		https://mega.nz/cm
 
 LICENSE=	GPLv3 BSD2CLAUSE
 LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libcares.so:dns/c-ares libcryptopp.so:security/cryptopp \
 		libcurl.so:ftp/curl libsodium.so:security/libsodium \
 		libuv.so:devel/libuv libpcre.so:devel/pcre
 
 USES=		autoreconf libtool sqlite:3 readline shebangfix ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	meganz
 GH_PROJECT=	MEGAcmd sdk:sdk
 GH_SUBDIR=	sdk:sdk
 GH_TAGNAME=	v3.9.11a:sdk
 
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	src/client/mega-lpwd \
 		src/client/mega-permissions \
 		src/client/mega-ls \
 		src/client/mega-pwd \
 		src/client/mega-deleteversions \
 		src/client/mega-log \
 		src/client/mega-session \
 		src/client/mega-share \
 		src/client/mega-quit \
 		src/client/mega-reload \
 		src/client/mega-find \
 		src/client/mega-errorcode \
 		src/client/mega-logout \
 		src/client/mega-backup \
 		src/client/mega-exclude \
 		src/client/mega-confirmcancel \
 		src/client/mega-transfers \
 		src/client/mega-rm \
 		src/client/mega-invite \
 		src/client/mega-webdav \
 		src/client/mega-cancel \
 		src/client/mega-cp \
 		src/client/mega-cd \
 		src/client/mega-thumbnail \
 		src/client/mega-attr \
 		src/client/mega-login \
 		src/client/mega-speedlimit \
 		src/client/mega-get \
 		src/client/mega-debug \
 		src/client/mega-du \
 		src/client/mega-ipc \
 		src/client/mega-mv \
 		src/client/mega-whoami \
 		src/client/mega-https \
 		src/client/mega-help \
 		src/client/mega-showpcr \
 		src/client/mega-lcd \
 		src/client/mega-preview \
 		src/client/mega-ftp \
 		src/client/mega-put \
 		src/client/mega-graphics \
 		src/client/mega-mount \
 		src/client/mega-import \
 		src/client/mega-version \
 		src/client/mega-confirm \
 		src/client/mega-mkdir \
 		src/client/mega-userattr \
 		src/client/mega-signup \
 		src/client/mega-passwd \
 		src/client/mega-killsession \
 		src/client/mega-sync \
 		src/client/mega-users \
 		src/client/mega-export \
 		src/client/mega-cat \
 		src/client/mega-mediainfo \
 		src/client/mega-proxy \
 		src/client/mega-df \
 		src/client/mega-tree
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-examples \
 		--disable-java --disable-php --disable-python \
 		--disable-chat --without-freeimage \
 		--without-termcap --without-ffmpeg --without-libraw \
 		--without-libzen --without-libmediainfo \
 		--enable-gcc-hardening \
 		--with-cares=${LOCALBASE} --with-cryptopp=${LOCALBASE} \
 		--with-curl=${LOCALBASE} --with-sodium=${LOCALBASE} \
 		--with-sqlite=${LOCALBASE} --with-libuv=${LOCALBASE} \
 		--with-zlib --with-readline=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
-CXXFLAGS+=	`pkgconf --cflags-only-other libcryptopp`
-
 .include <bsd.port.mk>
diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index 193bc797cf85..f9fa20a3d824 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -1,113 +1,97 @@
 PORTNAME=	cryptopp
-PORTVERSION=	8.6.0
+PORTVERSION=	8.7.0
 CATEGORIES=	security
 MASTER_SITES=	http://www.cryptopp.com/
 DISTNAME=	cryptopp${PORTVERSION:S/.//g}
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Free C++ class library of Cryptographic Primitives
 WWW=		https://www.cryptopp.com/
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
 USES=		cpe compiler:c++11-lang gmake zip
 USE_LDCONFIG=	yes
 CPE_PRODUCT=	crypto++
 CPE_VENDOR=	cryptopp
 
 EXTRACT_BEFORE_ARGS=	-aq
 NO_WRKSUBDIR=		yes
 
 CXXFLAGS+=	-Wno-deprecated-declarations -fPIC
 MAKEFILE=	GNUmakefile
 ALL_TARGET=	static shared libcryptopp.pc
 
 SOVERSION=	${PORTVERSION:R:R}
 PLIST_SUB+=	SOVERSION=${SOVERSION} \
 		PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		DEBUG DOCS FULL_DEBUG TOOLS
 OPTIONS_DEFINE_amd64=	SIMD
 OPTIONS_DEFINE_i386=	SIMD
 OPTIONS_DEFINE_powerpc=		SIMD
 OPTIONS_DEFINE_powerpc64=	SIMD
 OPTIONS_DEFINE_powerpc64le=	SIMD
 OPTIONS_DEFAULT=	TOOLS
 OPTIONS_DEFAULT_powerpc=	SIMD
 OPTIONS_DEFAULT_powerpc64=	SIMD
 OPTIONS_DEFAULT_powerpc64le=	SIMD
 OPTIONS_SUB=		yes
 
 # Always compile with -DNDEBUG for release. Otherwise, sensitive
 # information could be accessed if an assert triggers.
 # See ${WRKSRC}/Readme.txt for more details.
 FULL_DEBUG_DESC=	Build with full debugging support (SECURITY RISK!!!)
 FULL_DEBUG_CXXFLAGS=	-DCRYPTOPP_DEBUG
 FULL_DEBUG_CXXFLAGS_OFF=-DNDEBUG
 FULL_DEBUG_IMPLIES=	DEBUG
 
 # Disable this option to run the regression tests.
 TOOLS_DESC=		Install encryption/decryption tools
 TOOLS_MAKE_ENV=		CRYPTOPP_DATA_DIR=${DATADIR}/
 TOOLS_ALL_TARGET=	cryptest.exe
 TOOLS_TEST_TARGET_OFF=	test
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSIMD}
-.  if ${ARCH} == i386 || ${ARCH} == amd64
-.    if !${MACHINE_CPU:Msse2}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2
-.    endif
-.    if !${MACHINE_CPU:Mssse3}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_SSSE3
-.    endif
-.    if !${MACHINE_CPU:Msse41}
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_SSE4
-.    endif
-.  elif ${ARCH} == powerpc || ${ARCH:Mpowerpc64*}
-CXXFLAGS+=	-DCRYPTOPP_ALTIVEC_AVAILABLE
-.  endif
-.else
-CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_SSE2 \
-		-DCRYPTOPP_DISABLE_SSSE3 -DCRYPTOPP_DISABLE_SSE4 \
-		-DCRYPTOPP_DISABLE_ALTIVEC
+.if !${PORT_OPTIONS:MSIMD}
+CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
 .endif
 
 pre-configure-FULL_DEBUG-on:
 	@${ECHO_CMD}
 	@${ECHO_CMD} "----------------------------- WARNING!!! ----------------------------"
 	@${ECHO_CMD} "You have chosen to compile with full debugging support. If an assert"
 	@${ECHO_CMD} "triggers, sensitive information could possibly be egressed to the"
 	@${ECHO_CMD} "filesystem via a core dump. If this is not your intention, hit CTRL-C"
 	@${ECHO_CMD} "now and run 'make config clean' and disable the FULL_DEBUG option."
 	@${ECHO_CMD} "---------------------------------------------------------------------"
 	@${ECHO_CMD}
 .  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
 	@sleep 10
 .  endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libcryptopp.so ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${PORTVERSION}
 	${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so.${SOVERSION}
 	${LN} -fs libcryptopp.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libcryptopp.so
 	${INSTALL_DATA} ${WRKSRC}/libcryptopp.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/cryptopp
 	(for i in `${FIND} ${WRKSRC}/ -name '*.h' \
 			-and -not -name 'dll.h' \
 			-and -not -name 'resource.h'`; do \
 		${INSTALL_DATA} $$i ${STAGEDIR}${PREFIX}/include/cryptopp; \
 	done)
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/Readme.txt ${STAGEDIR}${DOCSDIR}/README
 
 do-install-TOOLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/TestData
 	${INSTALL_PROGRAM} ${WRKSRC}/cryptest.exe ${STAGEDIR}${PREFIX}/bin/cryptest
 	${INSTALL_DATA} ${WRKSRC}/TestData/usage.dat ${STAGEDIR}${DATADIR}/TestData
 
 .include <bsd.port.mk>
diff --git a/security/cryptopp/distinfo b/security/cryptopp/distinfo
index 136fac92348f..012fe83214ff 100644
--- a/security/cryptopp/distinfo
+++ b/security/cryptopp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645715486
-SHA256 (cryptopp860.zip) = 20aa413957d9c8ae353ee2f7747bd7ac392f933c60a53e3fd1e41cadbc48d193
-SIZE (cryptopp860.zip) = 9274149
+TIMESTAMP = 1663283275
+SHA256 (cryptopp870.zip) = d0d3a28fcb5a1f6ed66b3adf57ecfaed234a7e194e42be465c2ba70c744538dd
+SIZE (cryptopp870.zip) = 9277791
diff --git a/security/cryptopp/files/patch-GNUmakefile b/security/cryptopp/files/patch-GNUmakefile
index 1fc8ef2b3017..8ad66cac17b6 100644
--- a/security/cryptopp/files/patch-GNUmakefile
+++ b/security/cryptopp/files/patch-GNUmakefile
@@ -1,33 +1,23 @@
-We need to export the CRYPTOPP_DISABLE_ASM flag if cryptopp was not built
-with SIMD support. Certain functions prototypes are guarded by this
-flag and build failures will arise in other ports if not set appropriately.
+Masquerade as Linux to enable certain build options.
+Always use pthread even if feature detection is disabled.
 
---- GNUmakefile.orig	2021-01-01 17:22:45 UTC
+--- GNUmakefile.orig	2022-08-07 19:52:03 UTC
 +++ GNUmakefile
-@@ -71,7 +71,7 @@ ifeq ($(SYSTEMX),)
+@@ -70,7 +70,7 @@ endif
    SYSTEMX := $(shell uname -s 2>/dev/null)
  endif
  
 -IS_LINUX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Linux")
 +IS_LINUX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "Linux|FreeBSD")
  IS_HURD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c -E "GNU|Hurd")
  IS_MINGW := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "MinGW")
  IS_CYGWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Cygwin")
-@@ -795,7 +795,7 @@ endif
+@@ -848,7 +848,7 @@ endif
  
  # Use -pthread whenever it is available. See http://www.hpl.hp.com/techreports/2004/HPL-2004-209.pdf
  #   http://stackoverflow.com/questions/2127797/gcc-significance-of-pthread-flag-when-compiling
 -ifeq ($(DETECT_FEATURES),1)
 +ifeq (1,1)
   ifeq ($(XLC_COMPILER),1)
    ifeq ($(findstring -qthreaded,$(CXXFLAGS)),)
-    TPROG = TestPrograms/test_pthreads.cxx
-@@ -1450,7 +1450,7 @@ libcryptopp.pc:
- 	@echo 'Version: 8.4' >> libcryptopp.pc
- 	@echo 'URL: https://cryptopp.com/' >> libcryptopp.pc
- 	@echo '' >> libcryptopp.pc
--	@echo 'Cflags: -I$${includedir}' >> libcryptopp.pc
-+	@echo 'Cflags: -I$${includedir} $(findstring -DCRYPTOPP_DISABLE_ASM,$(CXXFLAGS))' >> libcryptopp.pc
- 	@echo 'Libs: -L$${libdir} -lcryptopp' >> libcryptopp.pc
- 
- # This recipe prepares the distro files
+    TPROG = TestPrograms/test_pthreads.cpp
diff --git a/security/cryptopp/files/patch-misc.h b/security/cryptopp/files/patch-misc.h
index 165720d6bef7..7d923019af27 100644
--- a/security/cryptopp/files/patch-misc.h
+++ b/security/cryptopp/files/patch-misc.h
@@ -1,60 +1,60 @@
 This fixes a warning triggered by testing an unsigned parameter
 against 0.  The patch solves this by creating a different template
 for signed case. (PR: 178827)
 
---- misc.h.orig	2021-01-01 17:03:59 UTC
+--- misc.h.orig	2022-08-07 19:52:03 UTC
 +++ misc.h
-@@ -700,8 +700,10 @@ inline bool SafeConvert(T1 from, T2 &to)
+@@ -720,8 +720,10 @@ inline bool SafeConvert(T1 from, T2 &to)
  /// \param value the value to convert
  /// \param base the base to use during the conversion
  /// \return the string representation of value in base.
 +template<bool> struct IsUnsigned {};
 +
  template <class T>
 -std::string IntToString(T value, unsigned int base = 10)
 +std::string IntToStringImpl(T value, unsigned int base, IsUnsigned<true>)
  {
  	// Hack... set the high bit for uppercase.
  	const unsigned int HIGH_BIT = (1U << 31);
-@@ -712,12 +714,6 @@ std::string IntToString(T value, unsigned int base = 1
+@@ -732,12 +734,6 @@ std::string IntToString(T value, unsigned int base = 1
  	if (value == 0)
  		return "0";
  
 -	bool negate = false;
 -	if (value < 0)
 -	{
 -		negate = true;
 -		value = 0-value;	// VC .NET does not like -a
 -	}
  	std::string result;
  	while (value > 0)
  	{
-@@ -725,9 +721,28 @@ std::string IntToString(T value, unsigned int base = 1
+@@ -745,9 +741,28 @@ std::string IntToString(T value, unsigned int base = 1
  		result = char((digit < 10 ? '0' : (CH - 10)) + digit) + result;
  		value /= base;
  	}
 +	return result;
 +}
 +
 +template <class T>
 +std::string IntToStringImpl(T value, unsigned int base, IsUnsigned<false>)
 +{
 +	bool negate = false;
 +	if (value < 0)
 +	{
 +		negate = true;
 +		value = 0-value;	// VC .NET does not like -a
 +	}
 +	std::string result = IntToStringImpl(value, base, IsUnsigned<true>());
  	if (negate)
  		result = "-" + result;
  	return result;
 +}
 +
 +template <class T>
 +std::string IntToString(T value, unsigned int base = 10)
 +{
 +	return IntToStringImpl(value, base, IsUnsigned<(static_cast<T>(-1) > 0)>());
  }
  
  /// \brief Converts an unsigned value to a string