diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index f12f3fdf7b27..5c6214cf3ade 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -1,77 +1,75 @@
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt core non-graphical module
 
 LIB_DEPENDS=	libdouble-conversion.so:devel/double-conversion \
 		libicui18n.so:devel/icu \
 		libpcre2-posix.so:devel/pcre2 \
 		libzstd.so:archivers/zstd
 
 USES=		compiler:c++11-lang gnome qmake:no_env qt-dist:5,base
 USE_GNOME=	glib20
 USE_QT=		qmake_build buildtools_build
 HAS_CONFIGURE=	yes
 # Disable (almost) everything to install minimal qconfig.h.
 # -no-feature-* adds QT_NO_* (for features which have no switch or
 # that need to be detected).
 CONFIGURE_ARGS=	-no-accessibility -no-gif -no-libpng -no-libjpeg \
 		-no-openssl -no-gui -no-widgets -no-cups \
 		-no-iconv -no-dbus -no-opengl \
 		-no-egl -no-evdev \
 		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
 		-no-libudev -no-xcb -no-xcb-xlib \
 		-no-xkbcommon -no-libinput
 
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 BUILD_WRKSRC=	${WRKSRC}/src/corelib
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 QT_BINARIES=	yes
 QT_DEFINES=	GLIB
 QT_CONFIG=	glib icu
 
 MORE_WRKSRCS=	src/tools/bootstrap src/corelib src/tools/qlalr
 
 .include <bsd.port.pre.mk>
-# FreeBSD base gained /etc/os-release in r354922, which
-# corresponds to __FreeBSD_version 1300060
-.if ${OSVERSION} < 1300060
+.if !exists(/etc/rc.d/os-release)
 RUN_DEPENDS+=	etc_os-release>0:sysutils/etc_os-release
 post-patch:
 	${REINPLACE_CMD}  -e '/readEtcFile/s|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
 		${WRKSRC}/src/corelib/global/qglobal.cpp
 .endif
 
 post-configure:
 .for d in ${MORE_WRKSRCS}
 	${MKDIR} ${WRKSRC}/${d}
 	cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d}
 .endfor
 
 pre-build:
 .for d in ${MORE_WRKSRCS}
 	${MKDIR} ${WRKSRC}/${d}
 	cd ${WRKSRC}/${d} && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 .endfor
 
 post-install:
 # Allow qconfig.h to be customized by single ports.
 	${AWK} 'BEGIN{print "#include <QtCore/qconfig-modules.h>"}{print}' \
 		${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h > ${WRKDIR}/qconfig.h
 # Manually install qlalr
 	cd ${WRKSRC}/src/tools/qlalr && \
 		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
 		${MAKE_ARGS} ${INSTALL_TARGET}
 # Cleanup qconfig.h and remove stray '#define QT_NO_FOO'
 	${REINPLACE_CMD} "/#define QT_NO_/d" ${WRKDIR}/qconfig.h
 	${MV} ${WRKDIR}/qconfig.h ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtCore/qconfig.h
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 39ce0ca9eb54..93aea90e1bec 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -1,84 +1,83 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.38.3
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 3 project
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas #\
 #		docbook-xsl>=0:textproc/docbook-xsl
 LIB_DEPENDS=	libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libcups.so:print/cups \
 		libpulse.so:audio/pulseaudio \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libclutter-gtk-1.0.so:graphics/clutter-gtk3 \
 		libupower-glib.so:sysutils/upower \
 		libaccountsservice.so:sysutils/accountsservice \
 		libcolord.so:graphics/colord \
 		libcolord-gtk.so:graphics/colord-gtk \
 		libibus-1.0.so:textproc/ibus \
 		libsoup-2.4.so:devel/libsoup \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libpwquality.so:security/libpwquality \
 		libgtop-2.0.so:devel/libgtop \
 		libgrilo-0.3.so:net/grilo \
 		libpolkit-gobject-1.so:sysutils/polkit \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libudisks2.so:sysutils/libudisks \
 		libsecret-1.so:security/libsecret \
 		libepoxy.so:graphics/libepoxy
 RUN_DEPENDS=	gnome-settings-daemon>=3.4.0:sysutils/gnome-settings-daemon \
 		gsettings-desktop-schemas>=3.2.2:devel/gsettings-desktop-schemas \
 		cantarell-fonts>=0:x11-fonts/cantarell-fonts \
 		gcm-import:graphics/gnome-color-manager
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c++11-lib gettext gnome localbase:ldflags meson \
 		pkgconfig python:3.6+,build samba:lib tar:xz xorg
 USE_GNOME=	cairo gnomedesktop3 libxml2 gsound
 USE_XORG=	x11 xi
 #USE_GSTREAMER1=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 GLIB_SCHEMAS=	org.gnome.ControlCenter.gschema.xml
 
 OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	WAYLAND CHEESE
 OPTIONS_DEFAULT=WAYLAND CHEESE
 
 CHEESE_DESC=	Cheese webcam support
 CHEESE_LIB_DEPENDS=	libcheese.so:multimedia/cheese
 CHEESE_MESON_TRUE=	cheese
 
 WAYLAND_MESON_TRUE=	wayland
 WAYLAND_LIB_DEPENDS=	libgudev-1.0.so:devel/libgudev
 
 # This can be removed after 11.x is no longer supported
 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld)
 LDFLAGS+=      -fuse-ld=lld
 .endif
 
 .include <bsd.port.pre.mk>
-# FreeBSD base gained /etc/os-release in r354922, which
-# corresponds to __FreeBSD_version 1300060
-.if ${OSVERSION} < 1300060
+.if !exists(/etc/rc.d/os-release)
 RUN_DEPENDS+=	etc_os-release>0:sysutils/etc_os-release
 post-patch:
 	@${REINPLACE_CMD}  -e 's|/etc/os-release|${LOCALBASE}/etc/os-release|g' \
 		${WRKSRC}/panels/common/cc-os-release.c
 .endif
 
 .include <bsd.port.post.mk>