43 files changed, 95 insertions, 101 deletions

diff --git a/CHANGES b/CHANGES
index 8deda520e43a..22010d492aa6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,17 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20251111:
+AUTHOR: kiwi@FreeBSD.org
+
+  USES=sudo has been added into ports, to allow depending on a
+  different sudo flavor. Ports depending on sudo were updated
+  to use and introduced USES.
+
+  You can update make.conf to use sssd version of sudo with:
+
+        DEFAULT_VERSIONS+=sudo=sssd
+
 20250619:
 AUTHOR: python@FreeBSD.org
 
diff --git a/Mk/Uses/sudo.mk b/Mk/Uses/sudo.mk
new file mode 100644
index 000000000000..0ef480cabd81
--- /dev/null
+++ b/Mk/Uses/sudo.mk
@@ -0,0 +1,16 @@
+# Handle dependency on sudo
+#
+# Feature:	sudo
+# Usage:	USES=sudo
+#
+# MAINTAINER: kiwi@FreeBSD.org
+
+.if !defined(_INCLUDE_USES_SUDO_MK)
+_INCLUDE_USES_SUDO_MK=   yes
+
+SUDO_FLAVOR?=	${SUDO_DEFAULT}
+SUDO_PORT?=	security/sudo
+SUDO_DEPENDS=	${LOCALBASE}/bin/sudo:${SUDO_PORT}@${SUDO_FLAVOR}
+
+RUN_DEPENDS+=	${SUDO_DEPENDS}
+.endif
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 6336b8e1bba1..605d3a7448ba 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -189,6 +189,8 @@ check-makevars::
 # Make sure we have a default in the end
 SSL_DEFAULT?=	base
 .  endif
+# Possible values: default, sssd
+SUDO_DEFAULT?=		default
 # Possible values: 8.6, 9.0
 TCLTK_DEFAULT?=		8.6
 # Possible values: 6, 7
diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 0850413b09a8..9133a9374d4c 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -12,10 +12,9 @@ WWW=		https://www.phoronix-test-suite.com
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	sudo:security/sudo \
-		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
-USES=		php:cli,build,flavors python shebangfix
+USES=		php:cli,build,flavors python shebangfix sudo
 USE_GITHUB=	yes
 USE_PHP=	curl dom gd pcntl posix simplexml zip zlib
 NO_BUILD=	yes
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index adfa82e5ea68..e7b709c4e04a 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -13,10 +13,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	liblfcbase.so:devel/lfcbase \
 		liblfcxml.so:devel/lfcxml
-RUN_DEPENDS=	${LOCALBASE}/bin/sudo:security/sudo \
-		bash:shells/bash
+RUN_DEPENDS=	bash:shells/bash
 
-USES=		libtool localbase ncurses readline shebangfix
+USES=		libtool localbase ncurses readline shebangfix sudo
 SHEBANG_FILES=	tools/cgbackup tools/cgrecover tools/cgsimload \
 		tools/logManager tools/backupManager
 USE_LDCONFIG=	yes
diff --git a/devel/p5-IPC-ShellCmd/Makefile b/devel/p5-IPC-ShellCmd/Makefile
index f4c88e3a8acf..09faff2a2654 100644
--- a/devel/p5-IPC-ShellCmd/Makefile
+++ b/devel/p5-IPC-ShellCmd/Makefile
@@ -14,10 +14,9 @@ LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-RUN_DEPENDS=	p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote \
-		sudo:security/sudo
+RUN_DEPENDS=	p5-String-ShellQuote>=0:textproc/p5-String-ShellQuote
 
-USES=		perl5
+USES=		perl5 sudo
 USE_PERL5=	configure
 
 NO_ARCH=	yes
diff --git a/devel/py-invoke/Makefile b/devel/py-invoke/Makefile
index 9ea7c6213c50..c4d63a021da5 100644
--- a/devel/py-invoke/Makefile
+++ b/devel/py-invoke/Makefile
@@ -23,6 +23,6 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	SUDO
 SUDO_DESC=	Run shell commands via sudo
 
