*/*: sync with upstream

Taken from: HardenedBSD
2021-06-02 14:39:23 +02:00 · 2021-06-02 14:39:23 +02:00 · c64bd1f335
commit c64bd1f335
parent 32d3913725
51 changed files with 267 additions and 265 deletions
--- a/accessibility/orca/Makefile
+++ b/accessibility/orca/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	orca
 PORTVERSION=	40.0
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome3
@ -13,14 +14,12 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING

 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libatspi.so:accessibility/at-spi2-core
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}

 # conflict with py*-json-py because orca uses the json from python itself
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -65,6 +65,7 @@
    SUBDIR += libunrar
    SUBDIR += libunrar6
    SUBDIR += libzip
+    SUBDIR += libzippp
    SUBDIR += linux-c7-lz4
    SUBDIR += lizard
    SUBDIR += lrzip
--- a/archivers/libzippp/Makefile
+++ b/archivers/libzippp/Makefile
@ -0,0 +1,22 @@
+PORTNAME=	libzippp
+DISTVERSIONPREFIX=	${PORTNAME}-v
+DISTVERSION=	4.0-1.7.3
+CATEGORIES=	archivers devel
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	C++ wrapper for libzip
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENCE
+
+LIB_DEPENDS=	libzip.so:archivers/libzip
+
+USES=		cmake:testing
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	ctabin
+
+CMAKE_ON=		BUILD_SHARED_LIBS
+CMAKE_TESTING_ON=	LIBZIPPP_BUILD_TESTS
+
+.include <bsd.port.mk>
--- a/archivers/libzippp/distinfo
+++ b/archivers/libzippp/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1622621768
+SHA256 (ctabin-libzippp-libzippp-v4.0-1.7.3_GH0.tar.gz) = 7560c2d8bbace39245ba6e89c5454b8bc5eb753bb13451bca2c7b5810c0a2f2d
+SIZE (ctabin-libzippp-libzippp-v4.0-1.7.3_GH0.tar.gz) = 23835
--- a/archivers/libzippp/files/patch-CMakeLists.txt
+++ b/archivers/libzippp/files/patch-CMakeLists.txt
@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig	2021-06-02 08:25:32 UTC
+++ CMakeLists.txt
+@@ -17,7 +17,7 @@ option(LIBZIPPP_ENABLE_ENCRYPTION "Build with encrypti
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+ 
+-find_package(LIBZIP MODULE REQUIRED)
+find_package(libzip REQUIRED)
+ 
+ add_library(libzippp "src/libzippp.cpp")
+ add_library(libzippp::libzippp ALIAS libzippp) # Convenience alias
+@@ -87,10 +87,10 @@ if(LIBZIPPP_INSTALL)
+     COMPATIBILITY SameMajorVersion
+   )
+ 
+-  install(
+-    FILES ${PROJECT_CONFIG_FILE} ${PROJECT_VERSION_FILE} cmake/FindLIBZIP.cmake
+-    DESTINATION ${configInstallDestination}
+-  )
+  #install(
+  #  FILES ${PROJECT_CONFIG_FILE} ${PROJECT_VERSION_FILE} cmake/FindLIBZIP.cmake
+  #  DESTINATION ${configInstallDestination}
+  #)
+ 
+   install(
+     EXPORT libzipppTargets
--- a/archivers/libzippp/pkg-descr
+++ b/archivers/libzippp/pkg-descr
@ -0,0 +1,4 @@
+libzippp is a simple basic C++ wrapper around the libzip library. It is meant to
+be a portable and easy-to-use library for ZIP handling.
+
+WWW: https://github.com/ctabin/libzippp
--- a/archivers/libzippp/pkg-plist
+++ b/archivers/libzippp/pkg-plist
@ -0,0 +1,4 @@
+include/libzippp/libzippp.h
+lib/libzippp.so
+%%DATADIR%%/libzipppTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/libzipppTargets.cmake
--- a/devel/py-cxx/Makefile
+++ b/devel/py-cxx/Makefile
@ -1,7 +1,7 @@
 # Created by: ijliao

 PORTNAME=	cxx
-PORTVERSION=	7.1.4
+PORTVERSION=	7.1.5
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/CXX/PyCXX%20V${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -13,7 +13,7 @@ COMMENT=	Make it easier to extend Python with C++
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT

-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	autoplist concurrent distutils pythonprefix
 PYDISTUTILS_PKGNAME=	CXX

--- a/devel/py-cxx/distinfo
+++ b/devel/py-cxx/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1594643701
-SHA256 (pycxx-7.1.4.tar.gz) = 314314fbfaac9bdd9610d605c5f8d0b12b91f3f9c4fdab181bc1e021b6806b3d
-SIZE (pycxx-7.1.4.tar.gz) = 152376
+TIMESTAMP = 1622624360
+SHA256 (pycxx-7.1.5.tar.gz) = 9087a8574ac9caf631a8ec0b90e260828051e4bc89e1e44f4fc253ccc297d826
+SIZE (pycxx-7.1.5.tar.gz) = 156343
--- a/devel/py-magic/Makefile
+++ b/devel/py-magic/Makefile
@ -1,7 +1,7 @@
 # Created by: Alexander Botero-Lowry <alexbl@FreeBSD.org>

 PORTNAME=	magic
-PORTVERSION=	5.39
+PORTVERSION=	5.40
 CATEGORIES=	devel python
 MASTER_SITES=	ftp://ftp.astron.com/pub/file/ \
 		ftp://ftp.gw.com/mirrors/pub/unix/file/ \
@ -14,7 +14,7 @@ COMMENT=	Python module for determining file type

 LICENSE=	BSD2CLAUSE

-USES=		python:3.6+
+USES=		python
 USE_PYTHON=	distutils autoplist

 # both install module as magic.py
--- a/devel/py-magic/distinfo
+++ b/devel/py-magic/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1594644343
-SHA256 (file-5.39.tar.gz) = f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1
-SIZE (file-5.39.tar.gz) = 954266
+TIMESTAMP = 1622623858
+SHA256 (file-5.40.tar.gz) = 167321f43c148a553f68a0ea7f579821ef3b11c27b8cbe158e4df897e4a5dd57
+SIZE (file-5.40.tar.gz) = 1004214
--- a/devel/py-sysv_ipc/Makefile
+++ b/devel/py-sysv_ipc/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	sysv_ipc
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	http://semanchuk.com/philip/sysv_ipc/ \
 		CHEESESHOP
@ -10,7 +10,7 @@ COMMENT=	System V IPC for Python

 LICENSE=	BSD2CLAUSE

-USES=	python:3.6+
+USES=	python
 USE_PYTHON=	autoplist concurrent distutils

 .include <bsd.port.mk>
--- a/devel/py-sysv_ipc/distinfo
+++ b/devel/py-sysv_ipc/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1575276717
-SHA256 (sysv_ipc-1.0.1.tar.gz) = 8eff10dd17789ddf21b422ce46ae0f6420088902a88e4296cb805cf2fde8b4dc
-SIZE (sysv_ipc-1.0.1.tar.gz) = 102174
+TIMESTAMP = 1622624471
+SHA256 (sysv_ipc-1.1.0.tar.gz) = 0f063cbd36ec232032e425769ebc871f195a7d183b9af32f9901589ea7129ac3
+SIZE (sysv_ipc-1.1.0.tar.gz) = 99448
--- a/devel/simdjson/Makefile
+++ b/devel/simdjson/Makefile
@ -1,6 +1,6 @@
 PORTNAME=	simdjson
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.9.4
+DISTVERSION=	0.9.5
 CATEGORIES=	devel

 MAINTAINER=	olevole@olevole.ru
--- a/devel/simdjson/distinfo
+++ b/devel/simdjson/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1621579404
-SHA256 (simdjson-simdjson-v0.9.4_GH0.tar.gz) = 00f73c19e10af0f9b128a95ff584f84b20ff94b63929ba1214b1867d35838987
-SIZE (simdjson-simdjson-v0.9.4_GH0.tar.gz) = 7955504
+TIMESTAMP = 1622379607
+SHA256 (simdjson-simdjson-v0.9.5_GH0.tar.gz) = db69582fc5e4ece8c0a6a64894efeef475fe22fe466bd67195422de11b08b4d2
+SIZE (simdjson-simdjson-v0.9.5_GH0.tar.gz) = 7956300
--- a/emulators/i386-wine/Makefile
+++ b/emulators/i386-wine/Makefile
@ -8,11 +8,10 @@ PORTNAME=	wine
 # define a dummy DISTVERSION to avoid errors with poudriere bulk -a
 # on architectures unsupported by this port
 DISTVERSION?=	0
-PORTREVISION=	1
 PKGNAMEPREFIX=	i386-
 CATEGORIES=	emulators

-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	Alexander88207@protonmail.com
 COMMENT=	32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD

 ONLY_FOR_ARCHS=	i386 amd64
@ -24,7 +23,7 @@ PKGDEINSTALL=	${PKGINSTALL}

 distinfo-update:
 	${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~
-.for osrel in 11 12 13
+.for osrel in 11 12 13 14
 	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 	${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~
--- a/emulators/i386-wine/Makefile.amd64
+++ b/emulators/i386-wine/Makefile.amd64
@ -1,8 +1,8 @@
 # Created by: David Naylor <dbn@FreeBSD.org>

-DISTVERSION=	5.0
+DISTVERSION=	5.0.4
 PORTEPOCH=	1
-MASTER_SITES=	LOCAL/salvadore/i386-wine/${DIST_SUBDIR}/
+MASTER_SITES=	http://Alexander88207.de/Homura/Winebuilds/${DIST_SUBDIR}/
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH}
 DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64

@ -22,7 +22,7 @@ BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTSCOUT=	limitw:1,even

-.for osrel in 11 12 13
+.for osrel in 11 12 13 14
 .if ${OSREL:C/\..*//} == ${osrel}
 PLIST_SUB+=	OSREL${osrel}=""
 PLIST_SUB+=	NOOSREL${osrel}="@comment "
