diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index 1aaccfe9f39a..abafebf2e631 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -1,28 +1,28 @@
 # Establish Ada-capable compiler as a build dependency
 # To change default compiler, define ADA_DEFAULT in make.conf
 #
 # Feature:      ada
 # Usage:        USES=ada
 # Valid ARGS:   run
 #
 # MAINTAINER: ports@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_ADA_MK)
 _INCLUDE_USES_ADA_MK=    yes
 
 DEPRECATED=	Depends on expired lang/gcc6-aux
-EXPIRATION_DATE=2022-09-30
+EXPIRATION_DATE=2022-12-31
 
 CC=	ada
 
 .  if ${ada_ARGS:Mrun}
 RUN_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
 .  endif
 
 BUILD_DEPENDS+=	${LOCALBASE}/gcc6-aux/bin/ada:lang/gcc6-aux
 MAKE_ENV+=	PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 CONFIGURE_ENV+=	PATH=${LOCALBASE}/gcc6-aux/bin:${PATH} \
 		ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
 
 .endif
diff --git a/devel/adacurses/Makefile b/devel/adacurses/Makefile
index a3c627357cc2..8f9006e5d3d4 100644
--- a/devel/adacurses/Makefile
+++ b/devel/adacurses/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	adacurses
 DISTVERSION=	20180127
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.invisible-island.net/AdaCurses/
 DISTNAME=	AdaCurses-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ada95 bindings for ncurses
 WWW=		https://invisible-island.net/ncurses/ncurses-Ada95.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/README
 
-EXPIRATION_DATE=2022-09-30
+EXPIRATION_DATE=2022-12-31
 
 USES=		ada gmake pkgconfig tar:tgz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ada-include=${PREFIX}/include/adacurses \
 		--with-ada-objects=${PREFIX}/lib/adacurses \
 		--with-curses-dir=${NCURSESBASE} \
 		--libdir=${PREFIX}/lib/adacurses \
 		--enable-widec
 PORTDOCS=	ada Ada95.html
 PLIST_SUB=	atic=adacurses/terminal_interface-curses
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/(INSTALL_PROG)/d' -e 's|@ADAGEN_LDFLAGS@||' \
 		${WRKSRC}/gen/Makefile.in
 	@${REINPLACE_CMD} -e '/pragma Linker_Options/d' \
 		${WRKSRC}/gen/terminal_interface-curses.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-menus.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-forms.ads.m4 \
 		${WRKSRC}/gen/terminal_interface-curses-panels.ads.m4
 	@${REINPLACE_CMD} -e 's|@LIBS@|@LIBS@ -lmenu -lform -lpanel|' \
 		${WRKSRC}/samples/Makefile.in
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/gen/adacurses-config \
 		${STAGEDIR}${PREFIX}/bin/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat
 	${SED} "s|@PREFIX@|${NCURSESBASE}|g" ${FILESDIR}/adacurses.gpr.in > \
 		${STAGEDIR}${PREFIX}/lib/gnat/adacurses.gpr
 
 do-install-DOCS-on:
 	(cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
 		${MAKE_CMD} ${MAKE_ARGS} THIS=${PORTNAME} install.html)
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses
 .else
 USES+=		ncurses:port
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/gcc6-aux/Makefile b/lang/gcc6-aux/Makefile
index 2d608bf81cbb..f2efeb332a1e 100644
--- a/lang/gcc6-aux/Makefile
+++ b/lang/gcc6-aux/Makefile
@@ -1,290 +1,290 @@
 PORTNAME=	gcc6-aux
 PORTVERSION=	${SNAPSHOT}
 PORTREVISION=	${MAIN_PR}
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://downloads.dragonlace.net/src/:boot \
 		LOCAL/marino:boot LOCAL/ericbsd:boot GCC/${MS_SUBDIR}
 DISTFILES=	${IDENTIFICATION}.tar.xz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Version of GCC ${GCC_BRANCH} with full Ada support
 WWW=		http://www.dragonlace.net/
 
 LICENSE=	GPLv3 GPLv3RLE
 LICENSE_COMB=	multi
 
 # PR 248674
 DEPRECATED=	Based on way end-of-life version of GCC, has issues, and is unmaintained
