Framework: partially sync with upstream

Taken from: HardenedBSD

MOVED

@@ -5974,7 +5974,6 @@ java/linux-sun-jdk16||2014-05-11|Has expired: Unsupported and known for multiple
 ports-mgmt/pver||2014-05-11|Has expired: does not support pkgng
 databases/firebird20-client|databases/firebird25-client|2014-05-11|Firebird 2.0 is EOLed
 databases/firebird20-server|databases/firebird25-server|2014-05-11|Firebird 2.0 is EOLed
-editors/ved||2014-05-15|Has expired: Depends on deprecated smake
 japanese/chasen||2014-05-15|Has expired: Unmaintained since 2001
 www/openx|www/revive-adserver|2014-05-15|Upstream obsolete, forked
 security/clamav-devel||2014-05-16|Retire, older than security/clamav
@@ -16456,3 +16455,6 @@ www/blastbeat||2021-06-26|Removed, abandoned upstream, broken on 12.X since 2019
 www/demoroniser||2021-06-26|Removed, made for Microsoft Powerpoint 9x with Perl 4.0
 x11-toolkits/v||2021-06-27|Has expired: Dead upstream, unmaintained and no consumers
 sysutils/ssid|sysutils/setsid|2021-06-27|Move to more obvious package name
+databases/pgpool-II-35||2021-07-01|Has expired: EOL since January 2021, please use one of the other pgpool-II-* ports
+sysutils/cdrtools-devel|sysutils/cdrtools|2021-07-01|Obsolete, use sysutils/cdrtools instead
+sysutils/sformat|sysutils/schilyutils|2021-07-01|Subsumed under sysutils/schilyutils

Mk/Uses/meson.mk

@@ -24,7 +24,7 @@ _INCLUDE_USES_MESON_MK=	yes
 IGNORE=	Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
 .endif
 
-BUILD_DEPENDS+=		meson:devel/meson
+BUILD_DEPENDS+=		meson>=0.57.1_1:devel/meson
 
 # meson uses ninja
 .include "${USESDIR}/ninja.mk"

Mk/Uses/perl5.mk

@@ -167,7 +167,7 @@ IGNORE= has unknown USE_PERL5 components: ${_USE_PERL5_UNKNOWN}
 _USES_POST+=	perl5
 
 .  if   ${PERL_LEVEL} >= 503100
-P5_POD_PARSER=	p5-Pod-Parser>=0:textproc/p5-Pod-Parser
+P5_POD_PARSER=	p5-Pod-Parser>=1.63:textproc/p5-Pod-Parser
 .  else
 P5_POD_PARSER=	
 .  endif

Mk/Uses/qt-dist.mk

@@ -172,7 +172,7 @@ _EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
-.        if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64
+.    if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang)) || ${ARCH} == sparc64
 _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
@@ -204,15 +204,6 @@ QMAKE_ARGS+=		QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
 QMAKE_ARGS+=		QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
 .  endif
 
