Merge branch 'freebsd/main' into hardenedbsd/main

Mk/Uses/php.mk

@@ -190,8 +190,8 @@ PHP_EXT_DIR=   20180731
 PHP_EXT_INC=    pcre spl
 .    else
 # (rene) default to DEFAULT_VERSIONS
-PHP_EXT_DIR=	20190902
-PHP_EXT_INC=	hash pcre spl
+PHP_EXT_DIR=   20200930
+PHP_EXT_INC=    hash json pcre spl
 .    endif
 
 # Try to figure out what the PHP_EXT_DIR should be WRT the

Mk/bsd.default-versions.mk

@@ -108,7 +108,7 @@ PERL5_DEFAULT:=		${_PERL5_FROM_BIN:R}
 # Possible values: 9.6, 10, 11, 12, 13, 14
 PGSQL_DEFAULT?=		13
 # Possible values: 7.3, 7.4, 8.0, 8.1
-PHP_DEFAULT?=		7.4
+PHP_DEFAULT?=		8.0
 # Possible values: 2.7, 3.7, 3.8, 3.9, 3.10, 3.11
 PYTHON_DEFAULT?=	3.8
 # Possible values: 2.7

UPDATING

@@ -5,6 +5,22 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
+20220125:
+  AFFECTS: users of lang/php74
+  AUTHOR: tz@FreeBSD.org
+
+  The default version of PHP has been switched from 7.4 to 8.0.
+
+  If you use binary packages you should make a list of php packages
+  before running 'pkg upgrade':
+
+  # pkg info php7\* > ~/installed-php-ports-list
+
+  After the upgrade, check with such list if all your php extensions
+  are still installed, and reinstall them if needed.
+
+  If you use mod_php74 you need to deinstall it and install mod_php80.
+
 20220120:
   AFFECTS: users of x11-wm/dwm
   AUTHOR: 0mp@FreeBSD.org

comms/tcpser/Makefile

 # Created by: Edward Tomasz Napierala <trasz@FreeBSD.org>
 
 PORTNAME=	tcpser
-DISTVERSION=	1.0rc12
+DISTVERSION=	20210425
 CATEGORIES=	comms
-MASTER_SITES=	http://www.jbrain.com/pub/linux/serial/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nc@FreeBSD.org
 COMMENT=	TCPSER turns serial port into an emulated Hayes compatible modem
 
 LICENSE=	GPLv2+
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	FozzTexx
+GH_TAGNAME=	95f4b51
+
 LDFLAGS+=	-pthread
-USES=		dos2unix gmake
-WRKSRC=		${WRKDIR}/tcpser
+USES=		gmake
 
-PORTDOCS=	README CHANGES
+PORTDOCS=	README.md CHANGES
 PLIST_FILES=	bin/tcpser
 
 OPTIONS_DEFINE=	DOCS
@@ -24,6 +26,6 @@ do-install:
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

comms/tcpser/distinfo

-SHA256 (tcpser-1.0rc12.tar.gz) = a64a461c17c030ab31d8efe40c9a96cf0237108d9206cdef4a76ebe1679a5f76
-SIZE (tcpser-1.0rc12.tar.gz) = 50066
+TIMESTAMP = 1643082604
+SHA256 (FozzTexx-tcpser-20210425-95f4b51_GH0.tar.gz) = 98fc2ff2424f1e0bc35532e170f9d766e7242be757b6d55a51ddad3701209701
+SIZE (FozzTexx-tcpser-20210425-95f4b51_GH0.tar.gz) = 26719

comms/tcpser/files/patch-Makefile

---- Makefile.orig	2015-11-09 18:00:33 UTC
+--- Makefile.orig	2022-01-25 03:54:45 UTC
 +++ Makefile