-SUDO_RUN_DEPENDS=	sudo:security/sudo
+SUDO_USES=	sudo
 
 .include <bsd.port.mk>
diff --git a/devel/ruby-install/Makefile b/devel/ruby-install/Makefile
index 2cc8d5b06867..bd195c724056 100644
--- a/devel/ruby-install/Makefile
+++ b/devel/ruby-install/Makefile
@@ -11,9 +11,9 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	bash:shells/bash \
-		curl:ftp/curl \
-		sudo:security/sudo
+		curl:ftp/curl
 
+USES=		sudo
 NO_ARCH=	yes
 NO_BUILD=	yes
 
diff --git a/emulators/playonbsd/Makefile b/emulators/playonbsd/Makefile
index 4150d1300801..260b492a8331 100644
--- a/emulators/playonbsd/Makefile
+++ b/emulators/playonbsd/Makefile
@@ -18,12 +18,11 @@ RUN_DEPENDS=	7z:archivers/7-zip \
 		gsed:textproc/gsed \
 		icotool:graphics/icoutils \
 		jq:textproc/jq \
-		sudo:security/sudo \
 		wget:ftp/wget \
 		xdg-open:devel/xdg-utils \
 		xterm:x11/xterm
 
-USES=		perl5 python:run shebangfix
+USES=		perl5 python:run shebangfix sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	Clockwork6400
 GH_PROJECT=	POL-FreeBSD-4
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 47ba2e280d88..dccb2070f244 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -33,14 +33,13 @@ LIB_DEPENDS=	libx264.so:multimedia/libx264 \
 		libmp4v2.so:multimedia/mp4v2 \
 		libgcrypt.so:security/libgcrypt
 RUN_DEPENDS=	${ZM_DEPENDS} \
-		sudo:security/sudo \
 		p5-Device-SerialPort>=0:comms/p5-Device-SerialPort \
 		p5-Crypt-Eksblowfish>=0:security/p5-Crypt-Eksblowfish \
 		p5-Bytes-Random-Secure>=0:security/p5-Bytes-Random-Secure \
 		p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
 		zip:archivers/zip
 
-USES=		cmake:insource,noninja cpe jpeg mysql perl5 php:flavors shebangfix ssl
+USES=		cmake:insource,noninja cpe jpeg mysql perl5 php:flavors shebangfix ssl sudo
 USE_GITHUB=	yes
 GH_TUPLE=	FriendsOfCake:crud:1429237:crud/web/api/app/Plugin/Crud \
 		ZoneMinder:CakePHP-Enum-Behavior:ea90c0c:crud_plugin/web/api/app/Plugin/CakePHP-Enum-Behavior \
diff --git a/net-im/mastodon/Makefile b/net-im/mastodon/Makefile
index af2774e50fde..96b9829a8b24 100644
--- a/net-im/mastodon/Makefile
+++ b/net-im/mastodon/Makefile
@@ -20,11 +20,10 @@ RUN_DEPENDS=	autoconf>=2.71:devel/autoconf \
 		gnupg>0:security/gnupg \
 		redis>0:databases/redis \
 		rubygem-bundler>=0:sysutils/rubygem-bundler \
-		sudo>0:security/sudo \
 		wget>0:ftp/wget \
 		yarn>:www/yarn
 
-USES=		magick:7,run pgsql
+USES=		magick:7,run pgsql sudo
 USE_GITHUB=	yes
 USE_RC_SUBR=	mastodon_sidekiq mastodon_streaming mastodon_web
 
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index 55f53e7f2151..b41acf59fdf7 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
 		rrdtool:databases/rrdtool \
 		snmpget:net-mgmt/net-snmp
 
-USES=		cpe php python shebangfix
+USES=		cpe php python shebangfix sudo
 USE_GITHUB=	yes
 # php hash/json/openssl extension is required but it's statically linked in default php
 USE_PHP=	ctype curl dom fileinfo filter gd iconv ldap mbstring mysqli \
