Framework: partially sync with upstream

Taken from: FreeBSD
intecsov · Mar 28, 2022 · 6967f74 · 6967f74
1 parent 0f9b9f7
commit 6967f74
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 14 deletions.
diff --git a/MOVED b/MOVED
@@ -16968,3 +16968,5 @@ x11-toolkits/pangoxsl||2022-03-20|Has expired: Abandonware and not used by any p
 print/lgrind||2022-03-22|Has expired: Abandonware as last release was in 2001
 devel/py-decorator4||2022-03-22|Has expired: Legacy version, use devel/py-decorator instead
 devel/p5-Log-Any-Adapter-Callback|devel/p5-Log-Any|2022-03-22|Has expired: Use devel/p5-Log-Any (Log::Any::Adapter::Capture) instead
+devel/py-asyncio||2022-03-25|Remove obsoleted port. The asyncio package has been included in the standard library since Python 3.4
+math/py-mutatormath|math/py-MutatorMath|2022-03-25|Remove duplicate port
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
@@ -65,7 +65,7 @@ MASTER_SITES_QSCI2=	RIVERBANK/QScintilla/${PORTVERSION} \
 
 SIP_VERSION=		6.5.1
 SIP4_VERSION=		4.19.25
-QSCI2_VERSION=		2.13.1
+QSCI2_VERSION=		2.13.2
 PYQT5_VERSION=		5.15.6
 PYQTCHART_VERSION=	5.15.5
 PYQTNETWORKAUTH_VERSION=5.15.5

diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
@@ -514,18 +514,12 @@ _PYTHONPKGLIST=	${WRKDIR}/.PLIST.pymodtmp
 # - it uses USE_PYTHON=distutils
 #
 
-.if ${PYTHON_REL} >= 31100
-_CYTHON_DEP=	cython-${PYTHON_VER}:lang/cython-devel@${PY_FLAVOR}
-.else
-_CYTHON_DEP=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
-.endif
-
 .if defined(_PYTHON_FEATURE_CYTHON)
-BUILD_DEPENDS+=	${_CYTHON_DEP}
+BUILD_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .endif
 
 .if defined(_PYTHON_FEATURE_CYTHON_RUN)
-RUN_DEPENDS+=	${_CYTHON_DEP}
+RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .endif
 
 .if defined(_PYTHON_FEATURE_CONCURRENT)

diff --git a/Mk/Uses/varnish.mk b/Mk/Uses/varnish.mk
@@ -2,7 +2,7 @@
 #
 # Feature:      varnish
 # Usage:        USES=varnish
-# Valid ARGS:   4, 6, run
+# Valid ARGS:   4, 6, 7, run
 #
 # MAINTAINER: [email protected]
 
@@ -15,6 +15,8 @@ VARNISH_VERSION=	${VARNISH_DEFAULT}
 VARNISH_VERSION=	4
 . elif ${varnish_ARGS:M6}
 VARNISH_VERSION=	6
+. elif ${varnish_ARGS:M7}
+VARNISH_VERSION=	7
 . elif defined(VARNISH_DEFAULT)
 . endif
 

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
@@ -1927,7 +1927,7 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 						load-octave-pkg \
 						ocamlfind \
 						update-desktop-database update-mime-database \
-						gdk-pixbuf-query-loaders catalog.ports \
+						catalog.ports \
 						ccache-update-links
 
 .if defined(USE_LOCAL_MK)

diff --git a/Tools/scripts/search_lib_depends_and_bump.sh b/Tools/scripts/search_lib_depends_and_bump.sh
@@ -33,7 +33,7 @@ PORT_TO_SEARCH=${1}
 BASEDIR=$(pwd)
 # Get a list of all ports
 echo "Prepare a list of all ports"
-ports=$(find . -name Makefile ! -path "./Tools/* | sort")
+ports=`find . -name Makefile -maxdepth 3 -not \( -path "./distfiles/*" -prune \) -not \( -path "./Tools/*" -prune \) -print | sort`
 echo "done."
 echo
 

diff --git a/UPDATING b/UPDATING
@@ -5,6 +5,18 @@ 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.
 
+20220326:
+  AFFECTS: users of misc/freebsd-doc-*
+  AUTHOR: [email protected]
+
+  A change to the doc toolchain prevents the build of individual
+  localized HTML versions of the documentation without building the
+  en_US version.  HTML option is currently disabled until a good
+  solution is found.  PDF version, the default option, is now the only
+  available option.
+
+  Please re-run "make config" to pick up this new default.
+
 20220313:
   AFFECTS: users of net/unison
   AUTHOR: [email protected]
@@ -75,7 +87,7 @@ you update your ports collection, before attempting any port upgrades.
   AFFECTS: users of sysutils/intel-pcm-devel
   AUTHOR: [email protected]
 
-  sysutils/intel-pcm-devel became quite obsolte once sysutils/intel-pcm is
+  sysutils/intel-pcm-devel became quite obsolete once sysutils/intel-pcm is
   now pretty much following a constant and stable update cycle, so users of
   the -devel version are encouraged to switch to it.
 
@@ -307,7 +319,7 @@ you update your ports collection, before attempting any port upgrades.
 
   emulators/qemu50 has been moved to emulators/qemu5 and updated to 5.2.0 
   which is the last version from 5.X.X branch. This is done in preparation
-  of updating emulators/qemu into latest 6.X bgranch. If someone wants to
+  of updating emulators/qemu into latest 6.X branch. If someone wants to
   stick with 5.X.X branch please use one of the following command:
 
   # pkg install qemu5