From 869e1f27d0cd912f612cd1af8dd5491749901f80 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Wed, 14 Oct 2015 16:49:35 +0000
Subject: Drop the necessity to add ${PORTSDIR} to dependency line
Modify make describe to automatically prepend ${PORTSDIR} if the path for the
port is not absolute
Checked with poudriere, portmaster, portupgrade
PR: 203685
Exp-run by: antoine
Differential Revision: https://reviews.freebsd.org/D3866
---
Mk/Uses/ada.mk | 4 +-
Mk/Uses/autoreconf.mk | 12 +--
Mk/Uses/bison.mk | 2 +-
Mk/Uses/blaslapack.mk | 12 +--
Mk/Uses/cmake.mk | 4 +-
Mk/Uses/compiler.mk | 4 +-
Mk/Uses/cran.mk | 4 +-
Mk/Uses/desktop-file-utils.mk | 4 +-
Mk/Uses/display.mk | 10 +-
Mk/Uses/drupal.mk | 2 +-
Mk/Uses/elixir.mk | 6 +-
Mk/Uses/erlang.mk | 12 +--
Mk/Uses/execinfo.mk | 2 +-
Mk/Uses/fakeroot.mk | 2 +-
Mk/Uses/fam.mk | 4 +-
Mk/Uses/fmake.mk | 2 +-
Mk/Uses/fonts.mk | 6 +-
Mk/Uses/fortran.mk | 12 +--
Mk/Uses/fuse.mk | 4 +-
Mk/Uses/gecko.mk | 12 +--
Mk/Uses/gettext-runtime.mk | 6 +-
Mk/Uses/gettext-tools.mk | 4 +-
Mk/Uses/ghostscript.mk | 4 +-
Mk/Uses/gmake.mk | 2 +-
Mk/Uses/gnustep.mk | 12 +--
Mk/Uses/gperf.mk | 4 +-
Mk/Uses/gssapi.mk | 4 +-
Mk/Uses/horde.mk | 228 +++++++++++++++++++++---------------------
Mk/Uses/iconv.mk | 8 +-
Mk/Uses/imake.mk | 4 +-
Mk/Uses/jpeg.mk | 10 +-
Mk/Uses/lha.mk | 2 +-
Mk/Uses/libarchive.mk | 2 +-
Mk/Uses/libedit.mk | 2 +-
Mk/Uses/libtool.mk | 2 +-
Mk/Uses/lua.mk | 6 +-
Mk/Uses/makeinfo.mk | 2 +-
Mk/Uses/makeself.mk | 2 +-
Mk/Uses/mono.mk | 4 +-
Mk/Uses/motif.mk | 4 +-
Mk/Uses/ncurses.mk | 4 +-
Mk/Uses/ninja.mk | 2 +-
Mk/Uses/objc.mk | 4 +-
Mk/Uses/openal.mk | 6 +-
Mk/Uses/pear.mk | 4 +-
Mk/Uses/perl5.mk | 12 +--
Mk/Uses/pgsql.mk | 8 +-
Mk/Uses/pkgconfig.mk | 2 +-
Mk/Uses/pure.mk | 4 +-
Mk/Uses/python.mk | 14 +--
Mk/Uses/qmail.mk | 4 +-
Mk/Uses/readline.mk | 2 +-
Mk/Uses/scons.mk | 2 +-
Mk/Uses/shared-mime-info.mk | 4 +-
Mk/Uses/tcl.mk | 12 +--
Mk/Uses/twisted.mk | 26 ++---
Mk/Uses/xfce.mk | 20 ++--
Mk/Uses/zip.mk | 2 +-
Mk/Uses/zope.mk | 2 +-
59 files changed, 283 insertions(+), 283 deletions(-)
(limited to 'Mk/Uses')
diff --git a/Mk/Uses/ada.mk b/Mk/Uses/ada.mk
index 64eb89f64e38..d0e289034d71 100644
--- a/Mk/Uses/ada.mk
+++ b/Mk/Uses/ada.mk
@@ -28,10 +28,10 @@ ADAXX= gcc5
. endif
. if ${ada_ARGS:Mrun}
-RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
+RUN_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
. endif
-BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:${PORTSDIR}/lang/${ADAXX}-aux
+BUILD_DEPENDS+= ${LOCALBASE}/${ADAXX}-aux/bin/ada:lang/${ADAXX}-aux
MAKE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
ADA_PROJECT_PATH=${LOCALBASE}/lib/gnat
CONFIGURE_ENV+= PATH=${LOCALBASE}/${ADAXX}-aux/bin:${PATH} \
diff --git a/Mk/Uses/autoreconf.mk b/Mk/Uses/autoreconf.mk
index de92a6788f61..5733bf53d47e 100644
--- a/Mk/Uses/autoreconf.mk
+++ b/Mk/Uses/autoreconf.mk
@@ -54,14 +54,14 @@
_INCLUDE_USES_AUTORECONF_MK= yes
_USES_POST+= autoreconf
-BUILD_DEPENDS+= autoconf-2.69:${PORTSDIR}/devel/autoconf \
- autoheader-2.69:${PORTSDIR}/devel/autoconf \
- autoreconf-2.69:${PORTSDIR}/devel/autoconf \
- aclocal-1.15:${PORTSDIR}/devel/automake \
- automake-1.15:${PORTSDIR}/devel/automake
+BUILD_DEPENDS+= autoconf-2.69:devel/autoconf \
+ autoheader-2.69:devel/autoconf \
+ autoreconf-2.69:devel/autoconf \
+ aclocal-1.15:devel/automake \
+ automake-1.15:devel/automake
.if defined(libtool_ARGS) && empty(libtool_ARGS:Mbuild)
-BUILD_DEPENDS+= libtoolize:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS+= libtoolize:devel/libtool
.endif
.endif
diff --git a/Mk/Uses/bison.mk b/Mk/Uses/bison.mk
index dcad72783ea9..985d2eb13122 100644
--- a/Mk/Uses/bison.mk
+++ b/Mk/Uses/bison.mk
@@ -11,7 +11,7 @@
.if !defined(_INCLUDE_USES_BISON_MK)
_INCLUDE_USES_BISON_MK= yes
-_BISON_DEPENDS= bison:${PORTSDIR}/devel/bison
+_BISON_DEPENDS= bison:devel/bison
.if empty(bison_ARGS)
bison_ARGS= build
diff --git a/Mk/Uses/blaslapack.mk b/Mk/Uses/blaslapack.mk
index d497654c429a..20e31ec9841c 100644
--- a/Mk/Uses/blaslapack.mk
+++ b/Mk/Uses/blaslapack.mk
@@ -24,23 +24,23 @@ blaslapack_ARGS= ${_DEFAULT_BLASLAPACK}
LDFLAGS+= -L${LOCALBASE}/lib
.if ${blaslapack_ARGS} == atlas
-LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas
+LIB_DEPENDS+= libatlas.so:math/atlas
_BLASLIB= ptf77blas
LAPACKLIB= -lalapack -lptcblas
_ATLASLIB= atlas
ATLASLIB= -l${_ATLASLIB}
.elif ${blaslapack_ARGS} == gotoblas
-LIB_DEPENDS+= libgoto2.so:${PORTSDIR}/math/gotoblas
-LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+= libgoto2.so:math/gotoblas
+LIB_DEPENDS+= liblapack.so:math/lapack
_BLASLIB= goto2p
LAPACKLIB= -lgoto2p
.elif ${blaslapack_ARGS} == netlib
-LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas
-LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack
+LIB_DEPENDS+= libblas.so:math/blas
+LIB_DEPENDS+= liblapack.so:math/lapack
_BLASLIB= blas
LAPACKLIB= -llapack
.elif ${blaslapack_ARGS} == openblas
-LIB_DEPENDS+= libopenblas.so:${PORTSDIR}/math/openblas
+LIB_DEPENDS+= libopenblas.so:math/openblas
_BLASLIB= openblasp
LAPACKLIB= -lopenblasp
.else
diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk
index 666481cc6623..e92fbba451a0 100644
--- a/Mk/Uses/cmake.mk
+++ b/Mk/Uses/cmake.mk
@@ -48,10 +48,10 @@ IGNORE= Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not r
.endfor
CMAKE_BIN= ${LOCALBASE}/bin/cmake
-BUILD_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
+BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake
.if ${cmake_ARGS:Mrun}
-RUN_DEPENDS+= ${CMAKE_BIN}:${PORTSDIR}/devel/cmake
+RUN_DEPENDS+= ${CMAKE_BIN}:devel/cmake
.endif
.if defined(WITH_DEBUG)
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk
index 7d77a551597f..ad3b6c39c733 100644
--- a/Mk/Uses/compiler.mk
+++ b/Mk/Uses/compiler.mk
@@ -153,7 +153,7 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:${PORTSDIR}/lang/clang36
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang36:lang/clang36
CPP= ${LOCALBASE}/bin/clang-cpp36
CC= ${LOCALBASE}/bin/clang36
CXX= ${LOCALBASE}/bin/clang++36
@@ -179,7 +179,7 @@ CC= clang
CXX= clang++
CHOSEN_COMPILER_TYPE= clang
.else
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34
CPP= ${LOCALBASE}/bin/clang-cpp34
CC= ${LOCALBASE}/bin/clang34
CXX= ${LOCALBASE}/bin/clang++34
diff --git a/Mk/Uses/cran.mk b/Mk/Uses/cran.mk
index 20f16a0500e1..8e750f166718 100644
--- a/Mk/Uses/cran.mk
+++ b/Mk/Uses/cran.mk
@@ -28,8 +28,8 @@ MASTER_SITE_CRAN_ARCHIVE+= ${MASTER_SITE_CRAN:S,$,Archive/${PORTNAME}/,}
MASTER_SITES?= ${MASTER_SITE_CRAN} ${MASTER_SITE_CRAN_ARCHIVE}
-BUILD_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
-RUN_DEPENDS+= ${LOCALBASE}/bin/R:${PORTSDIR}/math/R
+BUILD_DEPENDS+= ${LOCALBASE}/bin/R:math/R
+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
index 73b6ceb4e3dd..135d05a396b9 100644
--- a/Mk/Uses/desktop-file-utils.mk
+++ b/Mk/Uses/desktop-file-utils.mk
@@ -15,8 +15,8 @@ _INCLUDE_USES_DESKTOP_FILE_UTILS_MK= yes
IGNORE= USES=desktop-file-utils does not require args
.endif
-BUILD_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
-RUN_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
+BUILD_DEPENDS+= update-desktop-database:devel/desktop-file-utils
+RUN_DEPENDS+= update-desktop-database:devel/desktop-file-utils
PLIST_FILES+= "@desktop-file-utils"
.endif
diff --git a/Mk/Uses/display.mk b/Mk/Uses/display.mk
index de7e1bc42b29..ef365cb19187 100644
--- a/Mk/Uses/display.mk
+++ b/Mk/Uses/display.mk
@@ -16,11 +16,11 @@ display_ARGS= install
.endif
.if !defined(DISPLAY)
-BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \
- ${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
- ${LOCALBASE}/share/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias \
- ${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
- xkbcomp:${PORTSDIR}/x11/xkbcomp
+BUILD_DEPENDS+= Xvfb:x11-servers/xorg-vfbserver \
+ ${LOCALBASE}/share/fonts/misc/8x13O.pcf.gz:x11-fonts/xorg-fonts-miscbitmaps \
+ ${LOCALBASE}/share/fonts/misc/fonts.alias:x11-fonts/font-alias \
+ ${LOCALBASE}/share/X11/xkb/rules/base:x11/xkeyboard-config \
+ xkbcomp:x11/xkbcomp
XVFBPORT!= port=0; while test -S /tmp/.X11-unix/X$${port} ; do port=$$(( port + 1 )) ; done ; ${ECHO_CMD} $$port
XVFBPIDFILE= /tmp/.xvfb-${XVFBPORT}.pid
diff --git a/Mk/Uses/drupal.mk b/Mk/Uses/drupal.mk
index ce47f4551de5..d6ebe5603c26 100644
--- a/Mk/Uses/drupal.mk
+++ b/Mk/Uses/drupal.mk
@@ -81,7 +81,7 @@ DIST_SUBDIR= drupal
NO_BUILD?= yes
WRKSRC?= ${WRKDIR}/${PORTNAME}
-RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${PORTSDIR}/${DRUPAL_BASE}
+RUN_DEPENDS+= ${LOCALBASE}/${DRUPAL_BASE}/index.php:${DRUPAL_BASE}
PLIST_SUB+= DRUPAL_MODDIR=${DRUPAL_MODDIR}
PLIST_FILES+= "@owner www" \
diff --git a/Mk/Uses/elixir.mk b/Mk/Uses/elixir.mk
index b40b608d7b18..a9cb95dfe026 100644
--- a/Mk/Uses/elixir.mk
+++ b/Mk/Uses/elixir.mk
@@ -58,11 +58,11 @@ MIX_EXTRA_APPS?=
MIX_EXTRA_DIRS?=
MIX_EXTRA_FILES?=
-BUILD_DEPENDS+= elixir:${PORTSDIR}/lang/elixir
-RUN_DEPENDS+= elixir:${PORTSDIR}/lang/elixir
+BUILD_DEPENDS+= elixir:lang/elixir
+RUN_DEPENDS+= elixir:lang/elixir
.for depend in ${MIX_BUILD_DEPS}
-BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
+BUILD_DEPENDS+= ${depend:T}>=0:${depend}
.endfor
.for depend in ${MIX_RUN_DEPS}
diff --git a/Mk/Uses/erlang.mk b/Mk/Uses/erlang.mk
index 7e83329bcf61..8703d8e8678d 100644
--- a/Mk/Uses/erlang.mk
+++ b/Mk/Uses/erlang.mk
@@ -38,23 +38,23 @@ ERL_DOCS?= README*
# VERSION is used in every Erlang pkg-plist
PLIST_SUB+= VERSION="${PORTVERSION}"
-BUILD_DEPENDS+= erl:${PORTSDIR}/lang/erlang
-RUN_DEPENDS+= erl:${PORTSDIR}/lang/erlang
+BUILD_DEPENDS+= erl:lang/erlang
+RUN_DEPENDS+= erl:lang/erlang
.if ${erlang_ARGS:Mrebar}
-BUILD_DEPENDS+= rebar>=0:${PORTSDIR}/devel/rebar
+BUILD_DEPENDS+= rebar>=0:devel/rebar
.endif
.if ${erlang_ARGS:Mrebar3}
-BUILD_DEPENDS+= rebar3>=0:${PORTSDIR}/devel/rebar3
+BUILD_DEPENDS+= rebar3>=0:devel/rebar3
.endif
.for depend in ${ERL_BUILD_DEPS}
-BUILD_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
+BUILD_DEPENDS+= ${depend:T}>=0:${depend}
.endfor
.for depend in ${ERL_RUN_DEPS}
-RUN_DEPENDS+= ${depend:T}>=0:${PORTSDIR}/${depend}
+RUN_DEPENDS+= ${depend:T}>=0:${depend}
.endfor
.if ${erlang_ARGS:Mrebar}
diff --git a/Mk/Uses/execinfo.mk b/Mk/Uses/execinfo.mk
index 3c4d0b846a04..d185dc01e262 100644
--- a/Mk/Uses/execinfo.mk
+++ b/Mk/Uses/execinfo.mk
@@ -19,7 +19,7 @@
_INCLUDE_USES_EXECINFO_MK= yes
.if !exists(/usr/lib/libexecinfo.so)
-LIB_DEPENDS+= libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS+= libexecinfo.so:devel/libexecinfo
EXECINFO_CPPFLAGS= -I${LOCALBASE}/include
EXECINFO_LDFLAGS= -L${LOCALBASE}/lib
.endif
diff --git a/Mk/Uses/fakeroot.mk b/Mk/Uses/fakeroot.mk
index a40b2d999b3a..3d691e62c497 100644
--- a/Mk/Uses/fakeroot.mk
+++ b/Mk/Uses/fakeroot.mk
@@ -10,7 +10,7 @@
.if !defined(_INCLUDE_USES_FAKEROOT_MK)
_INCLUDE_USES_FAKEROOT_MK= yes
-BUILD_DEPENDS+= fakeroot:${PORTSDIR}/security/fakeroot
+BUILD_DEPENDS+= fakeroot:security/fakeroot
.if ${UID} != 0
FAKEROOT?= fakeroot
.endif
diff --git a/Mk/Uses/fam.mk b/Mk/Uses/fam.mk
index 66ffa68a0f47..02410344f35c 100644
--- a/Mk/Uses/fam.mk
+++ b/Mk/Uses/fam.mk
@@ -15,8 +15,8 @@
.if !defined(_INCLUDE_USES_FAM_MK)
_INCLUDE_USES_FAM_MK= yes
-_fam_DEPENDS= libfam.so.0:${PORTSDIR}/devel/fam
-_gamin_DEPENDS= libfam.so.0:${PORTSDIR}/devel/gamin
+_fam_DEPENDS= libfam.so.0:devel/fam
+_gamin_DEPENDS= libfam.so.0:devel/gamin
_FAM_SYSTEMS= fam gamin
_DEFAULT_FAM= gamin
diff --git a/Mk/Uses/fmake.mk b/Mk/Uses/fmake.mk
index e3944753534c..8209a56b4ff6 100644
--- a/Mk/Uses/fmake.mk
+++ b/Mk/Uses/fmake.mk
@@ -16,7 +16,7 @@ IGNORE= Incorrect 'USES+= fmake:${fmake_ARGS}' fmake takes no arguments
.if defined(.PARSEDIR)
FMAKE= ${LOCALBASE}/bin/fmake
-BUILD_DEPENDS+= ${FMAKE}:${PORTSDIR}/devel/fmake
+BUILD_DEPENDS+= ${FMAKE}:devel/fmake
CONFIGURE_ENV+= MAKE=${FMAKE}
MAKE_CMD= ${FMAKE}
.endif
diff --git a/Mk/Uses/fonts.mk b/Mk/Uses/fonts.mk
index ea9084e77d8c..88fbf500e6f3 100644
--- a/Mk/Uses/fonts.mk
+++ b/Mk/Uses/fonts.mk
@@ -51,11 +51,11 @@ IGNORE= USES=fonts - invalid ARGS (${fonts_ARGS})
.endif
.if !empty(fonts_ARGS:Mfc) || !empty(fonts_ARGS:Mfcfontsdir)
-RUN_DEPENDS+= fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS+= fc-cache:x11-fonts/fontconfig
.endif
.if !empty(fonts_ARGS:Mfontsdir) || !empty(fonts_ARGS:Mfcfontsdir)
-RUN_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
- mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS+= mkfontdir:x11-fonts/mkfontdir \
+ mkfontscale:x11-fonts/mkfontscale
.endif
FONTNAME?= ${PORTNAME}
diff --git a/Mk/Uses/fortran.mk b/Mk/Uses/fortran.mk
index 890eaaf94700..01cf17efc772 100644
--- a/Mk/Uses/fortran.mk
+++ b/Mk/Uses/fortran.mk
@@ -19,11 +19,11 @@ fortran_ARGS= gcc
.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
_GCC_VER= ${GCC_DEFAULT:S/.//}
.if ${GCC_DEFAULT} == ${LANG_GCC_IS}
-BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
-RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
+BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
+RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc
.else
-BUILD_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
-RUN_DEPENDS+= gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc${_GCC_VER}
+BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
+RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER}
.endif
USE_BINUTILS= yes
F77= gfortran${_GCC_VER}
@@ -33,8 +33,8 @@ FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER}
LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
.elif ${fortran_ARGS} == ifort
-BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
-RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:${PORTSDIR}/lang/ifc
+BUILD_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
+RUN_DEPENDS+= ${LOCALBASE}/intel_fc_80/bin/ifort:lang/ifc
F77= ${LOCALBASE}/intel_fc_80/bin/ifort
FC= ${LOCALBASE}/intel_fc_80/bin/ifort
.else
diff --git a/Mk/Uses/fuse.mk b/Mk/Uses/fuse.mk
index e6ee0216a95c..62f61f9ed946 100644
--- a/Mk/Uses/fuse.mk
+++ b/Mk/Uses/fuse.mk
@@ -15,9 +15,9 @@ _INCLUDE_USES_FUSE_MK= yes
IGNORE= USES=fuse does not require args
.endif
-LIB_DEPENDS+= libfuse.so:${PORTSDIR}/sysutils/fusefs-libs
+LIB_DEPENDS+= libfuse.so:sysutils/fusefs-libs
.if !exists(/sbin/mount_fusefs)
-RUN_DEPENDS+= mount_fusefs:${PORTSDIR}/sysutils/fusefs-kmod
+RUN_DEPENDS+= mount_fusefs:sysutils/fusefs-kmod
.endif
.endif
diff --git a/Mk/Uses/gecko.mk b/Mk/Uses/gecko.mk
index 0902f78c8a08..bb3d68dc5b8c 100644
--- a/Mk/Uses/gecko.mk
+++ b/Mk/Uses/gecko.mk
@@ -31,8 +31,8 @@ GECKO_CONFING?= ${LOCALBASE}/bin/${GECKO}-config
XPIDL?= ${LOCALBASE}/lib/${GECKO}/xpidl
XPIDL_INCL?= `${GECKO_CONFIG} --idlflags`
-BUILD_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul
-RUN_DEPENDS+= libxul>=38:${PORTSDIR}/www/libxul
+BUILD_DEPENDS+= libxul>=38:www/libxul
+RUN_DEPENDS+= libxul>=38:www/libxul
.elif ${gecko_ARGS:Mfirefox}
@@ -41,8 +41,8 @@ _GECKO_VERSIONS= 38 41
_GECKO_TYPE= firefox
# Dependence lines for different Firefox versions
-38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox-esr
-41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:${PORTSDIR}/www/firefox
+38_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox-esr
+41_DEPENDS= ${LOCALBASE}/lib/firefox/firefox:www/firefox
.if exists(${LOCALBASE}/bin/firefox)
_GECKO_INSTALLED_VER!= ${LOCALBASE}/bin/firefox --version 2>/dev/null
@@ -61,7 +61,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9]*:C/[0-9].([0-9][0-9]).*/\1/
.endif
# Dependence lines for different Seamonkey versions
-33_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:${PORTSDIR}/www/seamonkey
+33_DEPENDS= ${LOCALBASE}/lib/seamonkey/seamonkey:www/seamonkey
.elif ${gecko_ARGS:Mthunderbird}
@@ -75,7 +75,7 @@ _GECKO_INSTALLED_VER:= ${_GECKO_INSTALLED_VER:M[0-9][0-9]*:C/([0-9][0-9]).*/\1/g
.endif
# Dependence lines for different Thunderbird versions
-38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:${PORTSDIR}/mail/thunderbird
+38_DEPENDS= ${LOCALBASE}/lib/thunderbird/thunderbird:mail/thunderbird
.else
IGNORE= Unknown type of gecko dependency you may specify either libxul, firefox, seamonkey or thunderbird
diff --git a/Mk/Uses/gettext-runtime.mk b/Mk/Uses/gettext-runtime.mk
index 5c0dc02f9b2a..d17bf927c5c6 100644
--- a/Mk/Uses/gettext-runtime.mk
+++ b/Mk/Uses/gettext-runtime.mk
@@ -16,13 +16,13 @@ gettext-runtime_ARGS= lib
.endif
.if ${gettext-runtime_ARGS:Mlib}
-LIB_DEPENDS+= libintl.so:${PORTSDIR}/devel/gettext-runtime
+LIB_DEPENDS+= libintl.so:devel/gettext-runtime
.endif
.if ${gettext-runtime_ARGS:Mbuild}
-BUILD_DEPENDS+= gettext:${PORTSDIR}/devel/gettext-runtime
+BUILD_DEPENDS+= gettext:devel/gettext-runtime
.endif
.if ${gettext-runtime_ARGS:Mrun}
-RUN_DEPENDS+= gettext:${PORTSDIR}/devel/gettext-runtime
+RUN_DEPENDS+= gettext:devel/gettext-runtime
.endif
.endif
diff --git a/Mk/Uses/gettext-tools.mk b/Mk/Uses/gettext-tools.mk
index 67f9546cb160..3a90a305fd95 100644
--- a/Mk/Uses/gettext-tools.mk
+++ b/Mk/Uses/gettext-tools.mk
@@ -16,10 +16,10 @@ gettext-tools_ARGS= build
.endif
.if ${gettext-tools_ARGS:Mbuild}
-BUILD_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext-tools
+BUILD_DEPENDS+= msgfmt:devel/gettext-tools
.endif
.if ${gettext-tools_ARGS:Mrun}
-RUN_DEPENDS+= msgfmt:${PORTSDIR}/devel/gettext-tools
+RUN_DEPENDS+= msgfmt:devel/gettext-tools
.endif
.endif
diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
index 98fd5012fc03..d1ab21c9bce8 100644
--- a/Mk/Uses/ghostscript.mk
+++ b/Mk/Uses/ghostscript.mk
@@ -101,9 +101,9 @@ _GS_X11_PORT= ghostscript${_GS_SELECTED}${_GS_AGPL_SUFFIX}-x11
.for type in BUILD RUN
.if defined(_GS_${type}_DEP)
-${type}_DEPENDS+= ${_GS_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_PORT}
+${type}_DEPENDS+= ${_GS_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_PORT}
.if ${_GS_ARGS:Mx11}
-${type}_DEPENDS+= ${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:${PORTSDIR}/print/${_GS_X11_PORT}
+${type}_DEPENDS+= ${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT}
.endif
.endif
.endfor
diff --git a/Mk/Uses/gmake.mk b/Mk/Uses/gmake.mk
index 64675459e2e9..ec5878b79c8a 100644
--- a/Mk/Uses/gmake.mk
+++ b/Mk/Uses/gmake.mk
@@ -22,7 +22,7 @@ IGNORE= Incorrect 'USES+= gmake:${gmake_ARGS}' gmake has only one valid argument
_GMAKE_EXT= -lite
.endif
-BUILD_DEPENDS+= gmake${_GMAKE_EXT}:${PORTSDIR}/devel/gmake${_GMAKE_EXT}
+BUILD_DEPENDS+= gmake${_GMAKE_EXT}:devel/gmake${_GMAKE_EXT}
CONFIGURE_ENV+= MAKE=gmake${_GMAKE_EXT}
MAKE_CMD= gmake${_GMAKE_EXT}
diff --git a/Mk/Uses/gnustep.mk b/Mk/Uses/gnustep.mk
index faaca1f09709..e7627819ab9f 100644
--- a/Mk/Uses/gnustep.mk
+++ b/Mk/Uses/gnustep.mk
@@ -42,7 +42,7 @@ MAKE_ENV+= ADDITIONAL_${a}="${ADDITIONAL_${a}}"
MAKE_ARGS+=messages=yes
MAKEFILE= GNUmakefile
-#MAKE_ENV+= GNUSTEP_CONFIG_FILE=${PORTSDIR}/devel/gnustep-make/files/GNUstep.conf
+#MAKE_ENV+= GNUSTEP_CONFIG_FILE=devel/gnustep-make/files/GNUstep.conf
GNU_CONFIGURE_PREFIX= ${GNUSTEP_PREFIX}
.if ${MACHINE_ARCH} == "i386"
@@ -58,7 +58,7 @@ PLIST_SUB+= MAJORLIBVERSION=${DEFAULT_LIBVERSION:C/([0-9]).*/\1/1}
.if defined(USE_GNUSTEP)
. if ${USE_GNUSTEP:Mbase}
-LIB_DEPENDS+= libgnustep-base.so:${PORTSDIR}/lang/gnustep-base
+LIB_DEPENDS+= libgnustep-base.so:lang/gnustep-base
. endif
. if ${USE_GNUSTEP:Mbuild}
@@ -69,17 +69,17 @@ MAKE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTE
# conflicts.
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
CONFIGURE_ENV+= PATH="${PATH}" GNUSTEP_MAKEFILES="${GNUSTEP_MAKEFILES}" GNUSTEP_SYSTEM_ROOT="${GNUSTEP_SYSTEM_ROOT}"
-BUILD_DEPENDS+= gnustep-make>0:${PORTSDIR}/devel/gnustep-make
+BUILD_DEPENDS+= gnustep-make>0:devel/gnustep-make
.include "${USESDIR}/objc.mk"
. endif
. if ${USE_GNUSTEP:Mgui}
-LIB_DEPENDS+= libgnustep-gui.so:${PORTSDIR}/x11-toolkits/gnustep-gui
+LIB_DEPENDS+= libgnustep-gui.so:x11-toolkits/gnustep-gui
. endif
. if ${USE_GNUSTEP:Mback}
-BUILD_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back
-RUN_DEPENDS+= gnustep-back>0:${PORTSDIR}/x11-toolkits/gnustep-back
+BUILD_DEPENDS+= gnustep-back>0:x11-toolkits/gnustep-back
+RUN_DEPENDS+= gnustep-back>0:x11-toolkits/gnustep-back
. endif
.endif
diff --git a/Mk/Uses/gperf.mk b/Mk/Uses/gperf.mk
index 403d476137dc..cf66063ba50e 100644
--- a/Mk/Uses/gperf.mk
+++ b/Mk/Uses/gperf.mk
@@ -11,7 +11,7 @@
_INCLUDE_USES_GPERF_MK= yes
.if !exists(/usr/bin/gperf)
-BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:devel/gperf
GPERF= ${LOCALBASE}/bin/gperf
.else
_GPERF_VERSION!= /usr/bin/gperf --version | head -1 || true
@@ -22,7 +22,7 @@ _GPERF_MAJ_VERSION= 0
.endif
.if ${_GPERF_MAJ_VERSION} < 3
-BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/gperf:devel/gperf
GPERF= ${LOCALBASE}/bin/gperf
.else
GPERF= /usr/bin/gperf
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index a59b543dfe81..35aba01822bd 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -75,8 +75,8 @@
.if !defined(_INCLUDE_USES_GSSAPI_MK)
_INCLUDE_USES_GSSAPI_MK= yes
-_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:${PORTSDIR}/security/heimdal
-_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:${PORTSDIR}/security/krb5
+_HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
+_MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
_HEADERS= sys/types.h sys/stat.h stdint.h
.undef _FIXUP_KRB5CONFIG
diff --git a/Mk/Uses/horde.mk b/Mk/Uses/horde.mk
index c57a49f92abc..86321cf9495a 100644
--- a/Mk/Uses/horde.mk
+++ b/Mk/Uses/horde.mk
@@ -11,8 +11,8 @@ _INCLUDE_USES_HORDE_MK= yes
MASTER_SITES?= http://pear.horde.org/get/
-BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde
-RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:${PORTSDIR}/devel/pear-channel-horde
+BUILD_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
+RUN_DEPENDS+= ${PEARDIR}/.channels/pear.horde.org.reg:devel/pear-channel-horde
PKGNAMEPREFIX?= pear-
HORDE_DIR?= www/horde
@@ -24,118 +24,118 @@ CPE_VENDOR?= horde
DIST_SUBDIR= Horde
PEAR_CHANNEL= horde
-horde-Horde_ActiveSync-DEPEND= ${PEARDIR}/Horde/ActiveSync.php:${PORTSDIR}/comms/pear-Horde_ActiveSync
-horde-Horde_Alarm-DEPEND= ${PEARDIR}/Horde/Alarm.php:${PORTSDIR}/devel/pear-Horde_Alarm
-horde-Horde_Auth-DEPEND= ${PEARDIR}/Horde/Auth.php:${PORTSDIR}/security/pear-Horde_Auth
-horde-Horde_Autoloader-DEPEND= ${PEARDIR}/Horde/Autoloader.php:${PORTSDIR}/devel/pear-Horde_Autoloader
-horde-Horde_Autoloader_Cache-DEPEND= ${PEARDIR}/Horde/Autoloader/Cache.php:${PORTSDIR}/devel/pear-Horde_Autoloader_Cache
-horde-Horde_Argv-DEPEND= ${PEARDIR}/Horde/Argv/Parser.php:${PORTSDIR}/devel/pear-Horde_Argv
-horde-Horde_Browser-DEPEND= ${PEARDIR}/Horde/Browser.php:${PORTSDIR}/www/pear-Horde_Browser
-horde-Horde_Cache-DEPEND= ${PEARDIR}/Horde/Cache.php:${PORTSDIR}/devel/pear-Horde_Cache
-horde-Horde_Cli-DEPEND= ${PEARDIR}/Horde/Cli.php:${PORTSDIR}/devel/pear-Horde_Cli
-horde-Horde_Compress-DEPEND= ${PEARDIR}/Horde/Compress.php:${PORTSDIR}/archivers/pear-Horde_Compress
-horde-Horde_Compress_Fast-DEPEND= ${PEARDIR}/Horde/Compress/Fast.php:${PORTSDIR}/archivers/pear-Horde_Compress_Fast
-horde-Horde_Constraint-DEPEND= ${PEARDIR}/Horde/Constraint.php:${PORTSDIR}/devel/pear-Horde_Constraint
-horde-Horde_Controller-DEPEND= ${PEARDIR}/Horde/Controller.php:${PORTSDIR}/devel/pear-Horde_Controller
-horde-Horde_Core-DEPEND= ${PEARDIR}/Horde.php:${PORTSDIR}/devel/pear-Horde_Core
-horde-Horde_Crypt-DEPEND= ${PEARDIR}/Horde/Crypt.php:${PORTSDIR}/security/pear-Horde_Crypt
-horde-Horde_Crypt_Blowfish-DEPEND= ${PEARDIR}/Horde/Crypt/Blowfish.php:${PORTSDIR}/security/pear-Horde_Crypt_Blowfish
-horde-Horde_CssMinify-DEPEND= ${PEARDIR}/Horde/CssMinify.php:${PORTSDIR}/textproc/pear-Horde_CssMinify
-horde-Horde_Css_Parser-DEPEND= ${PEARDIR}/Horde/Css/Parser.php:${PORTSDIR}/www/pear-Horde_Css_Parser
-horde-Horde_Data-DEPEND= ${PEARDIR}/Horde/Data.php:${PORTSDIR}/devel/pear-Horde_Data
-horde-Horde_Date-DEPEND= ${PEARDIR}/Horde/Date.php:${PORTSDIR}/devel/pear-Horde_Date
-horde-Horde_Date_Parser-DEPEND= ${PEARDIR}/Horde/Date/Parser.php:${PORTSDIR}/devel/pear-Horde_Date_Parser
-horde-Horde_Dav-DEPEND= ${PEARDIR}/Horde/Dav/Client.php:${PORTSDIR}/www/pear-Horde_Dav
-horde-Horde_Db-DEPEND= ${PEARDIR}/Horde/Db.php:${PORTSDIR}/databases/pear-Horde_Db
-horde-Horde_Editor-DEPEND= ${PEARDIR}/Horde/Editor.php:${PORTSDIR}/www/pear-Horde_Editor
-horde-Horde_Exception-DEPEND= ${PEARDIR}/Horde/Exception.php:${PORTSDIR}/devel/pear-Horde_Exception
-horde-Horde_Feed-DEPEND= ${PEARDIR}/Horde/Feed.php:${PORTSDIR}/www/pear-Horde_Feed
-horde-Horde_Form-DEPEND= ${PEARDIR}/Horde/Form.php:${PORTSDIR}/www/pear-Horde_Form
-horde-Horde_Group-DEPEND= ${PEARDIR}/Horde/Group/Base.php:${PORTSDIR}/security/pear-Horde_Group
-horde-Horde_HashTable-DEPEND= ${PEARDIR}/Horde/HashTable/Base.php:${PORTSDIR}/databases/pear-Horde_HashTable
-horde-Horde_History-DEPEND= ${PEARDIR}/Horde/History.php:${PORTSDIR}/devel/pear-Horde_History
-horde-Horde_Http-DEPEND= ${PEARDIR}/Horde/Http.php:${PORTSDIR}/www/pear-Horde_Http
-horde-Horde_Icalendar-DEPEND= ${PEARDIR}/Horde/Icalendar.php:${PORTSDIR}/devel/pear-Horde_Icalendar
-horde-Horde_Idna-DEPEND= ${PEARDIR}/Horde/Idna.php:${PORTSDIR}/dns/pear-Horde_Idna
-horde-Horde_Image-DEPEND= ${PEARDIR}/Horde/Image.php:${PORTSDIR}/graphics/pear-Horde_Image
-horde-Horde_Imap_Client-DEPEND= ${PEARDIR}/Horde/Imap/Client.php:${PORTSDIR}/mail/pear-Horde_Imap_Client
-horde-Horde_Imsp-DEPEND= ${PEARDIR}/Horde/Imsp.php:${PORTSDIR}/databases/pear-Horde_Imsp
-horde-Horde_Itip-DEPEND= ${PEARDIR}/Horde/Itip.php:${PORTSDIR}/devel/pear-Horde_Itip
-horde-Horde_Injector-DEPEND= ${PEARDIR}/Horde/Injector.php:${PORTSDIR}/devel/pear-Horde_Injector
-horde-Horde_JavascriptMinify-DEPEND= ${PEARDIR}/Horde/JavascriptMinify.php:${PORTSDIR}/textproc/pear-Horde_JavascriptMinify
-horde-Horde_Kolab_Format-DEPEND= ${PEARDIR}/Horde/Kolab/Format.php:${PORTSDIR}/textproc/pear-Horde_Kolab_Format
-horde-Horde_Kolab_Server-DEPEND= ${PEARDIR}/Horde/Kolab/Server/Factory.php:${PORTSDIR}/net/pear-Horde_Kolab_Server
-horde-Horde_Kolab_Session-DEPEND= ${PEARDIR}/Horde/Kolab/Session.php:${PORTSDIR}/net/pear-Horde_Kolab_Session
-horde-Horde_Kolab_Storage-DEPEND= ${PEARDIR}/Horde/Kolab/Storage.php:${PORTSDIR}/mail/pear-Horde_Kolab_Storage
-horde-Horde_Ldap-DEPEND= ${PEARDIR}/Horde/Ldap.php:${PORTSDIR}/net/pear-Horde_Ldap
-horde-Horde_ListHeaders-DEPEND= ${PEARDIR}/Horde/ListHeaders.php:${PORTSDIR}/mail/pear-Horde_ListHeaders
-horde-Horde_Lock-DEPEND= ${PEARDIR}/Horde/Lock.php:${PORTSDIR}/devel/pear-Horde_Lock
-horde-Horde_Log-DEPEND= ${PEARDIR}/Horde/Log.php:${PORTSDIR}/sysutils/pear-Horde_Log
-horde-Horde_LoginTasks-DEPEND= ${PEARDIR}/Horde/LoginTasks.php:${PORTSDIR}/devel/pear-Horde_LoginTasks
-horde-Horde_Mail-DEPEND= ${PEARDIR}/Horde/Mail/Transport.php:${PORTSDIR}/mail/pear-Horde_Mail
-horde-Horde_Mail_Autoconfig-DEPEND= ${PEARDIR}/Horde/Mail/Autoconfig.php:${PORTSDIR}/mail/pear-Horde_Mail_Autoconfig
-horde-Horde_Mapi-DEPEND= ${PEARDIR}/Horde/Mapi.php:${PORTSDIR}/mail/pear-Horde_Mapi
-horde-Horde_Memcache-DEPEND= ${PEARDIR}/Horde/Memcache.php:${PORTSDIR}/databases/pear-Horde_Memcache
-horde-Horde_Mime-DEPEND= ${PEARDIR}/Horde/Mime.php:${PORTSDIR}/mail/pear-Horde_Mime
-horde-Horde_Mime_Viewer-DEPEND= ${PEARDIR}/Horde/Mime/Viewer.php:${PORTSDIR}/mail/pear-Horde_Mime_Viewer
-horde-Horde_Mongo-DEPEND= ${PEARDIR}/Horde/Mongo/Client.php:${PORTSDIR}/databases/pear-Horde_Mongo
-horde-Horde_Nls-DEPEND= ${PEARDIR}/Horde/Nls.php:${PORTSDIR}/devel/pear-Horde_Nls
-horde-Horde_Notification-DEPEND= ${PEARDIR}/Horde/Notification.php:${PORTSDIR}/devel/pear-Horde_Notification
-horde-Horde_Oauth-DEPEND= ${PEARDIR}/Horde/Oauth/Consumer.php:${PORTSDIR}/security/pear-Horde_Oauth
-horde-Horde_Pack-DEPEND= ${PEARDIR}/Horde/Pack.php:${PORTSDIR}/archivers/pear-Horde_Pack
-horde-Horde_Pdf-DEPEND= ${PEARDIR}/Horde/Pdf/Writer.php:${PORTSDIR}/textproc/pear-Horde_Pdf
-horde-Horde_Perms-DEPEND= ${PEARDIR}/Horde/Perms.php:${PORTSDIR}/security/pear-Horde_Perms
-horde-Horde_Prefs-DEPEND= ${PEARDIR}/Horde/Prefs.php:${PORTSDIR}/devel/pear-Horde_Prefs
-horde-Horde_Queue-DEPEND= ${PEARDIR}/Horde/Queue/Runner.php:${PORTSDIR}/devel/pear-Horde_Queue
-horde-Horde_Rdo-DEPEND= ${PEARDIR}/Horde/Rdo.php:${PORTSDIR}/devel/pear-Horde_Rdo
-horde-Horde_Role-DEPEND= ${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:${PORTSDIR}/devel/pear-Horde_Role
-horde-Horde_Rpc-DEPEND= ${PEARDIR}/Horde/Rpc.php:${PORTSDIR}/net/pear-Horde_Rpc
-horde-Horde_Routes-DEPEND= ${PEARDIR}/Horde/Routes/Route.php:${PORTSDIR}/www/pear-Horde_Routes
-horde-Horde_Secret-DEPEND= ${PEARDIR}/Horde/Secret.php:${PORTSDIR}/security/pear-Horde_Secret
-horde-Horde_Serialize-DEPEND= ${PEARDIR}/Horde/Serialize.php:${PORTSDIR}/devel/pear-Horde_Serialize
-horde-Horde_SessionHandler-DEPEND= ${PEARDIR}/Horde/SessionHandler.php:${PORTSDIR}/www/pear-Horde_SessionHandler
-horde-Horde_Scheduler-DEPEND= ${PEARDIR}/Horde/Scheduler.php:${PORTSDIR}/devel/pear-Horde_Scheduler
-horde-Horde_Scribe-DEPEND= ${PEARDIR}/Horde/Scribe.php:${PORTSDIR}/net/pear-Horde_Scribe
-horde-Horde_Share-DEPEND= ${PEARDIR}/Horde/Share/Base.php:${PORTSDIR}/security/pear-Horde_Share
-horde-Horde_Smtp-DEPEND= ${PEARDIR}/Horde/Smtp.php:${PORTSDIR}/mail/pear-Horde_Smtp
-horde-Horde_Socket_Client-DEPEND= ${PEARDIR}/Horde/Socket/Client.php:${PORTSDIR}/net/pear-Horde_Socket_Client
-horde-Horde_SpellChecker-DEPEND= ${PEARDIR}/Horde/SpellChecker.php:${PORTSDIR}/textproc/pear-Horde_SpellChecker
-horde-Horde_Stream-DEPEND= ${PEARDIR}/Horde/Stream.php:${PORTSDIR}/devel/pear-Horde_Stream
-horde-Horde_Stream_Filter-DEPEND= ${PEARDIR}/Horde/Stream/Filter/Crc32.php:${PORTSDIR}/devel/pear-Horde_Stream_Filter
-horde-Horde_Stream_Wrapper-DEPEND= ${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:${PORTSDIR}/devel/pear-Horde_Stream_Wrapper
-horde-Horde_Service_Facebook-DEPEND= ${PEARDIR}/Horde/Service/Facebook.php:${PORTSDIR}/www/pear-Horde_Service_Facebook
-horde-Horde_Service_Twitter-DEPEND= ${PEARDIR}/Horde/Service/Twitter.php:${PORTSDIR}/www/pear-Horde_Service_Twitter
-horde-Horde_Service_UrlShortener-DEPEND= ${PEARDIR}/Horde/Service/UrlShortener.php:${PORTSDIR}/www/pear-Horde_Service_UrlShortener
-horde-Horde_Service_Weather-DEPEND= ${PEARDIR}/Horde/Service/Weather.php:${PORTSDIR}/www/pear-Horde_Service_Weather
-horde-Horde_Support-DEPEND= ${PEARDIR}/Horde/Support/Array.php:${PORTSDIR}/devel/pear-Horde_Support
-horde-Horde_SyncMl-DEPEND= ${PEARDIR}/Horde/SyncMl.php:${PORTSDIR}/comms/pear-Horde_SyncMl
-horde-Horde_Url-DEPEND= ${PEARDIR}/Horde/Url.php:${PORTSDIR}/net/pear-Horde_Url
-horde-Horde_Util-DEPEND= ${PEARDIR}/Horde/Util.php:${PORTSDIR}/devel/pear-Horde_Util
-horde-Horde_Template-DEPEND= ${PEARDIR}/Horde/Template.php:${PORTSDIR}/www/pear-Horde_Template
-horde-Horde_Text_Diff-DEPEND= ${PEARDIR}/Horde/Text/Diff.php:${PORTSDIR}/textproc/pear-Horde_Text_Diff
-horde-Horde_Text_Filter-DEPEND= ${PEARDIR}/Horde/Text/Filter.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter
-horde-Horde_Text_Filter_Csstidy-DEPEND= ${PEARDIR}/Horde/Text/Filter/Csstidy.php:${PORTSDIR}/textproc/pear-Horde_Text_Filter_Csstidy
-horde-Horde_Text_Flowed-DEPEND= ${PEARDIR}/Horde/Text/Flowed.php:${PORTSDIR}/textproc/pear-Horde_Text_Flowed
-horde-Horde_Thrift-DEPEND= ${PEARDIR}/Horde/Thrift.php:${PORTSDIR}/devel/pear-Horde_Thrift
-horde-Horde_Timezone-DEPEND= ${PEARDIR}/Horde/Timezone.php:${PORTSDIR}/devel/pear-Horde_Timezone
-horde-Horde_Token-DEPEND= ${PEARDIR}/Horde/Token.php:${PORTSDIR}/devel/pear-Horde_Token
-horde-Horde_Translation-DEPEND= ${PEARDIR}/Horde/Translation.php:${PORTSDIR}/devel/pear-Horde_Translation
-horde-Horde_Tree-DEPEND= ${PEARDIR}/Horde/Tree.php:${PORTSDIR}/devel/pear-Horde_Tree
-horde-Horde_Vfs-DEPEND= ${PEARDIR}/Horde/Vfs.php:${PORTSDIR}/sysutils/pear-Horde_Vfs
-horde-Horde_View-DEPEND= ${PEARDIR}/Horde/View.php:${PORTSDIR}/devel/pear-Horde_View
-horde-Horde_Xml_Element-DEPEND= ${PEARDIR}/Horde/Xml/Element.php:${PORTSDIR}/textproc/pear-Horde_Xml_Element
-horde-Horde_Xml_Wbxml-DEPEND= ${PEARDIR}/Horde/Xml/Wbxml.php:${PORTSDIR}/textproc/pear-Horde_Xml_Wbxml
-horde-content-DEPEND= ${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:${PORTSDIR}/devel/horde-content
-horde-gollem-DEPEND= ${LOCALBASE}/${HORDE_DIR}/gollem/index.php:${PORTSDIR}/ftp/horde-gollem
-horde-horde-DEPEND= ${LOCALBASE}/${HORDE_DIR}/index.php:${PORTSDIR}/www/horde-base
-horde-imp-DEPEND= ${LOCALBASE}/${HORDE_DIR}/imp/index.php:${PORTSDIR}/mail/horde-imp
-horde-ingo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/ingo/index.php:${PORTSDIR}/mail/horde-ingo
-horde-kronolith-DEPEND= ${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:${PORTSDIR}/deskutils/horde-kronolith
-horde-mnemo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:${PORTSDIR}/deskutils/horde-mnemo
-horde-nag-DEPEND= ${LOCALBASE}/${HORDE_DIR}/nag/index.php:${PORTSDIR}/deskutils/horde-nag
-horde-timeobjects-DEPEND= ${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:${PORTSDIR}/devel/horde-timeobjects
-horde-trean-DEPEND= ${LOCALBASE}/${HORDE_DIR}/trean/index.php:${PORTSDIR}/www/horde-trean
-horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/index.php:${PORTSDIR}/mail/horde-turba
+horde-Horde_ActiveSync-DEPEND= ${PEARDIR}/Horde/ActiveSync.php:comms/pear-Horde_ActiveSync
+horde-Horde_Alarm-DEPEND= ${PEARDIR}/Horde/Alarm.php:devel/pear-Horde_Alarm
+horde-Horde_Auth-DEPEND= ${PEARDIR}/Horde/Auth.php:security/pear-Horde_Auth
+horde-Horde_Autoloader-DEPEND= ${PEARDIR}/Horde/Autoloader.php:devel/pear-Horde_Autoloader
+horde-Horde_Autoloader_Cache-DEPEND= ${PEARDIR}/Horde/Autoloader/Cache.php:devel/pear-Horde_Autoloader_Cache
+horde-Horde_Argv-DEPEND= ${PEARDIR}/Horde/Argv/Parser.php:devel/pear-Horde_Argv
+horde-Horde_Browser-DEPEND= ${PEARDIR}/Horde/Browser.php:www/pear-Horde_Browser
+horde-Horde_Cache-DEPEND= ${PEARDIR}/Horde/Cache.php:devel/pear-Horde_Cache
+horde-Horde_Cli-DEPEND= ${PEARDIR}/Horde/Cli.php:devel/pear-Horde_Cli
+horde-Horde_Compress-DEPEND= ${PEARDIR}/Horde/Compress.php:archivers/pear-Horde_Compress
+horde-Horde_Compress_Fast-DEPEND= ${PEARDIR}/Horde/Compress/Fast.php:archivers/pear-Horde_Compress_Fast
+horde-Horde_Constraint-DEPEND= ${PEARDIR}/Horde/Constraint.php:devel/pear-Horde_Constraint
+horde-Horde_Controller-DEPEND= ${PEARDIR}/Horde/Controller.php:devel/pear-Horde_Controller
+horde-Horde_Core-DEPEND= ${PEARDIR}/Horde.php:devel/pear-Horde_Core
+horde-Horde_Crypt-DEPEND= ${PEARDIR}/Horde/Crypt.php:security/pear-Horde_Crypt
+horde-Horde_Crypt_Blowfish-DEPEND= ${PEARDIR}/Horde/Crypt/Blowfish.php:security/pear-Horde_Crypt_Blowfish
+horde-Horde_CssMinify-DEPEND= ${PEARDIR}/Horde/CssMinify.php:textproc/pear-Horde_CssMinify
+horde-Horde_Css_Parser-DEPEND= ${PEARDIR}/Horde/Css/Parser.php:www/pear-Horde_Css_Parser
+horde-Horde_Data-DEPEND= ${PEARDIR}/Horde/Data.php:devel/pear-Horde_Data
+horde-Horde_Date-DEPEND= ${PEARDIR}/Horde/Date.php:devel/pear-Horde_Date
+horde-Horde_Date_Parser-DEPEND= ${PEARDIR}/Horde/Date/Parser.php:devel/pear-Horde_Date_Parser
+horde-Horde_Dav-DEPEND= ${PEARDIR}/Horde/Dav/Client.php:www/pear-Horde_Dav
+horde-Horde_Db-DEPEND= ${PEARDIR}/Horde/Db.php:databases/pear-Horde_Db
+horde-Horde_Editor-DEPEND= ${PEARDIR}/Horde/Editor.php:www/pear-Horde_Editor
+horde-Horde_Exception-DEPEND= ${PEARDIR}/Horde/Exception.php:devel/pear-Horde_Exception
+horde-Horde_Feed-DEPEND= ${PEARDIR}/Horde/Feed.php:www/pear-Horde_Feed
+horde-Horde_Form-DEPEND= ${PEARDIR}/Horde/Form.php:www/pear-Horde_Form
+horde-Horde_Group-DEPEND= ${PEARDIR}/Horde/Group/Base.php:security/pear-Horde_Group
+horde-Horde_HashTable-DEPEND= ${PEARDIR}/Horde/HashTable/Base.php:databases/pear-Horde_HashTable
+horde-Horde_History-DEPEND= ${PEARDIR}/Horde/History.php:devel/pear-Horde_History
+horde-Horde_Http-DEPEND= ${PEARDIR}/Horde/Http.php:www/pear-Horde_Http
+horde-Horde_Icalendar-DEPEND= ${PEARDIR}/Horde/Icalendar.php:devel/pear-Horde_Icalendar
+horde-Horde_Idna-DEPEND= ${PEARDIR}/Horde/Idna.php:dns/pear-Horde_Idna
+horde-Horde_Image-DEPEND= ${PEARDIR}/Horde/Image.php:graphics/pear-Horde_Image
+horde-Horde_Imap_Client-DEPEND= ${PEARDIR}/Horde/Imap/Client.php:mail/pear-Horde_Imap_Client
+horde-Horde_Imsp-DEPEND= ${PEARDIR}/Horde/Imsp.php:databases/pear-Horde_Imsp
+horde-Horde_Itip-DEPEND= ${PEARDIR}/Horde/Itip.php:devel/pear-Horde_Itip
+horde-Horde_Injector-DEPEND= ${PEARDIR}/Horde/Injector.php:devel/pear-Horde_Injector
+horde-Horde_JavascriptMinify-DEPEND= ${PEARDIR}/Horde/JavascriptMinify.php:textproc/pear-Horde_JavascriptMinify
+horde-Horde_Kolab_Format-DEPEND= ${PEARDIR}/Horde/Kolab/Format.php:textproc/pear-Horde_Kolab_Format
+horde-Horde_Kolab_Server-DEPEND= ${PEARDIR}/Horde/Kolab/Server/Factory.php:net/pear-Horde_Kolab_Server
+horde-Horde_Kolab_Session-DEPEND= ${PEARDIR}/Horde/Kolab/Session.php:net/pear-Horde_Kolab_Session
+horde-Horde_Kolab_Storage-DEPEND= ${PEARDIR}/Horde/Kolab/Storage.php:mail/pear-Horde_Kolab_Storage
+horde-Horde_Ldap-DEPEND= ${PEARDIR}/Horde/Ldap.php:net/pear-Horde_Ldap
+horde-Horde_ListHeaders-DEPEND= ${PEARDIR}/Horde/ListHeaders.php:mail/pear-Horde_ListHeaders
+horde-Horde_Lock-DEPEND= ${PEARDIR}/Horde/Lock.php:devel/pear-Horde_Lock
+horde-Horde_Log-DEPEND= ${PEARDIR}/Horde/Log.php:sysutils/pear-Horde_Log
+horde-Horde_LoginTasks-DEPEND= ${PEARDIR}/Horde/LoginTasks.php:devel/pear-Horde_LoginTasks
+horde-Horde_Mail-DEPEND= ${PEARDIR}/Horde/Mail/Transport.php:mail/pear-Horde_Mail
+horde-Horde_Mail_Autoconfig-DEPEND= ${PEARDIR}/Horde/Mail/Autoconfig.php:mail/pear-Horde_Mail_Autoconfig
+horde-Horde_Mapi-DEPEND= ${PEARDIR}/Horde/Mapi.php:mail/pear-Horde_Mapi
+horde-Horde_Memcache-DEPEND= ${PEARDIR}/Horde/Memcache.php:databases/pear-Horde_Memcache
+horde-Horde_Mime-DEPEND= ${PEARDIR}/Horde/Mime.php:mail/pear-Horde_Mime
+horde-Horde_Mime_Viewer-DEPEND= ${PEARDIR}/Horde/Mime/Viewer.php:mail/pear-Horde_Mime_Viewer
+horde-Horde_Mongo-DEPEND= ${PEARDIR}/Horde/Mongo/Client.php:databases/pear-Horde_Mongo
+horde-Horde_Nls-DEPEND= ${PEARDIR}/Horde/Nls.php:devel/pear-Horde_Nls
+horde-Horde_Notification-DEPEND= ${PEARDIR}/Horde/Notification.php:devel/pear-Horde_Notification
+horde-Horde_Oauth-DEPEND= ${PEARDIR}/Horde/Oauth/Consumer.php:security/pear-Horde_Oauth
+horde-Horde_Pack-DEPEND= ${PEARDIR}/Horde/Pack.php:archivers/pear-Horde_Pack
+horde-Horde_Pdf-DEPEND= ${PEARDIR}/Horde/Pdf/Writer.php:textproc/pear-Horde_Pdf
+horde-Horde_Perms-DEPEND= ${PEARDIR}/Horde/Perms.php:security/pear-Horde_Perms
+horde-Horde_Prefs-DEPEND= ${PEARDIR}/Horde/Prefs.php:devel/pear-Horde_Prefs
+horde-Horde_Queue-DEPEND= ${PEARDIR}/Horde/Queue/Runner.php:devel/pear-Horde_Queue
+horde-Horde_Rdo-DEPEND= ${PEARDIR}/Horde/Rdo.php:devel/pear-Horde_Rdo
+horde-Horde_Role-DEPEND= ${PEARDIR}/PEAR/Installer/Role/Horde/Role.php:devel/pear-Horde_Role
+horde-Horde_Rpc-DEPEND= ${PEARDIR}/Horde/Rpc.php:net/pear-Horde_Rpc
+horde-Horde_Routes-DEPEND= ${PEARDIR}/Horde/Routes/Route.php:www/pear-Horde_Routes
+horde-Horde_Secret-DEPEND= ${PEARDIR}/Horde/Secret.php:security/pear-Horde_Secret
+horde-Horde_Serialize-DEPEND= ${PEARDIR}/Horde/Serialize.php:devel/pear-Horde_Serialize
+horde-Horde_SessionHandler-DEPEND= ${PEARDIR}/Horde/SessionHandler.php:www/pear-Horde_SessionHandler
+horde-Horde_Scheduler-DEPEND= ${PEARDIR}/Horde/Scheduler.php:devel/pear-Horde_Scheduler
+horde-Horde_Scribe-DEPEND= ${PEARDIR}/Horde/Scribe.php:net/pear-Horde_Scribe
+horde-Horde_Share-DEPEND= ${PEARDIR}/Horde/Share/Base.php:security/pear-Horde_Share
+horde-Horde_Smtp-DEPEND= ${PEARDIR}/Horde/Smtp.php:mail/pear-Horde_Smtp
+horde-Horde_Socket_Client-DEPEND= ${PEARDIR}/Horde/Socket/Client.php:net/pear-Horde_Socket_Client
+horde-Horde_SpellChecker-DEPEND= ${PEARDIR}/Horde/SpellChecker.php:textproc/pear-Horde_SpellChecker
+horde-Horde_Stream-DEPEND= ${PEARDIR}/Horde/Stream.php:devel/pear-Horde_Stream
+horde-Horde_Stream_Filter-DEPEND= ${PEARDIR}/Horde/Stream/Filter/Crc32.php:devel/pear-Horde_Stream_Filter
+horde-Horde_Stream_Wrapper-DEPEND= ${PEARDIR}/Horde/Stream/Wrapper/StringStream.php:devel/pear-Horde_Stream_Wrapper
+horde-Horde_Service_Facebook-DEPEND= ${PEARDIR}/Horde/Service/Facebook.php:www/pear-Horde_Service_Facebook
+horde-Horde_Service_Twitter-DEPEND= ${PEARDIR}/Horde/Service/Twitter.php:www/pear-Horde_Service_Twitter
+horde-Horde_Service_UrlShortener-DEPEND= ${PEARDIR}/Horde/Service/UrlShortener.php:www/pear-Horde_Service_UrlShortener
+horde-Horde_Service_Weather-DEPEND= ${PEARDIR}/Horde/Service/Weather.php:www/pear-Horde_Service_Weather
+horde-Horde_Support-DEPEND= ${PEARDIR}/Horde/Support/Array.php:devel/pear-Horde_Support
+horde-Horde_SyncMl-DEPEND= ${PEARDIR}/Horde/SyncMl.php:comms/pear-Horde_SyncMl
+horde-Horde_Url-DEPEND= ${PEARDIR}/Horde/Url.php:net/pear-Horde_Url
+horde-Horde_Util-DEPEND= ${PEARDIR}/Horde/Util.php:devel/pear-Horde_Util
+horde-Horde_Template-DEPEND= ${PEARDIR}/Horde/Template.php:www/pear-Horde_Template
+horde-Horde_Text_Diff-DEPEND= ${PEARDIR}/Horde/Text/Diff.php:textproc/pear-Horde_Text_Diff
+horde-Horde_Text_Filter-DEPEND= ${PEARDIR}/Horde/Text/Filter.php:textproc/pear-Horde_Text_Filter
+horde-Horde_Text_Filter_Csstidy-DEPEND= ${PEARDIR}/Horde/Text/Filter/Csstidy.php:textproc/pear-Horde_Text_Filter_Csstidy
+horde-Horde_Text_Flowed-DEPEND= ${PEARDIR}/Horde/Text/Flowed.php:textproc/pear-Horde_Text_Flowed
+horde-Horde_Thrift-DEPEND= ${PEARDIR}/Horde/Thrift.php:devel/pear-Horde_Thrift
+horde-Horde_Timezone-DEPEND= ${PEARDIR}/Horde/Timezone.php:devel/pear-Horde_Timezone
+horde-Horde_Token-DEPEND= ${PEARDIR}/Horde/Token.php:devel/pear-Horde_Token
+horde-Horde_Translation-DEPEND= ${PEARDIR}/Horde/Translation.php:devel/pear-Horde_Translation
+horde-Horde_Tree-DEPEND= ${PEARDIR}/Horde/Tree.php:devel/pear-Horde_Tree
+horde-Horde_Vfs-DEPEND= ${PEARDIR}/Horde/Vfs.php:sysutils/pear-Horde_Vfs
+horde-Horde_View-DEPEND= ${PEARDIR}/Horde/View.php:devel/pear-Horde_View
+horde-Horde_Xml_Element-DEPEND= ${PEARDIR}/Horde/Xml/Element.php:textproc/pear-Horde_Xml_Element
+horde-Horde_Xml_Wbxml-DEPEND= ${PEARDIR}/Horde/Xml/Wbxml.php:textproc/pear-Horde_Xml_Wbxml
+horde-content-DEPEND= ${LOCALBASE}/${HORDE_DIR}/content/lib/Tagger.php:devel/horde-content
+horde-gollem-DEPEND= ${LOCALBASE}/${HORDE_DIR}/gollem/index.php:ftp/horde-gollem
+horde-horde-DEPEND= ${LOCALBASE}/${HORDE_DIR}/index.php:www/horde-base
+horde-imp-DEPEND= ${LOCALBASE}/${HORDE_DIR}/imp/index.php:mail/horde-imp
+horde-ingo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/ingo/index.php:mail/horde-ingo
+horde-kronolith-DEPEND= ${LOCALBASE}/${HORDE_DIR}/kronolith/index.php:deskutils/horde-kronolith
+horde-mnemo-DEPEND= ${LOCALBASE}/${HORDE_DIR}/mnemo/index.php:deskutils/horde-mnemo
+horde-nag-DEPEND= ${LOCALBASE}/${HORDE_DIR}/nag/index.php:deskutils/horde-nag
+horde-timeobjects-DEPEND= ${LOCALBASE}/${HORDE_DIR}/timeobjects/lib/Driver.php:devel/horde-timeobjects
+horde-trean-DEPEND= ${LOCALBASE}/${HORDE_DIR}/trean/index.php:www/horde-trean
+horde-turba-DEPEND= ${LOCALBASE}/${HORDE_DIR}/turba/index.php:mail/horde-turba
.if defined(USE_HORDE_RUN)
. for DEP in ${USE_HORDE_RUN}
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index 1e1a0363d58d..92ce67d4fa76 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -24,11 +24,11 @@ ICONV_INCLUDE_PATH= ${LOCALBASE}/include
ICONV_LIB_PATH= ${LOCALBASE}/lib/libiconv.so
.if ${iconv_ARGS:Mbuild}
-BUILD_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS+= ${ICONV_CMD}:converters/libiconv
.elif ${iconv_ARGS:Mpatch}
-PATCH_DEPENDS+= ${ICONV_CMD}:${PORTSDIR}/converters/libiconv
+PATCH_DEPENDS+= ${ICONV_CMD}:converters/libiconv
.else
-LIB_DEPENDS+= libiconv.so:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+= libiconv.so:converters/libiconv
.endif
.else
@@ -44,7 +44,7 @@ ICONV_LIB_PATH= /usr/lib/libc.so
.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
|| (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
|| exists(${LOCALBASE}/include/iconv.h)
-BUILD_DEPENDS+= libiconv>=1.14_9:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv
CPPFLAGS+= -DLIBICONV_PLUG
CFLAGS+= -DLIBICONV_PLUG
CXXFLAGS+= -DLIBICONV_PLUG
diff --git a/Mk/Uses/imake.mk b/Mk/Uses/imake.mk
index 1e96f7a1fa3c..c266e07cf4ce 100644
--- a/Mk/Uses/imake.mk
+++ b/Mk/Uses/imake.mk
@@ -18,7 +18,7 @@ _INCLUDE_USES_IMAKE_MK= yes
IGNORE= USES=imake:${imake_ARGS:S/ /,/g} is not a valid argument
.endif
-BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake
+BUILD_DEPENDS+= imake:devel/imake
.if defined(USE_GCC)
IMAKECPP= ${CPP}
@@ -26,7 +26,7 @@ IMAKECPPFLAGS= -DCppCmd=${CPP} -DCcCmd=${CC} -DCplusplusCmd=${CXX}
.else
IMAKECPP= tradcpp
IMAKECPPFLAGS= -DCppCmd=tradcpp -DCcCmd=${CC} -DCplusplusCmd=${CXX}
-BUILD_DEPENDS+= tradcpp:${PORTSDIR}/devel/tradcpp
+BUILD_DEPENDS+= tradcpp:devel/tradcpp
.endif
MAKE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
CONFIGURE_ENV+= IMAKECPP=${IMAKECPP} IMAKECPPFLAGS="${IMAKECPPFLAGS}"
diff --git a/Mk/Uses/jpeg.mk b/Mk/Uses/jpeg.mk
index daf8b96da85c..6fbbe80fe67e 100644
--- a/Mk/Uses/jpeg.mk
+++ b/Mk/Uses/jpeg.mk
@@ -23,14 +23,14 @@ jpeg_ARGS= lib
.endif
.if ${jpeg_ARGS} == lib
-LIB_DEPENDS+= libjpeg.so:${PORTSDIR}/${JPEG_PORT}
+LIB_DEPENDS+= libjpeg.so:${JPEG_PORT}
.elif ${jpeg_ARGS} == build
-BUILD_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT}
+BUILD_DEPENDS+= cjpeg:${JPEG_PORT}
.elif ${jpeg_ARGS} == run
-RUN_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT}
+RUN_DEPENDS+= cjpeg:${JPEG_PORT}
.elif ${jpeg_ARGS} == both
-BUILD_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT}
-RUN_DEPENDS+= cjpeg:${PORTSDIR}/${JPEG_PORT}
+BUILD_DEPENDS+= cjpeg:${JPEG_PORT}
+RUN_DEPENDS+= cjpeg:${JPEG_PORT}
.else
IGNORE= USES=jpeg - invalid args: [${jpeg_ARGS}] specified
.endif
diff --git a/Mk/Uses/lha.mk b/Mk/Uses/lha.mk
index cca76bc4a365..45664235a821 100644
--- a/Mk/Uses/lha.mk
+++ b/Mk/Uses/lha.mk
@@ -14,7 +14,7 @@ EXTRACT_SUFX?= .lzh
IGNORE= Incorrect 'USES+=lha:${lha_ARGS}' expecting 'USES+=lha'
.endif
-EXTRACT_DEPENDS+= lha:${PORTSDIR}/archivers/lha
+EXTRACT_DEPENDS+= lha:archivers/lha
EXTRACT_CMD?= ${LHA_CMD}
EXTRACT_BEFORE_ARGS?= xfpw=${WRKDIR}
EXTRACT_AFTER_ARGS?=
diff --git a/Mk/Uses/libarchive.mk b/Mk/Uses/libarchive.mk
index c2df6b5bbe66..894e753a1a0d 100644
--- a/Mk/Uses/libarchive.mk
+++ b/Mk/Uses/libarchive.mk
@@ -12,5 +12,5 @@
_INCLUDE_USES_LIBARCHIVE_MK= yes
.include "${USESDIR}/localbase.mk"
-LIB_DEPENDS+= libarchive.so.13:${PORTSDIR}/archivers/libarchive
+LIB_DEPENDS+= libarchive.so.13:archivers/libarchive
.endif
diff --git a/Mk/Uses/libedit.mk b/Mk/Uses/libedit.mk
index 5eb9f3c20248..4108d7e6ef0c 100644
--- a/Mk/Uses/libedit.mk
+++ b/Mk/Uses/libedit.mk
@@ -12,5 +12,5 @@
_INCLUDE_USES_LIBEDIT_MK= yes
.include "${USESDIR}/localbase.mk"
-LIB_DEPENDS+= libedit.so.0:${PORTSDIR}/devel/libedit
+LIB_DEPENDS+= libedit.so.0:devel/libedit
.endif
diff --git a/Mk/Uses/libtool.mk b/Mk/Uses/libtool.mk
index 96596278dc34..928b5e13ac8c 100644
--- a/Mk/Uses/libtool.mk
+++ b/Mk/Uses/libtool.mk
@@ -18,7 +18,7 @@ _INCLUDE_USES_LIBTOOL_MK= yes
_USES_POST+= libtool
.if ${libtool_ARGS:Mbuild}
-BUILD_DEPENDS+= libtool:${PORTSDIR}/devel/libtool
+BUILD_DEPENDS+= libtool:devel/libtool
.endif
.endif
diff --git a/Mk/Uses/lua.mk b/Mk/Uses/lua.mk
index 297e025f1d77..8bdd1274bef2 100644
--- a/Mk/Uses/lua.mk
+++ b/Mk/Uses/lua.mk
@@ -97,11 +97,11 @@ MAKE_ENV+= LUA_MODLIBDIR=${LUA_MODLIBDIR} \
LUA_LIBDIR=${LUA_LIBDIR}
.if ${lua_ARGS:Mbuild}
-BUILD_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
+BUILD_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR}
.elif ${lua_ARGS:Mrun}
-RUN_DEPENDS+= ${LUA_CMD}:${PORTSDIR}/lang/lua${LUA_VER_STR}
+RUN_DEPENDS+= ${LUA_CMD}:lang/lua${LUA_VER_STR}
.else
-LIB_DEPENDS+= liblua-${LUA_VER}.so:${PORTSDIR}/lang/lua${LUA_VER_STR}
+LIB_DEPENDS+= liblua-${LUA_VER}.so:lang/lua${LUA_VER_STR}
.endif
.endif
diff --git a/Mk/Uses/makeinfo.mk b/Mk/Uses/makeinfo.mk
index 1d9de328477a..27a6071973cf 100644
--- a/Mk/Uses/makeinfo.mk
+++ b/Mk/Uses/makeinfo.mk
@@ -16,7 +16,7 @@ IGNORE= USES=makeinfo - expects no arguments
.endif
.if !exists(/usr/bin/makeinfo)
-BUILD_DEPENDS+= makeinfo:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS+= makeinfo:print/texinfo
.endif
.endif
diff --git a/Mk/Uses/makeself.mk b/Mk/Uses/makeself.mk
index 2f806280f9fa..34139c6a30e1 100644
--- a/Mk/Uses/makeself.mk
+++ b/Mk/Uses/makeself.mk
@@ -14,7 +14,7 @@ _INCLUDE_USES_MAKESELF_MK= yes
IGNORE= Incorrect 'USES+= makeself:${makeself_ARGS}' makeself takes no arguments
.endif
-EXTRACT_DEPENDS+= ${UNMAKESELF_CMD}:${PORTSDIR}/archivers/unmakeself
+EXTRACT_DEPENDS+= ${UNMAKESELF_CMD}:archivers/unmakeself
EXTRACT_CMD= ${UNMAKESELF_CMD}
EXTRACT_BEFORE_ARGS=
diff --git a/Mk/Uses/mono.mk b/Mk/Uses/mono.mk
index 1ca6f96f76e0..347131cf6be7 100644
--- a/Mk/Uses/mono.mk
+++ b/Mk/Uses/mono.mk
@@ -19,8 +19,8 @@ IGNORE= USES=mono takes no arguments
MONO_SHARED_DIR= ${WRKDIR}
CONFIGURE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}"
MAKE_ENV+= MONO_SHARED_DIR="${MONO_SHARED_DIR}" TZ=UTC
-BUILD_DEPENDS+= mono:${PORTSDIR}/lang/mono
-RUN_DEPENDS+= mono:${PORTSDIR}/lang/mono
+BUILD_DEPENDS+= mono:lang/mono
+RUN_DEPENDS+= mono:lang/mono
# Set the location that webaps served by XSP should use.
XSP_DOCROOT= ${PREFIX}/www/xsp
diff --git a/Mk/Uses/motif.mk b/Mk/Uses/motif.mk
index 60cd47e9b573..eb0dd5d7ce38 100644
--- a/Mk/Uses/motif.mk
+++ b/Mk/Uses/motif.mk
@@ -18,10 +18,10 @@ IGNORE= USES=motif takes no arguments
.endif
.if defined(WANT_LESSTIF)
-LIB_DEPENDS+= libXm.so:${PORTSDIR}/x11-toolkits/lesstif
+LIB_DEPENDS+= libXm.so:x11-toolkits/lesstif
.else
USE_XORG+= xpm
-LIB_DEPENDS+= libXm.so.4:${PORTSDIR}/x11-toolkits/open-motif
+LIB_DEPENDS+= libXm.so.4:x11-toolkits/open-motif
.endif
MOTIFLIB?= -L${LOCALBASE}/lib -lXm -lXp
diff --git a/Mk/Uses/ncurses.mk b/Mk/Uses/ncurses.mk
index 8e7400160508..2c8e63c6d92b 100644
--- a/Mk/Uses/ncurses.mk
+++ b/Mk/Uses/ncurses.mk
@@ -73,8 +73,8 @@ NCURSES_SHLIBVER?= ${NCURSES_SHLIBFILE:E}
NCURSES_PORT?= devel/ncurses
NCURSES_SHLIBVER?= 5
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
-RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${PORTSDIR}/${NCURSES_PORT}
+BUILD_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
+RUN_DEPENDS+= ${LOCALBASE}/lib/libncurses.so.${NCURSES_SHLIBVER}:${NCURSES_PORT}
NCURSESRPATH= ${NCURSESBASE}/lib
.else
diff --git a/Mk/Uses/ninja.mk b/Mk/Uses/ninja.mk
index 42859684f78f..30029f692963 100644
--- a/Mk/Uses/ninja.mk
+++ b/Mk/Uses/ninja.mk
@@ -21,7 +21,7 @@ IGNORE= Incorrect 'USES+= ninja:${ninja_ARGS}' ninja takes no arguments
MAKE_ARGS+= -v
.endif
-BUILD_DEPENDS+= ninja:${PORTSDIR}/devel/ninja
+BUILD_DEPENDS+= ninja:devel/ninja
CMAKE_ARGS+= -GNinja
MAKEFILE=
diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk
index 96888a8ebd6b..44bc563c8d5b 100644
--- a/Mk/Uses/objc.mk
+++ b/Mk/Uses/objc.mk
@@ -46,7 +46,7 @@ CC= /usr/bin/clang
CPP= /usr/bin/clang-cpp
CXX= /usr/bin/clang++
.else
-BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:${PORTSDIR}/lang/clang34
+BUILD_DEPENDS+= ${LOCALBASE}/bin/clang34:lang/clang34
CPP= ${LOCALBASE}/bin/clang-cpp34
CC= ${LOCALBASE}/bin/clang34
CXX= ${LOCALBASE}/bin/clang++34
@@ -58,7 +58,7 @@ LDFLAGS+= -B${LOCALBASE}/bin
.endif
.if ! ${objc_ARGS:Mcompiler}
-LIB_DEPENDS+= libobjc.so.4.6:${PORTSDIR}/lang/libobjc2
+LIB_DEPENDS+= libobjc.so.4.6:lang/libobjc2
OBJCFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.endif
diff --git a/Mk/Uses/openal.mk b/Mk/Uses/openal.mk
index af35422d207b..f07051141cab 100644
--- a/Mk/Uses/openal.mk
+++ b/Mk/Uses/openal.mk
@@ -17,9 +17,9 @@ _INCLUDE_USES_OPENAL_MK= yes
_valid_ARGS= al si soft alut
-_si_DEPENDS= libopenal.so.0:${PORTSDIR}/audio/openal
-_soft_DEPENDS= libopenal.so.1:${PORTSDIR}/audio/openal-soft
-_alut_DEPENDS= libalut.so.0:${PORTSDIR}/audio/freealut
+_si_DEPENDS= libopenal.so.0:audio/openal
+_soft_DEPENDS= libopenal.so.1:audio/openal-soft
+_alut_DEPENDS= libalut.so.0:audio/freealut
_OPENAL_LIBS= si soft
_DEFAULT_OPENAL= soft
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
index 40779b3585c8..4ceef8a80b4d 100644
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -23,8 +23,8 @@ MASTER_SITES?= http://pear.php.net/get/ \
EXTRACT_SUFX?= .tgz
DIST_SUBDIR?= PEAR
-BUILD_DEPENDS+= pear:${PORTSDIR}/devel/pear
-RUN_DEPENDS+= pear:${PORTSDIR}/devel/pear
+BUILD_DEPENDS+= pear:devel/pear
+RUN_DEPENDS+= pear:devel/pear
.if !defined(USE_PHPIZE)
NO_BUILD= yes
diff --git a/Mk/Uses/perl5.mk b/Mk/Uses/perl5.mk
index 011f483163ef..350d3355d04d 100644
--- a/Mk/Uses/perl5.mk
+++ b/Mk/Uses/perl5.mk
@@ -200,13 +200,13 @@ CONFIGURE_ARGS+=--destdir ${STAGEDIR}
DESTDIRNAME= --destdir
.if ${_USE_PERL5:Mmodbuild}
.if ${PORTNAME} != Module-Build
-BUILD_DEPENDS+= p5-Module-Build>=0.4206:${PORTSDIR}/devel/p5-Module-Build
+BUILD_DEPENDS+= p5-Module-Build>=0.4206:devel/p5-Module-Build
.endif
CONFIGURE_ARGS+=--create_packlist 1
.endif
.if ${_USE_PERL5:Mmodbuildtiny}
.if ${PORTNAME} != Module-Build-Tiny
-BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.039:${PORTSDIR}/devel/p5-Module-Build-Tiny
+BUILD_DEPENDS+= p5-Module-Build-Tiny>=0.039:devel/p5-Module-Build-Tiny
.endif
CONFIGURE_ARGS+=--create_packlist 1
.endif
@@ -226,19 +226,19 @@ CONFIGURE_ENV+= PERL_MM_USE_DEFAULT="YES"
.endif # configure
.if ${_USE_PERL5:Mextract}
-EXTRACT_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+EXTRACT_DEPENDS+= ${PERL5_DEPEND}:lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mpatch}
-PATCH_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+PATCH_DEPENDS+= ${PERL5_DEPEND}:lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mbuild}
-BUILD_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+BUILD_DEPENDS+= ${PERL5_DEPEND}:lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mrun}
-RUN_DEPENDS+= ${PERL5_DEPEND}:${PORTSDIR}/lang/${PERL_PORT}
+RUN_DEPENDS+= ${PERL5_DEPEND}:lang/${PERL_PORT}
.endif
.if ${_USE_PERL5:Mconfigure}
diff --git a/Mk/Uses/pgsql.mk b/Mk/Uses/pgsql.mk
index fdc85055656c..88811eb6d8b4 100644
--- a/Mk/Uses/pgsql.mk
+++ b/Mk/Uses/pgsql.mk
@@ -122,7 +122,7 @@ IGNORE?= cannot install: does not work with postgresql${PGSQL_VER_NODOT}-client
. endif # IGNORE_WITH_PGSQL
.if !defined(WANT_PGSQL) || ${WANT_PGSQL} == lib
-LIB_DEPENDS+= libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-client
+LIB_DEPENDS+= libpq.so.${PGSQL${PGSQL_VER_NODOT}_LIBVER}:databases/postgresql${PGSQL_VER_NODOT}-client
.endif
_USE_PGSQL_DEP= client contrib docs pgtcl pltcl plperl server
@@ -136,10 +136,10 @@ _USE_PGSQL_DEP_server= postgres
. if defined(WANT_PGSQL)
. for depend in ${_USE_PGSQL_DEP}
. if ${WANT_PGSQL:M${depend}}
-BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}
-RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${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}
. elif ${WANT_PGSQL:M${depend}\:*}
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
+BUILD_DEPENDS+= ${NONEXISTENT}:databases/postgresql${PGSQL_VER_NODOT}-${depend}:${WANT_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
. endif
. endfor
. endif
diff --git a/Mk/Uses/pkgconfig.mk b/Mk/Uses/pkgconfig.mk
index a68d8ffdb0aa..723aaca47568 100644
--- a/Mk/Uses/pkgconfig.mk
+++ b/Mk/Uses/pkgconfig.mk
@@ -11,7 +11,7 @@
.if !defined(_INCLUDE_USES_PKGCONFIG_MK)
_INCLUDE_USES_PKGCONFIG_MK= yes
-_PKGCONFIG_DEPENDS= pkgconf:${PORTSDIR}/devel/pkgconf
+_PKGCONFIG_DEPENDS= pkgconf:devel/pkgconf
.if empty(pkgconfig_ARGS)
pkgconfig_ARGS= build
diff --git a/Mk/Uses/pure.mk b/Mk/Uses/pure.mk
index a753dc65308f..d743613eade7 100644
--- a/Mk/Uses/pure.mk
+++ b/Mk/Uses/pure.mk
@@ -23,11 +23,11 @@ IGNORE= Incorrect 'USES+= pure:${pure_ARGS}' usage: argument [${arg}] is not rec
. endif
.endfor
-LIB_DEPENDS+= libpure.so:${PORTSDIR}/lang/pure
+LIB_DEPENDS+= libpure.so:lang/pure
.include "${USESDIR}/gmake.mk"
.if ${pure_ARGS:Mffi}
-RUN_DEPENDS+= ${LOCALBASE}/lib/pure/ffi.pure:${PORTSDIR}/devel/pure-ffi
+RUN_DEPENDS+= ${LOCALBASE}/lib/pure/ffi.pure:devel/pure-ffi
.endif
MAKE_ARGS+= prefix=${PREFIX} mandir=${PREFIX}/man \
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index a2695f9bc2a1..2943c032e635 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -220,7 +220,7 @@ _INCLUDE_USES_PYTHON_MK= yes
_PYTHON_VERSIONS= 2.7 3.4 3.5 3.3 3.2 # preferred first
_PYTHON_PORTBRANCH= 2.7 # ${_PYTHON_VERSIONS:[1]}
_PYTHON_BASECMD= ${LOCALBASE}/bin/python
-_PYTHON_RELPORTDIR= ${PORTSDIR}/lang/python
+_PYTHON_RELPORTDIR= lang/python
# Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
.for var in ${USE_PYTHON}
@@ -382,7 +382,7 @@ PYTHON_MAJOR_VER= ${PYTHON_VER:R}
PYTHON_REL= # empty
PYTHON_ABIVER= # empty
PYTHON_PORTSDIR= ${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
-PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PYTHON_PORTSDIR}
+PYTHON_PORTVERSION!= ${MAKE} -V PORTVERSION -C ${PORTSDIR}/${PYTHON_PORTSDIR}
# Create a 4 integer version string, prefixing 0 to the last token if
# it's a single character. Only use the the first 3 tokens of
# PORTVERSION to support pre-release versions (rc3, alpha4, etc) of
@@ -448,8 +448,8 @@ UNIQUE_FIND_SUFFIX_FILES= \
_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
.if defined(_PYTHON_FEATURE_DISTUTILS) && \
${_CURRENTPORT:S/${PYTHON_SUFFIX}$//} != ${PYTHON_PKGNAMEPREFIX}setuptools
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:devel/py-setuptools${PYTHON_SUFFIX}
.endif
# distutils support
@@ -535,9 +535,9 @@ CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}"
CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER}
# Python 3rd-party modules
-PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game
-PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
-PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
+PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:devel/py-game
+PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:math/py-numeric
+PYNUMPY= ${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
# dependencies
.if defined(_PYTHON_BUILD_DEP)
diff --git a/Mk/Uses/qmail.mk b/Mk/Uses/qmail.mk
index 834c25e10b7f..253e38912dce 100644
--- a/Mk/Uses/qmail.mk
+++ b/Mk/Uses/qmail.mk
@@ -53,9 +53,9 @@ IGNORE= Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${
. endif
. if defined(QMAIL_SLAVEPORT)
-_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:tl}
+_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:mail/qmail-${QMAIL_SLAVEPORT:tl}
. else
-_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail
+_QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:mail/qmail
. endif
.endif
diff --git a/Mk/Uses/readline.mk b/Mk/Uses/readline.mk
index fbd77ab258b9..7ffc9a4a4e62 100644
--- a/Mk/Uses/readline.mk
+++ b/Mk/Uses/readline.mk
@@ -16,7 +16,7 @@ readline_ARGS= port
.endif
.if ${readline_ARGS} == port
-LIB_DEPENDS+= libreadline.so.6:${PORTSDIR}/devel/readline
+LIB_DEPENDS+= libreadline.so.6:devel/readline
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.endif
diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk
index 9bf68fbef392..4b2cb54d40c1 100644
--- a/Mk/Uses/scons.mk
+++ b/Mk/Uses/scons.mk
@@ -22,7 +22,7 @@ LINKFLAGS?= ${LDFLAGS}
LIBPATH?= ${LOCALBASE}/lib
CPPPATH?= ${LOCALBASE}/include
SCONS= ${LOCALBASE}/bin/scons
-BUILD_DEPENDS+= ${SCONS}:${PORTSDIR}/devel/scons
+BUILD_DEPENDS+= ${SCONS}:devel/scons
MAKE_CMD= ${SCONS}
MAKE_ARGS+= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \
diff --git a/Mk/Uses/shared-mime-info.mk b/Mk/Uses/shared-mime-info.mk
index a47953d93656..02f9e4cc6bd1 100644
--- a/Mk/Uses/shared-mime-info.mk
+++ b/Mk/Uses/shared-mime-info.mk
@@ -15,8 +15,8 @@ _INCLUDE_USES_SHARED_MIME_INFO_MK= yes
IGNORE= USES=shared-mime-info does not require args
.endif
-BUILD_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info
-RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info
+BUILD_DEPENDS+= update-mime-database:misc/shared-mime-info
+RUN_DEPENDS+= update-mime-database:misc/shared-mime-info
PLIST_FILES+= "@shared-mime-info share/mime"
.endif
diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 74a831d0fbe1..6aa03fffb5d9 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -172,19 +172,19 @@ _TCLTK_LIB_DEPENDS=
# Construct the correct dependency lines (wrapper)
.if ${tcl_ARGS:Mwrapper}
. if ${_TCLTK_PORT} == "tcl"
-_TCLTK_WRAPPER_PORT= tclsh:${PORTSDIR}/lang/tcl-wrapper
+_TCLTK_WRAPPER_PORT= tclsh:lang/tcl-wrapper
. elif ${_TCLTK_PORT} == "tk"
-_TCLTK_WRAPPER_PORT= wish:${PORTSDIR}/x11-toolkits/tk-wrapper
+_TCLTK_WRAPPER_PORT= wish:x11-toolkits/tk-wrapper
. endif
.endif
# Construct the correct dependency lines (Tcl/Tk)
. if ${_TCLTK_PORT} == "tcl"
-_TCLTK_EXE_LINE= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
-_TCLTK_LIB_LINE= libtcl${TCL_SHLIB_VER}.so:${PORTSDIR}/lang/tcl${_TCLTK_WANTED_VERSION}
+_TCLTK_EXE_LINE= tclsh${TCL_VER}:lang/tcl${_TCLTK_WANTED_VERSION}
+_TCLTK_LIB_LINE= libtcl${TCL_SHLIB_VER}.so:lang/tcl${_TCLTK_WANTED_VERSION}
. elif ${_TCLTK_PORT} == "tk"
-_TCLTK_EXE_LINE= wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
-_TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:${PORTSDIR}/x11-toolkits/tk${_TCLTK_WANTED_VERSION}
+_TCLTK_EXE_LINE= wish${TK_VER}:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
+_TCLTK_LIB_LINE= libtk${TK_SHLIB_VER}.so:x11-toolkits/tk${_TCLTK_WANTED_VERSION}
.endif
.if ${tcl_ARGS:Mbuild}
diff --git a/Mk/Uses/twisted.mk b/Mk/Uses/twisted.mk
index ed7785dc6ff4..348d1e569307 100644
--- a/Mk/Uses/twisted.mk
+++ b/Mk/Uses/twisted.mk
@@ -26,25 +26,25 @@ _INCLUDE_USES_TWISTED_MK= yes
# If neither build nor run are specified add both.
.if ${twisted_ARGS:Mbuild} || empty(twisted_ARGS:Mrun)
-BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:devel/py-twistedCore
.endif
.if ${twisted_ARGS:Mrun} || empty(twisted_ARGS:Mbuild)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twistedCore
+RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/__init__.py:devel/py-twistedCore
.endif
_TWISTED_COMPONENTS= conch flow lore mail names news pair runner web web2 words
-conch_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
-flow_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:${PORTSDIR}/devel/py-twistedFlow
-lore_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc/py-twistedLore
-mail_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
-names_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
-news_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/news/__init__.py:${PORTSDIR}/news/py-twistedNews
-pair_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:${PORTSDIR}/net/py-twistedPair
-runner_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:${PORTSDIR}/devel/py-twistedRunner
-web2_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
-web_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
-words_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
+conch_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:security/py-twistedConch
+flow_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:devel/py-twistedFlow
+lore_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:textproc/py-twistedLore
+mail_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:mail/py-twistedMail
+names_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/names/__init__.py:dns/py-twistedNames
+news_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/news/__init__.py:news/py-twistedNews
+pair_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:net/py-twistedPair
+runner_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:devel/py-twistedRunner
+web2_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:www/py-twistedWeb2
+web_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:www/py-twistedWeb
+words_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:net-im/py-twistedWords
.for component in ${twisted_ARGS:Nbuild:Nrun}
. if ${_TWISTED_COMPONENTS:M${component}}==""
diff --git a/Mk/Uses/xfce.mk b/Mk/Uses/xfce.mk
index 467626d4b8e3..470fd248b96d 100644
--- a/Mk/Uses/xfce.mk
+++ b/Mk/Uses/xfce.mk
@@ -27,33 +27,33 @@ xfce_ARGS?= # empty
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
-garcon_LIB_DEPENDS= libgarcon-1.so:${PORTSDIR}/sysutils/garcon
+garcon_LIB_DEPENDS= libgarcon-1.so:sysutils/garcon
garcon_USE_XFCE_REQ= libmenu
-libexo_LIB_DEPENDS= libexo-1.so:${PORTSDIR}/x11/libexo
+libexo_LIB_DEPENDS= libexo-1.so:x11/libexo
libexo_USE_XFCE_REQ= libmenu
-libgui_LIB_DEPENDS= libxfcegui4.so:${PORTSDIR}/x11-toolkits/libxfce4gui
+libgui_LIB_DEPENDS= libxfcegui4.so:x11-toolkits/libxfce4gui
libgui_USE_XFCE_REQ= libutil
-libmenu_LIB_DEPENDS= libxfce4ui-1.so:${PORTSDIR}/x11/libxfce4menu
+libmenu_LIB_DEPENDS= libxfce4ui-1.so:x11/libxfce4menu
libmenu_DETECT= ${LOCALBASE}/lib/libxfce4ui-1.so
libmenu_GTK3_DETECT= ${LOCALBASE}/lib/libxfce4ui-2.so
libmenu_USE_XFCE_REQ= xfconf
-libutil_LIB_DEPENDS= libxfce4util.so:${PORTSDIR}/x11/libxfce4util
+libutil_LIB_DEPENDS= libxfce4util.so:x11/libxfce4util
-panel_LIB_DEPENDS= libxfce4panel-1.0.so:${PORTSDIR}/x11-wm/xfce4-panel
-panel_RUN_DEPENDS= xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
+panel_LIB_DEPENDS= libxfce4panel-1.0.so:x11-wm/xfce4-panel
+panel_RUN_DEPENDS= xfce4-panel:x11-wm/xfce4-panel
panel_DETECT= ${LOCALBASE}/lib/libxfce4panel-1.0.so
panel_GTK3_DETECT= ${LOCALBASE}/lib/libxfce4panel-2.0.so
panel_USE_XFCE_REQ= garcon libexo xfconf
-thunar_LIB_DEPENDS= libthunarx-2.so:${PORTSDIR}/x11-fm/thunar
-thunar_RUN_DEPENDS= Thunar:${PORTSDIR}/x11-fm/thunar
+thunar_LIB_DEPENDS= libthunarx-2.so:x11-fm/thunar
+thunar_RUN_DEPENDS= Thunar:x11-fm/thunar
thunar_USE_XFCE_REQ= xfconf libmenu
-xfconf_LIB_DEPENDS= libxfconf-0.so:${PORTSDIR}/x11/xfce4-conf
+xfconf_LIB_DEPENDS= libxfconf-0.so:x11/xfce4-conf
xfconf_USE_XFCE_REQ= libutil
.if defined(USE_XFCE)
diff --git a/Mk/Uses/zip.mk b/Mk/Uses/zip.mk
index 61945eceb8e7..0a8ee1185184 100644
--- a/Mk/Uses/zip.mk
+++ b/Mk/Uses/zip.mk
@@ -18,7 +18,7 @@ EXTRACT_AFTER_ARGS?= -d ${WRKDIR}
.if empty(zip_ARGS)
EXTRACT_CMD?= ${UNZIP_NATIVE_CMD}
.elif ${zip_ARGS} == "infozip"
-EXTRACT_DEPENDS+= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS+= ${UNZIP_CMD}:archivers/unzip
EXTRACT_CMD?= ${UNZIP_CMD}
.else
IGNORE= Incorrect 'USES+=zip:${zip_ARGS}' expecting 'USES+=zip[:infozip]'
diff --git a/Mk/Uses/zope.mk b/Mk/Uses/zope.mk
index 5165c89abb64..1808b56824f0 100644
--- a/Mk/Uses/zope.mk
+++ b/Mk/Uses/zope.mk
@@ -77,7 +77,7 @@ IGNORE+= Zope requires Python ${_PYTHON_VER_REQUIRED}.\
# Zope-related variables
.if ${ZOPE_VERSION} == ${_ZOPE_PORTBRANCH}
-RUN_DEPENDS+= zope213>0:${PORTSDIR}/www/zope213
+RUN_DEPENDS+= zope213>0:www/zope213
.else
_USES_sanity+= 300:check-makevars-zope
check-makevars-zope:
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0