@@ -94,20 +94,12 @@ DBDIR=		/var/db/${PORTNAME}
 
 OPTIONS_DEFINE=		DOCS EXAMPLES FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS \
 			NMAP WMIC X11
-OPTIONS_DEFAULT=	FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER SUDO \
-			WMIC
-OPTIONS_RADIO=		SUDO
-OPTIONS_RADIO_SUDO=	SUDO SUDO_SSSD
-
-SUDO_RUN_DEPENDS=	sudo:security/sudo
-SUDO_SSSD_RUN_DEPENDS=	sudo:security/sudo@sssd
+OPTIONS_DEFAULT=	FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC
 
 FPING_DESC=	Enable fping support ping monitoring
 IPMITOOL_DESC=	Enable support for monitoring hardware IPMI
 MYSQLD_DESC=	Use local MySQL server
 WMIC_DESC=	Enable support for WMI polling
-SUDO_DESC=	use security/sudo
-SUDO_SSSD_DESC=	use security/sudo@sssd
 
 FPING_RUN_DEPENDS=	fping:net/fping
 IPMITOOL_RUN_DEPENDS=	ipmitool:sysutils/ipmitool
diff --git a/net-mgmt/networkmgr/Makefile b/net-mgmt/networkmgr/Makefile
index 58cb4eafe8ec..68cf5ac8668b 100644
--- a/net-mgmt/networkmgr/Makefile
+++ b/net-mgmt/networkmgr/Makefile
@@ -12,10 +12,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=  gtk-update-icon-cache:graphics/gtk-update-icon-cache \
 		${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:devel/py-python-distutils-extra@${PY_FLAVOR}
-RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
-		sudo:security/sudo
+RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
 
-USES=		gettext-tools gnome python shebangfix
+USES=		gettext-tools gnome python shebangfix sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	GhostBSD
 USE_GNOME=	pygobject3 intltool
diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile
index 0bcaa1e54fdf..579c714d6a1a 100644
--- a/net-mgmt/observium/Makefile
+++ b/net-mgmt/observium/Makefile
@@ -20,10 +20,9 @@ RUN_DEPENDS=	rrdtool:databases/rrdtool \
 		mtr:net/mtr@nox11 \
 		${LOCALBASE}/share/pear/Net/IPv4.php:net/pear-Net_IPv4@${PHP_FLAVOR} \
 		${LOCALBASE}/share/pear/Net/IPv6.php:net/pear-Net_IPv6@${PHP_FLAVOR} \
-		snmpget:net-mgmt/net-snmp \
-		sudo:security/sudo
+		snmpget:net-mgmt/net-snmp
 
-USES=		cpe php:cli,flavors python shebangfix
+USES=		cpe php:cli,flavors python shebangfix sudo
 USE_PHP=	ctype filter gd iconv mysqli posix session snmp tokenizer xml zlib
 IGNORE_WITH_PHP=	81
 SHEBANG_FILES=	\
diff --git a/net-mgmt/zabbix6-server/Makefile b/net-mgmt/zabbix6-server/Makefile
index d0ce369330e3..137fbe1523e2 100644
--- a/net-mgmt/zabbix6-server/Makefile
+++ b/net-mgmt/zabbix6-server/Makefile
@@ -156,8 +156,8 @@ MODBUS_DESC=		Support for Modbus checks
 MODBUS_CONFIGURE_WITH=	libmodbus
 MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
 
-NMAP_RUN_DEPENDS=	nmap:security/nmap \
-			sudo:security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+NMAP_USES=		sudo
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USES=		ssl
diff --git a/net-mgmt/zabbix7-server/Makefile b/net-mgmt/zabbix7-server/Makefile
index f83deea580c7..c13406b28585 100644
--- a/net-mgmt/zabbix7-server/Makefile
+++ b/net-mgmt/zabbix7-server/Makefile
@@ -155,8 +155,8 @@ MODBUS_DESC=		Support for Modbus checks
 MODBUS_CONFIGURE_WITH=	libmodbus
 MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
 
-NMAP_RUN_DEPENDS=	nmap:security/nmap \
-			sudo:security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+NMAP_USES=		sudo
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USES=		ssl
diff --git a/net-mgmt/zabbix72-server/Makefile b/net-mgmt/zabbix72-server/Makefile
index e12b74b7f7d6..a30df70e89fd 100644
--- a/net-mgmt/zabbix72-server/Makefile
+++ b/net-mgmt/zabbix72-server/Makefile
@@ -153,8 +153,8 @@ MODBUS_DESC=		Support for Modbus checks
 MODBUS_CONFIGURE_WITH=	libmodbus
 MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
 
-NMAP_RUN_DEPENDS=	nmap:security/nmap \
-			sudo:security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+NMAP_USES=		sudo
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USES=		ssl
diff --git a/net-mgmt/zabbix74-server/Makefile b/net-mgmt/zabbix74-server/Makefile
index 901b698a26c0..f84cb1890285 100644
--- a/net-mgmt/zabbix74-server/Makefile
+++ b/net-mgmt/zabbix74-server/Makefile
@@ -147,8 +147,8 @@ MODBUS_DESC=		Support for Modbus checks
 MODBUS_CONFIGURE_WITH=	libmodbus
 MODBUS_LIB_DEPENDS=	libmodbus.so:comms/libmodbus
 
-NMAP_RUN_DEPENDS=	nmap:security/nmap \
-			sudo:security/sudo
+NMAP_RUN_DEPENDS=	nmap:security/nmap
+NMAP_USES=		sudo
 
 OPENSSL_CONFIGURE_WITH=	openssl
 OPENSSL_USES=		ssl
diff --git a/net/cloud-init-devel/Makefile b/net/cloud-init-devel/Makefile
index 48d037c7b174..2485724dbe3b 100644
--- a/net/cloud-init-devel/Makefile
+++ b/net/cloud-init-devel/Makefile
@@ -24,14 +24,13 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
-		sudo>0:security/sudo
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-mock>=0:devel/py-pytest-mock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}responses>=0:devel/py-responses@${PY_FLAVOR} \
 		bash:shells/bash
 