-EXPIRATION_DATE=2022-02-28
+EXPIRATION_DATE=2022-12-31
 
 .include "${.CURDIR}/Makefile.common"
 
 LANGS=			c c++ ada
 APPLY_DIFFS=		core cxx ada
 INTENDED_COMPILER=	NATIVE
 GARCH=			${ARCH:S/amd64/x86_64/}
 BOOTSTRAP_COMPILER=	gnat-bootstrap.${GARCH}.${OPSYS:tl}.tar.bz2
 BLD_TARGET=		${GARCH}-aux-${OPSYS:tl}${OSREL}
 FULL_GNATGCC=		NOT_SET
 OS_LABEL4VERS=		[${OPSYS}${GARCH:S/amd//:S/x86_//:S/aarch/\/ARM/:S/i386/32/}]
 NO_MTREE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
 OPTIONS_GROUP=		STANDARD BOOTSTRAP
 OPTIONS_GROUP_STANDARD=	FORTRAN OBJC NLS TESTSUITE ALLSTAGES STATIC
 OPTIONS_GROUP_BOOTSTRAP=BOOTSTRAP
 OPTIONS_DEFAULT=	FORTRAN OBJC
 NO_OPTIONS_SORT=	yes
 
 TESTSUITE_DESC=		Activate test support
 ALLSTAGES_DESC=		Build compiler with itself (twice, brings in libcc1)
 STATIC_DESC=		Link compilers and drivers statically
 BOOTSTRAP_DESC=		Create bootstrap compiler (overrides other options)
 
 # The BOOTSTRAP option overrides all the others.  "make stage" will build a
 # static compiler that supports C, C++, and Ada languages and then create
 # a new distfile in $WRKDIR/newbsd with the name following the pattern:
 # ada-bootstrap.$ARCH.$OPSYS.XY.tar.bz2.  There is no need to "make install"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 ONLY_FOR_ARCHS=		aarch64 amd64 i386
 MODERN_BINUTILS=	yes
 BOOTSTRAP_COMPILER=	ada-bootstrap.${GARCH}.freebsd.120.tar.bz2
 .endif
 .if ${OPSYS} == DragonFly
 ONLY_FOR_ARCHS=		x86_64
 BOOTSTRAP_COMPILER=	ada-bootstrap.x86_64.dragonfly.41.tar.bz2
 .endif
 
 .if defined(MODERN_BINUTILS)
 # Apparently gcc 4.9 needs binutils 2.23 or greater to link Ada correctly
 USE_BINUTILS=	yes
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 EXTRA_CONFIG+=	--with-ld=${LOCALBASE}/bin/ld
 EXTRA_CONFIG+=	--with-as=${LOCALBASE}/bin/as
 .else
 EXTRA_CONFIG+=	--with-ld=/usr/bin/ld
 EXTRA_CONFIG+=	--with-as=/usr/bin/as
 .endif
 
 WRKSRC=			${WRKDIR}/${IDENTIFICATION}
 BUILDDIR=		${WRKDIR}/build
 NEWBSDIR=		${WRKDIR}/newbs/bootstrap
 CFG_SCRIPT=		${WRKSRC}/configure
 REVFILE=		${WRKSRC}/gcc/REVISION
 PHASEFILE=		${WRKSRC}/gcc/DEV-PHASE
 BOOTSTRAP_PREFIX=	${WRKDIR}/bootstrap
 PKG_PREFIX=		${PREFIX}/${PORTNAME}
 MANPREFIX=		${PREFIX}/${PORTNAME}/share
 BSFILENAME=		ada-bootstrap.${GARCH}.${OPSYS:tl}.${OSREL:S/.//}.tar.bz2
 
 # If we find gnatmake and friends in a standard location, then we'll use this
 # compiler instead of downloading the bootstrap.
 # Add ${LOCALBASE}/bin for gmake
 .if exists (${LOCALBASE}/${PORTNAME}/bin/ada)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatbind)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatlink)
 .if exists (${LOCALBASE}/${PORTNAME}/bin/gnatmake)
 FULL_GNATGCC=${LOCALBASE}/${PORTNAME}/bin/ada
 FULL_GNATGXX=${LOCALBASE}/${PORTNAME}/bin/g++
 FULL_PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/${PORTNAME}/bin:${PREFIX}/bin:${LOCALBASE}/bin
 .endif
 .endif
 .endif
 .endif
 
 # If FULL_GNATGCC is not set, we'll request the bootstrap compiler
 # Add ${LOCALBASE}/bin for gmake
 .if ${FULL_GNATGCC} == NOT_SET
 INTENDED_COMPILER=BOOTSTRAP
 FULL_GNATGCC=${BOOTSTRAP_PREFIX}/bin/gcc
 FULL_GNATGXX=${BOOTSTRAP_PREFIX}/bin/g++
 FULL_PATH=${BOOTSTRAP_PREFIX}/bin:/sbin:/bin:/usr/sbin:/usr/bin:${PREFIX}/bin:${LOCALBASE}/bin
 DISTFILES+=	${BOOTSTRAP_COMPILER}:boot
 .endif
 
 # for port maintenance, invoke "make makesum PLUS_BOOTSTRAPS=1"
 .if defined(PLUS_BOOTSTRAPS)
 DISTFILES=	\
    ${IDENTIFICATION}.tar.xz \
    ada-bootstrap.i386.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.i386.freebsd.120.tar.bz2:boot \
    ada-bootstrap.x86_64.dragonfly.41.tar.bz2:boot \
    ada-bootstrap.x86_64.freebsd.100B.tar.bz2:boot \
    ada-bootstrap.x86_64.freebsd.120.tar.bz2:boot \
    ada-bootstrap.aarch64.freebsd.120.tar.bz2:boot
 .endif
 
 .if ${PORT_OPTIONS:MFORTRAN} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		fortran
 EXTRA_CONFIG+=	--enable-libquadmath
 .else
 EXTRA_CONFIG+=	--disable-libquadmath
 .endif
 
 .if ${PORT_OPTIONS:MOBJC} && !${PORT_OPTIONS:MBOOTSTRAP}
 LANGS+=		objc
 .endif
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 BUILD_DEPENDS+=	dejagnu>=1.4:misc/dejagnu
 APPLY_DIFFS+=	ada-testsuite
 APPLY_DIFFS+=	gcc-testsuite
 .endif
 
 .if ${PORT_OPTIONS:MNLS} && !${PORT_OPTIONS:MBOOTSTRAP}
 USES+=		gettext
 EXTRA_CONFIG+=	--enable-nls
 .else
 EXTRA_CONFIG+=	--disable-nls
 .endif
 
 .if ${PORT_OPTIONS:MSTATIC} && !${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--with-stage1-ldflags=-static
 .endif
 
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 EXTRA_CONFIG+=		--disable-shared --disable-lto
 EXTRA_CONFIG+=		--with-boot-ldflags=-static
 .else
 .  if !${PORT_OPTIONS:MALLSTAGES}
 #  For reasons unknown, build fails at libcc1 when the compiler is not
 #  not bootstrapping.  It appears to be an upstream error.  LibCC1 is used
 #  for gdb 7.9 exclusively, so it's not really needed.  Let's disable it
 #  by default, but let people that want it suffer a 3-stage build.
 EXTRA_CONFIG+=		--disable-bootstrap --disable-libcc1
 .  endif
 USES+=			iconv
 .endif
 
 # Establish Ada-aware compiler for use
 ADA_CONFIGURE_ENV+=	CC=${FULL_GNATGCC}
 ADA_CONFIGURE_ENV+=	CXX=${FULL_GNATGXX}
 ADA_CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 ADA_CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 ADA_CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS}"
 ADA_CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}"
 ADA_CONFIGURE_ENV+=	build_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	host_configargs="CPPFLAGS=\"${CPPFLAGS}\""
 ADA_CONFIGURE_ENV+=	PATH=${FULL_PATH}
 ADA_MAKE_ENV+=		PATH=${FULL_PATH}
 
 # The standard configuration options
 ADA_CONFIG_ARGS=	--enable-languages=${LANGS:Q}
 ADA_CONFIG_ARGS+=	--build=${BLD_TARGET}
 ADA_CONFIG_ARGS+=	--prefix=${PKG_PREFIX:Q}
 ADA_CONFIG_ARGS+=	--with-system-zlib
 ADA_CONFIG_ARGS+=	--with-gmp=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpfr=${PREFIX}
 ADA_CONFIG_ARGS+=	--with-mpc=${PREFIX}
 ADA_CONFIG_ARGS+=	${ICONV_CONFIGURE_ARG}
 ADA_CONFIG_ARGS+=	--enable-shared
 ADA_CONFIG_ARGS+=	--enable-threads=posix
 ADA_CONFIG_ARGS+=	--enable-checking=release
 ADA_CONFIG_ARGS+=	--disable-libmudflap
 ADA_CONFIG_ARGS+=	--disable-libgomp
 ADA_CONFIG_ARGS+=	--disable-libssp
 ADA_CONFIG_ARGS+=	${EXTRA_CONFIG}
 
 post-extract:
 	# Personalize GNAT for each different machine
 	@${ECHO} "-=> GNAT AUX ${OS_LABEL4VERS}" > ${REVFILE}
 	@${ECHO} ${PHASE} > ${PHASEFILE}
 
 	# Apply required composite diff files
 .for suffix in ${APPLY_DIFFS}
 	@${ECHO} "Applying composite patch diff-${suffix}"
 	@${PATCH} -d ${WRKSRC} -s -E < ${FILESDIR}/diff-${suffix}
 .endfor
 .if ${PORT_OPTIONS:MSTATIC} || ${PORT_OPTIONS:MBOOTSTRAP}
 	# Ensure GNAT tools are built statically
 	${REINPLACE_CMD} -e 's/^GCC_LINK_FLAGS=.*/GCC_LINK_FLAGS=-static/' \
 		${WRKSRC}/gcc/ada/gcc-interface/Makefile.in
 .endif
 	# Update LINK_SPEC to add gcc-aux lib runpath in every binary
 	@${ECHO} "Configuring LINK_SPEC runpath"
 	@${REINPLACE_CMD} -e 's;\@PREFIX\@;${PREFIX};' \
 		-e 's;\@GCCAUX\@;${PORTNAME};' \
 		${WRKSRC}/gcc/config/dragonfly.h \
 		${WRKSRC}/gcc/config/i386/freebsd64.h \
 		${WRKSRC}/gcc/config/i386/freebsd.h \
 		${WRKSRC}/gcc/config/aarch64/aarch64-freebsd.h
 	@${REINPLACE_CMD} -e 's|static:crtbeginT.o%s;||' \
 		${WRKSRC}/gcc/config/freebsd-spec.h
 .if defined(MODERN_BINUTILS)
 	# Use dwarf4-compatible addr2line (affects FreeBSD only)
 	${REINPLACE_CMD} -e 's|/usr/bin/addr2line|${PREFIX}/bin/addr2line|g' \
 	  ${WRKSRC}/gcc/ada/traceback_symbolic.c
 .endif
 
 do-configure:
 	${MKDIR} ${BUILDDIR}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_CONFIGURE_ENV} \
 		${CFG_SCRIPT} ${ADA_CONFIG_ARGS}
 
 do-build:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} ${MAKE_ARGS} all
 
 .if ${PORT_OPTIONS:MTESTSUITE} && !${PORT_OPTIONS:MBOOTSTRAP}
 test: build test-ada test-fortran test-objc test-cxx test-c
 
 test-ada:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -sk check-ada
 
 test-cxx:
 	# libstdc++ testsuite will break every time, for TRUE to continue
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c++ || true
 
 test-c:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-c
 
 test-fortran:
 .  if ${PORT_OPTIONS:MFORTRAN}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-fortran
 .  endif
 
 test-objc:
 .  if ${PORT_OPTIONS:MOBJC}
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -sk check-objc
 .  endif
 .endif
 
 do-install:
 	cd ${BUILDDIR} && ${SETENV} ${ADA_MAKE_ENV} \
 		${MAKE_CMD} install-strip ${MAKE_ARGS}
 	${MV} ${STAGEDIR}${PKG_PREFIX}/share ${WRKDIR}/moved_share
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dejagnu/baseboards \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config
 	${INSTALL_DATA} ${FILESDIR}/android6.exp \
 		${STAGEDIR}${PREFIX}/share/dejagnu/config
 	${INSTALL_DATA} ${FILESDIR}/gnatdroid6.exp \
 		${STAGEDIR}${PREFIX}/share/dejagnu/baseboards
 
 post-stage:
 	${RM} -r ${STAGEDIR}${PKG_PREFIX}/lib/gcc/${BLD_TARGET}/${GCC_VERSION}/include-fixed/
 	(cd ${STAGEDIR}${PKG_PREFIX}; ${FIND} * -type d -empty | \
 		${SORT} -dr | ${XARGS} ${RMDIR})
 	(cd ${STAGEDIR}${PREFIX}; ${FIND} ${PORTNAME} share \
 		\( -type f -or -type l \) | ${SORT} | ${SED} \
 		-e 's/\/man\/man[1578]\/.*[1578]$$/&.gz/' >> ${TMPPLIST})
 .if ${PORT_OPTIONS:MBOOTSTRAP}
 	${MKDIR} ${NEWBSDIR}
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/bin ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/lib ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/include ${NEWBSDIR}/
 	${CP} -a ${STAGEDIR}${PKG_PREFIX}/libexec ${NEWBSDIR}/
 	${RM} ${NEWBSDIR}/bin/${GARCH}*
 	(cd ${NEWBSDIR}/.. ; ${TAR} -cyf ${BSFILENAME} bootstrap)
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/ini_file_manager/Makefile b/misc/ini_file_manager/Makefile
index 5f80def0584d..b0a27d6bfc38 100644
--- a/misc/ini_file_manager/Makefile
+++ b/misc/ini_file_manager/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	ini_file_manager
 PORTVERSION=	03
 PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://sourceforge.net/projects/${SFPATH}/
 DISTNAME=	ini-files-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ini configuration file reader and manipulator package for Ada
 WWW=		https://sourceforge.net/projects/ini-files/
 
 LICENSE=	MIT
 
