diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -46,7 +46,7 @@
 .  endif
 
 .  if ${ada_ARGS:Mrun}
-RUN_DEPENDS+=	${_BINDEP}:${_ADAPORT}
+USES_RUN_DEPENDS+=	${_BINDEP}:${_ADAPORT}
 .  endif
 
 BUILD_DEPENDS+=	${_BINDEP}:${_ADAPORT}
diff --git a/Mk/Uses/ansible.mk b/Mk/Uses/ansible.mk
--- a/Mk/Uses/ansible.mk
+++ b/Mk/Uses/ansible.mk
@@ -75,6 +75,6 @@
 .  endif
 
 .  if ${ansible_ARGS} == "module" || ${ansible_ARGS} == "plugin"
-RUN_DEPENDS+=	${ANSIBLE_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${ANSIBLE_RUN_DEPENDS}
 .  endif
 .endif
diff --git a/Mk/Uses/apache.mk b/Mk/Uses/apache.mk
--- a/Mk/Uses/apache.mk
+++ b/Mk/Uses/apache.mk
@@ -314,7 +314,7 @@
 .    endif
 
 .    if defined(_APACHE_RUN_DEP)
-RUN_DEPENDS+=	${APXS}:${_APACHE_PORT}
+USES_RUN_DEPENDS+=	${APXS}:${_APACHE_PORT}
 .    endif
 
 PLIST_SUB+=	AP_NAME="${SHORTMODNAME}"
diff --git a/Mk/Uses/azurepy.mk b/Mk/Uses/azurepy.mk
--- a/Mk/Uses/azurepy.mk
+++ b/Mk/Uses/azurepy.mk
@@ -6,7 +6,7 @@
 .if !defined(_INCLUDE_USES_AZUREPY_MK)
 _INCLUDE_USES_AZUREPY_MK=	yes
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}azure-cli-base>=0:sysutils/py-azure-cli-base@${PY_FLAVOR}
+USES_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}azure-cli-base>=0:sysutils/py-azure-cli-base@${PY_FLAVOR}
 
 POST_PLIST=	trim-azure-namespace
 
diff --git a/Mk/Uses/bdb.mk b/Mk/Uses/bdb.mk
--- a/Mk/Uses/bdb.mk
+++ b/Mk/Uses/bdb.mk
@@ -174,7 +174,7 @@
 .    if defined(BDB_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${db${_BDB_VER}_FIND}:${db${_BDB_VER}_DEPENDS:C/^libdb.*://}
 .    else
-LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
+USES_LIB_DEPENDS+=	${db${_BDB_VER}_DEPENDS}
 .    endif
 .    if ${_BDB_VER} == 5
 BDB_LIB_NAME=		db-5.3
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -23,10 +23,10 @@
 .  if ${bison_ARGS} == "build"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
 .  elif ${bison_ARGS} == "run"
-RUN_DEPENDS+=	${_BISON_DEPENDS}
+USES_RUN_DEPENDS+=	${_BISON_DEPENDS}
 .  elif ${bison_ARGS} == "both"
 BUILD_DEPENDS+=	${_BISON_DEPENDS}
-RUN_DEPENDS+=	${_BISON_DEPENDS}
+USES_RUN_DEPENDS+=	${_BISON_DEPENDS}
 .  elif ${bison_ARGS} == "alias"
 BINARY_ALIAS+=	bison=byacc
 .  elif ${bison_ARGS} == "wrapper"
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -24,30 +24,30 @@
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 .  if ${blaslapack_ARGS} == atlas
-LIB_DEPENDS+=	libatlas.so:math/atlas
+USES_LIB_DEPENDS+=	libatlas.so:math/atlas
 _BLASLIB=	ptf77blas
 LAPACKLIB=	-lalapack -lptcblas
 _ATLASLIB=	atlas
 ATLASLIB=	-l${_ATLASLIB}
 BLA_VENDOR=	ATLAS
 .  elif ${blaslapack_ARGS} == blis
-LIB_DEPENDS+=	libblis.so:math/blis
-LIB_DEPENDS+=	libflame.so:math/libflame
+USES_LIB_DEPENDS+=	libblis.so:math/blis
+USES_LIB_DEPENDS+=	libflame.so:math/libflame
 _BLASLIB=	blis
 LAPACKLIB=	-lflame
 BLA_VENDOR=	FLAME
 .  elif ${blaslapack_ARGS} == flexiblas
-LIB_DEPENDS+=	libflexiblas.so:math/flexiblas
+USES_LIB_DEPENDS+=	libflexiblas.so:math/flexiblas
 _BLASLIB=	flexiblas
 BLA_VENDOR=	FlexiBLAS
 .  elif ${blaslapack_ARGS} == netlib
-LIB_DEPENDS+=	libblas.so:math/blas
-LIB_DEPENDS+=	liblapack.so:math/lapack
+USES_LIB_DEPENDS+=	libblas.so:math/blas
+USES_LIB_DEPENDS+=	liblapack.so:math/lapack
 _BLASLIB=	blas
 LAPACKLIB=	-llapack
 BLA_VENDOR=	Generic
 .  elif ${blaslapack_ARGS} == openblas
-LIB_DEPENDS+=	libopenblas.so:math/openblas
+USES_LIB_DEPENDS+=	libopenblas.so:math/openblas
 _BLASLIB=	openblas
 LAPACKLIB=	-lopenblas
 BLA_VENDOR=	OpenBLAS
diff --git a/Mk/Uses/budgie.mk b/Mk/Uses/budgie.mk
--- a/Mk/Uses/budgie.mk
+++ b/Mk/Uses/budgie.mk
@@ -64,13 +64,13 @@
 .      if ${USE_BUDGIE:M${comp}\:build} && defined(${comp}_BUILD_DEPENDS)
 BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS}
 .      elif ${USE_BUDGIE:M${comp}\:run} && defined(${comp}_RUN_DEPENDS)
-RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
+USES_RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
 .      else
 .        if defined(${comp}_LIB_DEPENDS)
-LIB_DEPENDS+= ${${comp}_LIB_DEPENDS}
+USES_LIB_DEPENDS+= ${${comp}_LIB_DEPENDS}
 .        else
 BUILD_DEPENDS+= ${${comp}_BUILD_DEPENDS}
-RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
+USES_RUN_DEPENDS+= ${${comp}_RUN_DEPENDS}
 .        endif
 .      endif
 .    endfor
diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk
--- a/Mk/Uses/cabal.mk
+++ b/Mk/Uses/cabal.mk
@@ -117,7 +117,7 @@
 .  endif
 
 # Inherited via lang/ghc we need to depend on libffi.so and libgmp.so (stage q/a)
-LIB_DEPENDS+=	libgmp.so:math/gmp \
+USES_LIB_DEPENDS+=	libgmp.so:math/gmp \
 		libffi.so:devel/libffi
 
 DIST_SUBDIR?=	cabal
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -65,7 +65,7 @@
 BUILD_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
 
 .    if ${cmake_ARGS:Mrun}
-RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
+USES_RUN_DEPENDS+=		${CMAKE_BIN}:devel/cmake-core
 .    endif
 
 .    if defined(WITH_DEBUG)
diff --git a/Mk/Uses/corosync.mk b/Mk/Uses/corosync.mk
--- a/Mk/Uses/corosync.mk
+++ b/Mk/Uses/corosync.mk
@@ -28,6 +28,6 @@
 .  endif
 
 BUILD_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
-RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
+USES_RUN_DEPENDS+=	corosync:net/corosync${COROSYNC_DEFAULT}
 
 .endif
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -15,7 +15,7 @@
 MASTER_SITES?=	CRAN/src/contrib CRAN_ARCHIVE/src/contrib
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/R:math/R
-RUN_DEPENDS+=	${LOCALBASE}/bin/R:math/R
+USES_RUN_DEPENDS+=	${LOCALBASE}/bin/R:math/R
 
 PKGNAMEPREFIX?=	R-cran-
 
diff --git a/Mk/Uses/desktop-file-utils.mk b/Mk/Uses/desktop-file-utils.mk
--- a/Mk/Uses/desktop-file-utils.mk
+++ b/Mk/Uses/desktop-file-utils.mk
@@ -14,6 +14,6 @@
 .  endif
 
 BUILD_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
-RUN_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
+USES_RUN_DEPENDS+=	update-desktop-database:devel/desktop-file-utils
 
 .endif
diff --git a/Mk/Uses/drupal.mk b/Mk/Uses/drupal.mk
--- a/Mk/Uses/drupal.mk
+++ b/Mk/Uses/drupal.mk
@@ -76,7 +76,7 @@
 NO_BUILD?=	yes
 
 WRKSRC?=	${WRKDIR}/${PORTNAME}
-RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE}
+USES_RUN_DEPENDS+=	${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE}
 
 PLIST_SUB+=	DRUPAL_MODDIR=${DRUPAL_MODDIR}
 PLIST_FILES+=	"@owner www" \