-@@ -1,10 +1,8 @@
- SRC=src
- SRCS = $(SRC)/bridge.c $(SRC)/debug.c $(SRC)/getcmd.c $(SRC)/ip.c $(SRC)/init.c $(SRC)/modem_core.c $(SRC)/nvt.c $(SRC)/serial.c $(SRC)/ip232.c $(SRC)/util.c $(SRC)/phone_book.c $(SRC)/shared.c $(SRC)/tcpser.c $(SRC)/line.c $(SRC)/dce.c
- OBJS = $(SRC)/bridge.o $(SRC)/debug.o $(SRC)/getcmd.o $(SRC)/ip.o $(SRC)/init.o $(SRC)/modem_core.o $(SRC)/nvt.o $(SRC)/serial.o $(SRC)/ip232.o $(SRC)/util.o $(SRC)/phone_book.o $(SRC)/shared.o $(SRC)/tcpser.o $(SRC)/dce.o $(SRC)/line.o
--CC = gcc
- DEF = 
--CFLAGS = -O $(DEF) -Wall
--LDFLAGS = -lpthread
-+CFLAGS += $(DEF) -Wall
- DEPEND = makedepend $(DEF) $(CFLAGS)
- 
- all:	tcpser
+@@ -1,9 +1,7 @@
+ SRC=src
+ SRCS = $(SRC)/bridge.c $(SRC)/debug.c $(SRC)/getcmd.c $(SRC)/ip.c $(SRC)/init.c $(SRC)/modem_core.c $(SRC)/nvt.c $(SRC)/serial.c $(SRC)/ip232.c $(SRC)/util.c $(SRC)/phone_book.c $(SRC)/shared.c $(SRC)/tcpser.c $(SRC)/line.c $(SRC)/dce.c
+ OBJS = $(SRC)/bridge.o $(SRC)/debug.o $(SRC)/getcmd.o $(SRC)/ip.o $(SRC)/init.o $(SRC)/modem_core.o $(SRC)/nvt.o $(SRC)/serial.o $(SRC)/ip232.o $(SRC)/util.o $(SRC)/phone_book.o $(SRC)/shared.o $(SRC)/tcpser.o $(SRC)/dce.o $(SRC)/line.o
+-CC = gcc
+-DEF = 
+-CFLAGS = -g $(DEF) -Wall
++CFLAGS = -g -Wall
+ LDFLAGS = -lpthread
+ DEPEND = makedepend $(DEF) $(CFLAGS)
+ 

comms/tcpser/pkg-descr

@@ -5,4 +5,4 @@ Internet.  TCPSER supports all standard Hayes commands, and understands
 extended and vendor proprietary commands (though it does not implement
 many of them).  TCPSER can be used for both inbound and outbound connections.
 
-WWW: http://www.jbrain.com/pub/linux/serial/
+WWW: https://github.com/FozzTexx/tcpser

databases/xapian-bindings/Makefile

@@ -14,7 +14,9 @@ USES=		metaport
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=	LUA PERL PHP PYTHON RUBY
-OPTIONS_DEFAULT=LUA PERL PHP PYTHON RUBY
+# While switching php DEFAULT OPTION PHP is creating circular
+# dependency. For now remove default OPTION PHP
+OPTIONS_DEFAULT=LUA PERL PYTHON RUBY
 
 LUA_RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian@${LUA_FLAVOR}
 LUA_USES=		lua:run

emulators/citra/Makefile

 PORTNAME=	citra
-PORTVERSION=	s20220108
+PORTVERSION=	s20220124
 PORTREVISION?=	0
 CATEGORIES=	emulators
 .if make(makesum)
