summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorMathieu Arnold <mat@FreeBSD.org>2016-04-01 14:16:16 +0000
committerMathieu Arnold <mat@FreeBSD.org>2016-04-01 14:16:16 +0000
commit8d6597e0bb9591c40fc6d0c6e2159fca51178d56 (patch)
treed3548a0f08ca434f11cb4415a93d98037409413b /misc
parentRemove ${PORTSDIR}/ from dependencies, categories h, i, j, k, and l. (diff)
Remove ${PORTSDIR}/ from dependencies, categories m, n, o, and p.
With hat: portmgr Sponsored by: Absolight
Notes
Notes: svn path=/head/; revision=412348
Diffstat (limited to 'misc')
-rw-r--r--misc/amanda-server/Makefile24
-rw-r--r--misc/amfm/Makefile2
-rw-r--r--misc/ansiweather/Makefile8
-rw-r--r--misc/artikulate/Makefile6
-rw-r--r--misc/auto-multiple-choice/Makefile38
-rw-r--r--misc/bb/Makefile4
-rw-r--r--misc/bibletime/Makefile4
-rw-r--r--misc/biosfont-demos/Makefile4
-rw-r--r--misc/cdcollect/Makefile2
-rw-r--r--misc/chord2html/Makefile2
-rw-r--r--misc/cloc/Makefile2
-rw-r--r--misc/compat10x/pkg-descr2
-rw-r--r--misc/compat4x/Makefile2
-rw-r--r--misc/compat4x/pkg-descr2
-rw-r--r--misc/compat5x/Makefile2
-rw-r--r--misc/compat5x/pkg-descr2
-rw-r--r--misc/compat6x/pkg-descr2
-rw-r--r--misc/compat7x/pkg-descr2
-rw-r--r--misc/compat8x/Makefile2
-rw-r--r--misc/compat8x/pkg-descr2
-rw-r--r--misc/compat9x/Makefile2
-rw-r--r--misc/compat9x/pkg-descr2
-rw-r--r--misc/cs/Makefile2
-rw-r--r--misc/cuecat/Makefile4
-rw-r--r--misc/dahdi-kmod/Makefile2
-rw-r--r--misc/dahdi-kmod26/Makefile2
-rw-r--r--misc/dahdi/Makefile2
-rw-r--r--misc/dejagnu/Makefile2
-rw-r--r--misc/diary-hercules/Makefile4
-rw-r--r--misc/dphys-config/Makefile2
-rw-r--r--misc/e2fsprogs-libblkid/Makefile2
-rw-r--r--misc/elscreen/Makefile2
-rw-r--r--misc/esniper/Makefile2
-rw-r--r--misc/exercism/Makefile2
-rw-r--r--misc/figlet-fonts/Makefile2
-rw-r--r--misc/freebsd-doc-all/Makefile38
-rw-r--r--misc/freebsd-doc-en/Makefile18
-rw-r--r--misc/freeguide/Makefile2
-rw-r--r--misc/gcstar/Makefile40
-rw-r--r--misc/gimp-help-en/Makefile4
-rw-r--r--misc/gkrellm-gamma/Makefile4
-rw-r--r--misc/gkrellm-helium/Makefile6
-rw-r--r--misc/gkrellm-xkb/Makefile4
-rw-r--r--misc/gkrellmbgchg2/Makefile4
-rw-r--r--misc/gkrellmlaunch2/Makefile4
-rw-r--r--misc/gkrellshoot2/Makefile6
-rw-r--r--misc/gkrellweather2/Makefile4
-rw-r--r--misc/gkx86info2/Makefile4
-rw-r--r--misc/gnome-devel-docs/Makefile2
-rw-r--r--misc/gnome-icon-theme-extras/Makefile6
-rw-r--r--misc/gnome-icon-theme/Makefile8
-rw-r--r--misc/gnome-user-docs/Makefile2
-rw-r--r--misc/gregexp/Makefile2
-rw-r--r--misc/gtkfind/Makefile4
-rw-r--r--misc/help2man/Makefile4
-rw-r--r--misc/hotkeys/Makefile4
-rw-r--r--misc/ipa_conv/Makefile2
-rw-r--r--misc/iselect/Makefile2
-rw-r--r--misc/kde-thumbnailer-chm/Makefile2
-rw-r--r--misc/kde4-l10n/Makefile2
-rw-r--r--misc/kde4-l10n/files/bsd.l10n.mk4
-rw-r--r--misc/kdeedu4/Makefile42
-rw-r--r--misc/kdeutils4/Makefile26
-rw-r--r--misc/ktouch/Makefile2
-rw-r--r--misc/latex-mk/Makefile2
-rw-r--r--misc/lesspipe/Makefile2
-rw-r--r--misc/libisocodes/Makefile6
-rw-r--r--misc/libmetalink/Makefile4
-rw-r--r--misc/libsupertone/Makefile8
-rw-r--r--misc/lifelines/Makefile4
-rw-r--r--misc/lingoteach/Makefile2
-rw-r--r--misc/linm/Makefile2
-rw-r--r--misc/magicpoint/Makefile10
-rw-r--r--misc/mbuffer/Makefile2
-rw-r--r--misc/mc-light/Makefile2
-rw-r--r--misc/mc/Makefile4
-rw-r--r--misc/metalink-tools/Makefile8
-rw-r--r--misc/najitool/Makefile2
-rw-r--r--misc/nut/Makefile10
-rw-r--r--misc/openr2/Makefile2
-rw-r--r--misc/p5-Array-Compare/Makefile6
-rw-r--r--misc/p5-Array-Diff/Makefile4
-rw-r--r--misc/p5-Asterisk-FastAGI/Makefile12
-rw-r--r--misc/p5-Bot-Training-MegaHAL/Makefile6
-rw-r--r--misc/p5-Bot-Training-StarCraft/Makefile6
-rw-r--r--misc/p5-Bot-Training/Makefile18
-rw-r--r--misc/p5-Business-EDI/Makefile10
-rw-r--r--misc/p5-Business-Hours/Makefile6
-rw-r--r--misc/p5-Business-ISBN-Data/Makefile2
-rw-r--r--misc/p5-Business-ISBN/Makefile14
-rw-r--r--misc/p5-Business-ISIN/Makefile2
-rw-r--r--misc/p5-Business-UPS/Makefile2
-rw-r--r--misc/p5-Geo-Cache/Makefile4
-rw-r--r--misc/p5-Geo-Coder-Bing/Makefile10
-rw-r--r--misc/p5-Geo-Coder-Geocoder-US/Makefile6
-rw-r--r--misc/p5-Geo-Coder-Google/Makefile12
-rw-r--r--misc/p5-Geo-Coder-Googlev3/Makefile6
-rw-r--r--misc/p5-Geo-Coder-Many/Makefile34
-rw-r--r--misc/p5-Geo-Coder-Mapquest/Makefile10
-rw-r--r--misc/p5-Geo-Coder-Multimap/Makefile8
-rw-r--r--misc/p5-Geo-Coder-Multiple/Makefile2
-rw-r--r--misc/p5-Geo-Coder-Navteq/Makefile6
-rw-r--r--misc/p5-Geo-Coder-OSM/Makefile8
-rw-r--r--misc/p5-Geo-Coder-OpenCage/Makefile16
-rw-r--r--misc/p5-Geo-Coder-Ovi/Makefile8
-rw-r--r--misc/p5-Geo-Coder-PlaceFinder/Makefile8
-rw-r--r--misc/p5-Geo-Coder-TomTom/Makefile10
-rw-r--r--misc/p5-Geo-GeoNames/Makefile6
-rw-r--r--misc/p5-Geo-Postcodes-DK/Makefile4
-rw-r--r--misc/p5-Geo-Postcodes-NO/Makefile4
-rw-r--r--misc/p5-Geo-Weather/Makefile2
-rw-r--r--misc/p5-I18N-Charset/Makefile6
-rw-r--r--misc/p5-Locale-Geocode/Makefile4
-rw-r--r--misc/p5-Locale-US/Makefile2
-rw-r--r--misc/p5-OSSP-uuid/Makefile2
-rw-r--r--misc/p5-Software-License-CCpack/Makefile4
-rw-r--r--misc/p5-Software-License/Makefile8
-rw-r--r--misc/p5-Text-FIGlet/Makefile6
-rw-r--r--misc/pastebinit/Makefile2
-rw-r--r--misc/patchutils/Makefile2
-rw-r--r--misc/pdmenu/Makefile2
-rw-r--r--misc/pear-Services_Weather/Makefile12
-rw-r--r--misc/pfm/Makefile8
-rw-r--r--misc/podsleuth/Makefile8
-rw-r--r--misc/py-osd/Makefile2
-rw-r--r--misc/py-spdx-lookup/Makefile2
-rw-r--r--misc/pylize/Makefile8
-rw-r--r--misc/raspberrypi-userland/Makefile2
-rw-r--r--misc/rfc/Makefile2
-rw-r--r--misc/rubygem-rabbit/Makefile24
-rw-r--r--misc/saaghar/Makefile2
-rw-r--r--misc/smssend/Makefile2
-rw-r--r--misc/sshbuddy/Makefile2
-rw-r--r--misc/sword/Makefile8
-rw-r--r--misc/telbook/Makefile2
-rw-r--r--misc/tellico-kde4/Makefile10
-rw-r--r--misc/terraform/Makefile2
-rw-r--r--misc/teslams/Makefile4
-rw-r--r--misc/toilet/Makefile2
-rw-r--r--misc/tpp/Makefile4
-rw-r--r--misc/translate/Makefile2
-rw-r--r--misc/utftools/Makefile2
-rw-r--r--misc/wmScoreBoard/Makefile2
-rw-r--r--misc/wmcalendar/Makefile2
-rw-r--r--misc/wmweather+/Makefile16
-rw-r--r--misc/wotsap/Makefile2
-rw-r--r--misc/xdg-menu/Makefile6
-rw-r--r--misc/xfce4-appfinder/Makefile2
-rw-r--r--misc/xfce4-weather-plugin/Makefile4
-rw-r--r--misc/xiphos/Makefile14
-rw-r--r--misc/xsw/Makefile2
-rw-r--r--misc/xyzcmd/Makefile4
152 files changed, 462 insertions, 462 deletions
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 0067e247c167..0a983ed9d977 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -12,8 +12,8 @@ PKGNAMESUFFIX?= -server
MAINTAINER= fbsd@dylanleigh.net
COMMENT?= Advanced Maryland Automatic Network Disk Archiver (server)
-RUN_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
-BUILD_DEPENDS= perl-amanda:${PORTSDIR}/misc/amanda-perl-wrapper
+RUN_DEPENDS= perl-amanda:misc/amanda-perl-wrapper
+BUILD_DEPENDS= perl-amanda:misc/amanda-perl-wrapper
WRKSRC= ${WRKDIR}/amanda-${PORTVERSION}
SLAVEDIRS= misc/amanda-client
@@ -77,8 +77,8 @@ S3_DESC= Enable Amazon S3 device support
.if ${PORT_OPTIONS:MGNUTAR}
CONFIGURE_ARGS+=--with-gnutar-listdir=${AMANDA_GNUTAR_LISTDIR} \
--with-gnutar=${LOCALBASE}/bin/gtar
-BUILD_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-RUN_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
+BUILD_DEPENDS+= gtar:archivers/gtar
+RUN_DEPENDS+= gtar:archivers/gtar
.endif
# amanda-server part
@@ -105,15 +105,15 @@ pre-fetch:
CONFLICTS= amanda-server-2.* amanda-server-3.2.* amanda2[56]-server-*
-BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client
-RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:${PORTSDIR}/misc/amanda-client \
- p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client
+RUN_DEPENDS+= ${LOCALBASE}/lib/amanda/libamandad-${PORTVERSION}.so:misc/amanda-client \
+ p5-XML-Simple>=0:textproc/p5-XML-Simple
CONFIGURE_ARGS+=--without-client
.if ${PORT_OPTIONS:MPLOT}
-BUILD_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
-RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot
+BUILD_DEPENDS+= gnuplot:math/gnuplot
+RUN_DEPENDS+= gnuplot:math/gnuplot
PLIST_SUB+= PLOT=''
CONFIGURE_ARGS+= --with-gnuplot=${LOCALBASE}/bin/gnuplot
.else
@@ -123,14 +123,14 @@ CONFIGURE_ARGS+= --without-gnuplot
.if ${PORT_OPTIONS:MSAMBA}
SAMBA_PORT?= samba36
-BUILD_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
-RUN_DEPENDS+= smbclient:${PORTSDIR}/net/${SAMBA_PORT}
+BUILD_DEPENDS+= smbclient:net/${SAMBA_PORT}
+RUN_DEPENDS+= smbclient:net/${SAMBA_PORT}
CONFIGURE_ARGS+= --with-smbclient=${LOCALBASE}/bin/smbclient
.endif
# If configure founds libcurl, automatically enabled it (with plist change).
.if ${PORT_OPTIONS:MS3}
-LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+= libcurl.so:ftp/curl
CONFIGURE_ARGS+= --enable-s3-device
PLIST_SUB+= S3DEVICE=''
.else
diff --git a/misc/amfm/Makefile b/misc/amfm/Makefile
index 7d68bbbd08eb..0481f0e4ccd1 100644
--- a/misc/amfm/Makefile
+++ b/misc/amfm/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .c
MAINTAINER= sanpei@FreeBSD.org
COMMENT= THANKO USB AM/FM Radio controller
-LIB_DEPENDS= libhid.so:${PORTSDIR}/devel/libhid
+LIB_DEPENDS= libhid.so:devel/libhid
NO_WRKSUBDIR= yes
diff --git a/misc/ansiweather/Makefile b/misc/ansiweather/Makefile
index 5587ad65616b..607480190b04 100644
--- a/misc/ansiweather/Makefile
+++ b/misc/ansiweather/Makefile
@@ -9,10 +9,10 @@ COMMENT= Shell script for displaying the current weather in your terminal
LICENSE= BSD3CLAUSE
-RUN_DEPENDS= jq:${PORTSDIR}/textproc/jq \
- curl:${PORTSDIR}/ftp/curl \
- bash:${PORTSDIR}/shells/bash \
- gprintf:${PORTSDIR}/sysutils/coreutils
+RUN_DEPENDS= jq:textproc/jq \
+ curl:ftp/curl \
+ bash:shells/bash \
+ gprintf:sysutils/coreutils
USE_GITHUB= yes
GH_ACCOUNT= fcambus
diff --git a/misc/artikulate/Makefile b/misc/artikulate/Makefile
index ddfe8d6c5335..ea171e210805 100644
--- a/misc/artikulate/Makefile
+++ b/misc/artikulate/Makefile
@@ -9,9 +9,9 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Pronunciation trainer for KDE
-LIB_DEPENDS= libQtGStreamer-1.0.so:${PORTSDIR}/multimedia/gstreamer1-qt4 \
- libboost_thread.so:${PORTSDIR}/devel/boost-libs
-RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:${PORTSDIR}/graphics/kqtquickcharts
+LIB_DEPENDS= libQtGStreamer-1.0.so:multimedia/gstreamer1-qt4 \
+ libboost_thread.so:devel/boost-libs
+RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
IGNORE= not usable, links to both GStreamer 0.10.x and 1.x
diff --git a/misc/auto-multiple-choice/Makefile b/misc/auto-multiple-choice/Makefile
index 77405bd8e24e..502fa47f90cd 100644
--- a/misc/auto-multiple-choice/Makefile
+++ b/misc/auto-multiple-choice/Makefile
@@ -11,25 +11,25 @@ COMMENT= Multiple-choice questionnaire management with automated marking
LICENSE= GPLv2
-LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
- libnetpbm.so:${PORTSDIR}/graphics/netpbm \
- libopencv_highgui.so:${PORTSDIR}/graphics/opencv \
- libpangocairo-1.0.so:${PORTSDIR}/x11-toolkits/pango \
- libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
-RUN_DEPENDS= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite \
- p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
- p5-Email-MIME>=0:${PORTSDIR}/mail/p5-Email-MIME \
- p5-Email-Sender>=0:${PORTSDIR}/mail/p5-Email-Sender \
- p5-Glib-Object-Introspection>=0:${PORTSDIR}/devel/p5-Glib-Object-Introspection \
- p5-Gtk2-Notify>=0:${PORTSDIR}/devel/p5-Gtk2-Notify \
- p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
- p5-Module-Pluggable>=0:${PORTSDIR}/devel/p5-Module-Pluggable \
- p5-Net-CUPS>=0:${PORTSDIR}/print/p5-Net-CUPS \
- p5-OpenOffice-OODoc>=0:${PORTSDIR}/textproc/p5-OpenOffice-OODoc \
- p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
- p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
- p5-XML-Writer>=0:${PORTSDIR}/textproc/p5-XML-Writer \
- pdftoppm:${PORTSDIR}/graphics/poppler-utils
+LIB_DEPENDS= libcairo.so:graphics/cairo \
+ libnetpbm.so:graphics/netpbm \
+ libopencv_highgui.so:graphics/opencv \
+ libpangocairo-1.0.so:x11-toolkits/pango \
+ libpoppler-glib.so:graphics/poppler-glib
+RUN_DEPENDS= p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
+ p5-DBI>=0:databases/p5-DBI \
+ p5-Email-MIME>=0:mail/p5-Email-MIME \
+ p5-Email-Sender>=0:mail/p5-Email-Sender \
+ p5-Glib-Object-Introspection>=0:devel/p5-Glib-Object-Introspection \
+ p5-Gtk2-Notify>=0:devel/p5-Gtk2-Notify \
+ p5-Locale-gettext>=0:devel/p5-Locale-gettext \
+ p5-Module-Pluggable>=0:devel/p5-Module-Pluggable \
+ p5-Net-CUPS>=0:print/p5-Net-CUPS \
+ p5-OpenOffice-OODoc>=0:textproc/p5-OpenOffice-OODoc \
+ p5-Text-CSV>=0:textproc/p5-Text-CSV \
+ p5-XML-Simple>=0:textproc/p5-XML-Simple \
+ p5-XML-Writer>=0:textproc/p5-XML-Writer \
+ pdftoppm:graphics/poppler-utils
WRKSRC= ${WRKDIR}/auto-multiple-choice-${PORTVERSION}
PORTDOCS= html auto-multiple-choice.*
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index 34976dbc592c..f5bd3b66b423 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -13,8 +13,8 @@ COMMENT= High quality audio-visual demonstration for text terminal
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib \
- libmikmod.so:${PORTSDIR}/audio/libmikmod
+LIB_DEPENDS= libaa.so:graphics/aalib \
+ libmikmod.so:audio/libmikmod
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/bb-1.3.0
diff --git a/misc/bibletime/Makefile b/misc/bibletime/Makefile
index 69c0e97699e1..a10820c0d90e 100644
--- a/misc/bibletime/Makefile
+++ b/misc/bibletime/Makefile
@@ -10,8 +10,8 @@ COMMENT= Open source Bible study tool
LICENSE= GPLv2
-LIB_DEPENDS= libclucene-core.so:${PORTSDIR}/textproc/clucene \
- libsword.so:${PORTSDIR}/misc/sword
+LIB_DEPENDS= libclucene-core.so:textproc/clucene \
+ libsword.so:misc/sword
USES= cmake:outsource tar:xz
USE_OPENSSL= yes
diff --git a/misc/biosfont-demos/Makefile b/misc/biosfont-demos/Makefile
index 6c3e34c6b84e..9222e9a48eb1 100644
--- a/misc/biosfont-demos/Makefile
+++ b/misc/biosfont-demos/Makefile
@@ -12,8 +12,8 @@ COMMENT= Demos for the biosfont kernel module
LICENSE= BSD2CLAUSE
-BUILD_DEPENDS= ${LOCALBASE}/include/biosfont.h:${PORTSDIR}/sysutils/biosfont
-RUN_DEPENDS= /boot/modules/biosfont.ko:${PORTSDIR}/sysutils/biosfont
+BUILD_DEPENDS= ${LOCALBASE}/include/biosfont.h:sysutils/biosfont
+RUN_DEPENDS= /boot/modules/biosfont.ko:sysutils/biosfont
PLIST_FILES= bin/show_char bin/showdati
diff --git a/misc/cdcollect/Makefile b/misc/cdcollect/Makefile
index e207b5b081e7..0a73274082e0 100644
--- a/misc/cdcollect/Makefile
+++ b/misc/cdcollect/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}_source
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple CD catalog for GNOME
-BUILD_DEPENDS= sqlite3>=3.0:${PORTSDIR}/databases/sqlite3
+BUILD_DEPENDS= sqlite3>=3.0:databases/sqlite3
RUN_DEPENDS:= ${BUILD_DEPENDS}
GNU_CONFIGURE= yes
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index 6ebe82f8861d..e56d21baed8d 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
MAINTAINER= itetcu@FreeBSD.org
COMMENT= Convert CHORD input files to HTML
-RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD
+RUN_DEPENDS= p5-GD>=0:graphics/p5-GD
USES= shebangfix perl5
NO_BUILD= yes
diff --git a/misc/cloc/Makefile b/misc/cloc/Makefile
index 3401ee2d5d1b..49f25bc84f00 100644
--- a/misc/cloc/Makefile
+++ b/misc/cloc/Makefile
@@ -10,7 +10,7 @@ EXTRACT_SUFX= .pl
MAINTAINER= danilo@FreeBSD.org
COMMENT= Counts lines of code
-RUN_DEPENDS= p5-Algorithm-Diff>=0:${PORTSDIR}/devel/p5-Algorithm-Diff
+RUN_DEPENDS= p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff
USES= perl5
USE_PERL5= run
diff --git a/misc/compat10x/pkg-descr b/misc/compat10x/pkg-descr
index 09ddb1464e27..5c50559158d2 100644
--- a/misc/compat10x/pkg-descr
+++ b/misc/compat10x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 1100000
-LIB_DEPENDS+= libelf.so.1:${PORTSDIR}/misc/compat10x
+LIB_DEPENDS+= libelf.so.1:misc/compat10x
.endif
--
diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile
index 6a027e78e1be..717a28e29874 100644
--- a/misc/compat4x/Makefile
+++ b/misc/compat4x/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR= ${COMPAT4X_ARCH}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convenience package to install the compat4x libraries
-RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:misc/localedata
WRKSRC= ${WRKDIR}/usr/lib/compat
diff --git a/misc/compat4x/pkg-descr b/misc/compat4x/pkg-descr
index 348da64b5108..743e61c11adf 100644
--- a/misc/compat4x/pkg-descr
+++ b/misc/compat4x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500000
-LIB_DEPENDS+= c.4:${PORTSDIR}/misc/compat4x
+LIB_DEPENDS+= c.4:misc/compat4x
.endif
--
diff --git a/misc/compat5x/Makefile b/misc/compat5x/Makefile
index 8a18a279d953..1025bc78ba57 100644
--- a/misc/compat5x/Makefile
+++ b/misc/compat5x/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convenience package to install the compat5x libraries
-RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:${PORTSDIR}/misc/localedata
+RUN_DEPENDS= ${LOCALBASE}/share/compat/locale/UTF-8/LC_CTYPE:misc/localedata
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/misc/compat5x/pkg-descr b/misc/compat5x/pkg-descr
index 50e19528a58a..095d0677d329 100644
--- a/misc/compat5x/pkg-descr
+++ b/misc/compat5x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 600000
-LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS+= c.5:misc/compat5x
.endif
--
diff --git a/misc/compat6x/pkg-descr b/misc/compat6x/pkg-descr
index 63840d0b37a9..76d1a0cc175a 100644
--- a/misc/compat6x/pkg-descr
+++ b/misc/compat6x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 700043
-LIB_DEPENDS+= c.6:${PORTSDIR}/misc/compat6x
+LIB_DEPENDS+= c.6:misc/compat6x
.endif
--
diff --git a/misc/compat7x/pkg-descr b/misc/compat7x/pkg-descr
index c618eca5c087..2c5e59869893 100644
--- a/misc/compat7x/pkg-descr
+++ b/misc/compat7x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 800105
-LIB_DEPENDS+= alias.6:${PORTSDIR}/misc/compat7x
+LIB_DEPENDS+= alias.6:misc/compat7x
.endif
--
diff --git a/misc/compat8x/Makefile b/misc/compat8x/Makefile
index f77a821dfe3a..5f1d5c8efa0d 100644
--- a/misc/compat8x/Makefile
+++ b/misc/compat8x/Makefile
@@ -25,7 +25,7 @@ IGNORE= is for FreeBSD 8.x and newer
.endif
.if ${OSVERSION} >= 1000000
-RUN_DEPENDS= compat9x-${ARCH}>=0:${PORTSDIR}/misc/compat9x
+RUN_DEPENDS= compat9x-${ARCH}>=0:misc/compat9x
.endif
.if ${ARCH} == amd64
diff --git a/misc/compat8x/pkg-descr b/misc/compat8x/pkg-descr
index 9c6dc4c28471..563c48db132a 100644
--- a/misc/compat8x/pkg-descr
+++ b/misc/compat8x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 900042
-LIB_DEPENDS+= ufs.5:${PORTSDIR}/misc/compat8x
+LIB_DEPENDS+= ufs.5:misc/compat8x
.endif
--
diff --git a/misc/compat9x/Makefile b/misc/compat9x/Makefile
index 770596c56487..5c44db15ddec 100644
--- a/misc/compat9x/Makefile
+++ b/misc/compat9x/Makefile
@@ -25,7 +25,7 @@ IGNORE= is for FreeBSD 9.x and newer
.endif
.if ${OSVERSION} >= 1100000
-RUN_DEPENDS= compat10x-${ARCH}>=0:${PORTSDIR}/misc/compat10x
+RUN_DEPENDS= compat10x-${ARCH}>=0:misc/compat10x
.endif
.if ${ARCH} == amd64
diff --git a/misc/compat9x/pkg-descr b/misc/compat9x/pkg-descr
index f8eabd6ee9c3..ccd9711d536f 100644
--- a/misc/compat9x/pkg-descr
+++ b/misc/compat9x/pkg-descr
@@ -7,6 +7,6 @@ Ports usage example:
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 1000009
-LIB_DEPENDS+= archive.5:${PORTSDIR}/misc/compat9x
+LIB_DEPENDS+= archive.5:misc/compat9x
.endif
--
diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index a9c09ed04626..a5fc9e9ad898 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -12,7 +12,7 @@ COMMENT= Cross Stitch software
LICENSE= GPLv2+
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
NO_BUILD= yes
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index e3ad09ede8dc..83dca5fc62f5 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -23,8 +23,8 @@ OPTIONS_DEFINE= X11
OPTIONS_DEFAULT=X11
OPTIONS_SUB= yes
-X11_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter \
- ${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
+X11_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \
+ ${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
.include <bsd.port.options.mk>
diff --git a/misc/dahdi-kmod/Makefile b/misc/dahdi-kmod/Makefile
index 67dfc34c1a0a..568df9b39dc4 100644
--- a/misc/dahdi-kmod/Makefile
+++ b/misc/dahdi-kmod/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Digium/Asterisk Hardware Device Interface
-RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
+RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
DAHDI_VERSION= 2.4.0-rc5
DAHDI_TOOLS_VERSION= 2.4.0-rc1
diff --git a/misc/dahdi-kmod26/Makefile b/misc/dahdi-kmod26/Makefile
index 31036865b35a..25973aa0a17a 100644
--- a/misc/dahdi-kmod26/Makefile
+++ b/misc/dahdi-kmod26/Makefile
@@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}.tar.bz2\
MAINTAINER= fjoe@FreeBSD.org
COMMENT= Digium/Asterisk Hardware Device Interface
-RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:${PORTSDIR}/misc/dahdi
+RUN_DEPENDS= ${LOCALBASE}/sbin/dahdi_cfg:misc/dahdi
DAHDI_VERSION= 2.6.1-r10747
DAHDI_TOOLS_VERSION= 2.4.0-rc1
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile
index c069feb2ff51..2a73c79eba36 100644
--- a/misc/dahdi/Makefile
+++ b/misc/dahdi/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-freebsd-complete-${DAHDI_VERSION}+${DAHDI_TOOLS_VERSION}
MAINTAINER= fjoe@FreeBSD.org
COMMENT= DAHDI userland utilities and libraries
-LIB_DEPENDS= libnewt.so:${PORTSDIR}/devel/newt
+LIB_DEPENDS= libnewt.so:devel/newt
DAHDI_VERSION= 2.4.0-rc5
DAHDI_TOOLS_VERSION= 2.4.0-rc1
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 28b6411054da..c6a6f7b2b7ae 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -12,7 +12,7 @@ COMMENT= Automated program/system tester
LICENSE= GPLv3
-LIB_DEPENDS= libexpect.so:${PORTSDIR}/lang/expect
+LIB_DEPENDS= libexpect.so:lang/expect
USES+= gmake tcl
GNU_CONFIGURE= yes
diff --git a/misc/diary-hercules/Makefile b/misc/diary-hercules/Makefile
index 6fa0709e930d..25e433dd6f13 100644
--- a/misc/diary-hercules/Makefile
+++ b/misc/diary-hercules/Makefile
@@ -18,8 +18,8 @@ EXPIRATION_DATE= 2016-04-15
LICENSE= GPLv2
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:${PORTSDIR}/databases/py-sqlobject \
- ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlobject>=0.7:databases/py-sqlobject \
+ ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
USES= gettext python
USE_PYTHON= distutils
diff --git a/misc/dphys-config/Makefile b/misc/dphys-config/Makefile
index f46f9bd50033..3c5fcf46b703 100644
--- a/misc/dphys-config/Makefile
+++ b/misc/dphys-config/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to distribute config files
-RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS= wget:ftp/wget
NO_BUILD= yes
diff --git a/misc/e2fsprogs-libblkid/Makefile b/misc/e2fsprogs-libblkid/Makefile
index 686568f5bf01..00a7e719617b 100644
--- a/misc/e2fsprogs-libblkid/Makefile
+++ b/misc/e2fsprogs-libblkid/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX= -libblkid
COMMENT= Blkid library from e2fsprogs package
-LIB_DEPENDS= libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid
CONFIGURE_ARGS= --enable-elf-shlibs
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 1108680792e3..6c9b963467a5 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -19,7 +19,7 @@ DEPPORT_SUFFIX= -${EMACS_PORT_NAME}
DEPPORT_SUFFIX=
.endif
-RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
+RUN_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:editors/apel${DEPPORT_SUFFIX}
EMACS_NO_BUILD_DEPENDS= YES
NO_BUILD= YES
diff --git a/misc/esniper/Makefile b/misc/esniper/Makefile
index 9beb3ed29ac5..c39fca086b0b 100644
--- a/misc/esniper/Makefile
+++ b/misc/esniper/Makefile
@@ -11,7 +11,7 @@ COMMENT= Lightweight console application for sniping ebay auctions
LICENSE= BSD2CLAUSE
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= libcurl.so:ftp/curl
USES= tar:tgz
GNU_CONFIGURE= yes
diff --git a/misc/exercism/Makefile b/misc/exercism/Makefile
index d04835743ad3..1410c411b1e4 100644
--- a/misc/exercism/Makefile
+++ b/misc/exercism/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= misc
MAINTAINER= swills@FreeBSD.org
COMMENT= CLI client for exercism.io
-BUILD_DEPENDS= ${LOCALBASE}/bin/go:${PORTSDIR}/lang/go
+BUILD_DEPENDS= ${LOCALBASE}/bin/go:lang/go
USE_GITHUB= yes
GH_ACCOUNT= codegangsta:cg kardianos:osext golang:text,net davecgh:spew pmezard:diff stretchr:testify
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index 0933f11a275b..c7450924c490 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= figlet
MAINTAINER= ports@FreeBSD.org
COMMENT= Assorted fonts for the figlet(6) program
-RUN_DEPENDS= figlet:${PORTSDIR}/misc/figlet
+RUN_DEPENDS= figlet:misc/figlet
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 5ac8a144011c..18de45e3d0c9 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -9,25 +9,25 @@ CATEGORIES= misc docs
MAINTAINER= doceng@FreeBSD.org
COMMENT= Documentation from the FreeBSD Documentation Project
-RUN_DEPENDS+= bn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-bn \
- da-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-da \
- de-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-de \
- el-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-el \
- en-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-en \
- es-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-es \
- fr-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-fr \
- hu-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-hu \
- it-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-it \
- ja-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ja \
- ko-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ko \
- mn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-mn \
- nl-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-nl \
- pl-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-pl \
- pt-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-pt \
- ru-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-ru \
- tr-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-tr \
- zh_cn-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-zh_cn \
- zh_tw-freebsd-doc>=${PORTVERSION}:${PORTSDIR}/misc/freebsd-doc-zh_tw
+RUN_DEPENDS+= bn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-bn \
+ da-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-da \
+ de-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-de \
+ el-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-el \
+ en-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-en \
+ es-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-es \
+ fr-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-fr \
+ hu-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-hu \
+ it-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-it \
+ ja-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ja \
+ ko-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ko \
+ mn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-mn \
+ nl-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-nl \
+ pl-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-pl \
+ pt-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-pt \
+ ru-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-ru \
+ tr-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-tr \
+ zh_cn-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-zh_cn \
+ zh_tw-freebsd-doc>=${PORTVERSION}:misc/freebsd-doc-zh_tw
USES= metaport
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index eca558448fad..a4507e10bd1e 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX?= en-
MAINTAINER= doceng@FreeBSD.org
COMMENT?= Documentation from the FreeBSD Documentation Project
-BUILD_DEPENDS= docproj>=2.0_6:${PORTSDIR}/textproc/docproj
+BUILD_DEPENDS= docproj>=2.0_6:textproc/docproj
USES= uidfix
WRKSRC= ${WRKDIR}/doc
@@ -66,14 +66,14 @@ PLIST_FORMATS+= ${O:tl:S,_,-,}
.endfor
.if ${PORT_OPTIONS:MPDF} || ${PORT_OPTIONS:MPS}
-BUILD_DEPENDS+= fop:${PORTSDIR}/textproc/fop \
- ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:${PORTSDIR}/x11-fonts/gentium-plus \
- ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:${PORTSDIR}/x11-fonts/droid-fonts-ttf \
- ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:${PORTSDIR}/x11-fonts/lohit \
- ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:${PORTSDIR}/x11-fonts/dejavu \
- ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:${PORTSDIR}/chinese/arphicttf \
- ${LOCALBASE}/share/fonts/OTF/ipam.otf:${PORTSDIR}/japanese/font-ipa \
- ${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:${PORTSDIR}/korean/nanumfonts-ttf
+BUILD_DEPENDS+= fop:textproc/fop \
+ ${LOCALBASE}/share/fonts/GentiumPlus/GentiumPlus-R.ttf:x11-fonts/gentium-plus \
+ ${LOCALBASE}/share/fonts/Droid/DroidSans.ttf:x11-fonts/droid-fonts-ttf \
+ ${LOCALBASE}/share/fonts/Lohit/Lohit-Bengali.ttf:x11-fonts/lohit \
+ ${LOCALBASE}/share/fonts/dejavu/DejaVuSansMono.ttf:x11-fonts/dejavu \
+ ${LOCALBASE}/share/fonts/TrueType/gkai00mp.ttf:chinese/arphicttf \
+ ${LOCALBASE}/share/fonts/OTF/ipam.otf:japanese/font-ipa \
+ ${LOCALBASE}/share/fonts/nanum-ttf/NanumBarunGothic.ttf:korean/nanumfonts-ttf
.endif
# when html or html-split is defined as the format, add HTML_COMMON.
diff --git a/misc/freeguide/Makefile b/misc/freeguide/Makefile
index c319f94504ad..163e11954f53 100644
--- a/misc/freeguide/Makefile
+++ b/misc/freeguide/Makefile
@@ -12,7 +12,7 @@ COMMENT= Interactive TV guide which will create personalized TV listings
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/doc/COPYING
-RUN_DEPENDS= tv_cat:${PORTSDIR}/textproc/p5-xmltv
+RUN_DEPENDS= tv_cat:textproc/p5-xmltv
USE_JAVA= yes
JAVA_VERSION= 1.6+
diff --git a/misc/gcstar/Makefile b/misc/gcstar/Makefile
index 94a6ce5a029d..4ec255da86cc 100644
--- a/misc/gcstar/Makefile
+++ b/misc/gcstar/Makefile
@@ -14,26 +14,26 @@ COMMENT= Open source application for managing your collections
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
- p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML \
- p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
- p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
- p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
- p5-MP3-Tag>=0:${PORTSDIR}/audio/p5-MP3-Tag \
- p5-Ogg-Vorbis-Header-PurePerl>=0:${PORTSDIR}/audio/p5-Ogg-Vorbis-Header-PurePerl \
- p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
- p5-Time-Piece>=0:${PORTSDIR}/devel/p5-Time-Piece \
- p5-Gtk2-Spell>=0:${PORTSDIR}/devel/p5-Gtk2-Spell \
- p5-DateTime-Format-Strptime>=0:${PORTSDIR}/devel/p5-DateTime-Format-Strptime \
- p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
- p5-Switch>0:${PORTSDIR}/lang/p5-Switch \
- p5-Gnome2-VFS>=0:${PORTSDIR}/x11-toolkits/p5-Gnome2-VFS \
- p5-Net-FreeDB>=0:${PORTSDIR}/audio/p5-Net-FreeDB \
- p5-Sort-Naturally>=0:${PORTSDIR}/textproc/p5-Sort-Naturally \
- p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
- p5-GD-Graph>=0:${PORTSDIR}/graphics/p5-GD-Graph \
- p5-GD-TextUtil>=0:${PORTSDIR}/graphics/p5-GD-TextUtil
+RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2 \
+ p5-XML-LibXML>=0:textproc/p5-XML-LibXML \
+ p5-Archive-Tar>=0:archivers/p5-Archive-Tar \
+ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \
+ p5-libwww>=0:www/p5-libwww \
+ p5-MP3-Info>=0:audio/p5-MP3-Info \
+ p5-MP3-Tag>=0:audio/p5-MP3-Tag \
+ p5-Ogg-Vorbis-Header-PurePerl>=0:audio/p5-Ogg-Vorbis-Header-PurePerl \
+ p5-XML-Simple>=0:textproc/p5-XML-Simple \
+ p5-Time-Piece>=0:devel/p5-Time-Piece \
+ p5-Gtk2-Spell>=0:devel/p5-Gtk2-Spell \
+ p5-DateTime-Format-Strptime>=0:devel/p5-DateTime-Format-Strptime \
+ p5-Date-Calc>=0:devel/p5-Date-Calc \
+ p5-Switch>0:lang/p5-Switch \
+ p5-Gnome2-VFS>=0:x11-toolkits/p5-Gnome2-VFS \
+ p5-Net-FreeDB>=0:audio/p5-Net-FreeDB \
+ p5-Sort-Naturally>=0:textproc/p5-Sort-Naturally \
+ p5-GD>=0:graphics/p5-GD \
+ p5-GD-Graph>=0:graphics/p5-GD-Graph \
+ p5-GD-TextUtil>=0:graphics/p5-GD-TextUtil
WRKSRC= ${WRKDIR}/${PORTNAME}
USES= perl5 desktop-file-utils shared-mime-info shebangfix
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index 5ded60244ad9..600c362efb7a 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -18,8 +18,8 @@ COMMENT?= GIMP User Manual in English
LICENSE= GFDL
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
- ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2 \
+ ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
USES= gettext-tools gmake perl5 pkgconfig python:2 shebangfix tar:bzip2
USE_GNOME= libxslt:build
diff --git a/misc/gkrellm-gamma/Makefile b/misc/gkrellm-gamma/Makefile
index 3acf4c883c98..feac65bddcb3 100644
--- a/misc/gkrellm-gamma/Makefile
+++ b/misc/gkrellm-gamma/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/gamma/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= XFree86 gamma correction plugin for GKrellM
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
USES= pkgconfig
USE_XORG= x11 xxf86vm
diff --git a/misc/gkrellm-helium/Makefile b/misc/gkrellm-helium/Makefile
index 7e2809897bf2..f315adc03a4c 100644
--- a/misc/gkrellm-helium/Makefile
+++ b/misc/gkrellm-helium/Makefile
@@ -10,9 +10,9 @@ MASTER_SITES= https://sites.google.com/site/makovick/projects/
MAINTAINER= ports@FreeBSD.org
COMMENT= GKrellM plugin reading data from helium thermometer at Strahov, Prague
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+LIB_DEPENDS= libcurl.so:ftp/curl
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
USES= pkgconfig tar:tgz
diff --git a/misc/gkrellm-xkb/Makefile b/misc/gkrellm-xkb/Makefile
index b00a46222313..ee1580ee9839 100644
--- a/misc/gkrellm-xkb/Makefile
+++ b/misc/gkrellm-xkb/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES= http://www.sweb.cz/tripie/gkrellm/xkb/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= X keyboard layout plugin for GKrellM
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
USES= pkgconfig
PLIST_FILES= libexec/gkrellm2/plugins/xkb.so
diff --git a/misc/gkrellmbgchg2/Makefile b/misc/gkrellmbgchg2/Makefile
index 2ab510577031..358c8a811bbf 100644
--- a/misc/gkrellmbgchg2/Makefile
+++ b/misc/gkrellmbgchg2/Makefile
@@ -12,8 +12,8 @@ COMMENT= Plugin for GKrellM, which changes the desktop's background image
LICENSE= GPLv2
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
USES= gmake pkgconfig
USE_GNOME= gtk20
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 6110f118e85b..c4ca01b3e9ca 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -13,8 +13,8 @@ COMMENT= Application launcher plugin for GKrellM2
LICENSE= GPLv2+
-BUILD_DEPENDS= gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= gkrellm2>0:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm2>0:sysutils/gkrellm2
USES= pkgconfig
ALL_TARGET= gkrellmlaunch.so
diff --git a/misc/gkrellshoot2/Makefile b/misc/gkrellshoot2/Makefile
index d87fa8f8724f..77db76919633 100644
--- a/misc/gkrellshoot2/Makefile
+++ b/misc/gkrellshoot2/Makefile
@@ -11,9 +11,9 @@ PKGNAMESUFFIX= 2
MAINTAINER= ports@FreeBSD.org
COMMENT= Screen locking and screen capture plugin for GKrellM 2
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2 \
- import:${PORTSDIR}/graphics/ImageMagick
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2 \
+ import:graphics/ImageMagick
USES= pkgconfig
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index 3711b603a361..af6101726f1d 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -12,8 +12,8 @@ COMMENT= Weather plugin for GKrellM
LICENSE= GPLv2+
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
USES= gettext gmake pkgconfig tar:tgz
MAKE_ENV= enable_nls=1
diff --git a/misc/gkx86info2/Makefile b/misc/gkx86info2/Makefile
index c960e89a19a3..4bc54653620d 100644
--- a/misc/gkx86info2/Makefile
+++ b/misc/gkx86info2/Makefile
@@ -14,8 +14,8 @@ COMMENT= GKrellM2 plugin that simply prints the current clock speed
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
-RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:sysutils/gkrellm2
+RUN_DEPENDS= gkrellm:sysutils/gkrellm2
ONLY_FOR_ARCHS= i386 amd64
USES= pkgconfig
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
index cf4e621a123d..6f6d7aba5195 100644
--- a/misc/gnome-devel-docs/Makefile
+++ b/misc/gnome-devel-docs/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Documents targeted for GNOME developers
-BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
PORTSCOUT= limitw:1,even
diff --git a/misc/gnome-icon-theme-extras/Makefile b/misc/gnome-icon-theme-extras/Makefile
index 7516b56a44e9..875e2acbaac8 100644
--- a/misc/gnome-icon-theme-extras/Makefile
+++ b/misc/gnome-icon-theme-extras/Makefile
@@ -11,9 +11,9 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Additional collection of icons for the GNOME desktop
-BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
- icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+ icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme
USES= gmake pathfix pkgconfig tar:xz
USE_GNOME= intlhack gtk-update-icon-cache
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 0616ca3657b2..3eb09ffd82a1 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -12,10 +12,10 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Collection of icons for the GNOME desktop
-BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
- icon-naming-utils>=0.8.7:${PORTSDIR}/x11-themes/icon-naming-utils
-RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
- gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic
+BUILD_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+ icon-naming-utils>=0.8.7:x11-themes/icon-naming-utils
+RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \
+ gnome-icon-theme-symbolic>=0:x11-themes/gnome-icon-theme-symbolic
GNU_CONFIGURE= yes
USES= gettext-tools gmake pathfix pkgconfig tar:xz
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 4c9daa1bed84..ff603b247a09 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME 3 users guide
-BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
+BUILD_DEPENDS= itstool:textproc/itstool
PORTSCOUT= limitw:1,even
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 79b448bdedf2..3ab253f61c73 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://dentrassi.de/download/gregexp/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical regular expression explorer
-LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS= libpcre.so:devel/pcre
USES= pkgconfig
USE_GNOME= gnomeprefix libgnomeui
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index 935565924207..8da3dec61113 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -13,8 +13,8 @@ COMMENT= GTK front-end to find(1)
LICENSE= GPLv2
-BUILD_DEPENDS= appres:${PORTSDIR}/x11/appres \
- xterm:${PORTSDIR}/x11/xterm
+BUILD_DEPENDS= appres:x11/appres \
+ xterm:x11/xterm
USES= gmake
USE_GNOME= gtk12
diff --git a/misc/help2man/Makefile b/misc/help2man/Makefile
index ee2558dba977..d544f37d557c 100644
--- a/misc/help2man/Makefile
+++ b/misc/help2man/Makefile
@@ -27,12 +27,12 @@ PLIST_FILES= bin/${PORTNAME} \
LANGS= de el eo fi fr hr it pl pt_BR ru sr sv uk vi
LANGS_MTREE= ja # languages that already exist in BSD.local.dist
-NLS_BUILD_DEPENDS= p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+NLS_BUILD_DEPENDS= p5-Locale-gettext>=0:devel/p5-Locale-gettext
NLS_CONFIGURE_ENABLE= nls
# Add note of build failure caused by Perl infrastructure change in 20130612
NLS_VARS= CONFIGURE_FAIL_MESSAGE="Please read UPDATING entry 20130612 \(http://svnweb.freebsd.org/ports/head/UPDATING\?r1=320405\&r2=320679\) and PR/184276 \(http://www.freebsd.org/cgi/query-pr.cgi\?pr=ports/184276\) to fix your Perl installation if you got the error message \"configure: error: perl module Locale::gettext required\"."
NLS_PLIST_FILES= lib/bindtextdomain.so
-NLS_RUN_DEPENDS= p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext
+NLS_RUN_DEPENDS= p5-Locale-gettext>=0:devel/p5-Locale-gettext
NLS_USES= gettext
.for lang in ${LANGS} ${LANGS_MTREE}
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 6a6b34924445..e7576cc88298 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -14,7 +14,7 @@ COMMENT= Allows usage of special keys on internet/multimedia keyboards
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libxml2.so:textproc/libxml2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_ARGS= --with-db3-inc=${BDB_INCLUDE_DIR} \
@@ -29,7 +29,7 @@ USES= gmake
OPTIONS_DEFINE= OSD
OPTIONS_DEFAULT= OSD
-OSD_LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd
+OSD_LIB_DEPENDS= libxosd.so:misc/xosd
OSD_CONFIGURE_WITH= xosd
post-extract:
diff --git a/misc/ipa_conv/Makefile b/misc/ipa_conv/Makefile
index a5e424f859e6..e39dba9d9db0 100644
--- a/misc/ipa_conv/Makefile
+++ b/misc/ipa_conv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/ipa-system/modules/ipa_conv
MAINTAINER= misc/ipa_conv
COMMENT= IPA accounting/database module for converting statistics
-BUILD_DEPENDS= ${LOCALBASE}/include/ipa_mod.h:${PORTSDIR}/sysutils/ipa
+BUILD_DEPENDS= ${LOCALBASE}/include/ipa_mod.h:sysutils/ipa
USES= libtool tar:bzip2
USE_LDCONFIG= yes
diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile
index 16fbcecc3dff..19217780aa0d 100644
--- a/misc/iselect/Makefile
+++ b/misc/iselect/Makefile
@@ -28,7 +28,7 @@ PORTEXAMPLES= *
OPTIONS_DEFINE= SLANG EXAMPLES
SLANG_DESC= Link with slang
-SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
SLANG_CONFIGURE_ON= --with-incdir=${LOCALBASE}/include \
--with-libdir=${LOCALBASE}/lib
diff --git a/misc/kde-thumbnailer-chm/Makefile b/misc/kde-thumbnailer-chm/Makefile
index 9dec8b4a2019..006b07e3c844 100644
--- a/misc/kde-thumbnailer-chm/Makefile
+++ b/misc/kde-thumbnailer-chm/Makefile
@@ -10,7 +10,7 @@ DISTNAME= 153410-${PORTNAME}-${PORTVERSION}
MAINTAINER= makc@FreeBSD.org
COMMENT= KDE thumbnail generator for CHM files
-LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib
+LIB_DEPENDS= libchm.so:misc/chmlib
USES= cmake
USE_KDE4= kdeprefix kdelibs automoc4
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 43a3d0638010..bcc2e9adb04a 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -50,7 +50,7 @@ ${lang}_NAME?= ${lang}
${lang}_OPT= ${lang:S/@/_/}
LANG_OPT_ALL+= ${${lang}_OPT}
${${lang}_OPT}_DESC= ${${lang}_NAME} localization
-${${lang}_OPT}_RUN_DEPENDS= ${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT}
+${${lang}_OPT}_RUN_DEPENDS= ${${lang}_DETECT}:${${lang}_PORT}
.endfor
.for opt in ${LANG_OPT_ALL}
diff --git a/misc/kde4-l10n/files/bsd.l10n.mk b/misc/kde4-l10n/files/bsd.l10n.mk
index 7c6a7d5f70a7..5ca5cebf2dd8 100644
--- a/misc/kde4-l10n/files/bsd.l10n.mk
+++ b/misc/kde4-l10n/files/bsd.l10n.mk
@@ -66,5 +66,5 @@ OPTIONS_DEFINE+= HUNSPELL
HUNSPELL_DESC= Install hunspell dictionary
.endif
-ASPELL_RUN_DEPENDS+= ${${KDE4_L10N}_aspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_aspell_PORT}
-HUNSPELL_RUN_DEPENDS+= ${${KDE4_L10N}_hunspell_DETECT}:${PORTSDIR}/${${KDE4_L10N}_hunspell_PORT}
+ASPELL_RUN_DEPENDS+= ${${KDE4_L10N}_aspell_DETECT}:${${KDE4_L10N}_aspell_PORT}
+HUNSPELL_RUN_DEPENDS+= ${${KDE4_L10N}_hunspell_DETECT}:${${KDE4_L10N}_hunspell_PORT}
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index c2c5c8c17a7e..b291d6b834db 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -17,69 +17,69 @@ OPTIONS_DEFINE= ARTIKULATE BLINKEN CANTOR KALGEBRA KALZIUM KANAGRAM KBRUCH KGEOG
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NARTIKULATE}
ARTIKULATE_DESC= Pronunciation trainer
-ARTIKULATE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/artikulate:${PORTSDIR}/misc/artikulate
+ARTIKULATE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/artikulate:misc/artikulate
BLINKEN_DESC= Memory enhancement game
-BLINKEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/blinken:${PORTSDIR}/games/blinken
+BLINKEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/blinken:games/blinken
CANTOR_DESC= Frontend to mathematical software
-CANTOR_RUN_DEPENDS= ${KDE4_PREFIX}/bin/cantor:${PORTSDIR}/math/cantor
+CANTOR_RUN_DEPENDS= ${KDE4_PREFIX}/bin/cantor:math/cantor
KALGEBRA_DESC= Graph calculator
-KALGEBRA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalgebra:${PORTSDIR}/math/kalgebra
+KALGEBRA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalgebra:math/kalgebra
KALZIUM_DESC= Periodic table of elements
-KALZIUM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalzium:${PORTSDIR}/science/kalzium
+KALZIUM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kalzium:science/kalzium
KANAGRAM_DESC= Letter order game
-KANAGRAM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kanagram:${PORTSDIR}/games/kanagram
+KANAGRAM_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kanagram:games/kanagram
KBRUCH_DESC= Application to exercise fractions
-KBRUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kbruch:${PORTSDIR}/math/kbruch
+KBRUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kbruch:math/kbruch
KGEOGRAPHY_DESC= Geography trainer
-KGEOGRAPHY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgeography:${PORTSDIR}/misc/kgeography
+KGEOGRAPHY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgeography:misc/kgeography
KHANGMAN_DESC= Hangman game
-KHANGMAN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/khangman:${PORTSDIR}/games/khangman
+KHANGMAN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/khangman:games/khangman
KIG_DESC= Interactive geometry application
-KIG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kig:${PORTSDIR}/math/kig
+KIG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kig:math/kig
KITEN_DESC= Japanese reference/study tool
-KITEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kiten:${PORTSDIR}/japanese/kiten
+KITEN_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kiten:japanese/kiten
KLETTRES_DESC= Alphabet learning tool
-KLETTRES_RUN_DEPENDS= ${KDE4_PREFIX}/bin/klettres:${PORTSDIR}/misc/klettres
+KLETTRES_RUN_DEPENDS= ${KDE4_PREFIX}/bin/klettres:misc/klettres
KMPLOT_DESC= Mathematical function plotter
-KMPLOT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmplot:${PORTSDIR}/math/kmplot
+KMPLOT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kmplot:math/kmplot
KSTARS_DESC= Desktop planetarium
-KSTARS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kstars:${PORTSDIR}/astro/kstars
+KSTARS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kstars:astro/kstars
KTOUCH_DESC= Touch typing tutor
-KTOUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktouch:${PORTSDIR}/misc/ktouch
+KTOUCH_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktouch:misc/ktouch
KTURTLE_DESC= Educational programming environment
-KTURTLE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kturtle:${PORTSDIR}/lang/kturtle
+KTURTLE_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kturtle:lang/kturtle
KWORDQUIZ_DESC= Flash card trainer
-KWORDQUIZ_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwordquiz:${PORTSDIR}/misc/kwordquiz
+KWORDQUIZ_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwordquiz:misc/kwordquiz
MARBLE_DESC= Virtual globe and world atlas
MARBLE_USE= KDE4=marble_run
PAIRS_DESC= Memory and pairs game
-PAIRS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/pairs:${PORTSDIR}/games/pairs
+PAIRS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/pairs:games/pairs
PARLEY_DESC= Vocabulary trainer
-PARLEY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/parley:${PORTSDIR}/misc/parley
+PARLEY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/parley:misc/parley
ROCS_DESC= Graph teory IDE
-ROCS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/rocs:${PORTSDIR}/math/rocs
+ROCS_RUN_DEPENDS= ${KDE4_PREFIX}/bin/rocs:math/rocs
STEP_DESC= Interactive physics simulator
-STEP_RUN_DEPENDS= ${KDE4_PREFIX}/bin/step:${PORTSDIR}/science/step
+STEP_RUN_DEPENDS= ${KDE4_PREFIX}/bin/step:science/step
.include <bsd.port.mk>
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 35b839849ca9..58a54329ccbc 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -17,42 +17,42 @@ OPTIONS_DEFINE= ARK FILELIGHT KCALC KCHARSELECT KDF KFLOPPY KGPG \
OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
ARK_DESC= Archiving tool Ark
-ARK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ark:${PORTSDIR}/archivers/ark
+ARK_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ark:archivers/ark
FILELIGHT_DESC= File system viewer Filelight
-FILELIGHT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
+FILELIGHT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/filelight:sysutils/filelight-kde4
KCALC_DESC= Scientific calculator KCalc
-KCALC_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcalc:${PORTSDIR}/math/kcalc
+KCALC_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcalc:math/kcalc
KCHARSELECT_DESC= Character selector KCharSelect
-KCHARSELECT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcharselect:${PORTSDIR}/deskutils/kcharselect
+KCHARSELECT_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kcharselect:deskutils/kcharselect
KDF_DESC= Disk usage tool KDiskFree
-KDF_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kdf:${PORTSDIR}/sysutils/kdf
+KDF_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kdf:sysutils/kdf
KFLOPPY_DESC= Floppy formatter KFloppy
-KFLOPPY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kfloppy:${PORTSDIR}/sysutils/kfloppy
+KFLOPPY_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kfloppy:sysutils/kfloppy
KGPG_DESC= Encryption tool KGpg
-KGPG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgpg:${PORTSDIR}/security/kgpg-kde4
+KGPG_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kgpg:security/kgpg-kde4
KREMOTECONTROL_DESC= KRemoteControl
-KREMOTECONTROL_RUN_DEPENDS= ${KDE4_PREFIX}/bin/krcdnotifieritem:${PORTSDIR}/comms/kremotecontrol
+KREMOTECONTROL_RUN_DEPENDS= ${KDE4_PREFIX}/bin/krcdnotifieritem:comms/kremotecontrol
KTIMER_DESC= Countdown launcher KTimer
-KTIMER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktimer:${PORTSDIR}/x11-clocks/ktimer
+KTIMER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/ktimer:x11-clocks/ktimer
KWALLET_DESC= Password manager KWallet
-KWALLET_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwalletmanager:${PORTSDIR}/security/kwalletmanager
+KWALLET_RUN_DEPENDS= ${KDE4_PREFIX}/bin/kwalletmanager:security/kwalletmanager
PRINTMANAGER_DESC= Print manager
-PRINTMANAGER_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kcm_printer_manager.so:${PORTSDIR}/print/kde4-print-manager
+PRINTMANAGER_RUN_DEPENDS= ${KDE4_PREFIX}/lib/kde4/kcm_printer_manager.so:print/kde4-print-manager
SUPERKARAMBA_DESC= Widget framework SuperKaramba
-SUPERKARAMBA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/superkaramba:${PORTSDIR}/deskutils/superkaramba
+SUPERKARAMBA_RUN_DEPENDS= ${KDE4_PREFIX}/bin/superkaramba:deskutils/superkaramba
SWEEPER_DESC= System cleaner Sweeper
-SWEEPER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/sweeper:${PORTSDIR}/sysutils/sweeper
+SWEEPER_RUN_DEPENDS= ${KDE4_PREFIX}/bin/sweeper:sysutils/sweeper
.include <bsd.port.mk>
diff --git a/misc/ktouch/Makefile b/misc/ktouch/Makefile
index 7c3b591536d9..43f4c9ca0783 100644
--- a/misc/ktouch/Makefile
+++ b/misc/ktouch/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR= KDE/${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
COMMENT= Touch typing tutor for KDE 4
-RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:${PORTSDIR}/graphics/kqtquickcharts
+RUN_DEPENDS= ${LOCALBASE}/lib/kde4/imports/org/kde/charts/qmldir:graphics/kqtquickcharts
USE_KDE4= kdelibs kdeprefix automoc4
USES= cmake:outsource tar:xz
diff --git a/misc/latex-mk/Makefile b/misc/latex-mk/Makefile
index d27be390a040..061b26736e0c 100644
--- a/misc/latex-mk/Makefile
+++ b/misc/latex-mk/Makefile
@@ -13,7 +13,7 @@ COMMENT= Collection of makefile and scripts for LaTeX documents
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= texi2dvi:${PORTSDIR}/print/texinfo
+BUILD_DEPENDS= texi2dvi:print/texinfo
USE_TEX= latex
USES= gmake
diff --git a/misc/lesspipe/Makefile b/misc/lesspipe/Makefile
index fa23358b8bbc..a627803b0813 100644
--- a/misc/lesspipe/Makefile
+++ b/misc/lesspipe/Makefile
@@ -11,7 +11,7 @@ COMMENT= Preprocessor for less
LICENSE= GPLv2
-MY_DEPENDS= bash:${PORTSDIR}/shells/bash
+MY_DEPENDS= bash:shells/bash
BUILD_DEPENDS= ${MY_DEPENDS}
RUN_DEPENDS= ${MY_DEPENDS}
diff --git a/misc/libisocodes/Makefile b/misc/libisocodes/Makefile
index b34b1c337e63..be8fa2741d7c 100644
--- a/misc/libisocodes/Makefile
+++ b/misc/libisocodes/Makefile
@@ -11,9 +11,9 @@ COMMENT= Interaction library for iso-codes
LICENSE= GPLv3
-BUILD_DEPENDS= valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS= libgee-0.8.so:${PORTSDIR}/devel/libgee
-RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= valac:lang/vala
+LIB_DEPENDS= libgee-0.8.so:devel/libgee
+RUN_DEPENDS= iso-codes>=0:misc/iso-codes
GNU_CONFIGURE= yes
USES= gettext gmake libtool pathfix pkgconfig tar:xz
diff --git a/misc/libmetalink/Makefile b/misc/libmetalink/Makefile
index 68c453e74efc..84e8deb798cd 100644
--- a/misc/libmetalink/Makefile
+++ b/misc/libmetalink/Makefile
@@ -28,11 +28,11 @@ PORTEXAMPLES= LibO_3.5.4_Win_x86_install_multi.msi.meta4 \
ubuntu-12.04-server-amd64.metalink
EXPAT_CONFIGURE_WITH= libexpat
-EXPAT_LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
+EXPAT_LIB_DEPENDS= libexpat.so:textproc/expat2
LIBXML2_CONFIGURE_WITH= libxml2
LIBXML2_CPPFLAGS= -I${LOCALBASE}/include/libxml2
LIBXML2_USE= GNOME=libxml2
-TEST_BUILD_DEPENDS= cunit>=2.1:${PORTSDIR}/devel/cunit
+TEST_BUILD_DEPENDS= cunit>=2.1:devel/cunit
post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/misc/libsupertone/Makefile b/misc/libsupertone/Makefile
index 8b0fe5b43222..de30190856fd 100644
--- a/misc/libsupertone/Makefile
+++ b/misc/libsupertone/Makefile
@@ -12,10 +12,10 @@ COMMENT= Library for supervisory tone generation and detection
LICENSE= LGPL21
-LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
- libspandsp.so:${PORTSDIR}/comms/spandsp \
- libtiff.so:${PORTSDIR}/graphics/tiff \
- libxml2.so:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS= libaudiofile.so:audio/libaudiofile \
+ libspandsp.so:comms/spandsp \
+ libtiff.so:graphics/tiff \
+ libxml2.so:textproc/libxml2
USES= tar:tgz libtool
GNU_CONFIGURE= yes
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 8b6dc97b9c71..18b04fca05ee 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -30,8 +30,8 @@ DOCS_DESC= Install documentation
NLS_DESC= Build with NLS support
BUILDDOCS_CONFIGURE_WITH= docs
-BUILDDOCS_BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \
- dblatex:${PORTSDIR}/textproc/dblatex
+BUILDDOCS_BUILD_DEPENDS= xmlto:textproc/xmlto \
+ dblatex:textproc/dblatex
NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
diff --git a/misc/lingoteach/Makefile b/misc/lingoteach/Makefile
index e4ce83d76949..3639460c76dc 100644
--- a/misc/lingoteach/Makefile
+++ b/misc/lingoteach/Makefile
@@ -10,7 +10,7 @@ DISTFILES= ${PORTNAME}-ui-${PORTVERSION}.tar.gz:src
MAINTAINER= ports@FreeBSD.org
COMMENT= Language teaching program with sound
-LIB_DEPENDS= liblingoteach.so:${PORTSDIR}/textproc/liblingoteach
+LIB_DEPENDS= liblingoteach.so:textproc/liblingoteach
WRKSRC= ${WRKDIR}/${PORTNAME}-ui-${PORTVERSION}
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 37a70dca64ce..08439be3e4de 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -29,7 +29,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
OPTIONS_DEFINE= SMB DOCS
OPTIONS_SUB= yes
-SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_LIB_DEPENDS= libsmbclient.so:net/samba-libsmbclient
SMB_CONFIGURE_ENV_OFF= ac_cv_lib_smbclient_smbc_new_context=no
post-patch:
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 14effcc9c224..9dcb75126e95 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -12,9 +12,9 @@ COMMENT= X11-based presentation tool
LICENSE= BSD3CLAUSE
-LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png \
- libmng.so:${PORTSDIR}/graphics/libmng
-RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS+= libpng.so:graphics/png \
+ libmng.so:graphics/libmng
+RUN_DEPENDS+= pnmscale:graphics/netpbm
MAKE_JOBS_UNSAFE= yes
@@ -49,14 +49,14 @@ NO_OPTIONS_SORT=yes
FREETYPE_PREVENTS= XFT
FREETYPE_CONFIGURE_ENABLE= freetype
-FREETYPE_LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype
+FREETYPE_LIB_DEPENDS= libttf.so:print/freetype
XFT_PREVENTS= FREETYPE
XFT_USES= iconv
XFT_USE= XORG=xft
XFT_CONFIGURE_ENABLE= xft2
XFT_CONFIGURE_ON= --enable-freetype-charset16
GIF_CONFIGURE_ENABLE= gif
-GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS= libgif.so:graphics/giflib
GIF_CPPFLAGS= -I${LOCALBASE}/include
post-patch:
diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index 826cd3bd5b4d..ea4ba988924b 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT= MHASH
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMHASH}
-LIB_DEPENDS+= libmhash.so:${PORTSDIR}/security/mhash
+LIB_DEPENDS+= libmhash.so:security/mhash
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
.else
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 3b3dc9742d0f..80d380554130 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -14,7 +14,7 @@ COMMENT= Lightweight Midnight Commander clone
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk
+RUN_DEPENDS= gawk:lang/gawk
CONFLICTS= mc-4.7*
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 6d97c57f4dec..c4eb4db1fdb5 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -54,10 +54,10 @@ NLS_USES= gettext
NLS_CPPFLAGS= -I${LOCALBASE}/include
NLS_LDFLAGS= -L${LOCALBASE}/lib
-SFTP_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2
+SFTP_LIB_DEPENDS= libssh2.so:security/libssh2
SFTP_CONFIGURE_ENABLE= vfs-sftp
-SLANG_LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LIB_DEPENDS= libslang.so:devel/libslang2
SLANG_CONFIGURE_ON= --with-screen=slang --with-slang-includes=${LOCALBASE}/include
SMB_CONFIGURE_ENABLE= vfs-smb
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index f96a99d0b62b..a0dc42d5480c 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -14,10 +14,10 @@ COMMENT= Metalink generation tool
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
- libglibmm-2.4.so:${PORTSDIR}/devel/glibmm \
- libgpg-error.so:${PORTSDIR}/security/libgpg-error \
- libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
+LIB_DEPENDS= libgcrypt.so:security/libgcrypt \
+ libglibmm-2.4.so:devel/glibmm \
+ libgpg-error.so:security/libgpg-error \
+ libsigc-2.0.so:devel/libsigc++20
USE_GNOME= glib20
GNU_CONFIGURE= yes
diff --git a/misc/najitool/Makefile b/misc/najitool/Makefile
index ec285ff78c00..b30bc2d1b063 100644
--- a/misc/najitool/Makefile
+++ b/misc/najitool/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates, converts, and filters files
-BUILD_DEPENDS= ${LOCALBASE}/lib/libnaji.a:${PORTSDIR}/devel/libnaji
+BUILD_DEPENDS= ${LOCALBASE}/lib/libnaji.a:devel/libnaji
PLIST_FILES= bin/najitool
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index 20500282f27b..30baff2a08e9 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -23,11 +23,11 @@ OPTIONS_DEFINE= FLTK DOCS
OPTIONS_SUB= yes
FLTK_DESC= Install FLTK GUI
-FLTK_LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
- libfreetype.so:${PORTSDIR}/print/freetype2 \
- libexpat.so:${PORTSDIR}/textproc/expat2 \
- libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libfltk_images.so:${PORTSDIR}/x11-toolkits/fltk
+FLTK_LIB_DEPENDS= libpthread-stubs.so:devel/libpthread-stubs \
+ libfreetype.so:print/freetype2 \
+ libexpat.so:textproc/expat2 \
+ libfontconfig.so:x11-fonts/fontconfig \
+ libfltk_images.so:x11-toolkits/fltk
FLTK_USE= XORG=x11,xau,xcb,xdmcp,xext,xft,xinerama,xpm,xrender
FLTK_MAKE_ENV= HAVE_FLTK=1 FLTK_NUT="fltk/Nut"
FLTK_MAKE_ENV_OFF= HAVE_FLTK=0 FLTK_NUT=""
diff --git a/misc/openr2/Makefile b/misc/openr2/Makefile
index b2dc0ca32a80..de1af4e45826 100644
--- a/misc/openr2/Makefile
+++ b/misc/openr2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= fjoe@FreeBSD.org
COMMENT= MFC/R2 call setup library
-BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:${PORTSDIR}/misc/dahdi
+BUILD_DEPENDS= ${LOCALBASE}/include/dahdi/user.h:misc/dahdi
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/misc/p5-Array-Compare/Makefile b/misc/p5-Array-Compare/Makefile
index 857b34c16d7d..1431b68c2b90 100644
--- a/misc/p5-Array-Compare/Makefile
+++ b/misc/p5-Array-Compare/Makefile
@@ -15,10 +15,10 @@ COMMENT= Perl extension for comparing arrays
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Moo>0:${PORTSDIR}/devel/p5-Moo \
- p5-Type-Tiny>0:${PORTSDIR}/devel/p5-Type-Tiny
+BUILD_DEPENDS= p5-Moo>0:devel/p5-Moo \
+ p5-Type-Tiny>0:devel/p5-Type-Tiny
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-NoWarnings>0:${PORTSDIR}/devel/p5-Test-NoWarnings
+TEST_DEPENDS= p5-Test-NoWarnings>0:devel/p5-Test-NoWarnings
USES= perl5
USE_PERL5= modbuild
diff --git a/misc/p5-Array-Diff/Makefile b/misc/p5-Array-Diff/Makefile
index 3e023cb77c82..8449929bb9c8 100644
--- a/misc/p5-Array-Diff/Makefile
+++ b/misc/p5-Array-Diff/Makefile
@@ -14,8 +14,8 @@ COMMENT= Diff two arrays
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Algorithm-Diff>=1.19:${PORTSDIR}/devel/p5-Algorithm-Diff \
- p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor
+BUILD_DEPENDS= p5-Algorithm-Diff>=1.19:devel/p5-Algorithm-Diff \
+ p5-Class-Accessor>=0:devel/p5-Class-Accessor
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
diff --git a/misc/p5-Asterisk-FastAGI/Makefile b/misc/p5-Asterisk-FastAGI/Makefile
index 8b076a2bf8ef..6590563d2b2b 100644
--- a/misc/p5-Asterisk-FastAGI/Makefile
+++ b/misc/p5-Asterisk-FastAGI/Makefile
@@ -14,12 +14,12 @@ COMMENT= Perl module for FastAGI handling
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Module-Install>=0:${PORTSDIR}/devel/p5-Module-Install \
- p5-Asterisk>=0:${PORTSDIR}/misc/p5-Asterisk \
- p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
- p5-File-Remove>=0:${PORTSDIR}/devel/p5-File-Remove
-RUN_DEPENDS= p5-Asterisk>=0:${PORTSDIR}/misc/p5-Asterisk \
- p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server
+BUILD_DEPENDS= p5-Module-Install>=0:devel/p5-Module-Install \
+ p5-Asterisk>=0:misc/p5-Asterisk \
+ p5-Net-Server>=0:net/p5-Net-Server \
+ p5-File-Remove>=0:devel/p5-File-Remove
+RUN_DEPENDS= p5-Asterisk>=0:misc/p5-Asterisk \
+ p5-Net-Server>=0:net/p5-Net-Server
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Bot-Training-MegaHAL/Makefile b/misc/p5-Bot-Training-MegaHAL/Makefile
index 98afcb106b1c..4ca936f6ea01 100644
--- a/misc/p5-Bot-Training-MegaHAL/Makefile
+++ b/misc/p5-Bot-Training-MegaHAL/Makefile
@@ -15,9 +15,9 @@ COMMENT= Provide megahal.trn via Bot::Training
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-ShareDir-Install>=0:${PORTSDIR}/devel/p5-File-ShareDir-Install
-RUN_DEPENDS= p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
- p5-Bot-Training>=0:${PORTSDIR}/misc/p5-Bot-Training
+BUILD_DEPENDS= p5-File-ShareDir-Install>=0:devel/p5-File-ShareDir-Install
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+ p5-Bot-Training>=0:misc/p5-Bot-Training
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Bot-Training-StarCraft/Makefile b/misc/p5-Bot-Training-StarCraft/Makefile
index b05912461497..c3bbd8232a89 100644
--- a/misc/p5-Bot-Training-StarCraft/Makefile
+++ b/misc/p5-Bot-Training-StarCraft/Makefile
@@ -15,9 +15,9 @@ COMMENT= Provide starcraft.trn via Bot::Training
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-File-ShareDir-Install>=0.03:${PORTSDIR}/devel/p5-File-ShareDir-Install
-RUN_DEPENDS= p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
- p5-Bot-Training>=0:${PORTSDIR}/misc/p5-Bot-Training
+BUILD_DEPENDS= p5-File-ShareDir-Install>=0.03:devel/p5-File-ShareDir-Install
+RUN_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+ p5-Bot-Training>=0:misc/p5-Bot-Training
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Bot-Training/Makefile b/misc/p5-Bot-Training/Makefile
index 80a4a9013893..6c423ea0a508 100644
--- a/misc/p5-Bot-Training/Makefile
+++ b/misc/p5-Bot-Training/Makefile
@@ -15,15 +15,15 @@ COMMENT= Plain text training material for bots like Hailo and MegaHAL
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Any-Moose>=0:${PORTSDIR}/devel/p5-Any-Moose \
- p5-Dir-Self>=0:${PORTSDIR}/devel/p5-Dir-Self \
- p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir \
- p5-File-Slurp>=0:${PORTSDIR}/devel/p5-File-Slurp \
- p5-Moose>=0.82:${PORTSDIR}/devel/p5-Moose \
- p5-MooseX-Getopt>=0:${PORTSDIR}/devel/p5-MooseX-Getopt \
- p5-Mouse>=0:${PORTSDIR}/devel/p5-Mouse \
- p5-MouseX-Getopt>=0:${PORTSDIR}/devel/p5-MouseX-Getopt \
- p5-namespace-clean>=0:${PORTSDIR}/devel/p5-namespace-clean
+BUILD_DEPENDS= p5-Any-Moose>=0:devel/p5-Any-Moose \
+ p5-Dir-Self>=0:devel/p5-Dir-Self \
+ p5-File-ShareDir>=0:devel/p5-File-ShareDir \
+ p5-File-Slurp>=0:devel/p5-File-Slurp \
+ p5-Moose>=0.82:devel/p5-Moose \
+ p5-MooseX-Getopt>=0:devel/p5-MooseX-Getopt \
+ p5-Mouse>=0:devel/p5-Mouse \
+ p5-MouseX-Getopt>=0:devel/p5-MouseX-Getopt \
+ p5-namespace-clean>=0:devel/p5-namespace-clean
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
diff --git a/misc/p5-Business-EDI/Makefile b/misc/p5-Business-EDI/Makefile
index 6d779417a90d..93732485bba6 100644
--- a/misc/p5-Business-EDI/Makefile
+++ b/misc/p5-Business-EDI/Makefile
@@ -15,11 +15,11 @@ COMMENT= Class for generating EDI objects and subobjects
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Exporter-Easy>=0.14:${PORTSDIR}/devel/p5-Exporter-Easy \
- p5-File-Find-Rule>=0.32:${PORTSDIR}/devel/p5-File-Find-Rule \
- p5-JSON-XS>=2.01:${PORTSDIR}/converters/p5-JSON-XS \
- p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
- p5-UNIVERSAL-require>=0.10:${PORTSDIR}/devel/p5-UNIVERSAL-require
+BUILD_DEPENDS= p5-Exporter-Easy>=0.14:devel/p5-Exporter-Easy \
+ p5-File-Find-Rule>=0.32:devel/p5-File-Find-Rule \
+ p5-JSON-XS>=2.01:converters/p5-JSON-XS \
+ p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+ p5-UNIVERSAL-require>=0.10:devel/p5-UNIVERSAL-require
RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/atz-${PORTNAME}-327e01f
diff --git a/misc/p5-Business-Hours/Makefile b/misc/p5-Business-Hours/Makefile
index 0a2f03b0c5e6..304fdf217dc4 100644
--- a/misc/p5-Business-Hours/Makefile
+++ b/misc/p5-Business-Hours/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX= p5-
MAINTAINER= matthew@FreeBSD.org
COMMENT= Calculate business hours during a time period
-BUILD_DEPENDS= p5-Set-IntSpan>1.12:${PORTSDIR}/math/p5-Set-IntSpan
+BUILD_DEPENDS= p5-Set-IntSpan>1.12:math/p5-Set-IntSpan
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-Pod>-1.0:${PORTSDIR}/devel/p5-Test-Pod \
- p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS= p5-Test-Pod>-1.0:devel/p5-Test-Pod \
+ p5-Test-Pod-Coverage>0:devel/p5-Test-Pod-Coverage
NO_ARCH= yes
diff --git a/misc/p5-Business-ISBN-Data/Makefile b/misc/p5-Business-ISBN-Data/Makefile
index f2ca85af8053..7520f419b05b 100644
--- a/misc/p5-Business-ISBN-Data/Makefile
+++ b/misc/p5-Business-ISBN-Data/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
COMMENT= Data pack for Business::ISBN
-BUILD_DEPENDS= p5-ExtUtils-MakeMaker>=6.65:${PORTSDIR}/devel/p5-ExtUtils-MakeMaker
+BUILD_DEPENDS= p5-ExtUtils-MakeMaker>=6.65:devel/p5-ExtUtils-MakeMaker
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Business-ISBN/Makefile b/misc/p5-Business-ISBN/Makefile
index c4b13b26041b..24ae74d92144 100644
--- a/misc/p5-Business-ISBN/Makefile
+++ b/misc/p5-Business-ISBN/Makefile
@@ -14,10 +14,10 @@ COMMENT= Work with International Standard Book Numbers
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Business-ISBN-Data>=20140910.002:${PORTSDIR}/misc/p5-Business-ISBN-Data \
- p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious
+BUILD_DEPENDS= p5-Business-ISBN-Data>=20140910.002:misc/p5-Business-ISBN-Data \
+ p5-Mojolicious>=0:www/p5-Mojolicious
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
+TEST_DEPENDS= p5-GD-Barcode>=0:graphics/p5-GD-Barcode
OPTIONS_DEFINE= BARCODE XISBN
BARCODE_DESC= Barcode support
@@ -29,9 +29,9 @@ NO_ARCH= yes
USES= perl5
USE_PERL5= configure
-BARCODE_BUILD_DEPENDS= p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-BARCODE_RUN_DEPENDS= p5-GD-Barcode>=0:${PORTSDIR}/graphics/p5-GD-Barcode
-XISBN_BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-XISBN_RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BARCODE_BUILD_DEPENDS= p5-GD-Barcode>=0:graphics/p5-GD-Barcode
+BARCODE_RUN_DEPENDS= p5-GD-Barcode>=0:graphics/p5-GD-Barcode
+XISBN_BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
+XISBN_RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
.include <bsd.port.mk>
diff --git a/misc/p5-Business-ISIN/Makefile b/misc/p5-Business-ISIN/Makefile
index e1683a69d104..d22ee01c9f23 100644
--- a/misc/p5-Business-ISIN/Makefile
+++ b/misc/p5-Business-ISIN/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Validate International Securities Identification Numbers
-BUILD_DEPENDS= p5-Locale-Codes>=0:${PORTSDIR}/misc/p5-Locale-Codes
+BUILD_DEPENDS= p5-Locale-Codes>=0:misc/p5-Locale-Codes
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5 tar:tgz
diff --git a/misc/p5-Business-UPS/Makefile b/misc/p5-Business-UPS/Makefile
index f355a3fc64bf..f223b4418194 100644
--- a/misc/p5-Business-UPS/Makefile
+++ b/misc/p5-Business-UPS/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= UPS Interface Module
-BUILD_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
diff --git a/misc/p5-Geo-Cache/Makefile b/misc/p5-Geo-Cache/Makefile
index a35895d45f35..2379b8268810 100644
--- a/misc/p5-Geo-Cache/Makefile
+++ b/misc/p5-Geo-Cache/Makefile
@@ -14,8 +14,8 @@ COMMENT= Object interface for GPS waypoints
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules \
- p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS= p5-Time-modules>=0:devel/p5-Time-modules \
+ p5-XML-Simple>=0:textproc/p5-XML-Simple
BUILD_DEPENDS:= ${RUN_DEPENDS}
USES= perl5
diff --git a/misc/p5-Geo-Coder-Bing/Makefile b/misc/p5-Geo-Coder-Bing/Makefile
index bf8637ec6936..0bda5bce243a 100644
--- a/misc/p5-Geo-Coder-Bing/Makefile
+++ b/misc/p5-Geo-Coder-Bing/Makefile
@@ -13,11 +13,11 @@ COMMENT= Geocode addresses with the Bing Maps API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=6.02:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-Geocoder-US/Makefile b/misc/p5-Geo-Coder-Geocoder-US/Makefile
index d3c035620f1c..ff0c8b83a526 100644
--- a/misc/p5-Geo-Coder-Geocoder-US/Makefile
+++ b/misc/p5-Geo-Coder-Geocoder-US/Makefile
@@ -13,9 +13,9 @@ COMMENT= Geocode a location using http://geocoder.us/
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Text-CSV>=0:${PORTSDIR}/textproc/p5-Text-CSV \
- p5-URI>=0:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-Text-CSV>=0:textproc/p5-Text-CSV \
+ p5-URI>=0:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
DEPRECATED= http://geocoder.us/ disappeared in late 2015
diff --git a/misc/p5-Geo-Coder-Google/Makefile b/misc/p5-Geo-Coder-Google/Makefile
index d06e9f83db14..2f326c40181f 100644
--- a/misc/p5-Geo-Coder-Google/Makefile
+++ b/misc/p5-Geo-Coder-Google/Makefile
@@ -13,13 +13,13 @@ COMMENT= Google Maps Geocoding API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
- p5-JSON>=2.27:${PORTSDIR}/converters/p5-JSON \
- p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
- p5-URI>=0:${PORTSDIR}/net/p5-URI \
- p5-libwww>=5.5:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-Digest-HMAC>=0:security/p5-Digest-HMAC \
+ p5-JSON>=2.27:converters/p5-JSON \
+ p5-HTTP-Message>=0:www/p5-HTTP-Message \
+ p5-URI>=0:net/p5-URI \
+ p5-libwww>=5.5:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS= p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta
PORTSCOUT= limit:^[0-9\.]*$$
diff --git a/misc/p5-Geo-Coder-Googlev3/Makefile b/misc/p5-Geo-Coder-Googlev3/Makefile
index e70712d5c529..04ef4c942dd1 100644
--- a/misc/p5-Geo-Coder-Googlev3/Makefile
+++ b/misc/p5-Geo-Coder-Googlev3/Makefile
@@ -14,9 +14,9 @@ COMMENT= Google Maps v3 Geocoding API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON-XS>=0:${PORTSDIR}/converters/p5-JSON-XS \
- p5-URI>=0:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON-XS>=0:converters/p5-JSON-XS \
+ p5-URI>=0:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-Many/Makefile b/misc/p5-Geo-Coder-Many/Makefile
index e64de141ddd6..b6731868f1d8 100644
--- a/misc/p5-Geo-Coder-Many/Makefile
+++ b/misc/p5-Geo-Coder-Many/Makefile
@@ -15,24 +15,24 @@ COMMENT= Module to tie together multiple Geo::Coder::* modules
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Geo-Coder-Bing>=0.10:${PORTSDIR}/misc/p5-Geo-Coder-Bing \
- p5-Geo-Coder-Google>=0.06:${PORTSDIR}/misc/p5-Geo-Coder-Google \
- p5-Geo-Coder-Googlev3>=0.07:${PORTSDIR}/misc/p5-Geo-Coder-Googlev3 \
- p5-Geo-Coder-Mapquest>=0.05:${PORTSDIR}/misc/p5-Geo-Coder-Mapquest \
- p5-Geo-Coder-Multimap>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-Multimap \
- p5-Geo-Coder-OSM>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-OSM \
- p5-Geo-Coder-OpenCage>=0:${PORTSDIR}/misc/p5-Geo-Coder-OpenCage \
- p5-Geo-Coder-Ovi>=0.01:${PORTSDIR}/misc/p5-Geo-Coder-Ovi \
- p5-Geo-Coder-PlaceFinder>=0.02:${PORTSDIR}/misc/p5-Geo-Coder-PlaceFinder \
- p5-Geo-Distance-XS>=0.08:${PORTSDIR}/math/p5-Geo-Distance-XS \
- p5-HTTP-Message>=5.827:${PORTSDIR}/www/p5-HTTP-Message \
- p5-List-MoreUtils>=0.22:${PORTSDIR}/lang/p5-List-MoreUtils \
- p5-List-Util-WeightedRoundRobin>=0.4:${PORTSDIR}/misc/p5-List-Util-WeightedRoundRobin \
- p5-Sort-Versions>=1.5:${PORTSDIR}/devel/p5-Sort-Versions
+BUILD_DEPENDS= p5-Geo-Coder-Bing>=0.10:misc/p5-Geo-Coder-Bing \
+ p5-Geo-Coder-Google>=0.06:misc/p5-Geo-Coder-Google \
+ p5-Geo-Coder-Googlev3>=0.07:misc/p5-Geo-Coder-Googlev3 \
+ p5-Geo-Coder-Mapquest>=0.05:misc/p5-Geo-Coder-Mapquest \
+ p5-Geo-Coder-Multimap>=0.01:misc/p5-Geo-Coder-Multimap \
+ p5-Geo-Coder-OSM>=0.01:misc/p5-Geo-Coder-OSM \
+ p5-Geo-Coder-OpenCage>=0:misc/p5-Geo-Coder-OpenCage \
+ p5-Geo-Coder-Ovi>=0.01:misc/p5-Geo-Coder-Ovi \
+ p5-Geo-Coder-PlaceFinder>=0.02:misc/p5-Geo-Coder-PlaceFinder \
+ p5-Geo-Distance-XS>=0.08:math/p5-Geo-Distance-XS \
+ p5-HTTP-Message>=5.827:www/p5-HTTP-Message \
+ p5-List-MoreUtils>=0.22:lang/p5-List-MoreUtils \
+ p5-List-Util-WeightedRoundRobin>=0.4:misc/p5-List-Util-WeightedRoundRobin \
+ p5-Sort-Versions>=1.5:devel/p5-Sort-Versions
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-Exception>=0:${PORTSDIR}/devel/p5-Test-Exception \
- p5-Test-MockObject>=0:${PORTSDIR}/devel/p5-Test-MockObject \
- p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
+TEST_DEPENDS= p5-Test-Exception>=0:devel/p5-Test-Exception \
+ p5-Test-MockObject>=0:devel/p5-Test-MockObject \
+ p5-Test-Pod-Coverage>=0:devel/p5-Test-Pod-Coverage
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Geo-Coder-Mapquest/Makefile b/misc/p5-Geo-Coder-Mapquest/Makefile
index 086d8f6bec46..c962b862072e 100644
--- a/misc/p5-Geo-Coder-Mapquest/Makefile
+++ b/misc/p5-Geo-Coder-Mapquest/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with Mapquest
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=6.02:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=6.02:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-Multimap/Makefile b/misc/p5-Geo-Coder-Multimap/Makefile
index 18ae7c02f2de..a77d745374f8 100644
--- a/misc/p5-Geo-Coder-Multimap/Makefile
+++ b/misc/p5-Geo-Coder-Multimap/Makefile
@@ -14,10 +14,10 @@ COMMENT= Geocode addresses with the Multimap Open API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-Multiple/Makefile b/misc/p5-Geo-Coder-Multiple/Makefile
index 7b9d9d316dc2..24349ba8d753 100644
--- a/misc/p5-Geo-Coder-Multiple/Makefile
+++ b/misc/p5-Geo-Coder-Multiple/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-0.6
MAINTAINER= wen@FreeBSD.org
COMMENT= Perl module to tie together multiple Geo::Coder modules
-RUN_DEPENDS= p5-List-Util-WeightedRoundRobin>=0:${PORTSDIR}/misc/p5-List-Util-WeightedRoundRobin
+RUN_DEPENDS= p5-List-Util-WeightedRoundRobin>=0:misc/p5-List-Util-WeightedRoundRobin
BUILD_DEPENDS:= ${RUN_DEPENDS}
USES= perl5
diff --git a/misc/p5-Geo-Coder-Navteq/Makefile b/misc/p5-Geo-Coder-Navteq/Makefile
index 0a9dd1d06d4f..f5dd622bcc83 100644
--- a/misc/p5-Geo-Coder-Navteq/Makefile
+++ b/misc/p5-Geo-Coder-Navteq/Makefile
@@ -14,9 +14,9 @@ COMMENT= Geocode addresses with the Navteq MapTP AJAX API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-URI>=1.36:net/p5-URI \
+ p5-XML-Simple>=0:textproc/p5-XML-Simple \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-OSM/Makefile b/misc/p5-Geo-Coder-OSM/Makefile
index 4d87d741dc79..5ad6bdb0a447 100644
--- a/misc/p5-Geo-Coder-OSM/Makefile
+++ b/misc/p5-Geo-Coder-OSM/Makefile
@@ -14,10 +14,10 @@ COMMENT= Geocode addresses with the OpenStreetMap Nominatim API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-OpenCage/Makefile b/misc/p5-Geo-Coder-OpenCage/Makefile
index 399da978f08f..d637ce8f58c0 100644
--- a/misc/p5-Geo-Coder-OpenCage/Makefile
+++ b/misc/p5-Geo-Coder-OpenCage/Makefile
@@ -14,11 +14,11 @@ COMMENT= Geocode addresses with the OpenCage Geocoder API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2.53:${PORTSDIR}/converters/p5-JSON \
- p5-List-MoreUtils>=0.33:${PORTSDIR}/lang/p5-List-MoreUtils \
- p5-URI>=1.60:${PORTSDIR}/net/p5-URI
+BUILD_DEPENDS= p5-JSON>=2.53:converters/p5-JSON \
+ p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+ p5-URI>=1.60:net/p5-URI
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-Exception>=0.32:${PORTSDIR}/devel/p5-Test-Exception
+TEST_DEPENDS= p5-Test-Exception>=0.32:devel/p5-Test-Exception
NO_ARCH= yes
USE_PERL5= configure
@@ -27,10 +27,10 @@ USES= perl5
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 502000
-BUILD_DEPENDS+= p5-HTTP-Tiny>=0.028:${PORTSDIR}/www/p5-HTTP-Tiny \
- p5-Pod-Perldoc>=3.21:${PORTSDIR}/textproc/p5-Pod-Perldoc
-RUN_DEPENDS+= p5-HTTP-Tiny>=0.028:${PORTSDIR}/www/p5-HTTP-Tiny \
- p5-Pod-Perldoc>=3.21:${PORTSDIR}/textproc/p5-Pod-Perldoc
+BUILD_DEPENDS+= p5-HTTP-Tiny>=0.028:www/p5-HTTP-Tiny \
+ p5-Pod-Perldoc>=3.21:textproc/p5-Pod-Perldoc
+RUN_DEPENDS+= p5-HTTP-Tiny>=0.028:www/p5-HTTP-Tiny \
+ p5-Pod-Perldoc>=3.21:textproc/p5-Pod-Perldoc
.endif
.include <bsd.port.post.mk>
diff --git a/misc/p5-Geo-Coder-Ovi/Makefile b/misc/p5-Geo-Coder-Ovi/Makefile
index e36c9f8374ca..3edf59d93667 100644
--- a/misc/p5-Geo-Coder-Ovi/Makefile
+++ b/misc/p5-Geo-Coder-Ovi/Makefile
@@ -14,10 +14,10 @@ COMMENT= Geocode addresses with the Ovi Maps API
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-PlaceFinder/Makefile b/misc/p5-Geo-Coder-PlaceFinder/Makefile
index 7a79da425fce..94eb10a5aa27 100644
--- a/misc/p5-Geo-Coder-PlaceFinder/Makefile
+++ b/misc/p5-Geo-Coder-PlaceFinder/Makefile
@@ -14,10 +14,10 @@ COMMENT= Geocode addresses with Yahoo PlaceFinder
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Coder-TomTom/Makefile b/misc/p5-Geo-Coder-TomTom/Makefile
index dc2e8cbadef1..56d86b5d514c 100644
--- a/misc/p5-Geo-Coder-TomTom/Makefile
+++ b/misc/p5-Geo-Coder-TomTom/Makefile
@@ -13,11 +13,11 @@ COMMENT= Geocode addresses with the TomTom route planner
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-JSON>=2:${PORTSDIR}/converters/p5-JSON \
- p5-JSON-XS>=2:${PORTSDIR}/converters/p5-JSON-XS \
- p5-LWP-Protocol-https>=6.02:${PORTSDIR}/www/p5-LWP-Protocol-https \
- p5-URI>=1.36:${PORTSDIR}/net/p5-URI \
- p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS= p5-JSON>=2:converters/p5-JSON \
+ p5-JSON-XS>=2:converters/p5-JSON-XS \
+ p5-LWP-Protocol-https>=6.02:www/p5-LWP-Protocol-https \
+ p5-URI>=1.36:net/p5-URI \
+ p5-libwww>=0:www/p5-libwww
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-GeoNames/Makefile b/misc/p5-Geo-GeoNames/Makefile
index 72e844e26a5e..e2b6036265b7 100644
--- a/misc/p5-Geo-GeoNames/Makefile
+++ b/misc/p5-Geo-GeoNames/Makefile
@@ -13,9 +13,9 @@ COMMENT= Perform geographical queries using GeoNames Web Services
LICENSE= ART20
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= p5-JSON>=1.14:${PORTSDIR}/converters/p5-JSON \
- p5-Mojolicious>=0:${PORTSDIR}/www/p5-Mojolicious \
- p5-XML-Simple>=2.13:${PORTSDIR}/textproc/p5-XML-Simple
+BUILD_DEPENDS= p5-JSON>=1.14:converters/p5-JSON \
+ p5-Mojolicious>=0:www/p5-Mojolicious \
+ p5-XML-Simple>=2.13:textproc/p5-XML-Simple
RUN_DEPENDS:= ${BUILD_DEPENDS}
NO_ARCH= yes
diff --git a/misc/p5-Geo-Postcodes-DK/Makefile b/misc/p5-Geo-Postcodes-DK/Makefile
index 4e6b7595014b..77da2ce0c78c 100644
--- a/misc/p5-Geo-Postcodes-DK/Makefile
+++ b/misc/p5-Geo-Postcodes-DK/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Danish postcodes with associated information
-BUILD_DEPENDS= p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
-RUN_DEPENDS= p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
+BUILD_DEPENDS= p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
+RUN_DEPENDS= p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Geo-Postcodes-NO/Makefile b/misc/p5-Geo-Postcodes-NO/Makefile
index 3afbcb2e0349..f61cc5e8b2f1 100644
--- a/misc/p5-Geo-Postcodes-NO/Makefile
+++ b/misc/p5-Geo-Postcodes-NO/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Norwegian postcodes with associated information
-BUILD_DEPENDS= p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
-RUN_DEPENDS= p5-Geo-Postcodes>=0.31:${PORTSDIR}/misc/p5-Geo-Postcodes
+BUILD_DEPENDS= p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
+RUN_DEPENDS= p5-Geo-Postcodes>=0.31:misc/p5-Geo-Postcodes
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index eaf59af77ffa..9462e7bae9e8 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= p5-
MAINTAINER= perl@FreeBSD.org
COMMENT= Perl module to retrieve weather information from weather.com
-RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index deed84f8bc9c..d9216cee124a 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -12,9 +12,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/\.(.)$/\1/}
MAINTAINER= demon@FreeBSD.org
COMMENT= Module which maps CharSet names to the names registered with IANA
-BUILD_DEPENDS= p5-IO-Capture>=0:${PORTSDIR}/devel/p5-IO-Capture
-RUN_DEPENDS= p5-IO-String>=0:${PORTSDIR}/devel/p5-IO-String \
- p5-Unicode-MapUTF8>=0:${PORTSDIR}/converters/p5-Unicode-MapUTF8
+BUILD_DEPENDS= p5-IO-Capture>=0:devel/p5-IO-Capture
+RUN_DEPENDS= p5-IO-String>=0:devel/p5-IO-String \
+ p5-Unicode-MapUTF8>=0:converters/p5-Unicode-MapUTF8
USES= perl5
USE_PERL5= configure
diff --git a/misc/p5-Locale-Geocode/Makefile b/misc/p5-Locale-Geocode/Makefile
index 160517f21897..ddcb3aeb91dd 100644
--- a/misc/p5-Locale-Geocode/Makefile
+++ b/misc/p5-Locale-Geocode/Makefile
@@ -12,8 +12,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:C/0$//}
MAINTAINER= perl@FreeBSD.org
COMMENT= Find codes and information on geographical location
-RUN_DEPENDS= p5-XML-SAX-Expat>=0.39:${PORTSDIR}/textproc/p5-XML-SAX-Expat \
- p5-XML-Simple>=2.16:${PORTSDIR}/textproc/p5-XML-Simple
+RUN_DEPENDS= p5-XML-SAX-Expat>=0.39:textproc/p5-XML-SAX-Expat \
+ p5-XML-Simple>=2.16:textproc/p5-XML-Simple
BUILD_DEPENDS:= ${RUN_DEPENDS}
USES= perl5
diff --git a/misc/p5-Locale-US/Makefile b/misc/p5-Locale-US/Makefile
index b0d58896d800..f8c442a9c1d7 100644
--- a/misc/p5-Locale-US/Makefile
+++ b/misc/p5-Locale-US/Makefile
@@ -15,7 +15,7 @@ COMMENT= Two letter codes for state identification in the United States
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Section-Simple>=0:${PORTSDIR}/devel/p5-Data-Section-Simple
+BUILD_DEPENDS= p5-Data-Section-Simple>=0:devel/p5-Data-Section-Simple
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= perl5
diff --git a/misc/p5-OSSP-uuid/Makefile b/misc/p5-OSSP-uuid/Makefile
index 0c4556e4c43b..bf45d570336f 100644
--- a/misc/p5-OSSP-uuid/Makefile
+++ b/misc/p5-OSSP-uuid/Makefile
@@ -3,7 +3,7 @@
COMMENT= Perl bindings for ossp-uuid
-BUILD_DEPENDS= ${LOCALBASE}/lib/libossp-uuid.a:${PORTSDIR}/misc/ossp-uuid
+BUILD_DEPENDS= ${LOCALBASE}/lib/libossp-uuid.a:misc/ossp-uuid
SLAVEPORT= perl
USES= perl5
diff --git a/misc/p5-Software-License-CCpack/Makefile b/misc/p5-Software-License-CCpack/Makefile
index 635fbcedceef..35dd9ecbab23 100644
--- a/misc/p5-Software-License-CCpack/Makefile
+++ b/misc/p5-Software-License-CCpack/Makefile
@@ -13,9 +13,9 @@ COMMENT= Software::License pack for Creative Commons licenses
LICENSE= LGPL3
-BUILD_DEPENDS= p5-Software-License>=0:${PORTSDIR}/misc/p5-Software-License
+BUILD_DEPENDS= p5-Software-License>=0:misc/p5-Software-License
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Test-CheckDeps>=0.010:${PORTSDIR}/devel/p5-Test-CheckDeps
+TEST_DEPENDS= p5-Test-CheckDeps>=0.010:devel/p5-Test-CheckDeps
NO_ARCH= yes
USE_PERL5= configure
diff --git a/misc/p5-Software-License/Makefile b/misc/p5-Software-License/Makefile
index cb8a0cef5275..40831558aef5 100644
--- a/misc/p5-Software-License/Makefile
+++ b/misc/p5-Software-License/Makefile
@@ -14,11 +14,11 @@ COMMENT= Packages that provide templated software licenses
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-BUILD_DEPENDS= p5-Data-Section>=0:${PORTSDIR}/devel/p5-Data-Section \
- p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
- p5-Text-Template>=0:${PORTSDIR}/textproc/p5-Text-Template
+BUILD_DEPENDS= p5-Data-Section>=0:devel/p5-Data-Section \
+ p5-MRO-Compat>=0:devel/p5-MRO-Compat \
+ p5-Text-Template>=0:textproc/p5-Text-Template
RUN_DEPENDS:= ${BUILD_DEPENDS}
-TEST_DEPENDS= p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny
+TEST_DEPENDS= p5-Try-Tiny>=0:lang/p5-Try-Tiny
NO_ARCH= yes
USES= perl5
diff --git a/misc/p5-Text-FIGlet/Makefile b/misc/p5-Text-FIGlet/Makefile
index 11a17d0bc99e..4b50d1503605 100644
--- a/misc/p5-Text-FIGlet/Makefile
+++ b/misc/p5-Text-FIGlet/Makefile
@@ -14,9 +14,9 @@ COMMENT= Perl module to provide FIGlet abilities, akin to banner
LICENSE= ART10 GPLv1
LICENSE_COMB= dual
-RUN_DEPENDS= figlet:${PORTSDIR}/misc/figlet
-TEST_DEPENDS= p5-Test-Differences>=0:${PORTSDIR}/devel/p5-Test-Differences \
- p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+RUN_DEPENDS= figlet:misc/figlet
+TEST_DEPENDS= p5-Test-Differences>=0:devel/p5-Test-Differences \
+ p5-Test-Pod>=1:devel/p5-Test-Pod
NO_ARCH= yes
REINPLACE_ARGS= -i ''
diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile
index ef27e64be2c9..6e8f40431f29 100644
--- a/misc/pastebinit/Makefile
+++ b/misc/pastebinit/Makefile
@@ -12,7 +12,7 @@ COMMENT= Command line utility for pastebing
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-configobj
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:devel/py-configobj
USES= python:run shebangfix tar:bzip2
SHEBANG_FILES= pastebinit
diff --git a/misc/patchutils/Makefile b/misc/patchutils/Makefile
index 0f3077be13ad..7bc615d5ccff 100644
--- a/misc/patchutils/Makefile
+++ b/misc/patchutils/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://cyberelk.net/tim/data/patchutils/stable/
MAINTAINER= johans@FreeBSD.org
COMMENT= Small collection of programs that operate on patch files
-RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
+RUN_DEPENDS= bash:shells/bash
USES= perl5 shebangfix tar:xz
USE_PERL5= run build patch
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 68b506decb92..fad1fb414979 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple console menu program
LICENSE= GPLv2
-LIB_DEPENDS= libslang.so:${PORTSDIR}/devel/libslang2
+LIB_DEPENDS= libslang.so:devel/libslang2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile
index c287ae22024a..198a34ed499c 100644
--- a/misc/pear-Services_Weather/Makefile
+++ b/misc/pear-Services_Weather/Makefile
@@ -11,7 +11,7 @@ COMMENT= PEAR interface to various online weather-services
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request
+RUN_DEPENDS= ${PEARDIR}/HTTP/Request.php:www/pear-HTTP_Request
PORTSCOUT= skipv:1.4.7
@@ -26,10 +26,10 @@ PEAR_DB_DESC= PEAR::DB support
PEAR_SOAP_DESC= PEAR::SOAP support
PEAR_XML_SERIALIZER_DESC= PEAR::XML::Serializer support
-PEAR_NET_FTP_BUILD_DEPENDS= ${PEARDIR}/Net/FTP.php:${PORTSDIR}/ftp/pear-Net_FTP
-PEAR_CACHE_BUILD_DEPENDS= ${PEARDIR}/Cache.php:${PORTSDIR}/sysutils/pear-Cache
-PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
-PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:${PORTSDIR}/net/pear-SOAP
-PEAR_XML_SERIALIZER_BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serializer
+PEAR_NET_FTP_BUILD_DEPENDS= ${PEARDIR}/Net/FTP.php:ftp/pear-Net_FTP
+PEAR_CACHE_BUILD_DEPENDS= ${PEARDIR}/Cache.php:sysutils/pear-Cache
+PEAR_DB_BUILD_DEPENDS= ${PEARDIR}/DB.php:databases/pear-DB
+PEAR_SOAP_BUILD_DEPENDS=${PEARDIR}/SOAP/Base.php:net/pear-SOAP
+PEAR_XML_SERIALIZER_BUILD_DEPENDS= ${PEARDIR}/XML/Serializer.php:devel/pear-XML_Serializer
.include <bsd.port.mk>
diff --git a/misc/pfm/Makefile b/misc/pfm/Makefile
index bf6b474d6dac..bde3dce8eb5d 100644
--- a/misc/pfm/Makefile
+++ b/misc/pfm/Makefile
@@ -12,10 +12,10 @@ COMMENT= Terminal (curses)-based file manager written in Perl
LICENSE= GPLv2
-RUN_DEPENDS= p5-libwww>=5.827:${PORTSDIR}/www/p5-libwww \
- p5-File-Stat-Bits>=1.01:${PORTSDIR}/sysutils/p5-File-Stat-Bits \
- p5-ReadLine-Gnu>=1.09:${PORTSDIR}/devel/p5-ReadLine-Gnu \
- p5-Term-ScreenColor>=1.13:${PORTSDIR}/devel/p5-Term-ScreenColor
+RUN_DEPENDS= p5-libwww>=5.827:www/p5-libwww \
+ p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \
+ p5-ReadLine-Gnu>=1.09:devel/p5-ReadLine-Gnu \
+ p5-Term-ScreenColor>=1.13:devel/p5-Term-ScreenColor
USES= perl5
USE_PERL5= configure
diff --git a/misc/podsleuth/Makefile b/misc/podsleuth/Makefile
index 111432019741..efda7b1e92f0 100644
--- a/misc/podsleuth/Makefile
+++ b/misc/podsleuth/Makefile
@@ -10,10 +10,10 @@ MASTER_SITES= http://download.banshee.fm/${PORTNAME}/${PORTVERSION}/
MAINTAINER= mono@FreeBSD.org
COMMENT= Tool to discover detailed model information about an iPod
-LIB_DEPENDS= libsgutils2.so:${PORTSDIR}/sysutils/sg3_utils \
- libhal.so:${PORTSDIR}/sysutils/hal
-BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
-RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
+LIB_DEPENDS= libsgutils2.so:sysutils/sg3_utils \
+ libhal.so:sysutils/hal
+BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
+RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:devel/ndesk-dbus
CONFIGURE_ARGS+=--with-hal-callouts-dir=${PREFIX}/libexec
CONFIGURE_ENV= ac_cv_path_MCS=${LOCALBASE}/bin/mcs
diff --git a/misc/py-osd/Makefile b/misc/py-osd/Makefile
index 562e20ebc232..596e9572773d 100644
--- a/misc/py-osd/Makefile
+++ b/misc/py-osd/Makefile
@@ -12,7 +12,7 @@ DISTNAME= pyosd-${PORTVERSION}
MAINTAINER= novel@FreeBSD.org
COMMENT= Python wrapper for osd, for displaying text on your X display
-LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd
+LIB_DEPENDS= libxosd.so:misc/xosd
USES= python twisted:run
USE_PYTHON= distutils autoplist
diff --git a/misc/py-spdx-lookup/Makefile b/misc/py-spdx-lookup/Makefile
index 9e1ec961dae6..9c7afe334a6e 100644
--- a/misc/py-spdx-lookup/Makefile
+++ b/misc/py-spdx-lookup/Makefile
@@ -12,7 +12,7 @@ COMMENT= SPDX license list query tool
LICENSE= BSD2CLAUSE
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:${PORTSDIR}/misc/py-spdx
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}spdx>0:misc/py-spdx
USES= python:3.3+
USE_PYTHON= autoplist distutils
diff --git a/misc/pylize/Makefile b/misc/pylize/Makefile
index 591662acbbf3..04cdc372d0a6 100644
--- a/misc/pylize/Makefile
+++ b/misc/pylize/Makefile
@@ -12,10 +12,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= dryice@dryice.name
COMMENT= Presentation generation tool
-BUILD_DEPENDS= python:${PORTSDIR}/lang/python \
- ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \
- ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
- ${PYTHON_SITELIBDIR}/em.py:${PORTSDIR}/textproc/py-empy
+BUILD_DEPENDS= python:lang/python \
+ ${PYTHON_SITELIBDIR}/HTMLgen.py:www/py-HTMLgen \
+ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+ ${PYTHON_SITELIBDIR}/em.py:textproc/py-empy
RUN_DEPENDS:= ${BUILD_DEPENDS}
USES= python:2 tar:bzip2
diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index 91446b6d4adf..f4b523a1e09f 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -28,7 +28,7 @@ CMAKE_ARGS+= -DVMCS_INSTALL_PREFIX=${PREFIX} \
OPTIONS_DEFINE= EXAMPLES DEBUG
OPTIONS_DEFAULT= EXAMPLES
EXAMPLES_DESC= Install test applications source code (hello_pi)
-EXAMPLES_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
+EXAMPLES_LIB_DEPENDS= libfreetype.so:print/freetype2
DEBUG_CFLAGS_OFF= -DNDEBUG
diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile
index 999ef7f8030a..99426ee89c5e 100644
--- a/misc/rfc/Makefile
+++ b/misc/rfc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.dewn.com/rfc/
MAINTAINER= scf@FreeBSD.org
COMMENT= Perl script to search for RFC's
-RUN_DEPENDS= w3m:${PORTSDIR}/www/w3m
+RUN_DEPENDS= w3m:www/w3m
NO_BUILD= yes
USES= perl5 shebangfix
diff --git a/misc/rubygem-rabbit/Makefile b/misc/rubygem-rabbit/Makefile
index e16b40d64cbd..e7e012c9173f 100644
--- a/misc/rubygem-rabbit/Makefile
+++ b/misc/rubygem-rabbit/Makefile
@@ -13,17 +13,17 @@ LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
LICENSE_FILE_GPLv2= ${WRKSRC}/GPL
-RUN_DEPENDS= rubygem-coderay>=1.0.0:${PORTSDIR}/textproc/rubygem-coderay \
- rubygem-faraday>0:${PORTSDIR}/www/rubygem-faraday \
- rubygem-gettext>0:${PORTSDIR}/devel/rubygem-gettext \
- rubygem-gtk2>0:${PORTSDIR}/x11-toolkits/rubygem-gtk2 \
- rubygem-hikidoc>0:${PORTSDIR}/textproc/rubygem-hikidoc \
- rubygem-kramdown>0:${PORTSDIR}/textproc/rubygem-kramdown \
- rubygem-nokogiri>0:${PORTSDIR}/textproc/rubygem-nokogiri \
- rubygem-poppler>0:${PORTSDIR}/x11-toolkits/rubygem-poppler \
- rubygem-rdtool>0:${PORTSDIR}/textproc/rubygem-rdtool \
- rubygem-rsvg2>0:${PORTSDIR}/graphics/rubygem-rsvg2 \
- rubygem-rttool>0:${PORTSDIR}/textproc/rubygem-rttool
+RUN_DEPENDS= rubygem-coderay>=1.0.0:textproc/rubygem-coderay \
+ rubygem-faraday>0:www/rubygem-faraday \
+ rubygem-gettext>0:devel/rubygem-gettext \
+ rubygem-gtk2>0:x11-toolkits/rubygem-gtk2 \
+ rubygem-hikidoc>0:textproc/rubygem-hikidoc \
+ rubygem-kramdown>0:textproc/rubygem-kramdown \
+ rubygem-nokogiri>0:textproc/rubygem-nokogiri \
+ rubygem-poppler>0:x11-toolkits/rubygem-poppler \
+ rubygem-rdtool>0:textproc/rubygem-rdtool \
+ rubygem-rsvg2>0:graphics/rubygem-rsvg2 \
+ rubygem-rttool>0:textproc/rubygem-rttool
NO_ARCH= yes
USES= gettext
@@ -36,7 +36,7 @@ PLIST_FILES= bin/rabbit bin/rabbirc bin/rabbit-command bin/rabbit-slide \
OPTIONS_DEFINE= MIMETEX
MIMETEX_DESC= Run with mimetex
-MIMETEX_RUN_DEPENDS= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:${PORTSDIR}/www/mimetex
+MIMETEX_RUN_DEPENDS= ${LOCALBASE}/www/mimetex/cgi-bin/mimetex.cgi:www/mimetex
post-patch-MIMETEX-on:
${REINPLACE_CMD} -e 's|"mimetex.cgi"|"${PREFIX}/www/mimetex/cgi-bin/mimetex.cgi"|' \
diff --git a/misc/saaghar/Makefile b/misc/saaghar/Makefile
index f72245be6bf1..c25ed2f9b02e 100644
--- a/misc/saaghar/Makefile
+++ b/misc/saaghar/Makefile
@@ -14,7 +14,7 @@ COMMENT= Persian poetry software
LICENSE= GPLv3
-EXTRACT_DEPENDS= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+EXTRACT_DEPENDS= ${LOCALBASE}/bin/unzip:archivers/unzip
OPTIONS_DEFINE= DEBUG
diff --git a/misc/smssend/Makefile b/misc/smssend/Makefile
index 5c95b1812899..92aa6846ee4e 100644
--- a/misc/smssend/Makefile
+++ b/misc/smssend/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= LOCAL/laszlof \
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to send a SMS to any GSM
-LIB_DEPENDS= libskyutils.so:${PORTSDIR}/misc/skyutils
+LIB_DEPENDS= libskyutils.so:misc/skyutils
USES= libtool shebangfix
SHEBANG_FILES= bestsms.sh email2smssend
diff --git a/misc/sshbuddy/Makefile b/misc/sshbuddy/Makefile
index 7b3666826679..5e18fdce9d48 100644
--- a/misc/sshbuddy/Makefile
+++ b/misc/sshbuddy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://linuxmafia.com/pub/linux/security/sshbuddy/
MAINTAINER= wrighrc@gmail.com
COMMENT= Simple and small GUI utility to manage ssh sessions
-RUN_DEPENDS= expect:${PORTSDIR}/lang/expect
+RUN_DEPENDS= expect:lang/expect
USES= tk
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 3e71f5e0269e..fcfe8dd8c296 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -13,7 +13,7 @@ COMMENT= Framework for manipulating Bible texts
LICENSE= GPLv2
-BUILD_DEPENDS= cppunit-config:${PORTSDIR}/devel/cppunit
+BUILD_DEPENDS= cppunit-config:devel/cppunit
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-conf --with-zlib
@@ -31,15 +31,15 @@ OPTIONS_DEFAULT=CURL CLUCENE
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS= libcurl.so:ftp/curl
CONFIGURE_ARGS+= --with-curl
.else
CONFIGURE_ARGS+= --without-curl
.endif
.if ${PORT_OPTIONS:MCLUCENE}
-LIB_DEPENDS+= libclucene-core.so:${PORTSDIR}/textproc/clucene \
- libicudata.so:${PORTSDIR}/devel/icu
+LIB_DEPENDS+= libclucene-core.so:textproc/clucene \
+ libicudata.so:devel/icu
CONFIGURE_ARGS+= --with-clucene=${LOCALBASE} --with-icu
.else
CONFIGURE_ARGS+= --without-clucene --without-icu
diff --git a/misc/telbook/Makefile b/misc/telbook/Makefile
index e8f055c1d86c..8dde06977dd1 100644
--- a/misc/telbook/Makefile
+++ b/misc/telbook/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple telephone book
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-RUN_DEPENDS= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+RUN_DEPENDS= p5-Gtk2>=0:x11-toolkits/p5-Gtk2
USES= shebangfix tar:bzip2
SHEBANG_FILES= telbook
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index b79a73c68458..fa14544b7347 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -12,11 +12,11 @@ COMMENT= Collection manager for KDE
LICENSE= GPLv2
-LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib \
- libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4 \
- libyaz.so:${PORTSDIR}/net/yaz \
- libexempi.so:${PORTSDIR}/textproc/exempi \
- libqjson.so:${PORTSDIR}/devel/qjson
+LIB_DEPENDS= libtag.so:audio/taglib \
+ libpoppler-qt4.so:graphics/poppler-qt4 \
+ libyaz.so:net/yaz \
+ libexempi.so:textproc/exempi \
+ libqjson.so:devel/qjson
USE_KDE4= kdelibs kdeprefix libksane pimlibs \
automoc4 qimageblitz libkcddb libkcompactdisc
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 91bd56556b79..38f25ccfd047 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -15,7 +15,7 @@ COMMENT= Interactive height field generation and manipulation program
LICENSE= GPLv2 GPLv3
LICENSE_COMB= dual
-BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio
+BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:devel/trio
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/misc/teslams/Makefile b/misc/teslams/Makefile
index a3493ff925bd..bbd367850392 100644
--- a/misc/teslams/Makefile
+++ b/misc/teslams/Makefile
@@ -13,8 +13,8 @@ COMMENT= Node.js implementation of Tesla Model S API client
LICENSE= BSD2CLAUSE BSD3CLAUSE APACHE20 MIT ISCL
LICENSE_COMB= multi
-BUILD_DEPENDS= npm>=0:${PORTSDIR}/www/npm
-RUN_DEPENDS= npm>=0:${PORTSDIR}/www/npm
+BUILD_DEPENDS= npm>=0:www/npm
+RUN_DEPENDS= npm>=0:www/npm
NO_ARCH= yes
NO_BUILD= yes
diff --git a/misc/toilet/Makefile b/misc/toilet/Makefile
index aefb68b80afe..6de9f0ed8847 100644
--- a/misc/toilet/Makefile
+++ b/misc/toilet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/toilet/
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced figlet(6)
-LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
+LIB_DEPENDS= libcaca.so:graphics/libcaca
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-transform-name=""
diff --git a/misc/tpp/Makefile b/misc/tpp/Makefile
index bb63cfdf4802..d8de580b5c1e 100644
--- a/misc/tpp/Makefile
+++ b/misc/tpp/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES= http://synflood.at/tpp/
MAINTAINER= ports@FreeBSD.org
COMMENT= Text presentation program
-RUN_DEPENDS= ${RUBY_SITELIBDIR}/ncurses.rb:${PORTSDIR}/devel/ruby-ncurses \
- figlet:${PORTSDIR}/misc/figlet
+RUN_DEPENDS= ${RUBY_SITELIBDIR}/ncurses.rb:devel/ruby-ncurses \
+ figlet:misc/figlet
NO_BUILD= yes
USE_RUBY= yes
diff --git a/misc/translate/Makefile b/misc/translate/Makefile
index 85bd83ea493c..bd0f74ff84c8 100644
--- a/misc/translate/Makefile
+++ b/misc/translate/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.freebsdcluster.org/~mich/software/
MAINTAINER= mich@FreeBSD.org
COMMENT= Translates string using Babelfish
-RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS= p5-libwww>=0:www/p5-libwww
USES= perl5 shebangfix
NO_BUILD= yes
diff --git a/misc/utftools/Makefile b/misc/utftools/Makefile
index e76a2f456081..c048cc8c0468 100644
--- a/misc/utftools/Makefile
+++ b/misc/utftools/Makefile
@@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT
LICENSE_NAME= utftools license
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= ${LOCALBASE}/lib/libutf.a:${PORTSDIR}/misc/libutf
+BUILD_DEPENDS= ${LOCALBASE}/lib/libutf.a:misc/libutf
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${LOCALBASE}/lib --includedir=${LOCALBASE}/include
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index 5602c1c29a08..86e6924a0d40 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -12,7 +12,7 @@ COMMENT= Window Maker dockapp that display game scores from excite
LICENSE= GPLv2
-RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
+RUN_DEPENDS= wget:ftp/wget
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USE_XORG= xpm
diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index 5c02f54eec4c..f1b599d87e54 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= xride@FreeBSD.org
COMMENT= Dockable calendar with interface to iCalendar based calendars
-LIB_DEPENDS= libical.so:${PORTSDIR}/devel/libical
+LIB_DEPENDS= libical.so:devel/libical
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 817fbd469459..2a2427fcf94e 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -16,12 +16,12 @@ COMMENT= Displays current conditions and forecasts with icons and text
LICENSE= GPLv2
-LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
- libpcre.so:${PORTSDIR}/devel/pcre \
- libtiff.so:${PORTSDIR}/graphics/tiff \
- libHermes.so:${PORTSDIR}/graphics/Hermes \
- libpng.so:${PORTSDIR}/graphics/png \
- libgif.so:${PORTSDIR}/graphics/giflib
+LIB_DEPENDS= libcurl.so:ftp/curl \
+ libpcre.so:devel/pcre \
+ libtiff.so:graphics/tiff \
+ libHermes.so:graphics/Hermes \
+ libpng.so:graphics/png \
+ libgif.so:graphics/giflib
WRKSRC= ${WRKDIR}/wmweather+-${PORTVERSION}
@@ -53,9 +53,9 @@ DESKTOP_ENTRIES="${PORTNAME}" "" "${PORTNAME}" \
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MWM}
-LIB_DEPENDS+= libWMaker.so:${PORTSDIR}/x11-wm/windowmaker
+LIB_DEPENDS+= libWMaker.so:x11-wm/windowmaker
.else
-LIB_DEPENDS+= libwraster.so:${PORTSDIR}/x11-wm/libwraster
+LIB_DEPENDS+= libwraster.so:x11-wm/libwraster
.endif
post-patch:
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index 0ebdb1b2d1f8..2639ee17e941 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= danilo@FreeBSD.org
COMMENT= Web of trust statistics and pathfinder
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow
USES= python:2,run
NO_BUILD= yes
diff --git a/misc/xdg-menu/Makefile b/misc/xdg-menu/Makefile
index 0f5ce0dc1aaf..8e04599f886b 100644
--- a/misc/xdg-menu/Makefile
+++ b/misc/xdg-menu/Makefile
@@ -17,9 +17,9 @@ COMMENT= ROX panel applet that displays an applications menu button
LICENSE= GPLv2
-RUN_DEPENDS= ${LOCALBASE}/bin/rox:${PORTSDIR}/x11-fm/rox-filer \
- ${PYTHON_PKGNAMEPREFIX}xdg>=0:${PORTSDIR}/devel/py-xdg \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \
+ ${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg \
+ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
WRKSRC= ${WRKDIR}/XDG-Menu
DATADIR= ${PREFIX}/apps/XDG-Menu
diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile
index ea103962c7f0..b16a0d775f04 100644
--- a/misc/xfce4-appfinder/Makefile
+++ b/misc/xfce4-appfinder/Makefile
@@ -12,7 +12,7 @@ COMMENT= Application launcher and finder
LICENSE= GPLv2
-LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib
GNU_CONFIGURE= yes
USES= gmake pkgconfig gettext-tools tar:bzip2
diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile
index 2c8ed90c34ab..5258d5ff3a09 100644
--- a/misc/xfce4-weather-plugin/Makefile
+++ b/misc/xfce4-weather-plugin/Makefile
@@ -14,7 +14,7 @@ COMMENT= Weather plugin for the Xfce panel
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS= libsoup-2.4.so:devel/libsoup
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
@@ -26,7 +26,7 @@ USE_XFCE= panel
OPTIONS_DEFINE= UPOWER
UPOWER_DESC= Power management tasks
-UPOWER_LIB_DEPENDS= libupower-glib.so:${PORTSDIR}/sysutils/upower
+UPOWER_LIB_DEPENDS= libupower-glib.so:sysutils/upower
UPOWER_CONFIGURE_ENABLE= upower
.include <bsd.port.mk>
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index a389af9b5f76..152bc6265560 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -11,14 +11,14 @@ COMMENT= Bible interface utilizing the sword framework
LICENSE= GPLv2
-RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp
+RUN_DEPENDS= yelp:x11/yelp
BUILD_DEPENDS:= ${RUN_DEPENDS} \
- docbook2html:${PORTSDIR}/textproc/docbook-utils \
- gnome-doc-tool:${PORTSDIR}/textproc/gnome-doc-utils \
- nspr>=4.8:${PORTSDIR}/devel/nspr
-LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
- libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
- libsword.so:${PORTSDIR}/misc/sword
+ docbook2html:textproc/docbook-utils \
+ gnome-doc-tool:textproc/gnome-doc-utils \
+ nspr>=4.8:devel/nspr
+LIB_DEPENDS= libwebkitgtk-3.0.so:www/webkit-gtk3 \
+ libdbus-glib-1.so:devel/dbus-glib \
+ libsword.so:misc/sword
USES= gettext pkgconfig waf
INSTALLS_OMF= yes
diff --git a/misc/xsw/Makefile b/misc/xsw/Makefile
index 9a89472abbb9..04ebc307872e 100644
--- a/misc/xsw/Makefile
+++ b/misc/xsw/Makefile
@@ -12,7 +12,7 @@ COMMENT= Tool for creating presentations
OPTIONS_DEFINE= DOCS
-RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick
+RUN_DEPENDS= convert:graphics/ImageMagick
USE_SDL= sdl ttf image gfx
diff --git a/misc/xyzcmd/Makefile b/misc/xyzcmd/Makefile
index d7caee5d2650..c545760e79c2 100644
--- a/misc/xyzcmd/Makefile
+++ b/misc/xyzcmd/Makefile
@@ -11,8 +11,8 @@ COMMENT= Pure console visual file manager
LICENSE= LGPL3
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
+BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/urwid/raw_display.py:devel/py-urwid
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/urwid/raw_display.py:devel/py-urwid
USES= python tar:bzip2
USE_PYTHON= distutils