@ -32,8 +32,8 @@ PLIST_SUB+=	NOOSREL${osrel}=""
 .endif
 .endfor

-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
-IGNORE=		binaries compiled for FreeBSD 11.4+, 12.2+ and 13.0+ only
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400013))
+IGNORE=		binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ & 14.0+ only
 .endif

 OPTIONS_DEFINE=	GECKO MONO
--- a/emulators/i386-wine/distinfo
+++ b/emulators/i386-wine/distinfo
@ -1,7 +1,9 @@
-TIMESTAMP = 1588246565
-SHA256 (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 18967945475b8b98f21ee0f0b063b3450c30241ff8127bfd8f829cbe614176e8
-SIZE (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 71647480
-SHA256 (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = a32f4c10ca4062854d47c1a2052c2872458a5d669a00bd4bb52e75f48324af1c
-SIZE (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = 71924448
-SHA256 (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 0b402febf2caa60cfae326ed0f9830fb38eb74494f58bd4355db270dab7a9e43
-SIZE (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 73941832
+TIMESTAMP = 1620476085
+SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 9273f16297c499f416e901df8fac2c965a4979ffb190019045ea74bddb58ef39
+SIZE (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 92755060
+SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 743df3fd4a1a76148931217c13ce06c9b393258028ed2b72bce00d8494754270
+SIZE (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 93124636
+SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = efcec0f77e36a9252c64da7399b041467c6ecb385bb080f44c9d88f7818c6d15
+SIZE (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = 93596936
+SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 9b3c4568d888d32401a36b32bcb3fd027d20b4826d95a969cabe40f98aa55c94
+SIZE (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 93591812
--- a/emulators/i386-wine/files/binbounce
+++ b/emulators/i386-wine/files/binbounce
@ -10,10 +10,10 @@ then
  export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri
  if [ `uname -p` = i386 ]
  then
-    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH"
+    export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL"
    export LD_LIBRARY_PATH_RPATH=y
  else
-    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32
+    export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32
    export LD_32_LIBRARY_PATH_RPATH=y
  fi
  export PATH="$LOCALBASE/bin32":"$PATH"
--- a/emulators/i386-wine/files/nvidia.sh
+++ b/emulators/i386-wine/files/nvidia.sh
@ -29,55 +29,6 @@
 # those of the authors and should not be interpreted as representing official
 # policies, either expressed or implied, of David Naylor.

-# Version 1.0 - 2010/05/28
-#  - initial release
-# Version 1.1 - 2010/10/04
-#  - add support for 256 driver series
-#  - use passive connections for FTP
-#  - allow resuming of downloads if they were interrupted
-#  - add license and copyright notice
-# Version 1.2 - 2010/10/17
-#  - try to save the NVIDIA tarball under $PORTSDIR/distfiles
-#  - obay $PREFIX
-#  - extract files directly to destination (avoids using /tmp)
-# Version 1.3 - 2010/11/02
-#  - add support for future driver series
-# Version 1.4 - 2011/05/23
-#  - add support for legacy drivers
-# Version 1.5 - 2011/10/23
-#  - add support for no-fetch mode
-#  - backup the original openGL.so.1 library
-# Version 1.6 - 2012/06/06
-#  - add support for pkgng
-# Version 1.7 - 2012/06/23
-#  - make nVidia detection more robust
-#  - allow mixed pkg/pkgng operation
-# Version 1.8 - 2012/07/02
-#  - fix mixed pkg/pkgng operation
-# Version 1.9 - 2012/10/31
-#  - fix permission of extracts files
-# Version 1.10 - 2013/05/06
-#  - s/wine-fbsd64/i386-wine/g
-#  - fix unwanted failures due to `set -e`
-# Version 1.11 - 2013/05/26
-#  - install libGL.so.1 to ${PREFIX}/lib32/.nvidia and link to it
-#  - add deinstall option
-# Version 1.12 - 2013/11/03
-#  - add detection for i386-wine-devel
-# Version 1.13 - 2014/08/05
-#  - add detection for i386-wine-compholio
-# Version 1.14 - 2014/12/26
-#  - gracefully handle a corrupt nVidia tarball
-#  - provide checksum and size information for nVidia tarball
-# Version 1.15 - 2015/03/10
-#  - handle nvidia-driver with package name suffix
-#  - handle i386-wine with arbitary package name suffix
-#  - remove support for old pkg_ tools
-# Version 1.16 - 2017/06/04
-#  - use https download site
-# Version 1.17 - 2020/03/02
-#  - do not do anything if nvidia-driver version >= 440.59
-
 set -e

 PORTSDIR=${PORTSDIR:-/usr/ports}
@ -115,12 +66,6 @@ do
      rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 
      rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
      rm -rf  ${PREFIX}/lib32/.nvidia/
-      if [ -d ${PREFIX}/lib32/.libGL-new ]
-      then
-        ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
-      else
-        ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
-      fi
      exit 0
      ;;
    -n)
--- a/emulators/i386-wine/files/pkg-install
+++ b/emulators/i386-wine/files/pkg-install
@ -3,20 +3,14 @@
 export PREFIX=${PKG_PREFIX:-/usr/local}
 export WINE=$1

-if [ -d ${PREFIX}/lib32/.libGL-new ]
-then
-    LIBGLDIR=.libGL-new
-else
-    LIBGLDIR=.libGL
-fi
+LIBGLDIR=.libGL

 case "$2" in
  DEINSTALL)
    sh ${PREFIX}/share/wine/patch-nvidia.sh -d
-    rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
+    rm -r ${PREFIX}/lib32/dri
    ;;
  POST-INSTALL)
-    ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
    mkdir -p ${PREFIX}/lib32/dri
    for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)
    do
--- a/emulators/i386-wine/pkg-plist
+++ b/emulators/i386-wine/pkg-plist
@ -1031,6 +1031,7 @@ include/wine/windows/xmllite.idl
 include/wine/windows/zmouse.h
 lib32/.libGL/dri/i915_dri.so
 lib32/.libGL/dri/i965_dri.so
+lib32/.libGL/dri/iris_dri.so
 lib32/.libGL/dri/kms_swrast_dri.so
 lib32/.libGL/dri/r200_dri.so
 lib32/.libGL/dri/r300_dri.so
@ -1040,7 +1041,7 @@ lib32/.libGL/dri/radeonsi_dri.so
 lib32/.libGL/dri/swrast_dri.so
 lib32/.libGL/dri/vmwgfx_dri.so
 lib32/.libGL/libGL.so.1
-lib32/libLLVM-8.so
+lib32/libLLVM-10.so
 lib32/libX11-xcb.so.1
 lib32/libX11.so.6
 lib32/libXau.so.6
@ -1061,23 +1062,24 @@ lib32/libdrm_intel.so.1
 lib32/libdrm_radeon.so.1
 lib32/libedit.so.0
 lib32/libexpat.so.1
-lib32/libffi.so.6
+lib32/libffi.so.7
 lib32/libfontconfig.so.1
 lib32/libfreetype.so.6
 lib32/libglapi.so.0
 lib32/libgmp.so.10
 lib32/libgnutls.so.30
-lib32/libhogweed.so.5
+lib32/libhogweed.so.6
 lib32/libidn2.so.0
+lib32/libintl.so.8
 lib32/libjpeg.so.8
 lib32/liblcms2.so.2
-lib32/libnettle.so.7
+lib32/libnettle.so.8
 lib32/libp11-kit.so.0
 lib32/libpciaccess.so.0
 lib32/libpng16.so.16
 lib32/libtasn1.so.6
 lib32/libunistring.so.2
-lib32/libunwind.so.8
+%%OSREL11%%lib32/libunwind.so.8
 lib32/libwine.so
 lib32/libwine.so.1
 lib32/libxcb-dri2.so.0
@ -1089,6 +1091,7 @@ lib32/libxcb-xfixes.so.0
 lib32/libxcb.so.1
 lib32/libxml2.so.2
 lib32/libxshmfence.so.1
+lib32/libzstd.so.1
 lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so
 lib32/wine/activeds.dll.so
@ -2361,6 +2364,8 @@ lib32/wine/fakedlls/webservices.dll
 lib32/wine/fakedlls/wer.dll
 lib32/wine/fakedlls/wevtapi.dll
 lib32/wine/fakedlls/wevtutil.exe
+lib32/wine/fakedlls/where.exe
+lib32/wine/fakedlls/whoami.exe
 lib32/wine/fakedlls/wiaservc.dll
 lib32/wine/fakedlls/wimgapi.dll
 lib32/wine/fakedlls/win32s16.dll16
@ -3024,6 +3029,8 @@ lib32/wine/webservices.dll.so
 lib32/wine/wer.dll.so
 lib32/wine/wevtapi.dll.so
 lib32/wine/wevtutil.exe.so
+lib32/wine/where.exe.so
+lib32/wine/whoami.exe.so
 lib32/wine/wiaservc.dll.so
 lib32/wine/wimgapi.dll.so
 lib32/wine/win32s16.dll16.so
--- a/math/boolector/Makefile
+++ b/math/boolector/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	boolector
-DISTVERSION=	3.2.1
+DISTVERSION=	3.2.2
 CATEGORIES=	math

 MAINTAINER=	yuri@FreeBSD.org
@ -12,16 +12,18 @@ BUILD_DEPENDS=	cadical>0:math/cadical
 LIB_DEPENDS=	libbtor2parser.so:math/btor2tools \
 		libminisat.so:math/minisat \
 		libpicosat.so:math/picosat
+TEST_DEPENDS=	bash:shells/bash
+
+USES=		cmake:noninja compiler:c++11-lang python:test # ninja fails to build tests

-USES=		cmake:noninja compiler:c++11-lang # ninja fails to build tests
 USE_GITHUB=	yes
 GH_ACCOUNT=	Boolector

 CMAKE_ON=	BUILD_SHARED_LIBS

-do-test: # tests assume that python-3.7 and bash are installed
+do-test:
 	@${FIND} ${WRKDIR} -name "*.py" \
-		| ${XARGS} ${REINPLACE_CMD} -e 's|#!/usr/bin/env python$$|#!${LOCALBASE}/bin/python3.7| ; s|#!/usr/bin/env python3$$|#!${LOCALBASE}/bin/python3.7|'
+		| ${XARGS} ${REINPLACE_CMD} -e 's|#!/usr/bin/env python$$|#!${PYTHON_CMD}| ; s|#!/usr/bin/env python3$$|#!${PYTHON_CMD}|'
 	@${FIND} ${WRKDIR} -name "*.sh" \
 		| ${XARGS} ${REINPLACE_CMD} 's|#!/bin/bash$$|#!${LOCALBASE}/bin/bash|'
 	@cd ${BUILD_WRKSRC} && \
--- a/math/boolector/distinfo
+++ b/math/boolector/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1585205935
-SHA256 (Boolector-boolector-3.2.1_GH0.tar.gz) = 0273347f6b24be406e5d37fd3681d64847a0eecb4131006a6afb8f120b69c4dd
-SIZE (Boolector-boolector-3.2.1_GH0.tar.gz) = 1561216
+TIMESTAMP = 1622619758
+SHA256 (Boolector-boolector-3.2.2_GH0.tar.gz) = 9a5bdbacf83f2dd81dbed1e1a9f923766807470afa29b73729c947ae769d42b9
+SIZE (Boolector-boolector-3.2.2_GH0.tar.gz) = 1566009
--- a/math/boolector/pkg-descr
+++ b/math/boolector/pkg-descr
@ -2,7 +2,6 @@ Boolector is a Satisfiability Modulo Theories (SMT) solver for the theories of
 fixed-size bit-vectors, arrays and uninterpreted functions. It supports the
 SMT-LIB logics BV, QF_ABV, QF_AUFBV, QF_BV and QF_UFBV. Boolector provides a
 rich C and Python API and supports incremental solving, both with the SMT-LIB
-commands push and pop, and as solving under assumptions. The documentation of
-its API can be found here.
+commands push and pop, and solving under assumptions.

 WWW: https://boolector.github.io/
--- a/math/py-bitvector/Makefile
+++ b/math/py-bitvector/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	bitvector
-PORTVERSION=	3.4.9
+PORTVERSION=	3.5.0
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP \
 		https://engineering.purdue.edu/kak/dist/
@ -11,7 +11,7 @@ COMMENT=	Pure-Python memory-efficient packed representation for bit arrays

 LICENSE=	PSFL

-USES=		python:3.6+
+USES=		python

 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	BitVector
--- a/math/py-bitvector/distinfo
+++ b/math/py-bitvector/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1554905030
-SHA256 (BitVector-3.4.9.tar.gz) = a5e94cbb4804213b1f0c32d84517cd8f0bb8c689b5eb8055d351632e220a5edd
-SIZE (BitVector-3.4.9.tar.gz) = 128306
+TIMESTAMP = 1622623986
+SHA256 (BitVector-3.5.0.tar.gz) = cac2fbccf11e325115827ed7be03e5fd62615227b0bbf3fa5a18a842a221839c
+SIZE (BitVector-3.5.0.tar.gz) = 161704
--- a/multimedia/streamlink/Makefile
+++ b/multimedia/streamlink/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	streamlink
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 CATEGORIES=	multimedia
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/multimedia/streamlink/distinfo
+++ b/multimedia/streamlink/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1616682867
-SHA256 (streamlink-2.1.1.tar.gz) = 59c56540a137e2544b93c685e36e2fc005bffd0395293b05e7110c1e8b52545e
-SIZE (streamlink-2.1.1.tar.gz) = 510944
+TIMESTAMP = 1621854352
+SHA256 (streamlink-2.1.2.tar.gz) = 5e3be17673ed6b7da359a4636bd1e6961b4e58acb2dd7d219f9aaab377a4c84d
+SIZE (streamlink-2.1.2.tar.gz) = 509287
--- a/net-mgmt/pushgateway/Makefile
+++ b/net-mgmt/pushgateway/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	pushgateway
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.4.0
+DISTVERSION=	1.4.1
 CATEGORIES=	net-mgmt

 MAINTAINER=	0xdutra@gmail.com
@ -25,21 +25,21 @@ GH_TUPLE=	\
 		go-logfmt:logfmt:v0.5.0:go_logfmt_logfmt/vendor/github.com/go-logfmt/logfmt \
 		go-yaml:yaml:v2.4.0:go_yaml_yaml/vendor/gopkg.in/yaml.v2 \
 		golang:crypto:5f87f3452ae9:golang_crypto/vendor/golang.org/x/crypto \
-		golang:net:f5854403a974:golang_net/vendor/golang.org/x/net \
-		golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \
-		golang:sys:f9fddec55a1e:golang_sys/vendor/golang.org/x/sys \
-		golang:text:v0.3.3:golang_text/vendor/golang.org/x/text \
+		golang:net:4c5254603344:golang_net/vendor/golang.org/x/net \
+		golang:protobuf:v1.5.1:golang_protobuf/vendor/github.com/golang/protobuf \
+		golang:sys:68d13333faf2:golang_sys/vendor/golang.org/x/sys \
+		golang:text:v0.3.2:golang_text/vendor/golang.org/x/text \
 		jpillora:backoff:v1.0.0:jpillora_backoff/vendor/github.com/jpillora/backoff \
 		julienschmidt:httprouter:v1.3.0:julienschmidt_httprouter/vendor/github.com/julienschmidt/httprouter \
 		matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \
 		mwitkow:go-conntrack:2f068394615f:mwitkow_go_conntrack/vendor/github.com/mwitkow/go-conntrack \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
-		prometheus:client_golang:v1.9.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
+		prometheus:client_golang:v1.10.0:prometheus_client_golang/vendor/github.com/prometheus/client_golang \
 		prometheus:client_model:v0.2.0:prometheus_client_model/vendor/github.com/prometheus/client_model \
-		prometheus:common:v0.15.0:prometheus_common/vendor/github.com/prometheus/common \
+		prometheus:common:v0.19.0:prometheus_common/vendor/github.com/prometheus/common \
 		prometheus:exporter-toolkit:v0.5.1:prometheus_exporter_toolkit/vendor/github.com/prometheus/exporter-toolkit \
-		prometheus:procfs:v0.2.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
-		protocolbuffers:protobuf-go:v1.23.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
+		prometheus:procfs:v0.6.0:prometheus_procfs/vendor/github.com/prometheus/procfs \
+		protocolbuffers:protobuf-go:v1.26.0:protocolbuffers_protobuf_go/vendor/google.golang.org/protobuf \
 		shurcooL:httpfs:8d4bc4ba7749:shurcool_httpfs/vendor/github.com/shurcooL/httpfs \
 		shurcooL:vfsgen:0d455de96546:shurcool_vfsgen/vendor/github.com/shurcooL/vfsgen

--- a/net-mgmt/pushgateway/distinfo
+++ b/net-mgmt/pushgateway/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1611517766
-SHA256 (prometheus-pushgateway-v1.4.0_GH0.tar.gz) = c4cd90c2f3b03a45d93881d35bfdb2330a1a6cea64700ff8bb0520f1b5426b85
-SIZE (prometheus-pushgateway-v1.4.0_GH0.tar.gz) = 6659094
+TIMESTAMP = 1622599251
+SHA256 (prometheus-pushgateway-v1.4.1_GH0.tar.gz) = 4a5f97ea8c14fc4366ab07a798fcf46ed65481115457998ab86e50955662fd2d
+SIZE (prometheus-pushgateway-v1.4.1_GH0.tar.gz) = 4264820
 SHA256 (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 4624eae43489de8a71ea60efaf6744c581b6bd62909f7514c484c1ea0efaba5a
 SIZE (alecthomas-kingpin-v2.2.6_GH0.tar.gz) = 44383
 SHA256 (alecthomas-template-fb15b899a751_GH0.tar.gz) = 2e2a44375eca48ce941182504b5d13aa98182b9a3f64ace33bfda52208bd0f5e
@ -19,14 +19,14 @@ SHA256 (go-yaml-yaml-v2.4.0_GH0.tar.gz) = d8e94679e5fff6bd1a35e10241543929a5f3da
 SIZE (go-yaml-yaml-v2.4.0_GH0.tar.gz) = 73209
 SHA256 (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 8e905a4ce396416a8c8afd8075b93da404f77a9ec1475ad2814d289a1e21a0ee
 SIZE (golang-crypto-5f87f3452ae9_GH0.tar.gz) = 1721681
-SHA256 (golang-net-f5854403a974_GH0.tar.gz) = 75e94d61e00b4aec6b7baea0927e51a92239caf876214f45394258855c73f92f
-SIZE (golang-net-f5854403a974_GH0.tar.gz) = 1178323
-SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610
-SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969
-SHA256 (golang-sys-f9fddec55a1e_GH0.tar.gz) = 1ab3f80841babed9c5cd8e93f69bfcb7847c406e767b5d86d5da7dc3c0f24931
-SIZE (golang-sys-f9fddec55a1e_GH0.tar.gz) = 1090464
-SHA256 (golang-text-v0.3.3_GH0.tar.gz) = 1604233637e3593749fbbb13b5069b08e6feba6d2b55a02fd3148793d5871185
-SIZE (golang-text-v0.3.3_GH0.tar.gz) = 7747332
+SHA256 (golang-net-4c5254603344_GH0.tar.gz) = 5957e628f2676d9e6c9517890bdcec334e8cac53d0f000b42ed6364a0550e152
+SIZE (golang-net-4c5254603344_GH0.tar.gz) = 1177478
+SHA256 (golang-protobuf-v1.5.1_GH0.tar.gz) = d6f2c6973d08e6701c41e6c0afc381c985270ad8050c7819da197b258ac8959d
+SIZE (golang-protobuf-v1.5.1_GH0.tar.gz) = 171617
+SHA256 (golang-sys-68d13333faf2_GH0.tar.gz) = 5c3c90ba4825031c3b528655871fa23218c401f6f47ef097ce8e2c90e84f8d00
+SIZE (golang-sys-68d13333faf2_GH0.tar.gz) = 1217255
+SHA256 (golang-text-v0.3.2_GH0.tar.gz) = 0b9309698f5708531c5377ab1e29b423a6d9e20c55a8d386c3b8283428212f22
+SIZE (golang-text-v0.3.2_GH0.tar.gz) = 7168069
 SHA256 (jpillora-backoff-v1.0.0_GH0.tar.gz) = 611b29ce95acfa2997e3449762a3df68fcaa773db045535f26eb5c686106351f
 SIZE (jpillora-backoff-v1.0.0_GH0.tar.gz) = 3507
 SHA256 (julienschmidt-httprouter-v1.3.0_GH0.tar.gz) = 2999dffc23f8ac3872ea37d108ddec0ba570d2780a42876300bdcdb0744908e2
@ -37,18 +37,18 @@ SHA256 (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 5bb72eaf9a4ffd7d0353fa69
 SIZE (mwitkow-go-conntrack-2f068394615f_GH0.tar.gz) = 17140
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
-SHA256 (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 92ccfb35268ce2de6beeb45d4b5639e4bce78111b8629bcde5727165f7e1afb1
-SIZE (prometheus-client_golang-v1.9.0_GH0.tar.gz) = 177330
+SHA256 (prometheus-client_golang-v1.10.0_GH0.tar.gz) = e7305f84aa6553d9dd4bfd148d29289df36a9df82dae7be3c6eda62feb56f3d1
+SIZE (prometheus-client_golang-v1.10.0_GH0.tar.gz) = 176316
 SHA256 (prometheus-client_model-v0.2.0_GH0.tar.gz) = 4ab1be9cdfa702d7f49beeb09a256bcc6a2aad55e8a0a37e7732a46934264e12
 SIZE (prometheus-client_model-v0.2.0_GH0.tar.gz) = 10986
-SHA256 (prometheus-common-v0.15.0_GH0.tar.gz) = f0957de56c09431076239d27bb85e07841bb832d0c99210087bc6da63a0b2cb6
-SIZE (prometheus-common-v0.15.0_GH0.tar.gz) = 124369
+SHA256 (prometheus-common-v0.19.0_GH0.tar.gz) = eb56931aa7c784b9019d660af2b5596c5d49770ed46ee937423adac9ec16f61c
+SIZE (prometheus-common-v0.19.0_GH0.tar.gz) = 123859
 SHA256 (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 721740ad90ac0d32e51c94d05b67a276cbed2c138e9af16587f98e8664750220
 SIZE (prometheus-exporter-toolkit-v0.5.1_GH0.tar.gz) = 50475
-SHA256 (prometheus-procfs-v0.2.0_GH0.tar.gz) = b6c013031ac8b9f8f9e1595103c48feb80dfe59c37aac73efe724fddbc0b3f50
-SIZE (prometheus-procfs-v0.2.0_GH0.tar.gz) = 157368
-SHA256 (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = e7266bedaa4f110216fce52ae533dc5eba475d3829bb0592e8876684e202ae1f
-SIZE (protocolbuffers-protobuf-go-v1.23.0_GH0.tar.gz) = 1214648
+SHA256 (prometheus-procfs-v0.6.0_GH0.tar.gz) = 6ad7a23cf4db9fa5dbf2c5d8fbd0fbf5ffe48e3ddb7bf15f9359813d764ce73c
+SIZE (prometheus-procfs-v0.6.0_GH0.tar.gz) = 169898
+SHA256 (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 26218474bcf776ecf32d7d194c6bfaca8e7b4f0c087e5b595fd50fbb31409676
+SIZE (protocolbuffers-protobuf-go-v1.26.0_GH0.tar.gz) = 1270215
 SHA256 (shurcooL-httpfs-8d4bc4ba7749_GH0.tar.gz) = 761fc18152b6998a40b6aa8169fa1275cbbbdba0632096bf5a004a8c5d1c9d99
 SIZE (shurcooL-httpfs-8d4bc4ba7749_GH0.tar.gz) = 8713
 SHA256 (shurcooL-vfsgen-0d455de96546_GH0.tar.gz) = e54c6fad553f915401861a2c687c53f2b44c8ad9a209ceac174b85be75e4669f
--- a/net/nats-streaming-server/Makefile
+++ b/net/nats-streaming-server/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	nats-streaming-server
-PORTVERSION=	0.21.2
+PORTVERSION=	0.22.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net

--- a/net/nats-streaming-server/distinfo
+++ b/net/nats-streaming-server/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1618590615
-SHA256 (nats-io-nats-streaming-server-v0.21.2_GH0.tar.gz) = 4e116cd50e92eb72583db654d083e993a4f217a2096ddb9c56eff561ca5b90ad
-SIZE (nats-io-nats-streaming-server-v0.21.2_GH0.tar.gz) = 2621419
+TIMESTAMP = 1622628653
+SHA256 (nats-io-nats-streaming-server-v0.22.0_GH0.tar.gz) = adbb4a51536f9baabf42788c9e87bef029bc861cc5376e679098f2bc2dce181e
+SIZE (nats-io-nats-streaming-server-v0.22.0_GH0.tar.gz) = 3047160
--- a/science/jmol/Makefile
+++ b/science/jmol/Makefile
@ -1,7 +1,7 @@
 # Created by: Wen heping <wenheping@gmail.com>

 PORTNAME=	Jmol
-DISTVERSION=	14.31.40
+DISTVERSION=	14.31.41
 CATEGORIES=	science java
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/Version%20${DISTVERSION:R}/${PORTNAME}%20${DISTVERSION}/
 DISTFILES=	${PORTNAME}-${DISTVERSION}-full${EXTRACT_SUFX}
--- a/science/jmol/distinfo
+++ b/science/jmol/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1622103232
-SHA256 (Jmol-14.31.40-full.tar.gz) = c7a8e7f70b0f420303d4df86a82ec9f69be80e354a2029f323aa73259bc3c461
-SIZE (Jmol-14.31.40-full.tar.gz) = 122612193
+TIMESTAMP = 1622619999
+SHA256 (Jmol-14.31.41-full.tar.gz) = 2f4a45aa9d00cd69a878c9e01a2c667949cd6b1bc39140456199381dd5954a17
+SIZE (Jmol-14.31.41-full.tar.gz) = 122656900
--- a/science/shelxle/Makefile
+++ b/science/shelxle/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	shelxle
-DISTVERSION=	1.0.1264
+DISTVERSION=	1.0.1267
 CATEGORIES=	science # chemistry
 MASTER_SITES=	SF/${PORTNAME}/code/

--- a/science/shelxle/distinfo
+++ b/science/shelxle/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1622437095
-SHA256 (shelxle-1.0.1264.tar.bz2) = 042d2979998c298e83864b272ea1b12d879f632775fa24a811b2b9708becc101
-SIZE (shelxle-1.0.1264.tar.bz2) = 3460619
+TIMESTAMP = 1622619227
+SHA256 (shelxle-1.0.1267.tar.bz2) = 23a300b841cff6848d9f0ee5493533e9f8b1d10c08f993b8e2987398c6d823dd
+SIZE (shelxle-1.0.1267.tar.bz2) = 3703673
--- a/security/py-gnutls/Makefile
+++ b/security/py-gnutls/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	gnutls
-PORTVERSION=	3.1.2
+PORTVERSION=	3.1.3
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/security/py-gnutls/distinfo
+++ b/security/py-gnutls/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1544176841
-SHA256 (python-gnutls-3.1.2.tar.gz) = 28748e02a8035c31826152944e41217ebcc58ab7793ae5a22850cd23d3cfbbbe
-SIZE (python-gnutls-3.1.2.tar.gz) = 40668
+TIMESTAMP = 1622624776
+SHA256 (python-gnutls-3.1.3.tar.gz) = 79f94017e6472ac665c85bc16d68aa2e6681f53b6a9e74516557b49b6fc6a651
+SIZE (python-gnutls-3.1.3.tar.gz) = 48180
--- a/security/py-gnutls/pkg-plist
+++ b/security/py-gnutls/pkg-plist
@ -1,6 +1,8 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/ca.pem
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/crl.pem
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/expired.crt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/expired.key
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/revoked.crt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/revoked.key
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/certs/valid.crt
@ -9,5 +11,4 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/crypto.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-client.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-green-client.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/twisted-server.py
--- a/security/seal/Makefile
+++ b/security/seal/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	seal
-DISTVERSION=	3.6.4
+DISTVERSION=	3.6.5
 CATEGORIES=	security

 MAINTAINER=	lwhsu@FreeBSD.org
@ -17,6 +17,6 @@ USE_LDCONFIG=	yes
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	SEAL_USE_MSGSL SEAL_USE_ZLIB SEAL_USE_ZSTD # project clones repositories instead of using exrernal packages, see https://github.com/microsoft/SEAL/issues/329

-PLIST_SUB+=	FILE_VER=${DISTVERSION:R}
+PLIST_SUB+=	VERSION=${DISTVERSION} VER=${DISTVERSION:R}

 .include <bsd.port.mk>
--- a/security/seal/distinfo
+++ b/security/seal/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1620257033
-SHA256 (Microsoft-SEAL-3.6.4_GH0.tar.gz) = 7392574fe3b757d5ced8cc973b23a7b69be0cd35b6e778b3c2447598e9ece5b3
-SIZE (Microsoft-SEAL-3.6.4_GH0.tar.gz) = 589909
+TIMESTAMP = 1622625253
+SHA256 (Microsoft-SEAL-3.6.5_GH0.tar.gz) = 77bfcb4a8b785206c419cdf7aff8c200250691518eeddc958f874d1f567b2872
+SIZE (Microsoft-SEAL-3.6.5_GH0.tar.gz) = 591480
--- a/security/seal/pkg-plist
+++ b/security/seal/pkg-plist
@ -1,67 +1,67 @@
-include/SEAL-%%FILE_VER%%/seal/batchencoder.h
-include/SEAL-%%FILE_VER%%/seal/ciphertext.h
-include/SEAL-%%FILE_VER%%/seal/ckks.h
-include/SEAL-%%FILE_VER%%/seal/context.h
-include/SEAL-%%FILE_VER%%/seal/decryptor.h
-include/SEAL-%%FILE_VER%%/seal/dynarray.h
-include/SEAL-%%FILE_VER%%/seal/encryptionparams.h
-include/SEAL-%%FILE_VER%%/seal/encryptor.h
-include/SEAL-%%FILE_VER%%/seal/evaluator.h
-include/SEAL-%%FILE_VER%%/seal/galoiskeys.h
-include/SEAL-%%FILE_VER%%/seal/keygenerator.h
-include/SEAL-%%FILE_VER%%/seal/kswitchkeys.h
-include/SEAL-%%FILE_VER%%/seal/memorymanager.h
-include/SEAL-%%FILE_VER%%/seal/modulus.h
-include/SEAL-%%FILE_VER%%/seal/plaintext.h
-include/SEAL-%%FILE_VER%%/seal/publickey.h
-include/SEAL-%%FILE_VER%%/seal/randomgen.h
-include/SEAL-%%FILE_VER%%/seal/randomtostd.h
-include/SEAL-%%FILE_VER%%/seal/relinkeys.h
-include/SEAL-%%FILE_VER%%/seal/seal.h
-include/SEAL-%%FILE_VER%%/seal/secretkey.h
-include/SEAL-%%FILE_VER%%/seal/serializable.h
-include/SEAL-%%FILE_VER%%/seal/serialization.h
-include/SEAL-%%FILE_VER%%/seal/util/blake2-impl.h
-include/SEAL-%%FILE_VER%%/seal/util/blake2.h
-include/SEAL-%%FILE_VER%%/seal/util/clang.h
-include/SEAL-%%FILE_VER%%/seal/util/clipnormal.h
-include/SEAL-%%FILE_VER%%/seal/util/common.h
-include/SEAL-%%FILE_VER%%/seal/util/config.h
-include/SEAL-%%FILE_VER%%/seal/util/croots.h
-include/SEAL-%%FILE_VER%%/seal/util/defines.h
-include/SEAL-%%FILE_VER%%/seal/util/dwthandler.h
-include/SEAL-%%FILE_VER%%/seal/util/fips202.h
-include/SEAL-%%FILE_VER%%/seal/util/galois.h
-include/SEAL-%%FILE_VER%%/seal/util/gcc.h
-include/SEAL-%%FILE_VER%%/seal/util/globals.h
-include/SEAL-%%FILE_VER%%/seal/util/hash.h
-include/SEAL-%%FILE_VER%%/seal/util/hestdparms.h
-include/SEAL-%%FILE_VER%%/seal/util/intel_seal_ext.h
-include/SEAL-%%FILE_VER%%/seal/util/iterator.h
-include/SEAL-%%FILE_VER%%/seal/util/locks.h
-include/SEAL-%%FILE_VER%%/seal/util/mempool.h
-include/SEAL-%%FILE_VER%%/seal/util/msvc.h
-include/SEAL-%%FILE_VER%%/seal/util/ntt.h
-include/SEAL-%%FILE_VER%%/seal/util/numth.h
-include/SEAL-%%FILE_VER%%/seal/util/pointer.h
-include/SEAL-%%FILE_VER%%/seal/util/polyarithsmallmod.h
-include/SEAL-%%FILE_VER%%/seal/util/polycore.h
-include/SEAL-%%FILE_VER%%/seal/util/rlwe.h
-include/SEAL-%%FILE_VER%%/seal/util/rns.h
-include/SEAL-%%FILE_VER%%/seal/util/scalingvariant.h
-include/SEAL-%%FILE_VER%%/seal/util/streambuf.h
-include/SEAL-%%FILE_VER%%/seal/util/uintarith.h
-include/SEAL-%%FILE_VER%%/seal/util/uintarithmod.h
-include/SEAL-%%FILE_VER%%/seal/util/uintarithsmallmod.h
-include/SEAL-%%FILE_VER%%/seal/util/uintcore.h
-include/SEAL-%%FILE_VER%%/seal/util/ztools.h
-include/SEAL-%%FILE_VER%%/seal/valcheck.h
-include/SEAL-%%FILE_VER%%/seal/version.h
-lib/cmake/SEAL-%%FILE_VER%%/SEALConfig.cmake
-lib/cmake/SEAL-%%FILE_VER%%/SEALConfigVersion.cmake
-lib/cmake/SEAL-%%FILE_VER%%/SEALTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/SEAL-%%FILE_VER%%/SEALTargets.cmake
+include/SEAL-%%VER%%/seal/batchencoder.h
+include/SEAL-%%VER%%/seal/ciphertext.h
+include/SEAL-%%VER%%/seal/ckks.h
+include/SEAL-%%VER%%/seal/context.h
+include/SEAL-%%VER%%/seal/decryptor.h
+include/SEAL-%%VER%%/seal/dynarray.h
+include/SEAL-%%VER%%/seal/encryptionparams.h
+include/SEAL-%%VER%%/seal/encryptor.h
+include/SEAL-%%VER%%/seal/evaluator.h
+include/SEAL-%%VER%%/seal/galoiskeys.h
+include/SEAL-%%VER%%/seal/keygenerator.h
+include/SEAL-%%VER%%/seal/kswitchkeys.h
+include/SEAL-%%VER%%/seal/memorymanager.h
+include/SEAL-%%VER%%/seal/modulus.h
+include/SEAL-%%VER%%/seal/plaintext.h
+include/SEAL-%%VER%%/seal/publickey.h
+include/SEAL-%%VER%%/seal/randomgen.h
+include/SEAL-%%VER%%/seal/randomtostd.h
+include/SEAL-%%VER%%/seal/relinkeys.h
+include/SEAL-%%VER%%/seal/seal.h
+include/SEAL-%%VER%%/seal/secretkey.h
+include/SEAL-%%VER%%/seal/serializable.h
+include/SEAL-%%VER%%/seal/serialization.h
+include/SEAL-%%VER%%/seal/util/blake2-impl.h
+include/SEAL-%%VER%%/seal/util/blake2.h
+include/SEAL-%%VER%%/seal/util/clang.h
+include/SEAL-%%VER%%/seal/util/clipnormal.h
+include/SEAL-%%VER%%/seal/util/common.h
+include/SEAL-%%VER%%/seal/util/config.h
+include/SEAL-%%VER%%/seal/util/croots.h
+include/SEAL-%%VER%%/seal/util/defines.h
+include/SEAL-%%VER%%/seal/util/dwthandler.h
+include/SEAL-%%VER%%/seal/util/fips202.h
+include/SEAL-%%VER%%/seal/util/galois.h
+include/SEAL-%%VER%%/seal/util/gcc.h
+include/SEAL-%%VER%%/seal/util/globals.h
+include/SEAL-%%VER%%/seal/util/hash.h
+include/SEAL-%%VER%%/seal/util/hestdparms.h
+include/SEAL-%%VER%%/seal/util/intel_seal_ext.h
+include/SEAL-%%VER%%/seal/util/iterator.h
+include/SEAL-%%VER%%/seal/util/locks.h
+include/SEAL-%%VER%%/seal/util/mempool.h
+include/SEAL-%%VER%%/seal/util/msvc.h
+include/SEAL-%%VER%%/seal/util/ntt.h
+include/SEAL-%%VER%%/seal/util/numth.h
+include/SEAL-%%VER%%/seal/util/pointer.h
+include/SEAL-%%VER%%/seal/util/polyarithsmallmod.h
+include/SEAL-%%VER%%/seal/util/polycore.h
+include/SEAL-%%VER%%/seal/util/rlwe.h
+include/SEAL-%%VER%%/seal/util/rns.h
+include/SEAL-%%VER%%/seal/util/scalingvariant.h
+include/SEAL-%%VER%%/seal/util/streambuf.h
+include/SEAL-%%VER%%/seal/util/uintarith.h
+include/SEAL-%%VER%%/seal/util/uintarithmod.h
+include/SEAL-%%VER%%/seal/util/uintarithsmallmod.h
+include/SEAL-%%VER%%/seal/util/uintcore.h
+include/SEAL-%%VER%%/seal/util/ztools.h
+include/SEAL-%%VER%%/seal/valcheck.h
+include/SEAL-%%VER%%/seal/version.h
+lib/cmake/SEAL-%%VER%%/SEALConfig.cmake
+lib/cmake/SEAL-%%VER%%/SEALConfigVersion.cmake
+lib/cmake/SEAL-%%VER%%/SEALTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/SEAL-%%VER%%/SEALTargets.cmake
 lib/libseal.so
-lib/libseal.so.3.6
-lib/libseal.so.3.6.4
+lib/libseal.so.%%VER%%
+lib/libseal.so.%%VERSION%%
 libdata/pkgconfig/seal_shared.pc
--- a/textproc/py-citeproc-py/Makefile
+++ b/textproc/py-citeproc-py/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	citeproc-py
-DISTVERSION=	0.5.1
+DISTVERSION=	0.6.0
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/textproc/py-citeproc-py/distinfo
+++ b/textproc/py-citeproc-py/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1586296192
-SHA256 (citeproc-py-0.5.1.tar.gz) = c8a4f22442f2ea57bd88342bb51253f9bff0511109ff3695059278098a734a01
-SIZE (citeproc-py-0.5.1.tar.gz) = 132144
+TIMESTAMP = 1622618961
+SHA256 (citeproc-py-0.6.0.tar.gz) = d9e3a224f936fe2e5033b5d9ffdacab769cedb61d96c4e0cf2f0b488f1d24b4e
+SIZE (citeproc-py-0.6.0.tar.gz) = 140624
--- a/textproc/py-citeproc-py/files/patch-setup.py
+++ b/textproc/py-citeproc-py/files/patch-setup.py
@ -1,4 +1,4 @@
--- setup.py.orig	2020-04-06 16:34:05 UTC
+--- setup.py.orig	2021-05-27 17:28:02 UTC
 +++ setup.py
@@ -30,7 +30,7 @@ os.chdir(BASE_PATH)
 # inspired by http://dcreager.net/2010/02/10/setuptools-git-version-numbers/
@ -9,7 +9,7 @@
                 stdout=PIPE, stderr=sys.stderr)
     if git.wait() != 0:
         raise OSError
-@@ -85,13 +85,12 @@ setup(
+@@ -85,14 +85,13 @@ setup(
     name='citeproc-py',
     version=__version__,
     cmdclass = dict(build_py=custom_build_py, develop=custom_develop),
@ -18,6 +18,7 @@
                             'data/locales/locales.json',
                             'data/schema/*.rng',
                             'data/styles/*.csl']},
+     python_requires='>=3.6',
     scripts=['bin/csl_unsorted'],
 -    setup_requires=['rnc2rng>=2.6.1,!=2.6.2'],
 +    setup_requires=['rnc2rng'],
--- a/www/py-httplib2/Makefile
+++ b/www/py-httplib2/Makefile
@ -1,6 +1,5 @@
 PORTNAME=	httplib2
-PORTVERSION=	0.19.0
-PORTREVISION=	1
+PORTVERSION=	0.19.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/www/py-httplib2/distinfo
+++ b/www/py-httplib2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1612800022
-SHA256 (httplib2-0.19.0.tar.gz) = e0d428dad43c72dbce7d163b7753ffc7a39c097e6788ef10f4198db69b92f08e
-SIZE (httplib2-0.19.0.tar.gz) = 263522
+TIMESTAMP = 1622623893
+SHA256 (httplib2-0.19.1.tar.gz) = 0b12617eeca7433d4c396a100eaecfa4b08ee99aa881e6df6e257a7aad5d533d
+SIZE (httplib2-0.19.1.tar.gz) = 263971
--- a/www/yt-dlp/Makefile
+++ b/www/yt-dlp/Makefile
@ -1,5 +1,5 @@
 PORTNAME=	yt-dlp
-DISTVERSION=	2021.05.20
+DISTVERSION=	2021.06.01
 CATEGORIES=	www

 MAINTAINER=	yuri@FreeBSD.org
@ -8,6 +8,8 @@ COMMENT=	Command-line program for downloading videos from various platforms
 LICENSE=	UNLICENSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycryptodome>0:security/py-pycryptodome@${PY_FLAVOR}
+
 USES=		gmake python shebangfix
 SHEBANG_GLOB=	devscripts/*.py

--- a/www/yt-dlp/distinfo
+++ b/www/yt-dlp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1621529609
-SHA256 (yt-dlp-yt-dlp-2021.05.20_GH0.tar.gz) = b1def2006482deb07005f3b9c61e571e8a7e780adc12e764ab042c97d0d821b4
-SIZE (yt-dlp-yt-dlp-2021.05.20_GH0.tar.gz) = 1631042
+TIMESTAMP = 1622618435
+SHA256 (yt-dlp-yt-dlp-2021.06.01_GH0.tar.gz) = 37992c9116901a6213e3157a6119d2af41d396483bd5260bf377acc80550ddef
+SIZE (yt-dlp-yt-dlp-2021.06.01_GH0.tar.gz) = 1647481
--- a/www/yt-dlp/files/patch-ytdlp_init__.py
+++ b/www/yt-dlp/files/patch-ytdlp_init__.py
@ -1,21 +1,13 @@
--- yt_dlp/__init__.py.orig	2021-03-18 03:08:48 UTC
+--- yt_dlp/__init__.py.orig	2021-06-01 14:59:03 UTC
 +++ yt_dlp/__init__.py
-@@ -38,7 +38,6 @@ from .utils import (
-     std_headers,
-     write_string,
- )
-from .update import update_self
- from .downloader import (
-     FileDownloader,
- )
-@@ -580,17 +579,9 @@ def _real_main(argv=None):
+@@ -660,17 +660,9 @@ def _real_main(argv=None):
         if opts.rm_cachedir:
             ydl.cache.remove()
 
 -        # Update version
 -        if opts.update_self:
 -            # If updater returns True, exit. Required for windows
-            if update_self(ydl.to_screen, opts.verbose, ydl._opener):
+-            if run_update(ydl):
 -                if actual_use:
 -                    sys.exit('ERROR: The program must exit for the update to complete')
 -                sys.exit()