@@ -10,9 +10,6 @@ MASTER_SITES=	LOCAL/jbeich:gamedb
 DISTFILES=	${PORTNAME}/compatibility_list.json:gamedb
 EXTRACT_ONLY=	${DISTFILES:N*\:gamedb:C/\:.*//}
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	4b04175c5d42.patch:-p1 # https://github.com/citra-emu/citra/pull/5917
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Nintendo 3DS emulator/debugger
 
@@ -31,7 +28,7 @@ BUILD_DEPENDS=	boost-libs>0:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	citra-emu
-GH_TAGNAME=	67f1e4111
+GH_TAGNAME=	4e15823db
 GH_TUPLE=	citra-emu:ext-boost:36603a1:boost/externals/boost \
 		citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \
 		citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \

emulators/citra/distinfo

-TIMESTAMP = 1641636091
+TIMESTAMP = 1643013868
 SHA256 (citra/compatibility_list.json) = 42586174a9fa78723eb0cf9a8c42fa9969c1b1007f70b09909a49d41418e52a2
 SIZE (citra/compatibility_list.json) = 327574
-SHA256 (citra-emu-citra-s20220108-67f1e4111_GH0.tar.gz) = 185140acd570bd8d75f2a7e88a249fa9cba6a65018c16242e0e797d8296878c2
-SIZE (citra-emu-citra-s20220108-67f1e4111_GH0.tar.gz) = 5334967
+SHA256 (citra-emu-citra-s20220124-4e15823db_GH0.tar.gz) = 81f2ceea783a1cbd5cee7be0bb379c00fa1739270156fa75613b42490ece4e18
+SIZE (citra-emu-citra-s20220124-4e15823db_GH0.tar.gz) = 5335155
 SHA256 (citra-emu-ext-boost-36603a1_GH0.tar.gz) = a1885cf0f7b1c790f8a83e963fec591bad1232e6b824e64d8db136920ec1b67d
 SIZE (citra-emu-ext-boost-36603a1_GH0.tar.gz) = 2351603
 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3
@@ -37,5 +37,3 @@ SHA256 (weidai11-cryptopp-CRYPTOPP_8_5_0_GH0.tar.gz) = 8f64cf09cf4f61d5d74bca535
 SIZE (weidai11-cryptopp-CRYPTOPP_8_5_0_GH0.tar.gz) = 8998459
 SHA256 (wwylele-teakra-3e032a7_GH0.tar.gz) = 14662b40f0eac637ea9bec201ce8e00bf1592b7b02f62b9d0b0b901e178bcf2d
 SIZE (wwylele-teakra-3e032a7_GH0.tar.gz) = 953167
-SHA256 (4b04175c5d42.patch) = a78581c7952c4b94349ef688faa2c25a83156709678da7882bde679e9db416f2
-SIZE (4b04175c5d42.patch) = 1614

emulators/rpcs3/Makefile

 PORTNAME=	rpcs3
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.0.20-13217 # git rev-list --count HEAD
-DISTVERSIONSUFFIX=	-g801e7f3c2f
+DISTVERSION=	0.0.20-13225 # git rev-list --count HEAD
+DISTVERSIONSUFFIX=	-gd2897bc6a0
 CATEGORIES=	emulators
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS_REASON=	requires int128 and SSE2
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	RPCS3
-GH_TUPLE=	RPCS3:hidapi:hidapi-0.11.0-2-gc47734c:hidapi/3rdparty/hidapi/hidapi \
+GH_TUPLE=	RPCS3:hidapi:hidapi-0.11.2-3-g8ff2dee:hidapi/3rdparty/hidapi/hidapi \
 		RPCS3:llvm-mirror:509d31ad8967:llvm/llvm \
 		asmjit:asmjit:fc2a5d8:asmjit/3rdparty/asmjit/asmjit \
 		jbeder:yaml-cpp:yaml-cpp-0.7.0-1-g0b67821:yamlcpp/3rdparty/yaml-cpp/yaml-cpp \

emulators/rpcs3/distinfo

-TIMESTAMP = 1642807037
-SHA256 (RPCS3-rpcs3-v0.0.20-13217-g801e7f3c2f_GH0.tar.gz) = 05142425dc16a026a5820f4f116c35af58f8e71734287e688a2fd5f4502894fb
-SIZE (RPCS3-rpcs3-v0.0.20-13217-g801e7f3c2f_GH0.tar.gz) = 8256874
-SHA256 (RPCS3-hidapi-hidapi-0.11.0-2-gc47734c_GH0.tar.gz) = be71b1f2f57f2e243e721d684625234b1d0684dc46e49772a7fcf74deb1fc55f
-SIZE (RPCS3-hidapi-hidapi-0.11.0-2-gc47734c_GH0.tar.gz) = 232983
+TIMESTAMP = 1643051817
+SHA256 (RPCS3-rpcs3-v0.0.20-13225-gd2897bc6a0_GH0.tar.gz) = 1ef15cdb8c4532b9429cab3a6a1e2c7bac2efbc6871ecd3f02351cace779f8ad
+SIZE (RPCS3-rpcs3-v0.0.20-13225-gd2897bc6a0_GH0.tar.gz) = 8256920
+SHA256 (RPCS3-hidapi-hidapi-0.11.2-3-g8ff2dee_GH0.tar.gz) = bcb3fa102bf899455d668b9006b5639017bde104b691b1600087dc91a5caa3d4
+SIZE (RPCS3-hidapi-hidapi-0.11.2-3-g8ff2dee_GH0.tar.gz) = 233682
 SHA256 (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 82a62696fb4a24187ed50146edfba3e587aa7ec3c809e644e0d69a530f06e6f3
 SIZE (RPCS3-llvm-mirror-509d31ad8967_GH0.tar.gz) = 29967699
 SHA256 (asmjit-asmjit-fc2a5d8_GH0.tar.gz) = e4550efadfbc0f35ca7eecf099d3b8afff764bb4808061ee20aeb2637562f5c0

emulators/yuzu/Makefile

 PORTNAME=	yuzu
-PORTVERSION=	s20220122
+PORTVERSION=	s20220124
 CATEGORIES=	emulators
 .if make(makesum)
 MASTER_SITES=	https://api.yuzu-emu.org/gamedb/?dummy=/:gamedb
@@ -42,7 +42,7 @@ TEST_DEPENDS=	catch>0:devel/catch
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yuzu-emu
-GH_TAGNAME=	5b57ee66c
+GH_TAGNAME=	344236512
 GH_TUPLE=	yuzu-emu:mbedtls:v2.16.9-115-g8c88150ca:mbedtls/externals/mbedtls \
 		KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-32-ga3fdfe8:SPIRV_Headers/externals/sirit/externals/SPIRV-Headers \
 		KhronosGroup:Vulkan-Headers:v1.2.202:Vulkan_Headers/externals/Vulkan-Headers \

emulators/yuzu/distinfo

-TIMESTAMP = 1642847159
+TIMESTAMP = 1643067709
 SHA256 (yuzu/compatibility_list.json) = 730160cafb46ded975f78538c449907fa319ad5a4acdbc39f8cbc8101ef4e23c
 SIZE (yuzu/compatibility_list.json) = 1255203
-SHA256 (yuzu-emu-yuzu-s20220122-5b57ee66c_GH0.tar.gz) = 8739f33dda8d470c7e7d8348ee1cf727c83bf342f26b90170c892b9616b464e1
-SIZE (yuzu-emu-yuzu-s20220122-5b57ee66c_GH0.tar.gz) = 4491231
+SHA256 (yuzu-emu-yuzu-s20220124-344236512_GH0.tar.gz) = f98f963a1860ab3900b215863000dd1ba2f3de8d980b7927c184700c95e86539
+SIZE (yuzu-emu-yuzu-s20220124-344236512_GH0.tar.gz) = 4491363
 SHA256 (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 8cd6d075b4da0ad5fb995eb37390e2e6088be8d41ab1cdfc7e7e4256bd991450
 SIZE (yuzu-emu-mbedtls-v2.16.9-115-g8c88150ca_GH0.tar.gz) = 2679189
 SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-32-ga3fdfe8_GH0.tar.gz) = bd629d6296dd374eb2aeff923c75895ba0f3ce6448dad89763930e65b954e0cb

graphics/mesa-devel/Makefile

 PORTNAME=	mesa
-DISTVERSION=	21.3-branchpoint-3048
-DISTVERSIONSUFFIX=	-g4198ca4b3f6
+DISTVERSION=	21.3-branchpoint-3112
+DISTVERSIONSUFFIX=	-g09072a08030
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 

graphics/mesa-devel/distinfo

-TIMESTAMP = 1642807473
-SHA256 (mesa3d-mesa-21.3-branchpoint-3048-g4198ca4b3f6_GH0.tar.gz) = 94e17abefecd5b621b65ec3623e9d339129cc80c6512239a39dd54b760dbb1bd
-SIZE (mesa3d-mesa-21.3-branchpoint-3048-g4198ca4b3f6_GH0.tar.gz) = 23925400
+TIMESTAMP = 1643066845
+SHA256 (mesa3d-mesa-21.3-branchpoint-3112-g09072a08030_GH0.tar.gz) = c7906cc2a6378e087941f9334b10e3256e3ab3cde715a9109d6faa47ff27fcb6
+SIZE (mesa3d-mesa-21.3-branchpoint-3112-g09072a08030_GH0.tar.gz) = 23926994
 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5
 SIZE (700efacda59c.patch) = 981
 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470

net-mgmt/Makefile

@@ -45,6 +45,7 @@
     SUBDIR += check_ups_health
     SUBDIR += chillispot
     SUBDIR += choparp
+    SUBDIR += chronograf
     SUBDIR += cidr
     SUBDIR += ciscoconf
     SUBDIR += clog

textproc/py-furo/Makefile

@@ -2,9 +2,13 @@
 
 PORTNAME=	furo
 PORTVERSION=	2022.1.2
+PORTREVISION=	1
 CATEGORIES=	textproc python
-MASTER_SITES=	CHEESESHOP
+MASTER_SITES=	CHEESESHOP \
+		LOCAL/sunpoet:static
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}-static${EXTRACT_SUFX}:static
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Clean customizable Sphinx documentation theme
@@ -24,4 +28,7 @@ NO_ARCH=	yes
 post-patch:
 	@${SED} -e 's|%%PORTVERSION%%|${PORTVERSION}|' ${FILESDIR}/setup.py > ${WRKSRC}/setup.py
 
+post-install:
+	cd ${WRKDIR}/static/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR}/furo/theme/furo/static/
+
 .include <bsd.port.mk>

textproc/py-furo/distinfo

-TIMESTAMP = 1642102353
+TIMESTAMP = 1643045828
 SHA256 (furo-2022.1.2.tar.gz) = b217f218cbcd423ffbfe69baa79389d4ecebf2d86f0d593c44ef31da7b5aed30
 SIZE (furo-2022.1.2.tar.gz) = 1659274
+SHA256 (furo-2022.1.2-static.tar.gz) = f6aa4ae25f7c4a8e91856c1312dab5c4fc4d25caea85f5c00827731aff5c0d64
+SIZE (furo-2022.1.2-static.tar.gz) = 38236

textproc/py-furo/pkg-plist

+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/scripts/furo-extensions.js
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/scripts/furo.js
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/scripts/furo.js.LICENSE.txt
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/scripts/furo.js.map
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/styles/furo-extensions.css
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/styles/furo-extensions.css.map
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/styles/furo.css
+%%PYTHON_SITELIBDIR%%/furo/theme/furo/static/styles/furo.css.map