diff --git a/net-mgmt/icingaweb2-module-pdfexport/Makefile b/net-mgmt/icingaweb2-module-pdfexport/Makefile
index e3eec2f76ee0..e50181566290 100644
--- a/net-mgmt/icingaweb2-module-pdfexport/Makefile
+++ b/net-mgmt/icingaweb2-module-pdfexport/Makefile
@@ -1,38 +1,35 @@
 PORTNAME=	icingaweb2-module-pdfexport
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
 PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Icinga PDF Export
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-DEPRECATED=	Uses EOL Python 2.7 via www/chromium
-EXPIRATION_DATE=2021-06-23
-
 RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.4.1:net-mgmt/icingaweb2@${PHP_FLAVOR} \
 		chromium>0:www/chromium
 
 USES=		php:web,flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/bin/google-chrome|${LOCALBASE}/bin/chrome|" \
 		${WRKSRC}/library/Pdfexport/ProvidedHook/Pdfexport.php
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/icingaweb2-module-reporting/Makefile b/net-mgmt/icingaweb2-module-reporting/Makefile
index 107193839fa9..cb6b6ce47453 100644
--- a/net-mgmt/icingaweb2-module-reporting/Makefile
+++ b/net-mgmt/icingaweb2-module-reporting/Makefile
@@ -1,45 +1,38 @@
 PORTNAME=	icingaweb2-module-reporting
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.2
 PORTREVISION=	1
 CATEGORIES=	net-mgmt www
 PKGNAMESUFFIX=	${PHP_PKGNAMESUFFIX}
 
 MAINTAINER=	joneum@FreeBSD.org
 COMMENT=	Reporting module for Icinga Web 2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	icingaweb2${PHP_PKGNAMESUFFIX}>=2.6.0:net-mgmt/icingaweb2@${PHP_FLAVOR} \
 		icingaweb2-module-reactbundle${PHP_PKGNAMESUFFIX}>=0.4:net-mgmt/icingaweb2-module-reactbundle@${PHP_FLAVOR} \
 		icingaweb2-module-ipl${PHP_PKGNAMESUFFIX}>=0.2.1:net-mgmt/icingaweb2-module-ipl@${PHP_FLAVOR}
 
 USES=		php:web,flavors
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	icinga
 
 OPTIONS_DEFINE=		PDF
 PDF_DESC=		Use Chromium to export PDFs
 OPTIONS_DEFAULT=	PDF
 PDF_RUN_DEPENDS=	icingaweb2-module-pdfexport${PHP_PKGNAMESUFFIX}>=0.9:net-mgmt/icingaweb2-module-pdfexport@${PHP_FLAVOR}
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 WWWDIR?=	${PREFIX}/www/icingaweb2/modules/${PORTNAME:C/^.*-//}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC} && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR})
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPDF}
-DEPRECATED=	Uses EOL Python 2.7 via net-mgmt/icingaweb2-module-pdfexport@${PHP_FLAVOR}
-EXPIRATION_DATE=2021-06-23
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/sahi/Makefile b/www/sahi/Makefile
index fe238505b15d..d594ca25a2f2 100644
--- a/www/sahi/Makefile
+++ b/www/sahi/Makefile
@@ -1,95 +1,90 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 
 PORTNAME=	sahi
 PORTVERSION=	3.5.${SAHI_BUILD}
 PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/
 DISTNAME=	${PORTNAME}_${SAHI_BUILD:S,.,,g}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Web automation and testing tool
 
 LICENSE=	APACHE20 MPL11
 LICENSE_COMB=	multi
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
 JAVA_OS=	native
 JAVA_RUN=	yes
 
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	DOCS
 OPTIONS_DEFAULT=	CHROME
 OPTIONS_SINGLE=	BROWSER
 OPTIONS_SINGLE_BROWSER=	CHROME FIREFOX
 
 CHROME_DESC=	Use Chrome as default browser
 FIREFOX_DESC=	Use Firefox as default browser
 
 USES=		dos2unix zip
 DOS2UNIX_GLOB=	linux.xml os.properties sahi.properties
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MCHROME}
-DEPRECATED=	Uses EOL Python 2.7 via www/chromium
-EXPIRATION_DATE=2021-06-23
-.endif
-
 SAHI_BUILD=	2011.07.19
 
 USE_JAVA=	yes
 
 WRKSRC=	${WRKDIR}/sahi
 
 REINPLACE_ARGS=	-i ''
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	BROWSER=${BROWSER} JAVA_HOME=${JAVA_HOME}
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f \( -name "*.orig" -or -name "*.bat" \) -delete
 	@${FIND} ${WRKSRC} -type f \( -name "*.sh" -or -name "linux.xml" \
 		-or -name "sahi.properties" \) -print0 \
 		| ${XARGS} -0 ${REINPLACE_CMD} -E \
 			-e 's,%%CHROME%%,${LOCALBASE}/bin/chrome,g' \
 			-e 's,%%DATADIR%%,${DATADIR},g' \
 			-e 's,%%FIREFOX%%,${LOCALBASE}/bin/firefox,g' \
 			-e 's,%%JAVA%%,${JAVA},g' \
 			-e 's,%%JAVA_KEYTOOL%%,${JAVA_KEYTOOL},g' \
 			-e 's,%%OPERA%%,${LOCALBASE}/bin/opera,g' \
 			-e 's,(SAHI_HOME=).*$$,\1${DATADIR},g' \
 			-e 's,(export (SAHI_)?USERDATA_DIR=).*$$,if [ -z "$${SAHI_USERDATA_DIR}" ]; then \1\$${HOME}/.sahi; fi,g' \
 			-e 's,^(\#!/bin/)ba(sh)$$,\1\2,g'
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
 
 	@${CP} ${STAGEDIR}${DATADIR}/config/browser_types/linux.xml ${STAGEDIR}${DATADIR}/userdata/config/browser_types.xml
 .for	d in bin userdata/bin
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${DATADIR}/${d}/*
 .endfor
 .if ${PORT_OPTIONS:MDOCS}
 	@${MV} ${STAGEDIR}${DATADIR}/docs ${STAGEDIR}${DOCSDIR}
 .else
 	@${RM} -r ${STAGEDIR}${DATADIR}/docs
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MCHROME}
 BROWSER=	chrome
 RUN_DEPENDS+=	chrome:www/chromium
 .endif
 
 .if ${PORT_OPTIONS:MFIREFOX}
 BROWSER=	firefox
 RUN_DEPENDS+=	firefox:www/firefox
 .endif
 
 .include <bsd.port.post.mk>