diff --git a/Mk/Uses/eigen.mk b/Mk/Uses/eigen.mk
--- a/Mk/Uses/eigen.mk
+++ b/Mk/Uses/eigen.mk
@@ -46,7 +46,7 @@
 BUILD_DEPENDS+=	${_EIGEN_DEP}
 .  endif
 .  if ! empty(eigen_ARGS:Mrun)
-RUN_DEPENDS+=	${_EIGEN_DEP}
+USES_RUN_DEPENDS+=	${_EIGEN_DEP}
 .  endif
 
 .endif
diff --git a/Mk/Uses/electronfix.mk b/Mk/Uses/electronfix.mk
--- a/Mk/Uses/electronfix.mk
+++ b/Mk/Uses/electronfix.mk
@@ -34,7 +34,7 @@
 .  include "${.CURDIR}/../../devel/electron${_ELECTRONFIX_MK_VERSION}/Makefile.version"
 
 BUILD_DEPENDS+=	electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION}
-RUN_DEPENDS+=	electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION}
+USES_RUN_DEPENDS+=	electron${_ELECTRONFIX_MK_VERSION}:devel/electron${_ELECTRONFIX_MK_VERSION}
 
 ELECTRONFIX_SYMLINK_FILES?= \
 			chromedriver \
diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk
--- a/Mk/Uses/elixir.mk
+++ b/Mk/Uses/elixir.mk
@@ -57,14 +57,14 @@
 MIX_EXTRA_FILES?=
 
 BUILD_DEPENDS+=	elixir:lang/elixir
-RUN_DEPENDS+=	elixir:lang/elixir
+USES_RUN_DEPENDS+=	elixir:lang/elixir
 
 .  for depend in ${MIX_BUILD_DEPS}
 BUILD_DEPENDS+=	${depend:T}>=0:${depend}
 .  endfor
 
 .  for depend in ${MIX_RUN_DEPS}
-RUN_DEPENDS+=	${depend:T}>=0:${depend}
+USES_RUN_DEPENDS+=	${depend:T}>=0:${depend}
 .  endfor
 
 .  if !target(do-build)
diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk
--- a/Mk/Uses/emacs.mk
+++ b/Mk/Uses/emacs.mk
@@ -135,7 +135,7 @@
 BUILD_DEPENDS+=		${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
 .  endif
 .  if defined(_EMACS_RUN_DEP)
-RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
+USES_RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTDIR}@${EMACS_FLAVOR:C/devel_//}
 .  endif
 
 MAKE_ARGS+=	EMACS=${EMACS_CMD}
diff --git a/Mk/Uses/erlang.mk b/Mk/Uses/erlang.mk
--- a/Mk/Uses/erlang.mk
+++ b/Mk/Uses/erlang.mk
@@ -37,7 +37,7 @@
 PLIST_SUB+=		VERSION="${PORTVERSION}"
 
 BUILD_DEPENDS+=	erl:lang/erlang
-RUN_DEPENDS+=	erl:lang/erlang
+USES_RUN_DEPENDS+=	erl:lang/erlang
 
 .  if ${erlang_ARGS:Menc}
 BUILD_DEPENDS+=	enc:devel/erlang-native-compiler
@@ -56,7 +56,7 @@
 .  endfor
 
 .  for depend in ${ERL_RUN_DEPS}
-RUN_DEPENDS+=	${depend:T}>=0:${depend}
+USES_RUN_DEPENDS+=	${depend:T}>=0:${depend}
 .  endfor
 
 .  if ${erlang_ARGS:Mrebar}
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -55,6 +55,6 @@
 _USE_FAM=	${_DEFAULT_FAM}
 .  endif
 
-LIB_DEPENDS+=	${_${_USE_FAM}_DEPENDS}
+USES_LIB_DEPENDS+=	${_${_USE_FAM}_DEPENDS}
 
 .endif
diff --git a/Mk/Uses/firebird.mk b/Mk/Uses/firebird.mk
--- a/Mk/Uses/firebird.mk
+++ b/Mk/Uses/firebird.mk
@@ -22,6 +22,6 @@
 IGNORE=		Invalid Firebird version ${FIREBIRD_VER}; valid versions are ${VALID_FIREBIRD_VER}
 .  endif
 
-LIB_DEPENDS+=	libfbclient.so:databases/firebird${FIREBIRD_VER:S/.//}-client
+USES_LIB_DEPENDS+=	libfbclient.so:databases/firebird${FIREBIRD_VER:S/.//}-client
 
 .endif
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -49,10 +49,10 @@
 .  endif
 
 .  if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfontsdir)
-RUN_DEPENDS+=	fc-cache:x11-fonts/fontconfig
+USES_RUN_DEPENDS+=	fc-cache:x11-fonts/fontconfig
 .  endif
 .  if !empty(fonts_ARGS:Mfontsdir)
-RUN_DEPENDS+=	mkfontscale:x11-fonts/mkfontscale
+USES_RUN_DEPENDS+=	mkfontscale:x11-fonts/mkfontscale
 .  endif
 
 FONTNAME?=	${PORTNAME}
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -20,7 +20,7 @@
 _GCC_VER=	${_USE_GCC}
 .    endif
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
-RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
+USES_RUN_DEPENDS+=	gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
 F77=		gfortran${_GCC_VER}
 F90=		gfortran${_GCC_VER}
 FC=		gfortran${_GCC_VER}
diff --git a/Mk/Uses/fpc.mk b/Mk/Uses/fpc.mk
--- a/Mk/Uses/fpc.mk
+++ b/Mk/Uses/fpc.mk
@@ -60,7 +60,7 @@
 			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 
 .  if ${fpc_ARGS:Mrun}
-RUN_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
+USES_RUN_DEPENDS+=		${LOCALBASE}/bin/as:devel/binutils \
 			${LOCALBASE}/lib/fpc/${FPC_VER}/${PPNAME}:lang/fpc${FPC_DEVELSUFFIX}
 .  endif
 
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -14,9 +14,9 @@
 LIBFUSE_VER?=	2
 
 .  if ${LIBFUSE_VER} == 2
-LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
+USES_LIB_DEPENDS+=	libfuse.so:sysutils/fusefs-libs
 .  elif ${LIBFUSE_VER} == 3
-LIB_DEPENDS+=	libfuse3.so:sysutils/fusefs-libs3
+USES_LIB_DEPENDS+=	libfuse3.so:sysutils/fusefs-libs3
 .  else
 IGNORE=		cannot install: unknown FUSE library version: ${LIBFUSE_VERSION}
 .  endif
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -29,7 +29,7 @@
 
 BUILD_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 EXTRACT_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
-RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
+USES_RUN_DEPENDS+=	${RUBYGEMBIN}:devel/ruby-gems
 
 GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
 CACHE_DIR=	${GEMS_BASE_DIR}/cache
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -15,13 +15,13 @@
 
 .  if ${gettext-runtime_ARGS:Mlib}
 BUILD_DEPENDS+=	gettext-runtime>=0.22_1:devel/gettext-runtime
-LIB_DEPENDS+=	libintl.so:devel/gettext-runtime
+USES_LIB_DEPENDS+=	libintl.so:devel/gettext-runtime
 .  endif
 .  if ${gettext-runtime_ARGS:Mbuild}
 BUILD_DEPENDS+=	gettext-runtime>=0.22_1:devel/gettext-runtime
 .  endif
 .  if ${gettext-runtime_ARGS:Mrun}
-RUN_DEPENDS+=	gettext-runtime>=0.22_1:devel/gettext-runtime
+USES_RUN_DEPENDS+=	gettext-runtime>=0.22_1:devel/gettext-runtime
 .  endif
 
 .endif
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -17,7 +17,7 @@
 BUILD_DEPENDS+=	msgfmt:devel/gettext-tools
 .  endif
 .  if ${gettext-tools_ARGS:Mrun}
-RUN_DEPENDS+=	msgfmt:devel/gettext-tools
+USES_RUN_DEPENDS+=	msgfmt:devel/gettext-tools
 .  endif
 
 .endif
diff --git a/Mk/Uses/gl.mk b/Mk/Uses/gl.mk
--- a/Mk/Uses/gl.mk
+++ b/Mk/Uses/gl.mk
@@ -41,7 +41,7 @@
 IGNORE=		uses unknown GL component
 .    else
 USE_XORG+=	${_GL_${_component}_USE_XORG}
-LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${_GL_${_component}_LIB_DEPENDS}
 .    endif
 .  endfor
 
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -356,13 +356,13 @@
 .        if ${USE_GNOME:M${component}\:build} && defined(${component}_BUILD_DEPENDS)
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 .        elif ${USE_GNOME:M${component}\:run} && defined(${component}_RUN_DEPENDS)
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .        else
 .          if defined(${component}_LIB_DEPENDS)
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
 .          else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .          endif
 .        endif
 
@@ -395,7 +395,7 @@
 
 .  if defined(USE_GNOME_SUBR)
 GNOME_SUBR=		${LOCALBASE}/etc/gnome.subr
-RUN_DEPENDS+=	${GNOME_SUBR}:sysutils/gnome_subr
+USES_RUN_DEPENDS+=	${GNOME_SUBR}:sysutils/gnome_subr
 SUB_LIST+=		GNOME_SUBR=${GNOME_SUBR}
 .  endif
 
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
--- a/Mk/Uses/gnustep.mk
+++ b/Mk/Uses/gnustep.mk
@@ -64,7 +64,7 @@
 
 .  if defined(USE_GNUSTEP)
 .    if ${USE_GNUSTEP:Mbase}
-LIB_DEPENDS+=	libgnustep-base.so:lang/gnustep-base
+USES_LIB_DEPENDS+=	libgnustep-base.so:lang/gnustep-base
 .    endif
 
 .    if ${USE_GNUSTEP:Mbuild}
@@ -80,12 +80,12 @@
 .    endif
 
 .    if ${USE_GNUSTEP:Mgui}
-LIB_DEPENDS+=	libgnustep-gui.so:x11-toolkits/gnustep-gui
+USES_LIB_DEPENDS+=	libgnustep-gui.so:x11-toolkits/gnustep-gui
 .    endif
 
 .    if ${USE_GNUSTEP:Mback}
 BUILD_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
-RUN_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
+USES_RUN_DEPENDS+=	gnustep-back>0:x11-toolkits/gnustep-back
 .    endif
 
 .  endif
diff --git a/Mk/Uses/go.mk b/Mk/Uses/go.mk
--- a/Mk/Uses/go.mk
+++ b/Mk/Uses/go.mk
@@ -169,7 +169,7 @@
 BUILD_DEPENDS+=	${GO_CMD}:${GO_PORT}
 BINARY_ALIAS+=	go=go${GO_SUFFIX} gofmt=gofmt${GO_SUFFIX}
 .  if ${go_ARGS:Mrun}
-RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
+USES_RUN_DEPENDS+=	${GO_CMD}:${GO_PORT}
 .  endif
 
 _USES_POST+=	go
diff --git a/Mk/Uses/grantlee.mk b/Mk/Uses/grantlee.mk
--- a/Mk/Uses/grantlee.mk
+++ b/Mk/Uses/grantlee.mk
@@ -55,7 +55,7 @@
 
 # Append the correct LIB_DEPENDS
 .  if empty(grantlee_ARGS:Mselfbuild)
-LIB_DEPENDS+=	${GRANTLEE${_grantlee_version}_LIB_DEPEND}
+USES_LIB_DEPENDS+=	${GRANTLEE${_grantlee_version}_LIB_DEPEND}
 .  endif
 
 # Export the plist substitutions
diff --git a/Mk/Uses/groff.mk b/Mk/Uses/groff.mk
--- a/Mk/Uses/groff.mk
+++ b/Mk/Uses/groff.mk
@@ -17,10 +17,10 @@
 .    if ${groff_ARGS} == "build"
 BUILD_DEPENDS+=	${_GROFF_DEPENDS}
 .    elif ${groff_ARGS} == "run"
-RUN_DEPENDS+=	${_GROFF_DEPENDS}
+USES_RUN_DEPENDS+=	${_GROFF_DEPENDS}
 .    elif ${groff_ARGS} == "both"
 BUILD_DEPENDS+=	${_GROFF_DEPENDS}
-RUN_DEPENDS+=	${_GROFF_DEPENDS}
+USES_RUN_DEPENDS+=	${_GROFF_DEPENDS}
 .    else
 IGNORE=	USES=groff - invalid args: [${groff_ARGS}] specified
 .    endif
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -102,7 +102,7 @@
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .      if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_HEIMDAL_DEPENDS}
-RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
+USES_RUN_DEPENDS+=	${_HEIMDAL_DEPENDS}
 .      else
 PREFIX=		${HEIMDAL_HOME}
 .      endif
@@ -118,7 +118,7 @@
 _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 .      if !defined(_KRB_BOOTSTRAP)
 BUILD_DEPENDS+=	${_MITKRB5_DEPENDS}
-RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
+USES_RUN_DEPENDS+=	${_MITKRB5_DEPENDS}
 .      else
 PREFIX=		${KRB5_HOME}
 .      endif
diff --git a/Mk/Uses/gstreamer.mk b/Mk/Uses/gstreamer.mk
--- a/Mk/Uses/gstreamer.mk
+++ b/Mk/Uses/gstreamer.mk
@@ -432,8 +432,8 @@
 .    endif
 .  endfor
 
-LIB_DEPENDS+=   ${_GST_LIB_DEPENDS:O:u}
+USES_LIB_DEPENDS+=   ${_GST_LIB_DEPENDS:O:u}
 BUILD_DEPENDS+= ${_GST_BR_DEPENDS:O:u}
-RUN_DEPENDS+=   ${_GST_BR_DEPENDS:O:u}
+USES_RUN_DEPENDS+=   ${_GST_BR_DEPENDS:O:u}
 
 .endif
diff --git a/Mk/Uses/guile.mk b/Mk/Uses/guile.mk
--- a/Mk/Uses/guile.mk
+++ b/Mk/Uses/guile.mk
@@ -225,13 +225,13 @@
 BUILD_DEPENDS+=	${GUILE_CMD}:${GUILE_PORT}
 .    endif
 .    if ${_GUILE_ARG_RUN}
-RUN_DEPENDS+=	${GUILE_CMD}:${GUILE_PORT}
+USES_RUN_DEPENDS+=	${GUILE_CMD}:${GUILE_PORT}
 .    endif
 .    if !${_GUILE_ARG_BUILD} && !${_GUILE_ARG_RUN}
 .      if ${GUILE_SFX} > 1
-LIB_DEPENDS+=	libguile-${GUILE_VER}.so:${GUILE_PORT} ${_GUILE_EXTRA_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	libguile-${GUILE_VER}.so:${GUILE_PORT} ${_GUILE_EXTRA_LIB_DEPENDS}
 .      else
-LIB_DEPENDS+=	libguile.so:${GUILE_PORT} ${_GUILE_EXTRA_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	libguile.so:${GUILE_PORT} ${_GUILE_EXTRA_LIB_DEPENDS}
 .      endif
 .    endif
 .    if ${_GUILE_ARG_CMDS}
diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk
--- a/Mk/Uses/horde.mk
+++ b/Mk/Uses/horde.mk
@@ -123,7 +123,7 @@
 .      if !defined(horde-${DEP}-DEPEND)
 UNKNOWN_HORDE_PACKAGES+=	${DEP}
 .      else
-RUN_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
+USES_RUN_DEPENDS+=	${horde-${DEP}-DEPEND}@${PHP_FLAVOR}
 .      endif
 .    endfor
 .  endif
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -26,7 +26,7 @@
 .    elif ${iconv_ARGS:Mpatch}
 PATCH_DEPENDS+=	${ICONV_CMD}:converters/libiconv
 .    else
-LIB_DEPENDS+=	libiconv.so:converters/libiconv
+USES_LIB_DEPENDS+=	libiconv.so:converters/libiconv
 .    endif
 
 .  else
diff --git a/Mk/Uses/jpeg.mk b/Mk/Uses/jpeg.mk
--- a/Mk/Uses/jpeg.mk
+++ b/Mk/Uses/jpeg.mk
@@ -21,14 +21,14 @@
 .  endif
 
 .  if ${jpeg_ARGS} == lib
-LIB_DEPENDS+=	libjpeg.so:${JPEG_PORT}
+USES_LIB_DEPENDS+=	libjpeg.so:${JPEG_PORT}
 .  elif ${jpeg_ARGS} == build
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
 .  elif ${jpeg_ARGS} == run
-RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
+USES_RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .  elif ${jpeg_ARGS} == both
 BUILD_DEPENDS+=	cjpeg:${JPEG_PORT}
-RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
+USES_RUN_DEPENDS+=	cjpeg:${JPEG_PORT}
 .  else
 IGNORE=		USES=jpeg - invalid args: [${jpeg_ARGS}] specified
 .  endif
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -1046,7 +1046,7 @@
 .          endif
     # Set real dependencies.
 .          if defined(kde-${component}_LIB) && ${kde-${component}_TYPE:Mbuild} && ${kde-${component}_TYPE:Mrun}
-LIB_DEPENDS+=			${kde-${component}_LIB}:${kde-${component}_PORT}
+USES_LIB_DEPENDS+=			${kde-${component}_LIB}:${kde-${component}_PORT}
 .          else
 kde-${component}_PATH?=		${KDE_PREFIX}/lib/${kde-${component}_LIB}
 kde-${component}_DEPENDS=	${kde-${component}_PATH}:${kde-${component}_PORT}
@@ -1054,7 +1054,7 @@
 BUILD_DEPENDS+=			${kde-${component}_DEPENDS}
 .            endif
 .            if ${kde-${component}_TYPE:Mrun} != ""
-RUN_DEPENDS+=			${kde-${component}_DEPENDS}
+USES_RUN_DEPENDS+=			${kde-${component}_DEPENDS}
 .            endif
 .          endif # ${kde-${component}_LIB} && ${kde-${component}_TYPE:Mbuild} && ${kde-${component}_TYPE:Mrun}
 .        endif # defined(kde-${component}_PORT) && defined(kde-${component}_PATH)
diff --git a/Mk/Uses/kodi.mk b/Mk/Uses/kodi.mk
--- a/Mk/Uses/kodi.mk
+++ b/Mk/Uses/kodi.mk
@@ -20,9 +20,9 @@
 .  endfor
 
 BUILD_DEPENDS+=	${LOCALBASE}/include/kodi/AddonBase.h:multimedia/kodi
-LIB_DEPENDS+=	libp8-platform.so:devel/p8-platform \
+USES_LIB_DEPENDS+=	libp8-platform.so:devel/p8-platform \
 		libkodiplatform.so:devel/kodi-platform
-RUN_DEPENDS+=	kodi:multimedia/kodi
+USES_RUN_DEPENDS+=	kodi:multimedia/kodi
 
 PKGNAMEPREFIX?=	kodi-addon-
 KODI_ADDON?=	${PORTNAME}
diff --git a/Mk/Uses/lazarus.mk b/Mk/Uses/lazarus.mk
--- a/Mk/Uses/lazarus.mk
+++ b/Mk/Uses/lazarus.mk
@@ -109,7 +109,7 @@
 .  endif
 
 .  if ${lazarus_ARGS:Mgtk2} || ${FLAVOR} == gtk2
-LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
+USES_LIB_DEPENDS+=	libglib-2.0.so:devel/glib20 \
 		libgtk-x11-2.0.so:x11-toolkits/gtk20 \
 		libatk-1.0.so:accessibility/at-spi2-core \
 		libpango-1.0.so:x11-toolkits/pango \
@@ -119,13 +119,13 @@
 .  endif
 
 .  if ${lazarus_ARGS:Mqt5} || ${FLAVOR} == qt5
-LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
+USES_LIB_DEPENDS+=	libQt5Pas.so:x11-toolkits/qt5pas
 LCL_PLATFORM=	qt5
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt5${LAZARUS_DEVELSUFFIX}
 .  endif
 
 .  if ${lazarus_ARGS:Mqt6} || ${FLAVOR} == qt6
-LIB_DEPENDS+=	libQt6Pas.so:x11-toolkits/qt6pas
+USES_LIB_DEPENDS+=	libQt6Pas.so:x11-toolkits/qt6pas
 LCL_PLATFORM=	qt6
 BUILD_DEPENDS+=	${LCL_UNITS_DIR}/${LCL_PLATFORM}/interfaces.ppu:editors/lazarus-qt6${LAZARUS_DEVELSUFFIX}
 .  endif
diff --git a/Mk/Uses/ldap.mk b/Mk/Uses/ldap.mk
--- a/Mk/Uses/ldap.mk
+++ b/Mk/Uses/ldap.mk
@@ -96,10 +96,10 @@
 .      endfor
 .    endif # IGNORE_WITH_OPENLDAP
 .    if defined(_WANT_OPENLDAP_SERVER)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/slapd:${_OPENLDAP_SERVER}
+USES_RUN_DEPENDS+=	${LOCALBASE}/libexec/slapd:${_OPENLDAP_SERVER}
 .    endif
 .    if defined(_WANT_OPENLDAP_CLIENT) || !defined(_WANT_OPENLDAP_SERVER)
-LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:${_OPENLDAP_CLIENT}
+USES_LIB_DEPENDS+=	${OPENLDAP${OPENLDAP_VER}_LIB}:${_OPENLDAP_CLIENT}
 .    endif
 .  else
 IGNORE=		cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
diff --git a/Mk/Uses/libarchive.mk b/Mk/Uses/libarchive.mk
--- a/Mk/Uses/libarchive.mk
+++ b/Mk/Uses/libarchive.mk
@@ -10,5 +10,5 @@
 _INCLUDE_USES_LIBARCHIVE_MK=	yes
 _USES_POST+=	localbase
 
-LIB_DEPENDS+=	libarchive.so.13:archivers/libarchive
+USES_LIB_DEPENDS+=	libarchive.so.13:archivers/libarchive
 .endif
diff --git a/Mk/Uses/libedit.mk b/Mk/Uses/libedit.mk
--- a/Mk/Uses/libedit.mk
+++ b/Mk/Uses/libedit.mk
@@ -10,5 +10,5 @@
 _INCLUDE_USES_LIBEDIT_MK=	yes
 _USES_POST+=	localbase
 
-LIB_DEPENDS+=	libedit.so.0:devel/libedit
+USES_LIB_DEPENDS+=	libedit.so.0:devel/libedit
 .endif
diff --git a/Mk/Uses/linux.mk b/Mk/Uses/linux.mk
--- a/Mk/Uses/linux.mk
+++ b/Mk/Uses/linux.mk
@@ -150,7 +150,7 @@
 BUILD_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .    endif
 .    if ${_i_args:Mrun} || empty(_i_args)
-RUN_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
+USES_RUN_DEPENDS+=		${_linux_${linux_ARGS}_${i:C/:.*//}}
 .    endif
 .    if !defined(_linux_${linux_ARGS}_${i:C/:.*//})
 DEV_ERROR+=		"USE_LINUX=${i}: package does not exist"
diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
--- a/Mk/Uses/lua.mk
+++ b/Mk/Uses/lua.mk
@@ -270,10 +270,10 @@
 BUILD_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
 .    endif
 .    if ${lua_ARGS:Mrun}
-RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
+USES_RUN_DEPENDS+=	${LUA_CMD}:lang/lua${LUA_VER_STR}
 .    endif
 .    if !${lua_ARGS:Mbuild} && !${lua_ARGS:Mrun}
-LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
+USES_LIB_DEPENDS+=	liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
 .    endif
 .  endif
 
diff --git a/Mk/Uses/luajit.mk b/Mk/Uses/luajit.mk
--- a/Mk/Uses/luajit.mk
+++ b/Mk/Uses/luajit.mk
@@ -12,29 +12,29 @@
 .if !defined(_INCLUDE_USES_LUAJIT_MK)
 _INCLUDE_USES_LUAJIT_MK=yes
 
-.if !empty(luajit_ARGS)
+.  if !empty(luajit_ARGS)
 LUAJIT_VER=	${luajit_ARGS}
-.else
+.  else
 LUAJIT_VER=	${LUAJIT_DEFAULT}
-.endif
+.  endif
 
 # When adding a version, please keep the comment in
 # Mk/bsd.default-versions.mk in sync
 VALID_LUAJIT_VER=	luajit luajit-devel luajit-openresty
 
-.if empty(VALID_LUAJIT_VER:M${LUAJIT_DEFAULT})
+.  if empty(VALID_LUAJIT_VER:M${LUAJIT_DEFAULT})
 IGNORE=	Invalid luajit default version ${LUAJIT_DEFAULT}: valid versions are ${VALID_LUAJIT_VER}
-.elif empty(VALID_LUAJIT_VER:M${LUAJIT_VER})
+.  elif empty(VALID_LUAJIT_VER:M${LUAJIT_VER})
 IGNORE=	Invalid luajit version ${LUAJIT_VER}: valid versions are ${VALID_LUAJIT_VER}
-.endif
+.  endif
 
-.if ${LUAJIT_VER} == luajit
+.  if ${LUAJIT_VER} == luajit
 LUAJIT_LUAVER=	2.0
-.else
+.  else
 LUAJIT_LUAVER=	2.1
-.endif
+.  endif
 
-LIB_DEPENDS+=	libluajit-5.1.so:lang/${LUAJIT_VER}
+USES_LIB_DEPENDS+=	libluajit-5.1.so:lang/${LUAJIT_VER}
 LUAJIT_INCDIR=	${LOCALBASE}/include/luajit-${LUAJIT_LUAVER}
 
 .endif
diff --git a/Mk/Uses/lxqt.mk b/Mk/Uses/lxqt.mk
--- a/Mk/Uses/lxqt.mk
+++ b/Mk/Uses/lxqt.mk
@@ -86,11 +86,11 @@
 .      endif
 
 .      if defined(${comp}_LIB_DEPENDS)
-LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
 .      endif
 
 .      if defined(${comp}_RUN_DEPENDS)
-RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
 .      endif
 .    endfor
 
diff --git a/Mk/Uses/mate.mk b/Mk/Uses/mate.mk
--- a/Mk/Uses/mate.mk
+++ b/Mk/Uses/mate.mk
@@ -164,13 +164,13 @@
 .        if ${USE_MATE:M${component}\:build}!=""
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
 .        elif ${USE_MATE:M${component}\:run}!=""
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .        else
 .          if defined(${component}_LIB_DEPENDS)
-LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
 .          else
 BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
 .          endif
 .        endif
 .      endif
diff --git a/Mk/Uses/minizip.mk b/Mk/Uses/minizip.mk
--- a/Mk/Uses/minizip.mk
+++ b/Mk/Uses/minizip.mk
@@ -9,9 +9,9 @@
 _INCLUDE_USES_MINIZIP_MK=	yes
 
 .  if empty(minizip_ARGS)
-LIB_DEPENDS+=		libminizip.so:archivers/minizip
+USES_LIB_DEPENDS+=		libminizip.so:archivers/minizip
 .  elif ${minizip_ARGS} == "ng"
-LIB_DEPENDS+=		libminizip-ng.so:archivers/minizip-ng
+USES_LIB_DEPENDS+=		libminizip-ng.so:archivers/minizip-ng
 .  else
 IGNORE=	Incorrect 'USES+=minizip:${minizip_ARGS}' expecting 'USES+=minizip[:ng]'
 .  endif
diff --git a/Mk/Uses/mlt.mk b/Mk/Uses/mlt.mk
--- a/Mk/Uses/mlt.mk
+++ b/Mk/Uses/mlt.mk
@@ -52,7 +52,7 @@
 
 # Append the correct LIB_DEPENDS
 .  if !defined(_MLT_NODEPEND)
-LIB_DEPENDS+=	${_MLT_DEP}
+USES_LIB_DEPENDS+=	${_MLT_DEP}
 .  endif
 
 # Append version to PLIST_SUB
diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -82,7 +82,7 @@
 MAKE_ENV+=		MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC
 BUILD_DEPENDS+=		mono:lang/mono${MONO_DEFAULT}
 .  if empty(mono_ARGS:Mbuild)
-RUN_DEPENDS+=		mono:lang/mono${MONO_DEFAULT}
+USES_RUN_DEPENDS+=		mono:lang/mono${MONO_DEFAULT}
 .  endif
 
 # Set the location that webaps served by XSP should use.
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -16,13 +16,13 @@
 .  endif
 
 .  if defined(WANT_LESSTIF)
-LIB_DEPENDS+=		libXm.so:x11-toolkits/lesstif
+USES_LIB_DEPENDS+=		libXm.so:x11-toolkits/lesstif
 .  elif defined(WANT_OPEN_MOTIF_DEVEL)
 USE_XORG+=	xpm
-LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif-devel
+USES_LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif-devel
 .  else
 USE_XORG+=	xpm
-LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
+USES_LIB_DEPENDS+=		libXm.so.4:x11-toolkits/open-motif
 .  endif
 
 MOTIFLIB?=	-L${LOCALBASE}/lib -lXm
diff --git a/Mk/Uses/mpi.mk b/Mk/Uses/mpi.mk
--- a/Mk/Uses/mpi.mk
+++ b/Mk/Uses/mpi.mk
@@ -28,7 +28,7 @@
 .  endif
 
 .  if ${mpi_ARGS} == mpich
-LIB_DEPENDS+=	libmpich.so:net/mpich
+USES_LIB_DEPENDS+=	libmpich.so:net/mpich
 MPI_HOME=	${LOCALBASE}
 MPI_LIBS+=	`pkgconf --libs mpich`
 MPI4PY=		${PYTHON_PKGNAMEPREFIX}mpi4py-mpich>0:net/py-mpi4py-mpich@${PY_FLAVOR}
@@ -39,7 +39,7 @@
 .    endif
 MPI_CFLAGS+=	`pkgconf --cflags mpich`
 .  elif ${mpi_ARGS} == openmpi
-LIB_DEPENDS+=	libmpi_cxx.so:net/openmpi
+USES_LIB_DEPENDS+=	libmpi_cxx.so:net/openmpi
 MPI_HOME=	${LOCALBASE}/mpi/openmpi
 MPI4PY=		${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR}
 .    if ${USES:Mfortran}
diff --git a/Mk/Uses/mysql.mk b/Mk/Uses/mysql.mk
--- a/Mk/Uses/mysql.mk
+++ b/Mk/Uses/mysql.mk
@@ -133,10 +133,10 @@
 .      endfor
 .    endif # IGNORE_WITH_MYSQL
 .    if defined(_WANT_MYSQL_SERVER)
-RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
+USES_RUN_DEPENDS+=	${LOCALBASE}/libexec/mysqld:${_MYSQL_SERVER}
 .    endif
 .    if defined(_WANT_MYSQL_CLIENT) || !defined(_WANT_MYSQL_SERVER)
-LIB_DEPENDS+=	${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
+USES_LIB_DEPENDS+=	${_MYSQL_SHLIB}.so.${MYSQL${MYSQL_VER}_LIBVER}:${_MYSQL_CLIENT}
 .    endif
 .  else
 IGNORE=		cannot install: unknown MySQL version: ${MYSQL_VER}
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -70,7 +70,7 @@
 NCURSES_SHLIBVER?=	6
 
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
-RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
+USES_RUN_DEPENDS+=		${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
 NCURSESRPATH=		${NCURSESBASE}/lib
 TINFO_LIB=		-ltinfo
 NCURSES_LIB=		-lncurses
diff --git a/Mk/Uses/nextcloud.mk b/Mk/Uses/nextcloud.mk
--- a/Mk/Uses/nextcloud.mk
+++ b/Mk/Uses/nextcloud.mk
@@ -27,7 +27,7 @@
 
 LICENSE?=	AGPLv3
 
-RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=${NEXTCLOUD_RUN_DEPENDS}:www/nextcloud@${PHP_FLAVOR}
+USES_RUN_DEPENDS=	nextcloud${PHP_PKGNAMESUFFIX}>=${NEXTCLOUD_RUN_DEPENDS}:www/nextcloud@${PHP_FLAVOR}
 
 USES+=		php:flavors
 NO_BUILD=	yes
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -72,7 +72,7 @@
 .  endif
 
 .  if ${ninja_ARGS:Mrun}
-RUN_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
+USES_RUN_DEPENDS+=	${NINJA_CMD}:${_NINJA_PORT}
 .  endif
 
 .endif
diff --git a/Mk/Uses/nodejs.mk b/Mk/Uses/nodejs.mk
--- a/Mk/Uses/nodejs.mk
+++ b/Mk/Uses/nodejs.mk
@@ -54,7 +54,7 @@
 BUILD_DEPENDS+=	node:www/node${NODEJS_VERSION}
 .  endif
 .  if ${nodejs_ARGS:M*run*}
-RUN_DEPENDS+=	node:www/node${NODEJS_VERSION}
+USES_RUN_DEPENDS+=	node:www/node${NODEJS_VERSION}
 .  endif
 
 .endif
diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk
--- a/Mk/Uses/objc.mk
+++ b/Mk/Uses/objc.mk
@@ -70,7 +70,7 @@
 .  endif
 
 .  if ! ${objc_ARGS:Mcompiler}
-LIB_DEPENDS+=	libobjc.so.4.6:lang/libobjc2
+USES_LIB_DEPENDS+=	libobjc.so.4.6:lang/libobjc2
 OBJCFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 .  endif
diff --git a/Mk/Uses/octave.mk b/Mk/Uses/octave.mk
--- a/Mk/Uses/octave.mk
+++ b/Mk/Uses/octave.mk
@@ -26,9 +26,9 @@
 
 .  if empty(octave_ARGS:Menv)
 BUILD_DEPENDS+=	octave:math/octave
-RUN_DEPENDS+=	octave:math/octave \
+USES_RUN_DEPENDS+=	octave:math/octave \
 		${LOCALBASE}/libexec/octave/load-octave-pkg:math/octave-forge-base
-LIB_DEPENDS+=	libpcre.so:devel/pcre
+USES_LIB_DEPENDS+=	libpcre.so:devel/pcre
 
 .    if ! ${USES:Mcompiler}
 _USES_POST+=	compiler:c++14-lang
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -22,7 +22,7 @@
 _OPENAL_alut_DEPENDS=	libalut.so.0:audio/freealut
 
 .  for _arg in ${openal_ARGS}
-LIB_DEPENDS+=	${_OPENAL_${_arg}_DEPENDS}
+USES_LIB_DEPENDS+=	${_OPENAL_${_arg}_DEPENDS}
 .  endfor
 
 .endif
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -48,7 +48,7 @@
 .    endif
 
 BUILD_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
-RUN_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
+USES_RUN_DEPENDS+=	pear:devel/pear@${PHP_FLAVOR}
 
 PEAR_PKGNAMEPREFIX=	php${PHP_VER}-pear-
 
@@ -58,7 +58,7 @@
 PEARPKGREF=	${PEAR_CHANNEL}/${PORTNAME}
 PEAR_CHANNEL_VER?=	>=0
 BUILD_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
-RUN_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
+USES_RUN_DEPENDS+=	${PEAR_PKGNAMEPREFIX}channel-${PEAR_CHANNEL}${PEAR_CHANNEL_VER}:devel/pear-channel-${PEAR_CHANNEL}@${PHP_FLAVOR}
 .    else
 PKGNAMEPREFIX?=	${PEAR_PKGNAMEPREFIX}
 PEARPKGREF=	${PORTNAME}
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -240,7 +240,7 @@
 .  endif
 
 .  if ${_USE_PERL5:Mrun}
-RUN_DEPENDS+=		${PERL5_DEPEND}:lang/${PERL_PORT}
+USES_RUN_DEPENDS+=		${PERL5_DEPEND}:lang/${PERL_PORT}
 .  endif
 
 .  if ${_USE_PERL5:Mtest}
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -146,7 +146,7 @@
 .    endif # IGNORE_WITH_PGSQL
 
 .    if !defined(WANT_PGSQL) || ${WANT_PGSQL:Mlib}
-LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
+USES_LIB_DEPENDS+=	libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
 .    endif
 
 _USE_PGSQL_DEP=		client contrib docs pgtcl plperl plpython pltcl server
@@ -162,7 +162,7 @@
 .      for depend in ${_USE_PGSQL_DEP}
 .        if ${WANT_PGSQL:M${depend}}
 BUILD_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend}
-RUN_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend}
+USES_RUN_DEPENDS+=	${_USE_PGSQL_DEP_${depend}}:databases/postgresql${PGSQL_VER_NODOT}-${depend}
 .        elif ${WANT_PGSQL:M${depend}\:*}
 BUILD_DEPENDS+=	${NONEXISTENT}:databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
 .        endif
diff --git a/Mk/Uses/php.mk b/Mk/Uses/php.mk
--- a/Mk/Uses/php.mk
+++ b/Mk/Uses/php.mk
@@ -271,11 +271,11 @@
 .  if ${php_ARGS:Mbuild}
 BUILD_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
 .  endif
-RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
+USES_RUN_DEPENDS+=	${PHPBASE}/include/php/main/php.h:${PHP_PORT}
 .  if  ${php_ARGS:Mmod} || (${php_ARGS:Mweb} && defined(PHP_VERSION) && ${PHP_SAPI:Mcgi} == "" && ${PHP_SAPI:Mfpm} == "")
 apache_ARGS?=run
 .include "${USESDIR}/apache.mk"
-RUN_DEPENDS+=	${PHPBASE}/${APACHEMODDIR}/libphp.so:${MOD_PHP_PORT}
+USES_RUN_DEPENDS+=	${PHPBASE}/${APACHEMODDIR}/libphp.so:${MOD_PHP_PORT}
 .  endif
 
 PLIST_SUB+=	PHP_EXT_DIR=${PHP_EXT_DIR}
@@ -457,7 +457,7 @@
 .          if !empty(php_ARGS:Mbuild) || !empty(ext:M*\:build)
 BUILD_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS}
 .          endif
-RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS}
+USES_RUN_DEPENDS+=	${PHPBASE}/lib/php/${PHP_EXT_DIR}/${extension:S/:build//}.so:${${extension:S/:build//}_DEPENDS}
 .        endif
 .      else
 .        if ${ext:tl} != "yes" && !defined(_IGNORE_PHP_SET)
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -19,11 +19,11 @@
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
 .  elif ${pkgconfig_ARGS} == "run"
-RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+USES_RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 .  elif ${pkgconfig_ARGS} == "both"
 CONFIGURE_ENV+=	PKG_CONFIG=pkgconf
 BUILD_DEPENDS+=	${_PKGCONFIG_DEPENDS}
-RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
+USES_RUN_DEPENDS+=	${_PKGCONFIG_DEPENDS}
 .  else
 IGNORE=	USES=pkgconfig - invalid args: [${pkgconfig_ARGS}] specified
 .  endif
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk
--- a/Mk/Uses/pyqt.mk
+++ b/Mk/Uses/pyqt.mk
@@ -258,7 +258,7 @@
 .  for comp in ${_USE_PYQT}
 .    if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}}
 BUILD_DEPENDS+=		${py-${comp:S/:/_/}_BUILD_DEPENDS}
-RUN_DEPENDS+=		${py-${comp:S/:/_/}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=		${py-${comp:S/:/_/}_RUN_DEPENDS}
 TEST_DEPENDS+=		${py-${comp:S/:/_/}_TEST_DEPENDS}
 .    else
 IGNORE?=	cannot be installed: unknown USE_PYQT component ${comp} #'
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -616,7 +616,7 @@
 .  endif
 
 .  if defined(_PYTHON_FEATURE_CRYPTOGRAPHY)
-RUN_DEPENDS+=	${CRYPTOGRAPHY_DEPENDS}
+USES_RUN_DEPENDS+=	${CRYPTOGRAPHY_DEPENDS}
 .  endif
 
 .  if defined(_PYTHON_FEATURE_CRYPTOGRAPHY_TEST)
@@ -629,7 +629,7 @@
 .  endif
 
 .  if defined(_PYTHON_FEATURE_CYTHON_RUN)
-RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
+USES_RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FLAVOR}
 .  endif
 
 .  if defined(_PYTHON_FEATURE_CYTHON_TEST)
@@ -672,10 +672,10 @@
 	${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools44
 .    if ${PYTHON_VER} == 2.7
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
+USES_RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools44>0:devel/py-setuptools44@${PY_FLAVOR}
 .    else
 BUILD_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
+USES_RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
 .    endif
 .  endif
 
diff --git a/Mk/Uses/qca.mk b/Mk/Uses/qca.mk
--- a/Mk/Uses/qca.mk
+++ b/Mk/Uses/qca.mk
@@ -23,6 +23,6 @@
 _QCA_CHOSEN_PORT=	DEFAULT
 _QCA_FLAVOR=		qt${_QT_VER}
 
-LIB_DEPENDS+=		${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}@${_QCA_FLAVOR}
+USES_LIB_DEPENDS+=		${_QCA_LIB}:${_QCA_${_QCA_CHOSEN_PORT}_PORT}@${_QCA_FLAVOR}
 
 .endif
diff --git a/Mk/Uses/qmail.mk b/Mk/Uses/qmail.mk
--- a/Mk/Uses/qmail.mk
+++ b/Mk/Uses/qmail.mk
@@ -25,10 +25,10 @@
 .  if ${qmail_ARGS} == "build"
 BUILD_DEPENDS+=	${_QMAIL_DEPENDS}
 .  elif ${qmail_ARGS} == "run"
-RUN_DEPENDS+=	${_QMAIL_DEPENDS}
+USES_RUN_DEPENDS+=	${_QMAIL_DEPENDS}
 .  elif ${qmail_ARGS} == "both"
 BUILD_DEPENDS+=	${_QMAIL_DEPENDS}
-RUN_DEPENDS+=	${_QMAIL_DEPENDS}
+USES_RUN_DEPENDS+=	${_QMAIL_DEPENDS}
 .  elif ${qmail_ARGS} == "vars"
 .  else
 IGNORE=	USES=qmail - invalid args: [${qmail_ARGS}] specified
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -447,7 +447,7 @@
 .        endif
 # Set real dependencies.
 .        if defined(qt-${component}_LIB) && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun}
-LIB_DEPENDS+=			${qt-${component}_LIB}:${qt-${component}_PORT}
+USES_LIB_DEPENDS+=			${qt-${component}_LIB}:${qt-${component}_PORT}
 .        else
 qt-${component}_PATH?=		${QT_LIBDIR}/${qt-${component}_LIB}
 qt-${component}_DEPENDS=	${qt-${component}_PATH}:${qt-${component}_PORT}
@@ -455,7 +455,7 @@
 BUILD_DEPENDS+=			${qt-${component}_DEPENDS}
 .          endif
 .          if ${qt-${component}_TYPE:Mrun} != ""
-RUN_DEPENDS+=			${qt-${component}_DEPENDS}
+USES_RUN_DEPENDS+=			${qt-${component}_DEPENDS}
 .          endif
 .        endif # ${qt-${component}_LIB} && ${qt-${component}_TYPE:Mbuild} && ${qt-${component}_TYPE:Mrun}
 .      endif # defined(qt-${component}_PORT) && defined(qt-${component}_PATH)
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -12,7 +12,7 @@
 IGNORE= Incorrect 'USES+= readline:${readline_ARGS}' readline takes no arguments
 .  endif
 
-LIB_DEPENDS+=		libreadline.so.8:devel/readline
+USES_LIB_DEPENDS+=		libreadline.so.8:devel/readline
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 
diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk
--- a/Mk/Uses/ruby.mk
+++ b/Mk/Uses/ruby.mk
@@ -352,13 +352,13 @@
 EXTRACT_DEPENDS+=	${DEPEND_RUBY}
 PATCH_DEPENDS+=		${DEPEND_RUBY}
 BUILD_DEPENDS+=		${DEPEND_RUBY}
-RUN_DEPENDS+=		${DEPEND_RUBY}
+USES_RUN_DEPENDS+=		${DEPEND_RUBY}
 .    elif ${ruby_ARGS:Mbuild}
 EXTRACT_DEPENDS+=	${DEPEND_RUBY}
 PATCH_DEPENDS+=		${DEPEND_RUBY}
 BUILD_DEPENDS+=		${DEPEND_RUBY}
 .    elif ${ruby_ARGS:Mrun}
-RUN_DEPENDS+=		${DEPEND_RUBY}
+USES_RUN_DEPENDS+=		${DEPEND_RUBY}
 .    endif
 
 .  endif # _INVALID_RUBY_VER
diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
--- a/Mk/Uses/samba.mk
+++ b/Mk/Uses/samba.mk
@@ -31,10 +31,10 @@
 BUILD_DEPENDS+=	smbd:${SAMBAPORT}
 .  endif
 .  if ${samba_ARGS:Mlib}
-LIB_DEPENDS+=	libsmbclient.so:${SAMBAPORT}
+USES_LIB_DEPENDS+=	libsmbclient.so:${SAMBAPORT}
 .  endif
 .  if ${samba_ARGS:Mrun}
-RUN_DEPENDS+=	smbd:${SAMBAPORT}
+USES_RUN_DEPENDS+=	smbd:${SAMBAPORT}
 .  endif
 
 .endif
diff --git a/Mk/Uses/sdl.mk b/Mk/Uses/sdl.mk
--- a/Mk/Uses/sdl.mk
+++ b/Mk/Uses/sdl.mk
@@ -90,7 +90,7 @@
 
 # Provide LIB_DEPENDS
 .  for _component in ${_USE_SDL:O:u}
-LIB_DEPENDS+=	${_SDL_${_component}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${_SDL_${_component}_LIB_DEPENDS}
 .  endfor
 
 # Provide dependency on main SDL ports
diff --git a/Mk/Uses/shared-mime-info.mk b/Mk/Uses/shared-mime-info.mk
--- a/Mk/Uses/shared-mime-info.mk
+++ b/Mk/Uses/shared-mime-info.mk
@@ -14,6 +14,6 @@
 .  endif
 
 BUILD_DEPENDS+=	update-mime-database:misc/shared-mime-info
-RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info
+USES_RUN_DEPENDS+=	update-mime-database:misc/shared-mime-info
 
 .endif
diff --git a/Mk/Uses/sqlite.mk b/Mk/Uses/sqlite.mk
--- a/Mk/Uses/sqlite.mk
+++ b/Mk/Uses/sqlite.mk
@@ -12,9 +12,9 @@
 SQLITE_VER?=	3
 
 .  if ${SQLITE_VER} == 3
-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${SQLITE_VER}
+USES_LIB_DEPENDS+=	libsqlite3.so:databases/sqlite${SQLITE_VER}
 .  elif ${SQLITE_VER} == 2
-LIB_DEPENDS+=	libsqlite.so:databases/sqlite${SQLITE_VER}
+USES_LIB_DEPENDS+=	libsqlite.so:databases/sqlite${SQLITE_VER}
 .  else
 IGNORE=		cannot install: unknown SQLite version: ${SQLITE_VER}
 .  endif
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -101,7 +101,7 @@
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
 .    endif
 .    if defined(_SSL_RUN_DEP)
-RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
+USES_RUN_DEPENDS+=		${LOCALBASE}/lib/libcrypto.so.${OPENSSL_SHLIBVER}:${OPENSSL_PORT}
 .    endif
 OPENSSLRPATH=		${LOCALBASE}/lib
 
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -121,7 +121,7 @@
 _TCLTK_WANTED_VERSIONS=	${_TCLTK_DEFAULT_VERSION}
 .  endif
 
-# 
+#
 # Resolve minimum versions (ver+). Append anything greater or equal than the
 # specified minimum version to the list of wanted versions.
 #
@@ -208,14 +208,14 @@
 BUILD_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
 .  elif ${tcl_ARGS:Mrun}
-RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
+USES_RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
 .  elif ${tcl_ARGS:Mtest}
 TEST_DEPENDS+=	${_TCLTK_WRAPPER_PORT} \
 		${_TCLTK_EXE_LINE}
 .  else
-RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT}
-LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
+USES_RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT}
+USES_LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
 .  endif
 
 # Setup TEA stuff
diff --git a/Mk/Uses/vala.mk b/Mk/Uses/vala.mk
--- a/Mk/Uses/vala.mk
+++ b/Mk/Uses/vala.mk
@@ -16,7 +16,7 @@
 
 .  if empty(vala_ARGS:Mno_depend)
 .    if ! empty(vala_ARGS:Mlib)
-LIB_DEPENDS+=		${_VALA_LIBRARY}:${_VALA_PORT}
+USES_LIB_DEPENDS+=		${_VALA_LIBRARY}:${_VALA_PORT}
 .    endif
 .    if ! empty(vala_ARGS:Mbuild)
 BUILD_DEPENDS+=		${_VALA_BINARY}:${_VALA_PORT}
diff --git a/Mk/Uses/varnish.mk b/Mk/Uses/varnish.mk
--- a/Mk/Uses/varnish.mk
+++ b/Mk/Uses/varnish.mk
@@ -18,7 +18,7 @@
 .  elif defined(VARNISH_DEFAULT)
 .  endif
 
-RUN_DEPENDS+=	varnish${VARNISH_VERSION}>=${VARNISH_VERSION}:www/varnish${VARNISH_VERSION}
+USES_RUN_DEPENDS+=	varnish${VARNISH_VERSION}>=${VARNISH_VERSION}:www/varnish${VARNISH_VERSION}
 BUILD_DEPENDS+=	varnish${VARNISH_VERSION}>=${VARNISH_VERSION}:www/varnish${VARNISH_VERSION}
 
 CFLAGS+= 	-I${LOCALBASE}/include -I${LOCALBASE}/include/varnish
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -64,11 +64,11 @@
 .      endif
 
 .      if defined(${comp}_LIB_DEPENDS)
-LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
+USES_LIB_DEPENDS+=	${${comp}_LIB_DEPENDS}
 .      endif
 
 .      if defined(${comp}_RUN_DEPENDS)
-RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
+USES_RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
 .      endif
 .    endfor
 
diff --git a/Mk/Uses/xorg.mk b/Mk/Uses/xorg.mk
--- a/Mk/Uses/xorg.mk
+++ b/Mk/Uses/xorg.mk
@@ -138,7 +138,7 @@
 .    if ${XORG_MODULES:M${_module}} == ""
 IGNORE=		requires unknown xorg module (${_module})
 .    endif
-RUN_DEPENDS+=	${${_module}_BUILD_DEPENDS}
+USES_RUN_DEPENDS+=	${${_module}_BUILD_DEPENDS}
 .  endfor
 
 .  for _module in ${USE_XORG:C/\:both$//g}
@@ -149,7 +149,7 @@
 BUILD_DEPENDS+=	${${_module}_BUILD_DEPENDS}
 .  endfor
 
-RUN_DEPENDS+=	${LIB_PC_DEPENDS}
+USES_RUN_DEPENDS+=	${LIB_PC_DEPENDS}
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS}
 
 .endif
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1457,7 +1457,7 @@
 _USES_${target}?=
 .    endfor
 
-# Loading features
+# Loading features for the main package
 .    for f in ${USES}
 _f:=		${f:C/\:.*//}
 .      if !defined(${_f}_ARGS)
@@ -1471,6 +1471,8 @@
 .        if exists(${_usefile}) && !defined(_usefound)
 _usefound=
 .include "${_usefile}"
+LIB_DEPENDS+=	${USES_LIB_DEPENDS}
+RUN_DEPENDS+=	${USES_RUN_DEPENDS}
 .        endif
 .      endfor
 .      if !defined(_usefound)
@@ -1478,6 +1480,31 @@
 .      endif
 .    endfor
 
+# Loading features for subpackages
+.    for sp in ${SUBPACKAGES}
+.      for f in ${USES}.${sp}
+_f:=		${f:C/\:.*//}
+.        if !defined(${_f}_ARGS)
+${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
+.        endif
+.      endfor
+.      for f in ${USES}.${sp}
+.undef _usefound
+.        for udir in ${OVERLAYS:C,$,/Mk/Uses,} ${USESDIR}
+_usefile=	${udir}/${f:C/\:.*//}.mk
+.          if exists(${_usefile}) && !defined(_usefound)
+_usefound=
+.include "${_usefile}"
+LIB_DEPENDS.${sp}+=	${USES_LIB_DEPENDS}
+RUN_DEPENDS.${sp}+=	${USES_RUN_DEPENDS}
+.          endif
+.        endfor
+.        if !defined(_usefound)
+ERROR+=	"Unknown USES=${f:C/\:.*//}"
+.        endif
+.      endfor
+.    endfor
+
 .    if !empty(FLAVORS)
 .      if ${FLAVORS:Mall}
 DEV_ERROR+=		"FLAVORS cannot contain 'all', it is a reserved value"