-USES=		python shebangfix
+USES=		python shebangfix sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
diff --git a/net/cloud-init/Makefile b/net/cloud-init/Makefile
index eac2018b8eb4..d15d76c0745c 100644
--- a/net/cloud-init/Makefile
+++ b/net/cloud-init/Makefile
@@ -22,10 +22,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}oauthlib>0:security/py-oauthlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \
-		sudo>0:security/sudo
+		${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
 
-USES=		python shebangfix
+USES=		python shebangfix sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	canonical
 USE_PYTHON=	autoplist distutils
diff --git a/ports-mgmt/porttools/Makefile b/ports-mgmt/porttools/Makefile
index e4861cfaa193..30aab8421bd4 100644
--- a/ports-mgmt/porttools/Makefile
+++ b/ports-mgmt/porttools/Makefile
@@ -11,9 +11,9 @@ LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	git:devel/git \
 		portlint:ports-mgmt/portlint \
-		sudo:security/sudo \
 		ydiff:textproc/ydiff
 
+USES=		sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	skreuzer
 
diff --git a/security/kf5-kdesu/Makefile b/security/kf5-kdesu/Makefile
index 54fb47299b44..af6b1f0f2b46 100644
--- a/security/kf5-kdesu/Makefile
+++ b/security/kf5-kdesu/Makefile
@@ -21,8 +21,8 @@ SUDO_DESC=	Use sudo instead of su
 DOAS_DESC=	Use doas instead of su and sudo
 
 SUDO_CMAKE_BOOL=	KDESU_USE_SUDO_DEFAULT
-SUDO_BUILD_DEPENDS=	sudo:security/sudo
-SUDO_RUN_DEPENDS=	sudo:security/sudo
+SUDO_BUILD_DEPENDS=	${SUDO_DEPENDS}
+SUDO_USES=		sudo
 
 DOAS_CMAKE_BOOL=	KDESU_USE_DOAS_DEFAULT
 DOAS_BUILD_DEPENDS=	doas:security/doas
diff --git a/security/kf6-kdesu/Makefile b/security/kf6-kdesu/Makefile
index ac42ad91c4f8..0517ec1e365f 100644
--- a/security/kf6-kdesu/Makefile
+++ b/security/kf6-kdesu/Makefile
@@ -20,8 +20,8 @@ SUDO_DESC=	Use sudo instead of su
 DOAS_DESC=	Use doas instead of su and sudo
 
 SUDO_CMAKE_BOOL=	KDESU_USE_SUDO_DEFAULT
-SUDO_BUILD_DEPENDS=	sudo:security/sudo
-SUDO_RUN_DEPENDS=	sudo:security/sudo
+SUDO_BUILD_DEPENDS=	${SUDO_DEPENDS}
+SUDO_USES=		sudo
 
 DOAS_CMAKE_BOOL=	KDESU_USE_DOAS_DEFAULT
 DOAS_BUILD_DEPENDS=	doas:security/doas
diff --git a/security/lxqt-sudo/Makefile b/security/lxqt-sudo/Makefile
index cb1181975101..e4253d88b5c3 100644
--- a/security/lxqt-sudo/Makefile
+++ b/security/lxqt-sudo/Makefile
@@ -10,10 +10,8 @@ WWW=		https://lxqt-project.org
 
 LICENSE=	LGPL21+
 
-RUN_DEPENDS=	sudo:security/sudo
-
 USES=		cmake compiler:c++20-lang gettext kde:6 lxqt:2 qt:6 perl5 tar:xz \
-		gnome xorg
+		gnome sudo xorg
 USE_PERL5=	build
 USE_QT=		base:run tools:build svg
 
diff --git a/security/veracrypt/Makefile b/security/veracrypt/Makefile
index f8d957369eaf..0c3462db32f0 100644
--- a/security/veracrypt/Makefile
+++ b/security/veracrypt/Makefile
@@ -11,11 +11,10 @@ WWW=		https://www.veracrypt.fr/
 
 BUILD_DEPENDS=	yasm:devel/yasm
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite
-RUN_DEPENDS=	${LOCALBASE}/bin/sudo:security/sudo
 
 LICENSE_FILE=	${DOCSDIR}/LICENSE
 
-USES=		compiler:c++11-lang cpe desktop-file-utils fuse gmake iconv pkgconfig tar:bz2
+USES=		compiler:c++11-lang cpe desktop-file-utils fuse gmake iconv pkgconfig sudo tar:bz2
 CPE_VENDOR=	idrix
 USE_CXXSTD=	c++11
 USE_WX=		3.0+
diff --git a/sysutils/azure-agent/Makefile b/sysutils/azure-agent/Makefile
index 5f366b32c7e3..41bce154b84d 100644
--- a/sysutils/azure-agent/Makefile
+++ b/sysutils/azure-agent/Makefile
@@ -10,15 +10,14 @@ WWW=		https://github.com/Azure/WALinuxAgent/
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	sudo:security/sudo \
-		bash:shells/bash \
+RUN_DEPENDS=	bash:shells/bash \
 		dmidecode:sysutils/dmidecode \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
 		ca_root_nss>0:security/ca_root_nss
 
 NO_ARCH=	yes
 NO_BUILD=	yes
-USES=		python shebangfix
+USES=		python shebangfix sudo
 
 SHEBANG_FILES=	bin/waagent bin/waagent2.0
 
diff --git a/sysutils/bhyvemgr/Makefile b/sysutils/bhyvemgr/Makefile
index 7fa484ca14fe..8fc4c680c86c 100644
--- a/sysutils/bhyvemgr/Makefile
+++ b/sysutils/bhyvemgr/Makefile
@@ -11,12 +11,11 @@ WWW=		https://github.com/alonsobsd/bhyvemgr
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	virt-viewer>0:net-mgmt/virt-viewer \
-		sudo>0:security/sudo
+RUN_DEPENDS=	virt-viewer>0:net-mgmt/virt-viewer
 
 ONLY_FOR_ARCHS?=amd64
 
-USES=		desktop-file-utils fpc lazarus:flavors xorg
+USES=		desktop-file-utils fpc lazarus:flavors sudo xorg
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	alonsobsd
diff --git a/sysutils/brut/Makefile b/sysutils/brut/Makefile
index 8f43a00e9a3d..f0bddb71994a 100644
--- a/sysutils/brut/Makefile
+++ b/sysutils/brut/Makefile
@@ -10,9 +10,7 @@ WWW=		https://github.com/random532/brut
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	sudo>0:security/sudo
-
-USES=		gnome
+USES=		gnome sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	random532
 USE_GNOME=	gtk30
diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 6d2c65b993b3..22215fb6b2a6 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -39,8 +39,8 @@ ZEITGEIST_DESC=	Provide recent search suggestions (broken)
 
 POLKIT_RUN_DEPENDS=	pkexec:sysutils/polkit
 
-SUDO_RUN_DEPENDS=	sudo:security/sudo
-
 ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
 
+SUDO_USES=	sudo
+
 .include <bsd.port.mk>
diff --git a/sysutils/cbsd/Makefile b/sysutils/cbsd/Makefile
index e0ca3927e325..436945968cff 100644
--- a/sysutils/cbsd/Makefile
+++ b/sysutils/cbsd/Makefile
@@ -13,10 +13,9 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libssh2.so:security/libssh2
 RUN_DEPENDS=	curl:ftp/curl \
 		jq:textproc/jq \
-		rsync:net/rsync \
-		sudo:security/sudo
+		rsync:net/rsync
 
-USES=		compiler:c++11-lang libedit pkgconfig:both sqlite
+USES=		compiler:c++11-lang libedit pkgconfig:both sqlite sudo
 USE_GITHUB=	yes
 USE_RC_SUBR=	cbsdd cbsdrsyncd cbsd-statsd-bhyve cbsd-statsd-hoster \
 		cbsd-statsd-jail
diff --git a/sysutils/fpart/Makefile b/sysutils/fpart/Makefile
index 014f3df532ee..5c047ba8c182 100644
--- a/sysutils/fpart/Makefile
+++ b/sysutils/fpart/Makefile
@@ -20,9 +20,9 @@ PORTDOCS=	Changelog.md README.md TODO
 OPTIONS_DEFINE=	FPSYNC DOCS
 OPTIONS_DEFAULT=	FPSYNC
 FPSYNC_DESC=	Install fpsync tool
-FPSYNC_RUN_DEPENDS=	rsync:net/rsync \
-			sudo:security/sudo
+FPSYNC_RUN_DEPENDS=	rsync:net/rsync
 FPSYNC_PLIST_FILES=	bin/fpsync share/man/man1/fpsync.1.gz
+FPSYNC_USES=	sudo
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/mountsmb2/Makefile b/sysutils/mountsmb2/Makefile
index 41eb4962aa9f..1aa8caf9f906 100644
--- a/sysutils/mountsmb2/Makefile
+++ b/sysutils/mountsmb2/Makefile
@@ -7,10 +7,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SMB/CIFS shares mounting scripts to do it at login
 WWW=		http://www.granch.ru/~shelton
 
-RUN_DEPENDS=	nbtscan:net-mgmt/nbtscan \
-		sudo:security/sudo
+RUN_DEPENDS=	nbtscan:net-mgmt/nbtscan
 
-USES=		tar:bzip2
+USES=		sudo tar:bzip2
 NO_BUILD=	yes
 
 SCRIPTS=	smb2nsmbrc mountsmb2
diff --git a/sysutils/mybashburn/Makefile b/sysutils/mybashburn/Makefile
index 9b89e8b4645f..ea77bcefeb54 100644
--- a/sysutils/mybashburn/Makefile
+++ b/sysutils/mybashburn/Makefile
@@ -36,7 +36,7 @@ FLAC_RUN_DEPENDS=	flac:audio/flac
 LAME_RUN_DEPENDS=	lame:audio/lame
 MPG123_RUN_DEPENDS=	mpg123:audio/mpg123
 NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
-SUDO_RUN_DEPENDS=	sudo:security/sudo
+SUDO_USES=		sudo
 VORBIS_RUN_DEPENDS=	ogg123:audio/vorbis-tools
 
 post-patch:
diff --git a/sysutils/omnibackup/Makefile b/sysutils/omnibackup/Makefile
index 8072d645218d..2002f18dc8ae 100644
--- a/sysutils/omnibackup/Makefile
+++ b/sysutils/omnibackup/Makefile
@@ -48,7 +48,7 @@ PLIST_FILES+=	${DOCSDIR}/README.md
 .if ${PORT_OPTIONS:MOPENLDAP} \
 	|| ${PORT_OPTIONS:MPGSQL} \
 	|| ${PORT_OPTIONS:MMYSQL}
-RUN_DEPENDS+=	sudo:security/sudo
+USES+=	sudo
 .if ${PORT_OPTIONS:MOPENLDAP}
 RUN_DEPENDS+=	slapcat:net/openldap${OPENLDAP_VER}-server
 .endif
diff --git a/sysutils/openvox-server8/Makefile b/sysutils/openvox-server8/Makefile
index 02be5a045910..d45684f051da 100644
--- a/sysutils/openvox-server8/Makefile
+++ b/sysutils/openvox-server8/Makefile
@@ -16,10 +16,9 @@ ONLY_FOR_ARCHS_REASON=Bundled JNI only support some architectures
 RUN_DEPENDS=	bash>=0:shells/bash \
 		openvox-agent8>=8.0:sysutils/openvox-agent8 \
 		rubygem-openvoxserver-ca>=1:sysutils/rubygem-openvoxserver-ca \
-		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \
-		sudo>=1:security/sudo
+		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
 
-USES=		ruby java shebangfix
+USES=		ruby java shebangfix sudo
 JAVA_VERSION=	11+
 USE_RC_SUBR=	puppetserver
 WRKSRC=		${WRKDIR}/puppetserver-${PORTVERSION}
diff --git a/sysutils/puppetserver8/Makefile b/sysutils/puppetserver8/Makefile
index e8c60e8f1426..51ba63b3dfe3 100644
--- a/sysutils/puppetserver8/Makefile
+++ b/sysutils/puppetserver8/Makefile
@@ -16,10 +16,9 @@ ONLY_FOR_ARCHS_REASON=Bundled JNI only support some architectures
 RUN_DEPENDS=	bash>=0:shells/bash \
 		puppet8>=8.0:sysutils/puppet8 \
 		rubygem-puppetserver-ca>=1:sysutils/rubygem-puppetserver-ca \
-		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet \
-		sudo>=1:security/sudo
+		rubygem-semantic_puppet>=1:devel/rubygem-semantic_puppet
 
-USES=		ruby java shebangfix
+USES=		ruby java shebangfix sudo
 JAVA_VERSION=	11+
 USE_RC_SUBR=	puppetserver
 
diff --git a/sysutils/py-google-compute-engine/Makefile b/sysutils/py-google-compute-engine/Makefile
index a5c0e94dbec8..61033a86e6f2 100644
--- a/sysutils/py-google-compute-engine/Makefile
+++ b/sysutils/py-google-compute-engine/Makefile
@@ -15,10 +15,9 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
-		google_oslogin_control:sysutils/google-compute-engine-oslogin \
-		sudo:security/sudo
+		google_oslogin_control:sysutils/google-compute-engine-oslogin
 
-USES=		python shebangfix
+USES=		python shebangfix sudo
 USE_PYTHON=	autoplist concurrent distutils
 
 WRKSRC_SUBDIR=	packages/python-google-compute-engine
diff --git a/sysutils/qsudo/Makefile b/sysutils/qsudo/Makefile
index dc9323a2810d..436d21b588e0 100644
--- a/sysutils/qsudo/Makefile
+++ b/sysutils/qsudo/Makefile
@@ -10,9 +10,7 @@ WWW=		https://github.com/trueos/qsudo
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-RUN_DEPENDS=	sudo:security/sudo
-
-USES=		compiler:c++11-lang qmake qt:5
+USES=		compiler:c++11-lang qmake qt:5 sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	trueos
 GH_TAGNAME=	815e31c
diff --git a/sysutils/reggae/Makefile b/sysutils/reggae/Makefile
index 5ec3201a5e77..636c04ba364d 100644
--- a/sysutils/reggae/Makefile
+++ b/sysutils/reggae/Makefile
@@ -9,8 +9,7 @@ WWW=		https://github.com/cbsd/reggae
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	sudo:security/sudo
-
+USES=		sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	cbsd
 USE_RC_SUBR=	reggae reggae_pf
diff --git a/sysutils/topgrade/Makefile b/sysutils/topgrade/Makefile
index 58c03a8b2347..7e43c8a9d66b 100644
--- a/sysutils/topgrade/Makefile
+++ b/sysutils/topgrade/Makefile
@@ -11,9 +11,7 @@ WWW=		https://github.com/topgrade-rs/topgrade
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	sudo:security/sudo
-
-USES=		cargo
+USES=		cargo sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	topgrade-rs
 
diff --git a/sysutils/zogftw/Makefile b/sysutils/zogftw/Makefile
index 9d97d06f04c5..c95c5b00cb91 100644
--- a/sysutils/zogftw/Makefile
+++ b/sysutils/zogftw/Makefile
@@ -11,11 +11,11 @@ WWW=		https://www.fabiankeil.de/gehacktes/zogftw/
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	mbuffer:misc/mbuffer \
-		sudo:security/sudo
+RUN_DEPENDS=	mbuffer:misc/mbuffer
 TEST_DEPENDS=	atf-sh:devel/atf \
 		kyua:devel/kyua
 
+USES=		sudo
 NO_BUILD=	yes
 PORTSCOUT=	ignore:1
 
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index fc1d3ec8d35b..7461206a7c5e 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -18,10 +18,9 @@ RUN_DEPENDS=	${LOCALBASE}/share/pear/Auth/Auth.php:security/pear-Auth@${PHP_FLAV
 		${PECL_PKGNAMEPREFIX}imagick>=0:graphics/pecl-imagick@${PHP_FLAVOR} \
 		${UNZIP_CMD}:archivers/unzip \
 		composer:devel/php-composer@${PHP_FLAVOR} \
-		sudo:security/sudo \
 		zip:archivers/zip
 
-USES=		cpe jpeg magick:7,run php:flavors
+USES=		cpe jpeg magick:7,run php:flavors sudo
 USE_GITHUB=	yes
 GH_ACCOUNT=	ILIAS-eLearning
 GH_PROJECT=	ILIAS
diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile
index 255958492540..1e85aed9893a 100644
--- a/x11-wm/nscde/Makefile
+++ b/x11-wm/nscde/Makefile
@@ -83,7 +83,8 @@ SUDO_DESC=			Use sudo to elevate privileges
 ASTKSH_RUN_DEPENDS=	ksh93:shells/ast-ksh93
 DOAS_RUN_DEPENDS=	doas:security/doas
 KSH2020_RUN_DEPENDS=	ksh93:shells/ksh
-SUDO_RUN_DEPENDS=	sudo:security/sudo
+
+SUDO_USES=	sudo
 
 _SUDOFILES=	data/fvwm/Functions.fvwmconf.in lib/scripts/SysActionDialog