D36233.diff
No OneTemporary
Actions

Size

56 KB

Referenced Files

None

Subscribers

None

D36233.diff
View Options

	diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
	--- a/Mk/bsd.port.mk
	+++ b/Mk/bsd.port.mk
	@@ -1169,7 +1169,7 @@
	. endif
	_EXPORTED_VARS+= OSVERSION

	-. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1203000
	+. if ${OPSYS} == FreeBSD && (${OSVERSION} < 1203000 \|\| (${OSVERSION} >= 1300000 && ${OSVERSION} < 1301000))
	_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.
	. if defined(ALLOW_UNSUPPORTED_SYSTEM)
	diff --git a/Tools/scripts/portsearch b/Tools/scripts/portsearch
	--- a/Tools/scripts/portsearch
	+++ b/Tools/scripts/portsearch
	@@ -24,8 +24,6 @@
	# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
	# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	#
	-# $Id$
	-#


	# Each port record in INDEX contains 10 fields, delimited by ``\|'', some
	@@ -50,7 +48,7 @@
	$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );

	my $VERSION = "1.0";
	-my $file = "$portsdir/INDEX" . ($osrel <= 4 ? "" : "-$osrel");
	+my $file = "$portsdir/INDEX-$osrel";
	my $match = 1;
	my $count = 0;
	my $fulldesc = 0;
	diff --git a/archivers/zstd/Makefile b/archivers/zstd/Makefile
	--- a/archivers/zstd/Makefile
	+++ b/archivers/zstd/Makefile
	@@ -13,12 +13,11 @@
	LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING

	LIB_DEPENDS= liblz4.so:archivers/liblz4
	-TEST_DEPENDS= gmd5sum:sysutils/coreutils # required by FreeBSD 13.0

	USES= gmake localbase:ldflags tar:zst

	ALL_TARGET= default
	-#BINARY_ALIAS= gmd5sum=md5sum
	+BINARY_ALIAS= gmd5sum=md5sum
	TEST_TARGET= test
	MAKE_ENV= INSTALL_DATA="${INSTALL_DATA}" \
	INSTALL_MAN="${INSTALL_MAN}" \
	diff --git a/deskutils/xdg-desktop-portal/Makefile b/deskutils/xdg-desktop-portal/Makefile
	--- a/deskutils/xdg-desktop-portal/Makefile
	+++ b/deskutils/xdg-desktop-portal/Makefile
	@@ -28,7 +28,6 @@
	.include <bsd.port.pre.mk>

	.if (${OSVERSION} >= 1400000 && ${OSVERSION} < 1400008) \
	- \|\| (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300501) \
	\|\| ${OSVERSION} < 1300000
	IGNORE= requires O_PATH support in open(2)
	.endif
	diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
	--- a/devel/libpeas/Makefile
	+++ b/devel/libpeas/Makefile
	@@ -34,7 +34,6 @@
	DOCS_MESON_TRUE= gtk_doc

	pre-build:
	-# XXX DISABLE_MAKE_JOBS build fails on 12.2/13.0 i386
	${DO_MAKE_BUILD} -C ${BUILD_WRKSRC} \
	tests/libpeas/plugins/embedded/embedded-resources.h

	diff --git a/editors/imhex/Makefile b/editors/imhex/Makefile
	--- a/editors/imhex/Makefile
	+++ b/editors/imhex/Makefile
	@@ -70,7 +70,6 @@

	# Before LLVM13 import to the base system
	.if (${OSMAJOR} == 12 && ${OSVERSION} < 1203505) \
	- \|\| (${OSMAJOR} == 13 && ${OSVERSION} < 1300523) \
	\|\| (${OSMAJOR} == 14 && ${OSVERSION} < 1400042)
	IGNORE= will not build due to C++20 API functions unavailable in old libc++
	.endif
	diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
	--- a/editors/libreoffice/Makefile
	+++ b/editors/libreoffice/Makefile
	@@ -317,7 +317,6 @@
	.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD && ( \
	- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) \|\| \
	(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) \|\| \
	(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
	BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
	diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile
	--- a/editors/openoffice-4/Makefile
	+++ b/editors/openoffice-4/Makefile
	@@ -200,7 +200,6 @@
	.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD && ( \
	- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) \|\| \
	(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) \|\| \
	(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
	BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
	diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
	--- a/editors/openoffice-devel/Makefile
	+++ b/editors/openoffice-devel/Makefile
	@@ -231,7 +231,6 @@
	.include <bsd.port.pre.mk>

	.if ${OPSYS} == FreeBSD && ( \
	- (${OSVERSION} >= 1300525 && ${OSVERSION} < 1301000) \|\| \
	(${OSVERSION} >= 1301500 && ${OSVERSION} < 1301502) \|\| \
	(${OSVERSION} >= 1400051 && ${OSVERSION} < 1400057))
	BROKEN= please update FreeBSD base system first to fix an ABI incompatibility
	diff --git a/emulators/linux_base-c7/Makefile b/emulators/linux_base-c7/Makefile
	--- a/emulators/linux_base-c7/Makefile
	+++ b/emulators/linux_base-c7/Makefile
	@@ -136,23 +136,10 @@
	etc/passwd etc/printcap etc/protocols etc/services etc/shadow \
	sbin/clock sbin/debugfs sbin/hwclock sbin/runuser sbin/zramctl

	-.include <bsd.port.pre.mk>
	-
	-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300077)
	-GLIBC_VER= 2.17-292.el7
	-MASTER_SITE_SUBDIR+= altarch/7.7.1908/os/aarch64/Packages/:DEFAULT,aarch64 \
	- altarch/7.7.1908/updates/aarch64/Packages/:DEFAULT,aarch64 \
	- centos/7.7.1908/os/x86_64/Packages/:DEFAULT,amd64 \
	- centos/7.7.1908/updates/x86_64/Packages/:DEFAULT,amd64 \
	- altarch/7.7.1908/os/i386/Packages/:DEFAULT,i386 \
	- altarch/7.7.1908/updates/i386/Packages/:DEFAULT,i386 \
	- centos/7.7.1908/os/Source/SPackages/:SOURCE \
	- centos/7.7.1908/updates/Source/SPackages/:SOURCE
	-PLIST_SUB+= NEWGLIBC="@comment "
	-.else
	+.include <bsd.port.options.mk>
	+
	GLIBC_VER= 2.17-323.el7_9
	PLIST_SUB+= NEWGLIBC=""
	-.endif

	.if ${ARCH} == aarch64 \|\| ${ARCH} == amd64
	SYSCTLMIB= kern.features.linux64
	@@ -200,4 +187,4 @@
	${LN} -sf /var/run ${STAGEDIR}${PREFIX}/run
	${LN} -sf /var/tmp ${STAGEDIR}${PREFIX}/usr/tmp

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/emulators/linux_base-c7/pkg-plist.aarch64 b/emulators/linux_base-c7/pkg-plist.aarch64
	--- a/emulators/linux_base-c7/pkg-plist.aarch64
	+++ b/emulators/linux_base-c7/pkg-plist.aarch64
	@@ -496,7 +496,7 @@
	usr/lib64/gconv/IBM855.so
	usr/lib64/gconv/IBM856.so
	usr/lib64/gconv/IBM857.so
	-%%NEWGLIBC%%usr/lib64/gconv/IBM858.so
	+usr/lib64/gconv/IBM858.so
	usr/lib64/gconv/IBM860.so
	usr/lib64/gconv/IBM861.so
	usr/lib64/gconv/IBM862.so
	@@ -1316,7 +1316,7 @@
	usr/share/i18n/charmaps/IBM855.gz
	usr/share/i18n/charmaps/IBM856.gz
	usr/share/i18n/charmaps/IBM857.gz
	-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
	+usr/share/i18n/charmaps/IBM858.gz
	usr/share/i18n/charmaps/IBM860.gz
	usr/share/i18n/charmaps/IBM861.gz
	usr/share/i18n/charmaps/IBM862.gz
	diff --git a/emulators/linux_base-c7/pkg-plist.amd64 b/emulators/linux_base-c7/pkg-plist.amd64
	--- a/emulators/linux_base-c7/pkg-plist.amd64
	+++ b/emulators/linux_base-c7/pkg-plist.amd64
	@@ -486,7 +486,7 @@
	usr/lib/gconv/IBM855.so
	usr/lib/gconv/IBM856.so
	usr/lib/gconv/IBM857.so
	-%%NEWGLIBC%%usr/lib/gconv/IBM858.so
	+usr/lib/gconv/IBM858.so
	usr/lib/gconv/IBM860.so
	usr/lib/gconv/IBM861.so
	usr/lib/gconv/IBM862.so
	@@ -969,7 +969,7 @@
	usr/lib64/gconv/IBM855.so
	usr/lib64/gconv/IBM856.so
	usr/lib64/gconv/IBM857.so
	-%%NEWGLIBC%%usr/lib64/gconv/IBM858.so
	+usr/lib64/gconv/IBM858.so
	usr/lib64/gconv/IBM860.so
	usr/lib64/gconv/IBM861.so
	usr/lib64/gconv/IBM862.so
	@@ -1806,7 +1806,7 @@
	usr/share/i18n/charmaps/IBM855.gz
	usr/share/i18n/charmaps/IBM856.gz
	usr/share/i18n/charmaps/IBM857.gz
	-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
	+usr/share/i18n/charmaps/IBM858.gz
	usr/share/i18n/charmaps/IBM860.gz
	usr/share/i18n/charmaps/IBM861.gz
	usr/share/i18n/charmaps/IBM862.gz
	diff --git a/emulators/linux_base-c7/pkg-plist.i386 b/emulators/linux_base-c7/pkg-plist.i386
	--- a/emulators/linux_base-c7/pkg-plist.i386
	+++ b/emulators/linux_base-c7/pkg-plist.i386
	@@ -482,7 +482,7 @@
	usr/lib/gconv/IBM855.so
	usr/lib/gconv/IBM856.so
	usr/lib/gconv/IBM857.so
	-%%NEWGLIBC%%usr/lib/gconv/IBM858.so
	+usr/lib/gconv/IBM858.so
	usr/lib/gconv/IBM860.so
	usr/lib/gconv/IBM861.so
	usr/lib/gconv/IBM862.so
	@@ -1339,7 +1339,7 @@
	usr/share/i18n/charmaps/IBM855.gz
	usr/share/i18n/charmaps/IBM856.gz
	usr/share/i18n/charmaps/IBM857.gz
	-%%NEWGLIBC%%usr/share/i18n/charmaps/IBM858.gz
	+usr/share/i18n/charmaps/IBM858.gz
	usr/share/i18n/charmaps/IBM860.gz
	usr/share/i18n/charmaps/IBM861.gz
	usr/share/i18n/charmaps/IBM862.gz
	diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
	--- a/graphics/drm-kmod/Makefile
	+++ b/graphics/drm-kmod/Makefile
	@@ -17,8 +17,6 @@
	.if ${ARCH} == "amd64"
	.if ${OSVERSION} < 1300000
	RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd12.0-kmod
	-.elif ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300136
	-IGNORE= not supported on older 13, no kernel support
	.elif ${OSVERSION} >= 1300136 && ${OSVERSION} < 1400000
	RUN_DEPENDS= ${KMODDIR}/drm.ko:graphics/drm-fbsd13-kmod
	.elif ${OSVERSION} >= 1400000
	diff --git a/graphics/gpu-firmware-amd-kmod/Makefile b/graphics/gpu-firmware-amd-kmod/Makefile
	--- a/graphics/gpu-firmware-amd-kmod/Makefile
	+++ b/graphics/gpu-firmware-amd-kmod/Makefile
	@@ -49,9 +49,7 @@
	sienna_cichlid

	green_sardine_IGNORE_FreeBSD_12= "Not supported on < 13.1"
	-green_sardine_IGNORE_FreeBSD_13.0= "Not supported on < 13.1"
	sienna_cichlid_IGNORE_FreeBSD_12= "Not supported on < 13.1"
	-sienna_cichlid_IGNORE_FreeBSD_13.0= "Not supported on < 13.1"

	USES= kmod uidfix

	diff --git a/graphics/linux-c7-libdrm/Makefile b/graphics/linux-c7-libdrm/Makefile
	--- a/graphics/linux-c7-libdrm/Makefile
	+++ b/graphics/linux-c7-libdrm/Makefile
	@@ -15,17 +15,4 @@

	OPTIONS_DEFINE= DOCS

	-.include <bsd.port.options.mk>
	-
	-.if ${OPSYS} == FreeBSD && \
	- (${OSVERSION} >= 1300000 && ${OSVERSION} < 1300048)
	-PORTVERSION= 2.4.91
	-DISTVERSIONSUFFIX= -3.el7
	-
	-LINUX_DIST_VER= 7.6.1810
	-
	-post-install:
	- ${MV} ${STAGEDIR}${DOCSDIR}/README ${STAGEDIR}${DOCSDIR}/README.rst
	-.endif
	-
	.include <bsd.port.mk>
	diff --git a/math/igraph/Makefile b/math/igraph/Makefile
	--- a/math/igraph/Makefile
	+++ b/math/igraph/Makefile
	@@ -26,9 +26,4 @@
	pre-configure:
	@${ECHO} ${DISTVERSION} > ${WRKSRC}/IGRAPH_VERSION

	-.include <bsd.port.pre.mk>
	-.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300523
	-EXTRA_PATCHES= ${PATCHDIR}/extra-patch-etc_cmake_compilers.cmake
	-.endif
	-
	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/math/igraph/files/extra-patch-etc_cmake_compilers.cmake b/math/igraph/files/extra-patch-etc_cmake_compilers.cmake
	deleted file mode 100644
	--- a/math/igraph/files/extra-patch-etc_cmake_compilers.cmake
	+++ /dev/null
	@@ -1,10 +0,0 @@
	---- etc/cmake/compilers.cmake.orig 2022-01-04 06:55:25 UTC
	-+++ etc/cmake/compilers.cmake
	-@@ -31,7 +31,6 @@ macro(use_all_warnings TARGET_NAME)
	- target_compile_options(${TARGET_NAME} PRIVATE
	- # GCC-style compilers:
	- $<$<C_COMPILER_ID:GCC,Clang,AppleClang,Intel>:
	-- $<$<BOOL:${IGRAPH_WARNINGS_AS_ERRORS}>:-Werror>
	- -Wall -Wextra -pedantic
	- -Wno-unused-function -Wno-unused-parameter -Wno-sign-compare
	- >
	diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
	--- a/net/asterisk16/files/patch-Makefile
	+++ b/net/asterisk16/files/patch-Makefile
	@@ -1,6 +1,6 @@
	---- Makefile.orig 2022-07-28 15:44:36 UTC
	+--- Makefile.orig 2022-08-18 15:13:55 UTC
	+++ Makefile
	-@@ -144,7 +144,7 @@ OVERWRITE=y
	+@@ -144,7 +144,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
	OVERWRITE=y

	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
	@@ -18,16 +18,20 @@

	# If the file .asterisk.makeopts is present in your home directory, you can
	# include all of your favorite menuselect options so that every time you download
	-@@ -228,7 +228,7 @@ ifeq ($(OSARCH),FreeBSD)
	+@@ -226,12 +226,6 @@ else ifneq ($(findstring BSD,$(OSARCH)),)
	+ _ASTCFLAGS+=-isystem /usr/local/include
	+ endif

	- ifeq ($(OSARCH),FreeBSD)
	- # -V is understood by BSD Make, not by GNU make.
	+-ifeq ($(OSARCH),FreeBSD)
	+- # -V is understood by BSD Make, not by GNU make.
	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	-+ BSDVERSION=$(OSVERSION)
	- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
	+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
	+-endif
	+-
	+ ifeq ($(OSARCH),NetBSD)
	+ _ASTCFLAGS+=-pthread -D__LIBPTHREAD_SOURCE__ -I/usr/pkg/include
	endif
	-
	-@@ -475,8 +475,12 @@ endif
	+@@ -475,8 +469,12 @@ endif
	$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
	done \
	fi
	@@ -41,7 +45,7 @@
	done
	$(MAKE) -C sounds install
	find rest-api -name "*.json" \| while read x; do \
	-@@ -545,7 +549,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
	+@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
	@@ -50,7 +54,7 @@

	installdirs:
	@for i in $(INSTALLDIRS); do \
	-@@ -578,10 +582,10 @@ endif
	+@@ -578,10 +576,10 @@ endif
	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
	$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
	fi
	@@ -65,7 +69,7 @@

	$(SUBDIRS_INSTALL):
	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
	-@@ -706,7 +710,7 @@ endif
	+@@ -706,7 +704,7 @@ ifeq ($(ASTERISKVERSION),UNKNOWN__git_check_fail)
	endif


	@@ -74,7 +78,7 @@
	@if [ -x /usr/sbin/asterisk-post-install ]; then \
	/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
	fi
	-@@ -751,23 +755,10 @@ define INSTALL_CONFIGS
	+@@ -751,23 +749,10 @@ upgrade: bininstall
	# (2) the extension to strip off
	define INSTALL_CONFIGS
	@for x in $(1)/*$(2); do \
	@@ -100,7 +104,7 @@
	echo "Updating asterisk.conf" ; \
	sed -e 's\|^astcachedir.*$$\|astcachedir => $(ASTCACHEDIR)\|' \
	-e 's\|^astetcdir.*$$\|astetcdir => $(ASTETCDIR)\|' \
	-@@ -781,8 +772,8 @@ define INSTALL_CONFIGS
	+@@ -781,8 +766,8 @@ define INSTALL_CONFIGS
	-e 's\|^astrundir.*$$\|astrundir => $(ASTVARRUNDIR)\|' \
	-e 's\|^astlogdir.*$$\|astlogdir => $(ASTLOGDIR)\|' \
	-e 's\|^astsbindir.*$$\|astsbindir => $(ASTSBINDIR)\|' \
	@@ -111,7 +115,7 @@
	rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
	fi
	endef
	-@@ -816,7 +807,7 @@ adsi:
	+@@ -816,7 +801,7 @@ adsi:
	else \
	echo "Installing $$x" ; \
	fi ; \
	diff --git a/net/asterisk16/files/patch-build__tools_make__xml__documentation b/net/asterisk16/files/patch-build__tools_make__xml__documentation
	--- a/net/asterisk16/files/patch-build__tools_make__xml__documentation
	+++ b/net/asterisk16/files/patch-build__tools_make__xml__documentation
	@@ -1,6 +1,6 @@
	---- build_tools/make_xml_documentation.orig 2022-03-17 15:34:42 UTC
	+--- build_tools/make_xml_documentation.orig 2022-06-23 15:21:01 UTC
	+++ build_tools/make_xml_documentation
	-@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
	+@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do
	${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" \|\| { echo "" ; exit 1 ; }
	fi
	fi
	diff --git a/net/asterisk16/files/patch-channels_chan__dahdi.c b/net/asterisk16/files/patch-channels_chan__dahdi.c
	--- a/net/asterisk16/files/patch-channels_chan__dahdi.c
	+++ b/net/asterisk16/files/patch-channels_chan__dahdi.c
	@@ -1,6 +1,6 @@
	---- channels/chan_dahdi.c.orig 2020-07-09 15:39:17 UTC
	+--- channels/chan_dahdi.c.orig 2022-08-18 15:13:55 UTC
	+++ channels/chan_dahdi.c
	-@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	+@@ -4803,6 +4803,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	return;
	}
	if (p->echocancel.head.tap_length) {
	@@ -9,7 +9,7 @@
	#if defined(HAVE_PRI) \|\| defined(HAVE_SS7)
	switch (p->sig) {
	#if defined(HAVE_PRI)
	-@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	+@@ -4833,7 +4835,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	break;
	}
	#endif /* defined(HAVE_PRI) \|\| defined(HAVE_SS7) */
	@@ -20,7 +20,7 @@
	if (res) {
	ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
	} else {
	-@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
	+@@ -4867,8 +4871,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)

	if (p->echocanon) {
	struct dahdi_echocanparams ecp = { .tap_length = 0 };
	diff --git a/net/asterisk16/files/patch-channels_sip_include_sip.h b/net/asterisk16/files/patch-channels_sip_include_sip.h
	--- a/net/asterisk16/files/patch-channels_sip_include_sip.h
	+++ b/net/asterisk16/files/patch-channels_sip_include_sip.h
	@@ -1,6 +1,6 @@
	---- channels/sip/include/sip.h.orig 2020-07-09 15:39:17 UTC
	+--- channels/sip/include/sip.h.orig 2022-06-23 15:21:01 UTC
	+++ channels/sip/include/sip.h
	-@@ -192,7 +192,7 @@
	+@@ -193,7 +193,7 @@
	#define DEFAULT_MOHINTERPRET "default" /!< The default music class /
	#define DEFAULT_MOHSUGGEST ""
	#define DEFAULT_VMEXTEN "asterisk" /!< Default voicemail extension /
	diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
	--- a/net/asterisk16/files/patch-configure
	+++ b/net/asterisk16/files/patch-configure
	@@ -1,4 +1,4 @@
	---- configure.orig 2022-05-05 14:21:18 UTC
	+--- configure.orig 2022-06-23 15:21:01 UTC
	+++ configure
	@@ -5148,8 +5148,6 @@ case "${host_os}" in
	;;
	@@ -9,7 +9,15 @@
	;;
	openbsd*)
	ac_default_prefix=/usr/local
	-@@ -22951,6 +22949,8 @@ printf %s "checking for getifaddrs() support... " >&6;
	+@@ -21309,7 +21307,6 @@ then :
	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+ printf "%s\n" "yes" >&6; }
	+
	+-printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
	+
	+ else $as_nop
	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+@@ -22951,6 +22948,8 @@ printf %s "checking for getifaddrs() support... " >&6;

	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	/* end confdefs.h. */
	@@ -18,7 +26,7 @@
	#include <ifaddrs.h>
	int
	main (void)
	-@@ -32266,6 +32266,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
	+@@ -32266,6 +32265,8 @@ fi

	for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do

	@@ -27,7 +35,7 @@
	if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
	pbxlibdir=""
	# if --with-LUA=DIR has been specified, use it.
	-@@ -32280,14 +32282,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
	+@@ -32280,14 +32281,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
	ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
	CFLAGS="${CFLAGS} "
	as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" \| $as_tr_sh`
	@@ -45,7 +53,7 @@
	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	/* end confdefs.h. */

	-@@ -32328,7 +32330,7 @@ fi
	+@@ -32328,7 +32329,7 @@ fi

	# now check for the header.
	if test "${AST_LUA_FOUND}" = "yes"; then
	@@ -54,7 +62,7 @@
	# if --with-LUA=DIR has been specified, use it.
	if test "x${LUA_DIR}" != "x"; then
	LUA_INCLUDE="-I${LUA_DIR}/include"
	-@@ -32338,8 +32340,8 @@ fi
	+@@ -32338,8 +32339,8 @@ fi
	# check for the header
	ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
	CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
	@@ -65,7 +73,7 @@
	if eval test \"x\$"$as_ac_Header"\" = x"yes"
	then :
	LUA_HEADER_FOUND=1
	-@@ -32366,9 +32368,9 @@ fi
	+@@ -32366,9 +32367,9 @@ fi

	if test "x${PBX_LUA}" = "x1" ; then
	if test x"${LUA_DIR}" = x; then
	diff --git a/net/asterisk16/files/patch-main_Makefile b/net/asterisk16/files/patch-main_Makefile
	--- a/net/asterisk16/files/patch-main_Makefile
	+++ b/net/asterisk16/files/patch-main_Makefile
	@@ -1,16 +1,14 @@
	---- main/Makefile.orig 2020-07-09 15:39:17 UTC
	+--- main/Makefile.orig 2022-08-18 15:13:55 UTC
	+++ main/Makefile
	-@@ -80,9 +80,12 @@ endif
	+@@ -79,9 +79,8 @@ else
	+ endif

	ifeq ($(OSARCH),FreeBSD)
	- # -V is understood by BSD Make, not by GNU make.
	+- # -V is understood by BSD Make, not by GNU make.
	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	-+ BSDVERSION=$(OSVERSION)
	-+ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
	-+ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi)
	+- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
	++ AST_LIBS+=-pthread
	++ CRYPT_LIB=-lcrypt
	AST_LIBS+=-lcrypto
	-+ AST_LIBS+=%%LIBSYSINFO%%
	endif

	- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
	diff --git a/net/asterisk16/files/patch-main_term.c b/net/asterisk16/files/patch-main_term.c
	--- a/net/asterisk16/files/patch-main_term.c
	+++ b/net/asterisk16/files/patch-main_term.c
	@@ -1,6 +1,6 @@
	---- main/term.c.orig 2022-04-14 21:53:34 UTC
	+--- main/term.c.orig 2022-06-23 15:21:01 UTC
	+++ main/term.c
	-@@ -46,6 +46,7 @@ static const char * const termpath[] = {
	+@@ -46,6 +46,7 @@ static char enddata[80] = "";
	static char quitdata[80] = "";

	static const char * const termpath[] = {
	diff --git a/net/asterisk16/files/patch-menuselect_configure b/net/asterisk16/files/patch-menuselect_configure
	--- a/net/asterisk16/files/patch-menuselect_configure
	+++ b/net/asterisk16/files/patch-menuselect_configure
	@@ -1,6 +1,6 @@
	---- menuselect/configure.orig 2022-05-12 11:47:40 UTC
	+--- menuselect/configure.orig 2022-06-23 15:21:01 UTC
	+++ menuselect/configure
	-@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
	+@@ -5099,7 +5099,7 @@ else
	printf "%s\n" "yes" >&6; }

	PBX_LIBXML2=1
	diff --git a/net/asterisk18/files/patch-Makefile b/net/asterisk18/files/patch-Makefile
	--- a/net/asterisk18/files/patch-Makefile
	+++ b/net/asterisk18/files/patch-Makefile
	@@ -1,6 +1,6 @@
	---- Makefile.orig 2022-07-28 15:51:18 UTC
	+--- Makefile.orig 2022-08-18 15:18:29 UTC
	+++ Makefile
	-@@ -144,7 +144,7 @@ OVERWRITE=y
	+@@ -144,7 +144,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
	OVERWRITE=y

	# Include debug and macro symbols in the executables (-g) and profiling info (-pg)
	@@ -18,16 +18,20 @@

	# If the file .asterisk.makeopts is present in your home directory, you can
	# include all of your favorite menuselect options so that every time you download
	-@@ -228,7 +228,7 @@ ifeq ($(OSARCH),FreeBSD)
	+@@ -226,12 +226,6 @@ else ifneq ($(findstring BSD,$(OSARCH)),)
	+ _ASTCFLAGS+=-isystem /usr/local/include
	+ endif

	- ifeq ($(OSARCH),FreeBSD)
	- # -V is understood by BSD Make, not by GNU make.
	+-ifeq ($(OSARCH),FreeBSD)
	+- # -V is understood by BSD Make, not by GNU make.
	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	-+ BSDVERSION=$(OSVERSION)
	- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
	+- _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
	+-endif
	+-
	+ ifeq ($(OSARCH),NetBSD)
	+ _ASTCFLAGS+=-pthread -D__LIBPTHREAD_SOURCE__ -I/usr/pkg/include
	endif
	-
	-@@ -475,8 +475,12 @@ endif
	+@@ -475,8 +469,12 @@ endif
	$(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \
	done \
	fi
	@@ -41,7 +45,7 @@
	done
	$(MAKE) -C sounds install
	find rest-api -name "*.json" \| while read x; do \
	-@@ -545,7 +549,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
	+@@ -545,7 +543,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
	@@ -50,7 +54,7 @@

	installdirs:
	@for i in $(INSTALLDIRS); do \
	-@@ -557,7 +561,7 @@ main-bininstall:
	+@@ -557,7 +555,7 @@ installdirs:
	main-bininstall:
	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall

	@@ -59,7 +63,7 @@
	$(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/"
	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
	$(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/"
	-@@ -578,10 +582,10 @@ endif
	+@@ -578,10 +576,10 @@ endif
	if [ -f contrib/firmware/iax/iaxy.bin ] ; then \
	$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \
	fi
	@@ -74,7 +78,7 @@

	$(SUBDIRS_INSTALL):
	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
	-@@ -706,7 +710,7 @@ endif
	+@@ -706,7 +704,7 @@ ifeq ($(ASTERISKVERSION),UNKNOWN__git_check_fail)
	endif


	@@ -83,7 +87,7 @@
	@if [ -x /usr/sbin/asterisk-post-install ]; then \
	/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
	fi
	-@@ -751,23 +755,10 @@ define INSTALL_CONFIGS
	+@@ -751,23 +749,10 @@ upgrade: bininstall
	# (2) the extension to strip off
	define INSTALL_CONFIGS
	@for x in $(1)/*$(2); do \
	@@ -109,7 +113,7 @@
	echo "Updating asterisk.conf" ; \
	sed -e 's\|^astcachedir.*$$\|astcachedir => $(ASTCACHEDIR)\|' \
	-e 's\|^astetcdir.*$$\|astetcdir => $(ASTETCDIR)\|' \
	-@@ -781,8 +772,8 @@ define INSTALL_CONFIGS
	+@@ -781,8 +766,8 @@ define INSTALL_CONFIGS
	-e 's\|^astrundir.*$$\|astrundir => $(ASTVARRUNDIR)\|' \
	-e 's\|^astlogdir.*$$\|astlogdir => $(ASTLOGDIR)\|' \
	-e 's\|^astsbindir.*$$\|astsbindir => $(ASTSBINDIR)\|' \
	@@ -120,7 +124,7 @@
	rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
	fi
	endef
	-@@ -816,7 +807,7 @@ adsi:
	+@@ -816,7 +801,7 @@ adsi:
	else \
	echo "Installing $$x" ; \
	fi ; \
	diff --git a/net/asterisk18/files/patch-build__tools_make__xml__documentation b/net/asterisk18/files/patch-build__tools_make__xml__documentation
	--- a/net/asterisk18/files/patch-build__tools_make__xml__documentation
	+++ b/net/asterisk18/files/patch-build__tools_make__xml__documentation
	@@ -1,6 +1,6 @@
	---- build_tools/make_xml_documentation.orig 2022-03-17 15:40:57 UTC
	+--- build_tools/make_xml_documentation.orig 2022-06-23 15:26:13 UTC
	+++ build_tools/make_xml_documentation
	-@@ -228,7 +228,7 @@ for subdir in ${mod_subdirs} ; do
	+@@ -214,7 +214,7 @@ for subdir in ${mod_subdirs} ; do
	${XMLSTARLET} val -e -d "${source_tree}/doc/appdocsxml.dtd" "${i}" \|\| { echo "" ; exit 1 ; }
	fi
	fi
	diff --git a/net/asterisk18/files/patch-channels_chan__dahdi.c b/net/asterisk18/files/patch-channels_chan__dahdi.c
	--- a/net/asterisk18/files/patch-channels_chan__dahdi.c
	+++ b/net/asterisk18/files/patch-channels_chan__dahdi.c
	@@ -1,6 +1,6 @@
	---- channels/chan_dahdi.c.orig 2020-07-09 15:39:17 UTC
	+--- channels/chan_dahdi.c.orig 2022-08-18 15:18:29 UTC
	+++ channels/chan_dahdi.c
	-@@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	+@@ -4803,6 +4803,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	return;
	}
	if (p->echocancel.head.tap_length) {
	@@ -9,7 +9,7 @@
	#if defined(HAVE_PRI) \|\| defined(HAVE_SS7)
	switch (p->sig) {
	#if defined(HAVE_PRI)
	-@@ -4679,7 +4681,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	+@@ -4833,7 +4835,9 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
	break;
	}
	#endif /* defined(HAVE_PRI) \|\| defined(HAVE_SS7) */
	@@ -20,7 +20,7 @@
	if (res) {
	ast_log(LOG_WARNING, "Unable to enable echo cancellation on channel %d (%s)\n", p->channel, strerror(errno));
	} else {
	-@@ -4713,8 +4717,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)
	+@@ -4867,8 +4871,9 @@ void dahdi_ec_disable(struct dahdi_pvt *p)

	if (p->echocanon) {
	struct dahdi_echocanparams ecp = { .tap_length = 0 };
	diff --git a/net/asterisk18/files/patch-channels_sip_include_sip.h b/net/asterisk18/files/patch-channels_sip_include_sip.h
	--- a/net/asterisk18/files/patch-channels_sip_include_sip.h
	+++ b/net/asterisk18/files/patch-channels_sip_include_sip.h
	@@ -1,6 +1,6 @@
	---- channels/sip/include/sip.h.orig 2020-07-09 15:39:17 UTC
	+--- channels/sip/include/sip.h.orig 2022-06-23 15:26:13 UTC
	+++ channels/sip/include/sip.h
	-@@ -192,7 +192,7 @@
	+@@ -193,7 +193,7 @@
	#define DEFAULT_MOHINTERPRET "default" /!< The default music class /
	#define DEFAULT_MOHSUGGEST ""
	#define DEFAULT_VMEXTEN "asterisk" /!< Default voicemail extension /
	diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure
	--- a/net/asterisk18/files/patch-configure
	+++ b/net/asterisk18/files/patch-configure
	@@ -1,4 +1,4 @@
	---- configure.orig 2022-05-05 17:09:31 UTC
	+--- configure.orig 2022-06-23 15:26:13 UTC
	+++ configure
	@@ -5156,8 +5156,6 @@ case "${host_os}" in
	;;
	@@ -9,7 +9,15 @@
	;;
	openbsd*)
	ac_default_prefix=/usr/local
	-@@ -22983,6 +22981,8 @@ printf %s "checking for getifaddrs() support... " >&6;
	+@@ -21341,7 +21339,6 @@ then :
	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+ printf "%s\n" "yes" >&6; }
	+
	+-printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h
	+
	+ else $as_nop
	+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+@@ -22983,6 +22980,8 @@ printf %s "checking for getifaddrs() support... " >&6;

	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	/* end confdefs.h. */
	@@ -18,7 +26,7 @@
	#include <ifaddrs.h>
	int
	main (void)
	-@@ -32380,6 +32380,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do
	+@@ -32380,6 +32379,8 @@ fi

	for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do

	@@ -27,7 +35,7 @@
	if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
	pbxlibdir=""
	# if --with-LUA=DIR has been specified, use it.
	-@@ -32394,14 +32396,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
	+@@ -32394,14 +32395,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
	ast_ext_lib_check_save_CFLAGS="${CFLAGS}"
	CFLAGS="${CFLAGS} "
	as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" \| $as_tr_sh`
	@@ -45,7 +53,7 @@
	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	/* end confdefs.h. */

	-@@ -32442,7 +32444,7 @@ fi
	+@@ -32442,7 +32443,7 @@ fi

	# now check for the header.
	if test "${AST_LUA_FOUND}" = "yes"; then
	@@ -54,7 +62,7 @@
	# if --with-LUA=DIR has been specified, use it.
	if test "x${LUA_DIR}" != "x"; then
	LUA_INCLUDE="-I${LUA_DIR}/include"
	-@@ -32452,8 +32454,8 @@ fi
	+@@ -32452,8 +32453,8 @@ fi
	# check for the header
	ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
	CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
	@@ -65,7 +73,7 @@
	if eval test \"x\$"$as_ac_Header"\" = x"yes"
	then :
	LUA_HEADER_FOUND=1
	-@@ -32480,9 +32482,9 @@ fi
	+@@ -32480,9 +32481,9 @@ fi

	if test "x${PBX_LUA}" = "x1" ; then
	if test x"${LUA_DIR}" = x; then
	diff --git a/net/asterisk18/files/patch-main_Makefile b/net/asterisk18/files/patch-main_Makefile
	--- a/net/asterisk18/files/patch-main_Makefile
	+++ b/net/asterisk18/files/patch-main_Makefile
	@@ -1,16 +1,14 @@
	---- main/Makefile.orig 2020-07-09 15:39:17 UTC
	+--- main/Makefile.orig 2022-08-18 15:18:29 UTC
	+++ main/Makefile
	-@@ -80,9 +80,12 @@ endif
	+@@ -79,9 +79,8 @@ else
	+ endif

	ifeq ($(OSARCH),FreeBSD)
	- # -V is understood by BSD Make, not by GNU make.
	+- # -V is understood by BSD Make, not by GNU make.
	- BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	-+ BSDVERSION=$(OSVERSION)
	-+ BSDVERSION?=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
	- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
	-+ CRYPT_LIB=$(shell if test $(BSDVERSION) -ge 1200001 ; then echo "-lcrypt"; fi)
	+- AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
	++ AST_LIBS+=-pthread
	++ CRYPT_LIB=-lcrypt
	AST_LIBS+=-lcrypto
	-+ AST_LIBS+=%%LIBSYSINFO%%
	endif

	- ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
	diff --git a/net/asterisk18/files/patch-main_term.c b/net/asterisk18/files/patch-main_term.c
	--- a/net/asterisk18/files/patch-main_term.c
	+++ b/net/asterisk18/files/patch-main_term.c
	@@ -1,6 +1,6 @@
	---- main/term.c.orig 2022-04-14 21:53:34 UTC
	+--- main/term.c.orig 2022-06-23 15:26:13 UTC
	+++ main/term.c
	-@@ -46,6 +46,7 @@ static const char * const termpath[] = {
	+@@ -46,6 +46,7 @@ static char enddata[80] = "";
	static char quitdata[80] = "";

	static const char * const termpath[] = {
	diff --git a/net/asterisk18/files/patch-menuselect_configure b/net/asterisk18/files/patch-menuselect_configure
	--- a/net/asterisk18/files/patch-menuselect_configure
	+++ b/net/asterisk18/files/patch-menuselect_configure
	@@ -1,6 +1,6 @@
	---- menuselect/configure.orig 2022-05-12 11:50:59 UTC
	+--- menuselect/configure.orig 2022-06-23 15:26:13 UTC
	+++ menuselect/configure
	-@@ -5024,7 +5024,7 @@ printf "%s\n" "yes" >&6; }
	+@@ -5099,7 +5099,7 @@ else
	printf "%s\n" "yes" >&6; }

	PBX_LIBXML2=1
	diff --git a/security/openssl-devel/files/patch-crypto_threads__pthread.c b/security/openssl-devel/files/patch-crypto_threads__pthread.c
	deleted file mode 100644
	--- a/security/openssl-devel/files/patch-crypto_threads__pthread.c
	+++ /dev/null
	@@ -1,20 +0,0 @@
	-Drop after FreeBSD 13.0/12.2 EOL around 2022-05-30
	-
	-ld: error: undefined symbol: __atomic_is_lock_free
	->>> referenced by threads_pthread.c
	->>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_or) in archive providers/libfips.a
	->>> referenced by threads_pthread.c
	->>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_load) in archive providers/libfips.a
	-
	---- crypto/threads_pthread.c.orig 2021-07-29 14:50:29 UTC
	-+++ crypto/threads_pthread.c
	-@@ -15,6 +15,9 @@
	-
	- #if defined(__sun)
	- # include <atomic.h>
	-+#elif defined(__clang__) && defined(__i386__) && __clang_major__ < 12
	-+/* Until https://github.com/llvm/llvm-project/commit/00530dee5d12 */
	-+#define __atomic_is_lock_free(size, ptr) ((void)(ptr), size <= sizeof(void *))
	- #endif
	-
	- #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
	diff --git a/security/openssl-quictls/files/patch-crypto_threads__pthread.c b/security/openssl-quictls/files/patch-crypto_threads__pthread.c
	deleted file mode 100644
	--- a/security/openssl-quictls/files/patch-crypto_threads__pthread.c
	+++ /dev/null
	@@ -1,20 +0,0 @@
	-Drop after FreeBSD 13.0/12.2 EOL around 2022-05-30
	-
	-ld: error: undefined symbol: __atomic_is_lock_free
	->>> referenced by threads_pthread.c
	->>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_or) in archive providers/libfips.a
	->>> referenced by threads_pthread.c
	->>> libfips-lib-threads_pthread.o:(CRYPTO_atomic_load) in archive providers/libfips.a
	-
	---- crypto/threads_pthread.c.orig 2021-07-29 14:50:29 UTC
	-+++ crypto/threads_pthread.c
	-@@ -15,6 +15,9 @@
	-
	- #if defined(__sun)
	- # include <atomic.h>
	-+#elif defined(__clang__) && defined(__i386__) && __clang_major__ < 12
	-+/* Until https://github.com/llvm/llvm-project/commit/00530dee5d12 */
	-+#define __atomic_is_lock_free(size, ptr) ((void)(ptr), size <= sizeof(void *))
	- #endif
	-
	- #if defined(OPENSSL_THREADS) && !defined(CRYPTO_TDEBUG) && !defined(OPENSSL_SYS_WINDOWS)
	diff --git a/sysutils/bhyve+/Makefile b/sysutils/bhyve+/Makefile
	--- a/sysutils/bhyve+/Makefile
	+++ b/sysutils/bhyve+/Makefile
	@@ -36,8 +36,6 @@

	.if 1200000 <= ${OSVERSION} && ${OSVERSION} < 1300000
	EXTRA_PATCHES= ${PATCHDIR}/freebsd-12 ${PATCHDIR}/freebsd-12/3
	-.elif 1300000 <= ${OSVERSION} && ${OSVERSION} < 1301000
	-EXTRA_PATCHES= ${PATCHDIR}/freebsd-13/0
	.elif 1301000 <= ${OSVERSION} && ${OSVERSION} < 1400000
	EXTRA_PATCHES= ${PATCHDIR}/freebsd-13/1
	.elif 1400000 <= ${OSVERSION} && ${OSVERSION} < 1500000
	diff --git a/sysutils/bhyve+/files/freebsd-13/0/patch-custom-libs b/sysutils/bhyve+/files/freebsd-13/0/patch-custom-libs
	deleted file mode 100644
	--- a/sysutils/bhyve+/files/freebsd-13/0/patch-custom-libs
	+++ /dev/null
	@@ -1,21 +0,0 @@
	---- usr.sbin/bhyve/Makefile.orig 2021-09-04 02:15:16.364660000 +0200
	-+++ usr.sbin/bhyve/Makefile 2021-09-04 02:21:26.014446000 +0200
	-@@ -3,7 +3,7 @@
	- #
	-
	- .include <src.opts.mk>
	--CFLAGS+=-I${.CURDIR}/../../contrib/lib9p
	-+CFLAGS+=-I${SRCTOP}/contrib/lib9p
	- CFLAGS+=-I${SRCTOP}/sys
	- .PATH: ${SRCTOP}/sys/cam/ctl
	-
	-@@ -83,7 +83,8 @@
	- .PATH: ${BHYVE_SYSDIR}/sys/amd64/vmm
	- SRCS+= vmm_instruction_emul.c
	-
	--LIBADD= vmmapi md pthread z util sbuf cam 9p
	-+LIBADD= md pthread z util sbuf cam
	-+LDADD= ../../contrib/lib9p/lib9p.so.1.1 ../../lib/libvmmapi/libvmmapi.so.5.1
	-
	- .if ${MK_CASPER} != "no"
	- LIBADD+= casper
	diff --git a/sysutils/bhyve+/files/freebsd-13/0/patch-lib9p b/sysutils/bhyve+/files/freebsd-13/0/patch-lib9p
	deleted file mode 100644
	--- a/sysutils/bhyve+/files/freebsd-13/0/patch-lib9p
	+++ /dev/null
	@@ -1,12 +0,0 @@
	---- share/mk/src.libnames.mk.orig 2021-09-04 10:14:17.407288000 +0200
	-+++ share/mk/src.libnames.mk 2021-09-04 10:15:27.832153000 +0200
	-@@ -245,6 +245,9 @@
	- # 2nd+ order consumers. Auto-generating this would be better.
	- _DP_80211= sbuf bsdxml
	- _DP_9p= sbuf
	-+.if ${MK_CASPER} != "no"
	-+_DP_9p+= casper cap_pwd cap_grp
	-+.endif
	- _DP_archive= z bz2 lzma bsdxml zstd
	- _DP_zstd= pthread
	- .if ${MK_BLACKLIST} != "no"
	diff --git a/sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi b/sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi
	deleted file mode 100644
	--- a/sysutils/bhyve+/files/freebsd-13/0/patch-libvmmapi
	+++ /dev/null
	@@ -1,33 +0,0 @@
	---- lib/libvmmapi/Makefile.orig 2021-09-04 01:05:23.110816000 UTC
	-+++ lib/libvmmapi/Makefile
	-@@ -6,6 +6,7 @@
	- INCS= vmmapi.h
	-
	- WARNS?= 2
	-+SHLIB_MAJOR?= 5.1
	-
	- LIBADD= util
	-
	---- usr.sbin/bhyvectl/Makefile.orig 2021-09-04 02:33:12.704720000 +0200
	-+++ usr.sbin/bhyvectl/Makefile 2021-09-04 02:34:28.740202000 +0200
	-@@ -8,7 +8,8 @@
	-
	- MAN= bhyvectl.8
	-
	--LIBADD= vmmapi util
	-+LIBADD= util
	-+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
	-
	- WARNS?= 3
	-
	---- usr.sbin/bhyveload/Makefile.orig 2021-09-04 02:33:20.942548000 +0200
	-+++ usr.sbin/bhyveload/Makefile 2021-09-04 02:35:58.712996000 +0200
	-@@ -5,7 +5,7 @@
	- MAN= bhyveload.8
	- PACKAGE= bhyve
	-
	--LIBADD= vmmapi
	-+LDADD= ../../lib/libvmmapi/libvmmapi.so.5.1
	-
	- WARNS?= 3
	-
	diff --git a/sysutils/bhyve+/files/freebsd-13/0/patch-msi-x-mappings b/sysutils/bhyve+/files/freebsd-13/0/patch-msi-x-mappings
	deleted file mode 100644
	--- a/sysutils/bhyve+/files/freebsd-13/0/patch-msi-x-mappings
	+++ /dev/null
	@@ -1,132 +0,0 @@
	---- usr.sbin/bhyve/pci_emul.h.orig 2021-08-19 23:00:57 UTC
	-+++ usr.sbin/bhyve/pci_emul.h
	-@@ -146,6 +146,7 @@ struct pci_devinst {
	- struct msix_table_entry table; / allocated at runtime */
	- void *pba_page;
	- int pba_page_offset;
	-+ void *table_page;
	- } pi_msix;
	-
	- void pi_arg; / devemu-private data */
	---- usr.sbin/bhyve/pci_passthru.c.orig 2021-08-19 23:00:57 UTC
	-+++ usr.sbin/bhyve/pci_passthru.c
	-@@ -324,13 +324,14 @@ msix_table_read(struct passthru_softc *sc, uint64_t of
	- return (data);
	- }
	-
	-+ /* Should make this an assert. */
	- if (offset < pi->pi_msix.table_offset)
	- return (-1);
	-
	- offset -= pi->pi_msix.table_offset;
	- index = offset / MSIX_TABLE_ENTRY_SIZE;
	- if (index >= pi->pi_msix.table_count)
	-- return (-1);
	-+ goto readbar;
	-
	- entry = &pi->pi_msix.table[index];
	- entry_offset = offset % MSIX_TABLE_ENTRY_SIZE;
	-@@ -357,6 +358,33 @@ msix_table_read(struct passthru_softc *sc, uint64_t of
	- }
	-
	- return (data);
	-+
	-+readbar:
	-+ if (pi->pi_msix.table_page != NULL && offset < 4096) {
	-+ switch(size) {
	-+ case 1:
	-+ src8 = (uint8_t *)(pi->pi_msix.table_page + offset);
	-+ data = *src8;
	-+ break;
	-+ case 2:
	-+ src16 = (uint16_t *)(pi->pi_msix.table_page + offset);
	-+ data = *src16;
	-+ break;
	-+ case 4:
	-+ src32 = (uint32_t *)(pi->pi_msix.table_page + offset);
	-+ data = *src32;
	-+ break;
	-+ case 8:
	-+ src64 = (uint64_t *)(pi->pi_msix.table_page + offset);
	-+ data = *src64;
	-+ break;
	-+ default:
	-+ return (-1);
	-+ }
	-+ return (data);
	-+ }
	-+
	-+ return (-1);
	- }
	-
	- static void
	-@@ -403,13 +431,14 @@ msix_table_write(struct vmctx *ctx, int vcpu, struct p
	- return;
	- }
	-
	-+ /* Should make this an assert. */
	- if (offset < pi->pi_msix.table_offset)
	- return;
	-
	- offset -= pi->pi_msix.table_offset;
	- index = offset / MSIX_TABLE_ENTRY_SIZE;
	- if (index >= pi->pi_msix.table_count)
	-- return;
	-+ goto writebar;
	-
	- entry = &pi->pi_msix.table[index];
	- entry_offset = offset % MSIX_TABLE_ENTRY_SIZE;
	-@@ -432,6 +461,31 @@ msix_table_write(struct vmctx *ctx, int vcpu, struct p
	- entry->msg_data, entry->vector_control);
	- }
	- }
	-+
	-+writebar:
	-+ if (pi->pi_msix.table_page != NULL && offset < 4096) {
	-+ switch(size) {
	-+ case 1:
	-+ dest8 = (uint8_t *)(pi->pi_msix.table_page + offset);
	-+ *dest8 = data;
	-+ break;
	-+ case 2:
	-+ dest16 = (uint16_t *)(pi->pi_msix.table_page + offset);
	-+ *dest16 = data;
	-+ break;
	-+ case 4:
	-+ dest32 = (uint32_t *)(pi->pi_msix.table_page + offset);
	-+ *dest32 = data;
	-+ break;
	-+ case 8:
	-+ dest64 = (uint64_t *)(pi->pi_msix.table_page + offset);
	-+ *dest64 = data;
	-+ break;
	-+ default:
	-+ break;
	-+ }
	-+ return;
	-+ }
	- }
	-
	- static int
	-@@ -466,6 +520,21 @@ init_msix_table(struct vmctx *ctx, struct passthru_sof
	- idx = pi->pi_msix.table_bar;
	- start = pi->pi_bar[idx].addr;
	- remaining = pi->pi_bar[idx].size;
	-+
	-+ /*
	-+ * Some device (against better documentation of the spec)
	-+ * are mapping other usable address space into the same page
	-+ * as the end of the MSI-X tables.
	-+ * At least Intel AX200 being one of them apparently.
	-+ * Map the page and fall back to it for any reads/writes outside
	-+ * the MSI-X table in msix_table_{read,write}.
	-+ */
	-+ pi->pi_msix.table_page = mmap(NULL, 4096, PROT_READ \| PROT_WRITE,
	-+ MAP_SHARED, memfd, sc->psc_bar[idx].addr + table_offset);
	-+ if (pi->pi_msix.table_page == MAP_FAILED) {
	-+ warn("Failed to map table page for MSI-X on %d/%d/%d", b, s, f);
	-+ return (-1);
	-+ }
	-
	- if (pi->pi_msix.pba_bar == pi->pi_msix.table_bar) {
	- pba_offset = pi->pi_msix.pba_offset;
	diff --git a/sysutils/ebsnvme-id/Makefile b/sysutils/ebsnvme-id/Makefile
	--- a/sysutils/ebsnvme-id/Makefile
	+++ b/sysutils/ebsnvme-id/Makefile
	@@ -18,15 +18,9 @@
	sbin/ebsnvme-id \
	man/man8/ebsnvme-id.8.gz

	-.include <bsd.port.pre.mk>
	-
	-.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300039
	-IGNORE= needs NVME_GET_NSID ioctl
	-.endif
	-
	post-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
	${INSTALL_DATA} ${WRKSRC}/dev-aws-disk.conf ${STAGEDIR}${PREFIX}/etc/devd
	${INSTALL_SCRIPT} ${WRKSRC}/dev_aws_disk ${STAGEDIR}${PREFIX}/etc/rc.d/

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/sysutils/openzfs-kmod/Makefile b/sysutils/openzfs-kmod/Makefile
	--- a/sysutils/openzfs-kmod/Makefile
	+++ b/sysutils/openzfs-kmod/Makefile
	@@ -27,11 +27,7 @@
	INVARIANTS_DESC= Build kernel module with INVARIANTS
	INVARIANTS_IMPLIES= DEBUG

	-.include <bsd.port.pre.mk>
	-
	-.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013
	-IGNORE= needs FreeBSD 12/13 with AES-CCM support
	-.endif
	+.include <bsd.port.options.mk>

	.if ${OSVERSION} >= 1300000
	OPTIONS_DEFAULT= DEBUG INVARIANTS
	@@ -71,4 +67,4 @@
	${INSTALL} ${WRKSRC}/module/openzfs.ko.debug ${STAGEDIR}${KMODDIR}/${KMODTARGET}.debug
	.endif

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/sysutils/openzfs/Makefile b/sysutils/openzfs/Makefile
	--- a/sysutils/openzfs/Makefile
	+++ b/sysutils/openzfs/Makefile
	@@ -34,11 +34,7 @@
	GH_PROJECT= zfs
	GH_TAGNAME= 2d5622f5b

	-.include <bsd.port.pre.mk>
	-
	-.if ${OSVERSION} >= 1300000 && ${OSVERSION} < 1300013
	-IGNORE= needs FreeBSD 12/13 with AES-CCM support
	-.endif
	+.include <bsd.port.options.mk>

	.if ${PORT_OPTIONS:MDEBUG}
	CONFIGURE_ARGS+= --enable-debug --enable-debuginfo
	@@ -66,4 +62,4 @@
	pre-configure:
	cd ${WRKSRC} && ./autogen.sh

	-.include <bsd.port.post.mk>
	+.include <bsd.port.mk>
	diff --git a/www/firefox/pkg-message b/www/firefox/pkg-message
	--- a/www/firefox/pkg-message
	+++ b/www/firefox/pkg-message
	@@ -31,7 +31,7 @@

	## Gamepad API

	-Requires evdev(4) joystick support. On FreeBSD 13.0 enable hgame(4)
	+Requires evdev(4) joystick support. On FreeBSD 13 and later enable hgame(4)
	while older versions can use sysutils/iichid or multimedia/webcamd.

	## smb:// issues
	diff --git a/x11/xorg-cf-files/files/patch-FreeBSD.cf b/x11/xorg-cf-files/files/patch-FreeBSD.cf
	--- a/x11/xorg-cf-files/files/patch-FreeBSD.cf
	+++ b/x11/xorg-cf-files/files/patch-FreeBSD.cf
	@@ -1,17 +1,73 @@
	---- ./FreeBSD.cf.orig 2009-10-16 23:45:42.000000000 +0200
	-+++ ./FreeBSD.cf 2013-06-27 17:14:30.661790922 +0200
	-@@ -78,6 +78,7 @@
	+--- FreeBSD.cf.orig 2021-08-02 01:00:38 UTC
	++++ FreeBSD.cf
	+@@ -47,19 +47,11 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #define HasNdbm YES
	+ #define HasPutenv YES
	+ #define HasSnprintf YES
	+-#if OSMajorVersion == 3 && OSMinorVersion >= 3 \|\| OSMajorVersion > 3
	+ # define HasStrlcat YES
	+-#endif
	+-#if OSMajorVersion == 4 && OSMinorVersion >= 2 \|\| OSMajorVersion > 4
	+ # define HasBasename YES
	+-#else
	+-# define HasBasename NO
	+-#endif
	+ #define HasBSD44Sockets YES
	+ #define HasDlopen YES
	+-#if ((OSRelVersion >= 410002) && OSRelVersion < 500000) \|\| (OSRelVersion >= 500012)
	+ #define HasSetProcTitle YES
	+-#endif
	+ #ifndef HasLibCrypt
	+ # define HasLibCrypt YES
	+ #endif
	+@@ -74,64 +66,28 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #ifndef BuildPDFdocs
	+ # define BuildPDFdocs NO
	+ #endif
	+-#if (OSMajorVersion >= 3)
	#define HasIssetugid YES
	#define HasPoll YES
	- #endif
	+-#endif
	+#define BuildHtmlManPages NO

	- #if OSMajorVersion >= 4
	+-#if OSMajorVersion >= 4
	#define HasGetIfAddrs YES
	-@@ -117,14 +118,8 @@
	- # if (OSRelVersion < 500043)
	- # define NeedUIThrStubs YES
	- # endif
	+-#endif
	+
	+-/* All versions define AF_INET6. 3.x and earlier don't have IPv6 support. */
	+-#if OSMajorVersion < 4
	+-#ifndef BuildIPv6
	+-#define BuildIPv6 NO
	+-#endif
	+-#endif
	+-
	+ #define IPv6SocketsAlsoIPv4 NO
	+
	+-#if (OSMajorVersion > 1)
	+ #define InstallXloadSetGID NO
	+-#else
	+-#define InstallXloadSetGID YES
	+-#endif
	+
	+ #define HasWeakSymbols UseElfFormat
	+
	+ /*
	+ * Multi-thread safe libs
	+ */
	+-/* 2.2.7 and later has libc_r (POSIX threads) */
	+-#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 \|\| \
	+- OSMajorVersion >= 3
	+ # define HasPosixThreads YES
	+ # define ThreadedX YES
	+ # define HasThreadSafeAPI YES
	+-# if OSRelVersion < 501000
	+-# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
	+-# else
	+ # define MTSafeAPIDefines -DXUSE_MTSAFE_API
	+-# endif
	+-# if (OSRelVersion < 500043)
	+-# define NeedUIThrStubs YES
	+-# endif
	-# if (OSRelVersion >= 502102)
	-# define ThreadsLibraries -lpthread
	-# elif (OSRelVersion >= 500016)
	@@ -20,12 +76,42 @@
	-# define ThreadsLibraries -pthread
	-# endif
	-# define SystemMTDefines -D_THREAD_SAFE
	+-#endif
	+# define ThreadsLibraries -lpthread
	+# define SystemMTDefines
	+
	+-/* This fixes linking C programs against libGLU on FreeBSD 3.x */
	+-#if (OSMajorVersion == 3)
	+-#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) -lstdc++ -lgcc
	+-#endif
	+-
	+ #define AvoidNullMakeCommand YES
	+ #define StripInstalledPrograms YES
	+ #define CompressAllFonts YES
	+@@ -155,30 +111,18 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #endif
	+
	+ #ifndef HasMktemp
	+-#if (OSMajorVersion >= 4) \|\| (OSMajorVersion == 3 && OSMinorVersion >= 1) \|\| \
	+- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7)
	+ #define HasMktemp YES
	+-#else
	+-#define HasMktemp NO
	#endif
	+-#endif

	- /* This fixes linking C programs against libGLU on FreeBSD 3.x */
	-@@ -178,7 +173,9 @@
	+-/*
	+- * 2.2.x has perl 4 by default, not perl 5.
	+- */
	+-#if (OSMajorVersion <= 2)
	+-#ifndef HasPerl5
	+-#define HasPerl5 NO
	+-#endif
	+-#endif
	+-
	+ #ifndef CcCmd
	+ #define CcCmd cc
	+ #endif
	#ifndef CplusplusCmd
	#define CplusplusCmd c++
	#endif
	@@ -35,7 +121,99 @@
	#define PreProcessCmd CppCmd
	#define StandardCppOptions -traditional
	#define StandardCppDefines /**/
	-@@ -338,7 +335,7 @@
	+@@ -196,72 +140,45 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #endif
	+ #endif
	+ #ifndef ExtraLibraries
	+-/* support for multi-byte locales is in libxpg4 rather than libc */
	+-#if (OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \
	+- !(OSMajorVersion == 4 && OSRelVersion >= 400020) && \
	+- !(OSRelVersion >= 500005)
	+-#define ExtraLibraries -lxpg4
	+-#else
	+ #define ExtraLibraries /**/
	+ #endif
	+-#endif
	+ #ifndef UseGnuMalloc
	+-/* 2.2 doesn't really have GnuMalloc */
	+-#if OSMajorVersion < 2 \|\| (OSMajorVersion == 2 && OSMinorVersion < 2)
	+-#define UseGnuMalloc YES
	+-#else
	+ #define UseGnuMalloc NO
	+ #endif
	+-#endif
	+-/* 2.2.2 and later has setusercontext() */
	+-#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion > 2) \|\| \
	+- (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 2)
	+ #define HasSetUserContext YES
	+-#endif
	+
	+-#if OSMajorVersion >= 5 \|\| (OSMajorVersion == 4 && OSMinorVersion >= 6)
	+ #define HasGetpeereid YES
	+-#endif
	+
	+-/* 3.3(?) and later has support for setting MTRRs */
	+ #ifndef HasMTRRSupport
	+-#if OSMajorVersion > 3 \|\| (OSMajorVersion == 3 && OSMinorVersion >= 3)
	+ #define HasMTRRSupport YES
	+-#else
	+-#define HasMTRRSupport NO
	+ #endif
	+-#endif
	+
	+ /*
	+ * Drivers that don't need AGP can work with 4.0, but we don't have a
	+ * mechanism for specifying a subset of drivers in the OS.cf files yet.
	+ */
	+ #ifndef BuildXF86DRI
	+-#if OSMajorVersion >= 5 \|\| (OSMajorVersion == 4 && OSMinorVersion >= 1)
	+ #define BuildXF86DRI YES
	+ #endif
	+-#endif
	+
	+ /*
	+- * 4.1/i386 and 5.0/i386,alpha,ia64,amd64 have the AGP driver.
	++ * i386,alpha,ia64,amd64 have the AGP driver.
	+ */
	+ #ifndef HasAgpGart
	+-#if defined(i386Architecture) && \
	+- (OSMajorVersion >= 5 \|\| (OSMajorVersion == 4 && OSMinorVersion >= 1))
	++#if defined(i386Architecture)
	+ #define HasAgpGart YES
	+ #endif
	+ #if (defined(AlphaArchitecture) \|\| defined(ia64Architecture) \|\| \
	+- defined(AMD64Architecture)) && (OSMajorVersion >= 5)
	++ defined(AMD64Architecture))
	+ #define HasAgpGart YES
	+ #endif
	+ #endif
	+
	+ /*
	+ * SSE and 3DNow will be autodetected, so binutils is the only
	+- * requirement for enabling this. By 4.2 they were all supported.
	++ * requirement for enabling this.
	+ */
	+-#if defined(AMD64Architecture) \|\| defined(i386Architecture) && \
	+- (OSMajorVersion >= 5 \|\| (OSMajorVersion == 4 && OSMinorVersion >= 2))
	++#if defined(AMD64Architecture) \|\| defined(i386Architecture)
	+ # define HasX86Support YES
	+ # define HasMMXSupport YES
	+ # define Has3DNowSupport YES
	+@@ -311,8 +228,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ # define UseRpath YES
	+ #endif
	+
	+-#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion >= 2)
	+-
	+ # ifndef RpathLoadFlags
	+ # if UseRpath
	+ # if UseElfFormat
	+@@ -333,12 +248,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ # endif
	+ # endif
	+
	+-#endif
	+-
	#ifndef LibraryRpathLoadFlags
	# if UseRpath
	# if UseElfFormat
	@@ -44,14 +222,51 @@
	# else
	# define LibraryRpathLoadFlags -R $(USRLIBDIRPATH)
	# endif
	-@@ -470,14 +467,14 @@
	- /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
	+@@ -359,20 +272,13 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #define GnuMallocLibrary -lgnumalloc
	+ #endif
	+
	+-#if (OSMajorVersion > 2) \|\| (OSMajorVersion == 2 && OSMinorVersion >= 2) \
	+- \|\| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 6)
	+-/* 2.1.6 and 2.2 have libz */
	+ #ifndef HasZlib
	+ #define HasZlib YES
	+ #endif
	+-#endif
	+
	+-/* PAM appeared in FreeBSD 3.1 */
	+-#if (OSMajorVersion > 3) \|\| (OSMajorVersion == 3 && OSMinorVersion >=1 )
	+ #ifndef HasPam
	+ #define HasPam YES
	+ #endif
	+-#endif
	+
	+ /* There are two options for building. One is to assume that the system has
	+ * many of the dependencies provided by the ports tree. The other is to just
	+@@ -449,7 +355,6 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+
	+ #define StandardDefines -DCSRG_BASED
	+
	+-#if OSMajorVersion > 1
	+ #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
	+ #define XawI18nDefines -DUSE_XWCHAR_STRING
	+ #define HasMakefileSafeInclude YES
	+@@ -462,22 +367,15 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ #define ForceNormalLib YES
	+ #endif
	+ #define HasMkstemp YES
	+-#else
	+-#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
	+-#define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC
	+-#endif
	+
	+-/* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */
	#ifndef DefaultGcc2i386Opt
	- #if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion > 1) \|\| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
	+-#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion > 1) \|\| (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5)
	-#define DefaultGcc2i386Opt -O2 GccAliasingArgs
	+#define DefaultGcc2i386Opt
	#endif
	- #endif
	+-#endif

	#ifdef i386Architecture
	# define OptimizedCDebugFlags DefaultGcc2i386Opt
	@@ -61,7 +276,7 @@
	#endif

	#ifndef PreIncDir
	-@@ -498,6 +495,10 @@
	+@@ -498,6 +396,10 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	#define SystemManDirectory /usr/share/man
	#endif

	@@ -71,4 +286,28 @@
	+
	#define InstKmemFlags -g kmem -m 2755

	+ /*
	+@@ -507,9 +409,7 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+ # define CompressManPages YES
	+ #endif
	+
	+-#if OSMajorVersion > 2 \|\| (OSMajorVersion == 2 && OSMinorVersion >= 1)
	+ #define HasBsdMake YES
	+-#endif
	+
	+ #ifndef StaticLibrary
	+ #define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
	+@@ -561,13 +461,9 @@ XCOMM operating system: OSName (OSMajorVersion./**/OS
	+
	+ #ifndef HasCookieMaker
	+ /* Which versions have /dev/urandom? */
	+-#if OSMajorVersion >= 4
	+ #define HasCookieMaker YES
	+ #define MkCookieCmd \
	+ 'dd if=/dev/urandom bs=16 count=1 2>/dev/null \| hexdump -e \\"%08x\\"'
	+-#else
	+-#define HasCookieMaker NO
	+-#endif
	+ #endif
	+
	/*
	diff --git a/x11/xorg-cf-files/files/patch-Imake.rules b/x11/xorg-cf-files/files/patch-Imake.rules
	--- a/x11/xorg-cf-files/files/patch-Imake.rules
	+++ b/x11/xorg-cf-files/files/patch-Imake.rules
	@@ -1,6 +1,6 @@
	---- Imake.rules.orig Tue Dec 18 05:00:37 2001
	-+++ Imake.rules Mon Jan 21 02:34:48 2002
	-@@ -1399,7 +1399,7 @@
	+--- Imake.rules.orig 2021-08-02 01:00:38 UTC
	++++ Imake.rules
	+@@ -1475,7 +1475,7 @@ AllTarget(dest.suffix.html) @@\
	dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\
	RemoveFiles(dest.suffix.html dest.suffix-html) @@\
	RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\
	@@ -9,7 +9,7 @@
	@@\
	install.man:: dest.suffix.html @@\
	MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\
	-@@ -1644,7 +1644,7 @@
	+@@ -1732,7 +1732,7 @@ install:: @@\
	MakeDir(Concat($(DESTDIR),npath/mdir)) @@\
	@MakeFlagsToShellFlags(i,set +e); \ @@\
	if [ -d Concat($(DESTDIR),opath/cdir) ]; then \ @@\
	@@ -17,8 +17,8 @@
	+ RELPATH=`cd opath/cdir; pwd \| \ @@\
	sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ @@\
	cd Concat($(DESTDIR),opath/cdir); \ @@\
	- if [ -d rdir -a ! -h rdir ]; then \ @@\
	-@@ -1691,7 +1691,7 @@
	+ if [ -d rdir -a ! -h rdir ]; then \ @@\
	+@@ -1779,7 +1779,7 @@ install:: @@\
	MakeDir(Concat($(DESTDIR),npath)) @@\
	@MakeFlagsToShellFlags(i,set +e); \ @@\
	if [ -d Concat($(DESTDIR),opath) ]; then \ @@\
	@@ -26,4 +26,4 @@
	+ RELPATH=`cd opath; pwd \| \ @@\
	sed -e 's:^.::' -e 's:[^/.][^/]*:..:'g`; \ @@\
	cd Concat($(DESTDIR),opath); \ @@\
	- if [ -f lfile -a ! -h lfile ]; then \ @@\
	+ if [ -f lfile -a ! -h lfile ]; then \ @@\
	diff --git a/x11/xorg-cf-files/files/patch-Imake.tmpl b/x11/xorg-cf-files/files/patch-Imake.tmpl
	--- a/x11/xorg-cf-files/files/patch-Imake.tmpl
	+++ b/x11/xorg-cf-files/files/patch-Imake.tmpl
	@@ -1,6 +1,6 @@
	---- Imake.tmpl.orig Tue Jul 27 20:24:29 2004
	-+++ Imake.tmpl Fri Sep 10 18:45:12 2004
	-@@ -1798,7 +1798,7 @@
	+--- Imake.tmpl.orig 2021-08-02 01:00:38 UTC
	++++ Imake.tmpl
	+@@ -1823,7 +1823,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
	CXXOPTIONS = CplusplusOptions
	CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES)
	CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES)
	@@ -9,7 +9,7 @@
	#endif
	COMPRESS = CompressCmd
	GZIPCMD = GzipCmd
	-@@ -2038,7 +2038,7 @@
	+@@ -2073,7 +2073,7 @@ MODLDCOMBINEFLAGS = ModuleLdCombineFlags
	*/
	ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES)
	ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES)
	diff --git a/x11/xorg-cf-files/files/patch-Library.tmpl b/x11/xorg-cf-files/files/patch-Library.tmpl
	--- a/x11/xorg-cf-files/files/patch-Library.tmpl
	+++ b/x11/xorg-cf-files/files/patch-Library.tmpl
	@@ -1,6 +1,6 @@
	---- Library.tmpl.orig Thu Jan 18 01:22:30 2001
	-+++ Library.tmpl Mon Jun 4 19:30:34 2001
	-@@ -67,7 +67,7 @@
	+--- Library.tmpl.orig 2021-08-02 01:00:38 UTC
	++++ Library.tmpl
	+@@ -114,7 +114,7 @@ SHLIBGLOBALSFLAGS = ShlibGlobalsFlags
	STD_DEFINES = LibraryDefines $(PROJECT_DEFINES)
	CDEBUGFLAGS = LibraryCDebugFlags
	CLIBDEBUGFLAGS = LibraryDebugOpt

File Metadata

Mime Type: text/plain
Expires: Sat, Jan 18, 8:41 AM (16 h, 19 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 15852637
Default Alt Text: D36233.diff (56 KB)

D36233.diffNo OneTemporaryActions

D36233.diffView Options

File Metadata

Event Timeline

D36233.diff
No OneTemporary
Actions

D36233.diff
View Options