-EXPIRATION_DATE=2022-09-30
+EXPIRATION_DATE=2022-12-31
 
 USES=		ada zip dos2unix
 
 NO_WRKSUBDIR=	yes
 
 SFPATH=		ini-files/files/ini-files/ini-files-${PORTVERSION}
 PORTDOCS=	ini_file_manager.txt
 PORTEXAMPLES=	example.gpr test_config.adb runme.sh
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	${CP} ${FILESDIR}/construct.gpr ${WRKSRC}
 	${MKDIR} ${WRKSRC}/src
 	${MV} ${WRKSRC}/config.ad[bs] ${WRKSRC}/src
 	${SED} -e "s,@PREFIX@,${LOCALBASE},g" ${FILESDIR}/runme.sh.in \
 		> ${WRKSRC}/runme.sh
 
 do-build:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -p -Pconstruct)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gnat \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${FILESDIR}/ini_file_manager.gpr \
 		${STAGEDIR}${PREFIX}/lib/gnat
 	${INSTALL_DATA} ${WRKSRC}/src/* \
 		${STAGEDIR}${PREFIX}/include/ini_file_manager
 	${INSTALL_DATA} ${WRKSRC}/lib/*  \
 		${STAGEDIR}${PREFIX}/lib/ini_file_manager
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/ini_file_manager.txt ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/runme.sh ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/test_config.adb \
 		${FILESDIR}/example.gpr ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/synth/Makefile b/ports-mgmt/synth/Makefile
index 3f357a48e07a..5a1d9f3179c6 100644
--- a/ports-mgmt/synth/Makefile
+++ b/ports-mgmt/synth/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	synth
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.12
 CATEGORIES=	ports-mgmt
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Custom package repository builder for FreeBSD and DragonFly
 WWW=		https://github.com/jrmarino/synth
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/License.txt
 
-EXPIRATION_DATE=2022-09-30
+EXPIRATION_DATE=2022-12-31
 
 BUILD_DEPENDS=	${GPR}/ini_file_manager.gpr:misc/ini_file_manager \
 		${GPR}/adacurses.gpr:devel/adacurses
 
 USES=		ada:6 ncurses:base
 USE_GITHUB=	yes
 GH_ACCOUNT=	jrmarino
 
 GPR=		${LOCALBASE}/lib/gnat
 MAKE_ENV=	NCURSES_LINK=static
 
 OPTIONS_DEFINE=	WATCHDOG
 OPTIONS_DEFAULT=WATCHDOG
 
 WATCHDOG_DESC=	Build with watchdog monitor
 
 WATCHDOG_EXTRA_PATCHES_OFF=	${FILESDIR}/extrapatch-nowatchdog-portscan-buildcycle.adb
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1300079
 USES+=		ncurses:base
 .else
 USES+=		ncurses:port
 .endif
 
 .include <bsd.port.pre.mk>
 
 post-extract:
 .if ${OPSYS} == DragonFly && ${OSVERSION} < 400600
 	@${REINPLACE_CMD} -e 's|"re"|"r"|' ${WRKSRC}/src/unix.adb
 .endif
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/src/definitions.ads
 
 do-build:
 	(cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} \
 		gcc -c unix_core.c -o ../build/unix_core.o)
 	(cd ${WRKSRC}/synthexec && ${SETENV} ${MAKE_ENV} \
 		gcc synthexec.c -o ../build/synthexec)
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} gnatmake -P default \
 		-largs build/unix_core.o)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions \
 		${STAGEDIR}${PREFIX}/share/synth \
 		${STAGEDIR}/var/log/synth \
 		${STAGEDIR}/var/synth/live_packages
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synth \
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/build/synthexec \
 		${STAGEDIR}${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/synth.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_SCRIPT} ${WRKSRC}/shell-completers/_synth.bash \
 		${STAGEDIR}${PREFIX}/etc/bash_completion.d
 	${INSTALL_DATA} ${WRKSRC}/shell-completers/_synth \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${INSTALL_DATA} ${WRKSRC}/www/* ${STAGEDIR}${PREFIX}/share/synth
 
 .include <bsd.port.post.mk>