-# Add a RUN_DEPENDS on misc/qtchooser to select the binaries.
-# The binaries of both supported Qt versions are installed to
-# ${LOCALBASE}/lib/qt${_QT_VER}/bin. The port misc/qtchooser installs
-# wrapper binaries into ${LOCALBASE}/bin, and chooses the correct
-# one depending on the value of QT_SELECT (which we pass to both
-# CONFIGURE_ENV and MAKE_ENV). Therefore make all QT_DIST ports
-# RUN_DEPEND on it.
-RUN_DEPENDS+=		qtchooser:misc/qtchooser
-
 PLIST_SUB+=		SHORTVER=${DISTVERSION:R} \
 			FULLVER=${DISTVERSION:C/-.*//}
 
@@ -248,7 +239,7 @@ _QT_TOOLS+=		${UIC}
 _QT5_BASE=		core dbus gui network sql widgets
 _QT5_ADDITIONAL_LINK?=	# Ensure definition
 
-.if ${_QT_VER:M5}
+.      if ${_QT_VER:M5}
 post-patch: gcc-post-patch
 gcc-post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
@@ -259,7 +250,7 @@ gcc-post-patch:
 		${WRKSRC}/mkspecs/common/g++-base.conf \
 		${WRKSRC}/mkspecs/common/bsd/bsd.conf \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
-.endif
+.      endif
 
 pre-configure: qtbase-pre-configure
 qtbase-pre-configure:
@@ -353,11 +344,9 @@ _sub_need_remove=	\#\#
 _sub_need_add=		\#\#
 _sub_need_remove=	
 .    endif
-# Handle misc/qtchooser wrapper installation and deinstallation
 # If a port installs Qt version-specific binaries (e.g. "designer" which 
 # existed as a Qt4 application and exists as a Qt5 application and will 
-# probably be a Qt6 application) which should have a qtchooser-based wrapper, 
-# the port should set `QT_BINARIES=yes`.
+# probably be a Qt6 application) the port should set `QT_BINARIES=yes`.
 .    if defined(QT_BINARIES)
 _sub_need_bin=
 .    else

Mk/Uses/qt.mk

@@ -70,18 +70,21 @@ QT_ETCDIR_REL?=		etc/xdg
 QT_EXAMPLEDIR_REL?=	share/examples/${_QT_RELNAME}
 QT_TESTDIR_REL?=	${QT_DATADIR_REL}/tests
 QT_CMAKEDIR_REL?=	lib/cmake
-QT_QTCHOOSERDIR_REL?=	${QT_ETCDIR_REL}/qtchooser
 
 # Not customizable.
 QT_MKSPECDIR_REL=	${QT_ARCHDIR_REL}/mkspecs
 _QT_LIBVER=		${_QT_VERSION:R:R}
 
+LCONVERT?=		${QT_BINDIR}/lconvert
 LRELEASE?=		${QT_BINDIR}/lrelease
 LUPDATE?=		${QT_BINDIR}/lupdate
 MOC?=			${QT_BINDIR}/moc
 RCC?=			${QT_BINDIR}/rcc
 UIC?=			${QT_BINDIR}/uic
 QMAKE?=			${QT_BINDIR}/qmake
+QCOLLECTIONGENERATOR?=	${QT_BINDIR}/qcollectiongenerator
+QHELPGENERATOR?=	${QT_BINDIR}/qhelpgenerator
+
 # Needed to redefine the qmake target for internal Qt configuration.
 _QMAKE?=		${QMAKE}
 QMAKESPECNAME?=		freebsd-${QMAKE_COMPILER}
@@ -95,7 +98,7 @@ QMAKE_COMPILER=	$$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo
 
 .  for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
 	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC \
-	CMAKE QTCHOOSER
+	CMAKE
 QT_${dir}DIR=	${PREFIX}/${QT_${dir}DIR_REL}
 # Export all directories to the plist substituion for QT_DIST ports.
 # For the others, exclude QT_CMAKEDIR and QT_ETCDIR.

Mk/bsd.default-versions.mk

@@ -39,7 +39,7 @@ BDB_DEFAULT?=		5
 COROSYNC_DEFAULT?=	2
 # Possible_values: full canna nox devel_full devel_nox
 #EMACS_DEFAULT?=	let the flavor be the default if not explicitly set
-# Possible values: 2.5 3.0 4.0
+# Possible values: 2.5, 3.0, 4.0
 FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran

Mk/bsd.gcc.mk

@@ -44,7 +44,7 @@ GCC_Include_MAINTAINER=		[email protected]
 # All GCC versions supported by this framework.
 #
 # When updating this, keep Mk/bsd.default-versions.mk in sync.
-GCCVERSIONS=	4.8 7 8 9 10 11 12
+GCCVERSIONS=	4.8 8 9 10 11 12
 
 # No configurable parts below this. ####################################
 #

Mk/bsd.options.desc.mk

@@ -59,9 +59,11 @@ COOKIE_DESC?=		Web cookie support
 CUE_DESC?=		Embedded CUE sheets support
 CUPS_DESC?=		CUPS printing system support
 CURL_DESC?=		Data transfer support via cURL
+CVS_DESC?=		CVS version control support
 CXX_DESC?=		C++ language support
 CYASSL_DESC?=		SSL/TLS support via CyaSSL
 DAGRAB_DESC?=		CD ripping support (via dagrab)
+DARCS_DESC?=		Darcs version control support
 DATA_DESC?=		Install data files
 DBM_DESC?=		dbm database library support
 DBUS_DESC?=		D-Bus IPC system support
@@ -117,6 +119,7 @@ GGI_DESC?=		General Graphics Interface support
 GHOSTSCRIPT_DESC?=	Ghostscript support
 GIF_DESC?=		GIF image format support
 GIO_DESC?=		Use GIO for file I/O
+GIT_DESC?=		Git version control support
 GLADE_DESC?=		Glade interface builder support
 GLUT_DESC?=		OpenGL Utility Toolkit support
 GLX_DESC?=		X11 OpenGL rendering support
@@ -318,6 +321,7 @@ MATE_DESC?=		MATE desktop environment support
 MATROSKA_DESC?=		Matroska container format support
 MBEDTLS_DESC?=		SSL/TLS support via mbed TLS
 MDNSRESPONDER_DESC?=	Zeroconf support via mDNSResponder
+MERCURIAL_DESC?=	Mercurial version control support
 METALINK_DESC?=		Metalink support
 MIKMOD_DESC?=		MOD audio format support
 MIXER_DESC?=		Audio mixer support
@@ -389,6 +393,7 @@ PAM_DESC?=		Pluggable authentication module support
 PANGO_DESC?=		Pango rendering library support
 PCRE_DESC?=		Use Perl Compatible Regular Expressions
 PDF_DESC?=		PDF document support
+PERFORCE_DESC?=		Perforce version control support
 PERL_DESC?=		Perl scripting language support
 PGO_DESC?=		Use Profile-Guided Optimization
 PGSQL_DESC?=		PostgreSQL database support
@@ -462,9 +467,9 @@ SSL_DESC?=		SSL protocol support
 STATIC_DESC?=		Build static executables and/or libraries
 STRIP_DESC?=		Strip binaries before installation
 STROKE_DESC?=		Mouse gestures support via libstroke
+SUBVERSION_DESC?=	Subversion version control support
 SVG_DESC?=		SVG vector image format support
 SVGALIB_DESC?=		SVGA graphics support
-SVN_DESC?=		Subversion support
 SWFDEC_DESC?=		Flash support via Swfdec
 SWIG_DESC?=		SWIG binding/wrapper support
 SYBASE_DESC?=		Sybase SQL Server support

Tools/scripts/rmport

@@ -410,7 +410,7 @@ fi
 gitlog=$(mktemp -t gitlog)
 gitrmlist=$(mktemp -t gitrmlist)
 
-echo "*/*: Remove expired ports:" > ${gitlog}
+echo "cleanup: Remove expired ports:" > ${gitlog}
 echo "" >> ${gitlog}
 
 for catport in $* ; do

UPDATING

@@ -5,6 +5,19 @@ 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.
 
+20210704:
+  AFFECTS: users of misc/qtchooser
+  AUTHOR: [email protected]
+
+  QtChooser allows you to select your version of Qt among those installed.
+  However, this tool is no longer supported upstream and will not be
+  available for Qt6.
+
+  By default, our Qt installations are done in:
+  ${LOCALBASE}/lib/qt${QT_VERSION} as recommended.
+  We have added symbolic linking for the main binaries to 
+  ${LOCALBASE}/bin with the suffix -qt5.
+
 20210628:
   AFFECTS: users of misc/openhab
   AUTHOR: [email protected]