Framework: partially sync with upstream

Taken from: FreeBSD

MOVED

@@ -9128,7 +9128,6 @@ sysutils/sievelog||2017-04-30|Has expired: Unfetchable for more than six months
 sysutils/ldapenter||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 sysutils/py-danzfs||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 sysutils/plasma-applet-apcups||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
-sysutils/pdsh||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 deskutils/superswitcher||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 deskutils/plasma-applet-playwolf||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
 deskutils/nagaina||2017-04-30|Has expired: Unfetchable for more than six months (google code has gone away)
@@ -16486,3 +16485,18 @@ net-mgmt/zabbix52-frontend||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-java||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-proxy||2021-09-19|Has expired: Unsupported by upstream
 net-mgmt/zabbix52-server||2021-09-19|Has expired: Unsupported by upstream
+devel/py-pyyaml-env-tag|devel/py-pyyaml_env_tag|2021-09-28|Renamed to match upstream naming
+mail/opensmtpd-devel|mail/opensmtpd|2021-09-28|Has expired: move to offical releases
+devel/erlang-exmpp||2021-09-30|Removed, last upstream patches over 10 years ago
+sysutils/showbeastie||2021-09-30|Broken on FreeBSD 12 and above since 2018
+www/squid3|www/squid|2021-09-30|Has expired: Unsupported by upstream
+sysutils/cfengine310|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported.
+security/py-paramiko1|security/py-paramiko|2021-09-30|Has expired: Out of date version.  No consumer now.  Use security/py-paramiko
+sysutils/cfengine-masterfiles310|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine310 will retire at FreeBSD 11 EOL
+security/openca-tools-forked|security/libscep|2021-09-30|Has expired: Use modern port security/libscep instead
+multimedia/sms1xxx-kmod|multimedia/webcamd|2021-09-30|Has expired: Supports DVB API v3 only. Use multimedia/webcamd instead
+sysutils/cfengine311|sysutils/cfengine317|2021-09-30|Has expired: OpenSSL 1.1.X is not supported.
+sysutils/cfengine-masterfiles311|sysutils/cfengine-masterfiles317|2021-09-30|Has expired: cfengine311 will retire at FreeBSD 11 EOL
+mail/postfix35|mail/postfix|2021-09-30|Has expired: It is only here until FreeBSD 11 is EoL (Postfix >= 3.6 requires OpenSSL >= 1.1.x)
+graphics/drm-fbsd11.2-kmod||2021-09-30|Removed, only useful on EOL FreeBSD 11.4
+devel/qca-legacy|devel/qca|2021-09-30|Removed, only useful on EOL FreeBSD 11.4

Mk/Scripts/rust-compat11-canary.sh

@@ -3,7 +3,7 @@
 set -eu
 set -o pipefail
 
-if [ "${OPSYS}" != FreeBSD ] || [ "${OSVERSION}" -lt 1200000 ]; then
+if [ "${OPSYS}" != FreeBSD ] ; then
 	exit 0
 fi
 

Mk/Uses/qca.mk

@@ -16,13 +16,7 @@ IGNORE+=		USES=qca takes no arguments
 _QCA_LIB=		libqca-qt5.so
 
 _QCA_DEFAULT_PORT=	devel/qca
-_QCA_LEGACY_PORT=	devel/qca-legacy
-
-.  if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == base
-_QCA_CHOSEN_PORT=	LEGACY
-.  else
 _QCA_CHOSEN_PORT=	DEFAULT
-.  endif
 
 LIB_DEPENDS+=		${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}
 

Mk/bsd.lto.mk

@@ -0,0 +1,11 @@
+# LTO Support
+
+LTO_Include_MAINTAINER=	[email protected]
+
+.if !defined(LTO_UNSAFE)
+# Overridable as a user may want to use -flto
+LTO_FLAGS?=	-flto=thin
+CFLAGS+=	${LTO_FLAGS}
+CXXFLAGS+=	${LTO_FLAGS}
+LDFLAGS+=	${LTO_FLAGS}
+.endif

Mk/bsd.port.mk

@@ -1177,7 +1177,7 @@ OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${SRC
 .endif
 _EXPORTED_VARS+=	OSVERSION
 
-.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1104000 || (${OSVERSION} >= 1200000 && ${OSVERSION} < 1202000))) || \
+.if (${OPSYS} == FreeBSD && ${OSVERSION} < 1202000) || \
     (${OPSYS} == DragonFly && ${DFLYVERSION} < 400400)
 _UNSUPPORTED_SYSTEM_MESSAGE=	Ports Collection support for your ${OPSYS} version has ended, and no ports\
 								are guaranteed to build on this system. Please upgrade to a supported release.
@@ -1799,6 +1799,10 @@ INSTALL_TARGET:=	${INSTALL_TARGET:S/^install-strip$/install/g}
 .endif
 .endif
 
+.if defined(USE_LTO)
+.include "${PORTSDIR}/Mk/bsd.lto.mk"
+.endif
+
 .if !defined(WITHOUT_SSP)
 .include "${PORTSDIR}/Mk/bsd.ssp.mk"
 .endif

Templates/BSD.local.dist

@@ -290,6 +290,8 @@
             vendor_completions.d
             ..
         ..
+        icons
+        ..
         info
         ..
         java

Tools/scripts/tindex

@@ -27,7 +27,6 @@ ERROR_ADDRESS=root@localhost
 # Location of ports tree and source trees
 export BASEDIR=/a/tindex
 export PORTSDIR=${BASEDIR}/ports
-export SRCDIR11=${BASEDIR}/src.11
 export SRCDIR12=${BASEDIR}/src.12
 export SRCDIR13=${BASEDIR}/src.13
 export SRCDIR14=${BASEDIR}/src.14
@@ -114,9 +113,6 @@ export INDEX_JOBS=3
 export INDEX_QUIET=1
 
 # First update the source trees to get current OSVERSION
-${SVN} -q up ${SRCDIR11}/sys/sys
-OSVERSION11=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR11}/sys/sys/param.h)
-
 ${SVN} -q up ${SRCDIR12}/sys/sys
 OSVERSION12=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR12}/sys/sys/param.h)
 
@@ -127,15 +123,15 @@ ${GIT} -C ${SRCDIR14} pull --rebase -q
 OSVERSION14=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR14}/sys/sys/param.h)
 
 cd ${PORTSDIR}
-rm -f INDEX-11 INDEX-11.bz2 INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
+rm -f INDEX-12 INDEX-12.bz2 INDEX-13 INDEX-13.bz2 INDEX-14 INDEX-14.bz2
 OLD_HEAD=$(${GIT} rev-parse HEAD)
 if ! ${GIT} pull --ff-only > git.log 2>&1 ; then
   (echo "Git update failed with conflicts:";
     cat git.log) | mail -s "Ports Git update failed" ${ERROR_ADDRESS}
     exit 1
 fi
 
-for branch in 11.x 12.x 13.x 14.x; do
+for branch in 12.x 13.x 14.x; do
     release=$(echo $branch | sed -e 's,.x,,')
 
     eval _osver=\$OSVERSION${release}