Remove ${PORTSDIR}/ from dependencies, Mk and categories a, b, and c.

With hat:	portmgr
Sponsored by:	Absolight

66 files changed, 189 insertions, 189 deletions

diff --git a/astro/R-cran-maptools/Makefile b/astro/R-cran-maptools/Makefile
index 5f05dffba37c..ba2e1b4d8f1c 100644
--- a/astro/R-cran-maptools/Makefile
+++ b/astro/R-cran-maptools/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Tools for reading and handling spatial objects
 
 LICENSE=	GPLv2+
 
-RUN_DEPENDS=	R-cran-sp>=1.0.11:${PORTSDIR}/math/R-cran-sp
+RUN_DEPENDS=	R-cran-sp>=1.0.11:math/R-cran-sp
 
 USES=	cran:auto-plist
 
diff --git a/astro/astrometry/Makefile b/astro/astrometry/Makefile
index 0aa259da9a57..3e54af84ef52 100644
--- a/astro/astrometry/Makefile
+++ b/astro/astrometry/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Software for describing astronomical images
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${PYNUMPY}
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
-		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libnetpbm.so:${PORTSDIR}/graphics/netpbm
+LIB_DEPENDS=	libcairo.so:graphics/cairo \
+		libcfitsio.so:astro/cfitsio \
+		libpng.so:graphics/png \
+		libnetpbm.so:graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		gmake jpeg pkgconfig python tar:bzip2
diff --git a/astro/boinc-astropulse/Makefile b/astro/boinc-astropulse/Makefile
index 769ea86204e6..330a6bdeb48e 100644
--- a/astro/boinc-astropulse/Makefile
+++ b/astro/boinc-astropulse/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Astropulse for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \
-		${NONEXISTENT}:${PORTSDIR}/astro/boinc-setiathome-v7:patch
-RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
+		${NONEXISTENT}:astro/boinc-setiathome-v7:patch
+RUN_DEPENDS=	boinc_client:net/boinc-client
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf gmake libtool pkgconfig tar:xz
@@ -36,13 +36,13 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
 OPTIONS_SUB=	yes
 
-X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
 X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client
 
 SETI_WORK!=	cd ${.CURDIR}/../boinc-setiathome-v7 && ${MAKE} -V WRKSRC
 CONFIGURE_ENV+=	BOINCDIR="${NONEXISTENT}" \
diff --git a/astro/boinc-setiathome-v7/Makefile b/astro/boinc-setiathome-v7/Makefile
index 5b5648618987..3d79a5788482 100644
--- a/astro/boinc-setiathome-v7/Makefile
+++ b/astro/boinc-setiathome-v7/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Setiathome Enhanced for BOINC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3
-RUN_DEPENDS=	boinc_client:${PORTSDIR}/net/boinc-client
-LIB_DEPENDS=	libfftw3f.so:${PORTSDIR}/math/fftw3-float
+BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3
+RUN_DEPENDS=	boinc_client:net/boinc-client
+LIB_DEPENDS=	libfftw3f.so:math/fftw3-float
 
 USES=		tar:xz gmake pkgconfig
 USE_AUTOTOOLS=	autoconf:env automake:env
@@ -39,13 +39,13 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 
 OPTIONS_SUB=	yes
 
-X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:net/boinc-client
 X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics
 
-X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:${PORTSDIR}/net/boinc-client
+X11_BUILD_DEPENDS_OFF=	${LOCALBASE}/include/boinc/std_fixes.h:net/boinc-client
 
 CFLAGS_i386=	-mtune=native
 CFLAGS_amd64=	-mtune=native
diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile
index 16153975ad5c..12880799bcf0 100644
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Scriptable space flight simulator for X11
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gettext gmake jpeg libtool lua pkgconfig
 USE_GL=		gl
@@ -62,8 +62,8 @@ IGNORE=		requires one of the <${UI_LIST}> values for CELESTIA_UI
 
 .if ${CELESTIA_UI} == "gtk" || ${CELESTIA_UI} == "gnome"
 USES+=		pathfix
-LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
-		libtheora.so:${PORTSDIR}/multimedia/libtheora
+LIB_DEPENDS+=	libgtkglext-x11-1.0.so:x11-toolkits/gtkglext \
+		libtheora.so:multimedia/libtheora
 STARTUP_NOTIFY=	true
 PLIST_FILES+=	share/celestia/celestia-logo.png share/celestia/celestiaui.xml
 .else
diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile
index d40374b913b3..9518d66dd77c 100644
--- a/astro/cfitsio/Makefile
+++ b/astro/cfitsio/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library for reading and writing files in FITS data format
 
-LIB_DEPENDS=	libf2c.so:${PORTSDIR}/lang/f2c
+LIB_DEPENDS=	libf2c.so:lang/f2c
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/astro/foxtrotgps/Makefile b/astro/foxtrotgps/Makefile
index 289c494e2e0f..8a418826d9b9 100644
--- a/astro/foxtrotgps/Makefile
+++ b/astro/foxtrotgps/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Lightweight opensource gps moving map application
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexif.so:${PORTSDIR}/graphics/libexif \
-		libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
-		libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexif.so:graphics/libexif \
+		libsoup-2.4.so:devel/libsoup \
+		libgps.so:astro/gpsd
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	DATADIRNAME=share
diff --git a/astro/geographiclib/Makefile b/astro/geographiclib/Makefile
index 37ba888a6186..5784dba86578 100644
--- a/astro/geographiclib/Makefile
+++ b/astro/geographiclib/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Library for geographic projections
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:${PORTSDIR}/devel/autoconf-archive
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/ax_check_compile_flag.m4:devel/autoconf-archive
 
 USES=		autoreconf compiler:c++11-lang gmake libtool python
 PORTDOCS=	*
@@ -34,7 +34,7 @@ OPTIONS_DEFAULT=	DOXYGEN PERL\
 PERL_DESC=	Build documentation with pod2man and pod2html
 OPTIONS_GROUP=	DATASETS
 OPTIONS_SUB=	yes
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENV_OFF=	ac_cv_prog_DOXYGEN=
 PERL_USE=	PERL5=build
 PERL_USES=	perl5
diff --git a/astro/gkrellmoon2/Makefile b/astro/gkrellmoon2/Makefile
index fce2e2d9ac50..452bd4788665 100644
--- a/astro/gkrellmoon2/Makefile
+++ b/astro/gkrellmoon2/Makefile
@@ -11,8 +11,8 @@ DISTNAME=	gkrellmoon-${PORTVERSION}
 MAINTAINER=	w@wrzask.pl
 COMMENT=	Moon clock plugin for Gkrellm2
 
-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
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/astro/gmapcatcher/Makefile b/astro/gmapcatcher/Makefile
index b127c47da4b3..6047fe841e90 100644
--- a/astro/gmapcatcher/Makefile
+++ b/astro/gmapcatcher/Makefile
@@ -10,8 +10,8 @@ DISTNAME=	mapcatcher_${PORTVERSION}
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Offline map viewer
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/g}
 USES=		python
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index f113516e1ec6..9b7a6335cd78 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Explore, Search, and Discover
 
-EXTRACT_DEPENDS=	unmakeself:${PORTSDIR}/archivers/unmakeself
+EXTRACT_DEPENDS=	unmakeself:archivers/unmakeself
 
 RESTRICTED=	Not really sure about the redistribution terms
 
@@ -31,7 +31,7 @@ USE_PERL5=	patch build
 
 UNMAKESELF=	${LOCALBASE}/bin/unmakeself
 
-NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+NVIDIA_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver
 NVIDIA_USE_OFF=	LINUX_APPS=dri,libpciaccess
 
 # Fixed by the first post-patch target line?  Also, linprocfs needs to be mounted.
diff --git a/astro/gpsbabel14/Makefile b/astro/gpsbabel14/Makefile
index 781ff8defe38..92559cbb27da 100644
--- a/astro/gpsbabel14/Makefile
+++ b/astro/gpsbabel14/Makefile
@@ -14,7 +14,7 @@ COMMENT=	GPS file translating tool (pre-qt version)
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index e66467010832..01c39aaf578c 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Correlate digital camera photos with GPS data in GPX format
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2 \
-		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
+LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
+		libgtkmm-2.4.so:x11-toolkits/gtkmm24
 
 USES=		gmake pkgconfig
 USE_GNOME=	libxml2
diff --git a/astro/gpsd/Makefile b/astro/gpsd/Makefile
index d6ffe6dea7aa..05b758fd9f02 100644
--- a/astro/gpsd/Makefile
+++ b/astro/gpsd/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Daemon that monitors one or more GPSes attached to a host computer
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl \
-		xsltproc:${PORTSDIR}/textproc/libxslt
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+		xsltproc:textproc/libxslt
 
 USES=		cpe pathfix pkgconfig python scons
 CPE_VENDOR=	gpsd_project
@@ -112,7 +112,7 @@ PPS_IMPLIES=	NTPSHM
 
 # Export methods
 SOCKEXPORT_MAKE_ARGS_OFF=	socket_export=no
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_MAKE_ARGS=	dbus_export=yes
 SHMEXPORT_MAKE_ARGS_OFF=	shm_export=no
 
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index b778a0f3b880..3933a70e19d7 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -14,8 +14,8 @@ COMMENT=	GPS navigation system
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
-RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	libpcre.so:devel/pcre
+RUN_DEPENDS=	bash:shells/bash
 
 USES=		gmake libtool perl5 pkgconfig shebangfix
 SHEBANG_FILES=	src/gpsfetchmap.pl src/geocache2way src/gpssmswatch \
diff --git a/astro/gpsprune/Makefile b/astro/gpsprune/Makefile
index 4251825ad2d4..fc4d27793c7a 100644
--- a/astro/gpsprune/Makefile
+++ b/astro/gpsprune/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES=	bin/gpsprune ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 OPTIONS_DEFINE=	JAVA3D
 JAVA3D_DESC=	Support for 3D view of track
 
-JAVA3D_RUN_DEPENDS=	java3d>=1.5.2:${PORTSDIR}/java/java3d
+JAVA3D_RUN_DEPENDS=	java3d>=1.5.2:java/java3d
 
 do-install:
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
diff --git a/astro/gpxloggerd/Makefile b/astro/gpxloggerd/Makefile
index 97a6fc53bba4..28607ae3d444 100644
--- a/astro/gpxloggerd/Makefile
+++ b/astro/gpxloggerd/Makefile
@@ -10,7 +10,7 @@ GH_ACCOUNT=	glebius
 MAINTAINER=	glebius@FreeBSD.org
 COMMENT=	Daemon that connects to the GPSD daemon and logs GPS traces
 
-LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libgps.so:astro/gpsd
 
 USE_RC_SUBR=	${PORTNAME}
 PLIST_FILES=	sbin/${PORTNAME} \
diff --git a/astro/kstars/Makefile b/astro/kstars/Makefile
index 10fcdb58f589..2f63af4800f9 100644
--- a/astro/kstars/Makefile
+++ b/astro/kstars/Makefile
@@ -10,11 +10,11 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE 4 desktop planetarium
 
-LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libwcs.so:${PORTSDIR}/astro/wcslib
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:${PORTSDIR}/math/eigen3 \
-		xplanet:${PORTSDIR}/astro/xplanet
-RUN_DEPENDS=	xplanet:${PORTSDIR}/astro/xplanet
+LIB_DEPENDS=	libcfitsio.so:astro/cfitsio \
+		libwcs.so:astro/wcslib
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3 \
+		xplanet:astro/xplanet
+RUN_DEPENDS=	xplanet:astro/xplanet
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource compiler:c++11-lib tar:xz
diff --git a/astro/libkgeomap/Makefile b/astro/libkgeomap/Makefile
index 4695bc3d1cfc..ea6298915372 100644
--- a/astro/libkgeomap/Makefile
+++ b/astro/libkgeomap/Makefile
@@ -10,7 +10,7 @@ COMMENT=	KDE4 library for browsing photos on a map
 
 .include "${.CURDIR}/../../graphics/digikam-kde4/Makefile.common"
 
-BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:${PORTSDIR}/devel/boost-libs
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/graph/buffer_concepts.hpp:devel/boost-libs
 
 # libkexiv2 is used only for demo application
 USE_KDE4+=	marble
diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index bf0956f4b821..f2d921d8b1d7 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Library for handling binary OpenStreetMap data
 LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING.osmpbf
 
-LIB_DEPENDS=	libprotobuf.so:${PORTSDIR}/devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	scrosby
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index 04c7c5614053..bbe85c11d84a 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -9,7 +9,7 @@ DIST_SUBDIR=	KDE/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Virtual globe and world atlas for KDE
 
-LIB_DEPENDS=	libquazip.so:${PORTSDIR}/archivers/quazip
+LIB_DEPENDS=	libquazip.so:archivers/quazip
 
 USE_KDE4=	kdelibs kdeprefix automoc4
 USES=		cmake:outsource gmake shared-mime-info tar:xz
@@ -25,7 +25,7 @@ OPTIONS_DEFAULT=	GPS
 OPTIONS_SUB=	yes
 
 GPS_DESC=	Support for GPS position provider
-GPS_LIB_DEPENDS=	libgps.so:${PORTSDIR}/astro/gpsd
+GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_CMAKE_OFF=	-DWITH_libgps:BOOL=FALSE
 
 # pre-configure:
diff --git a/astro/merkaartor/Makefile b/astro/merkaartor/Makefile
index 73e34d74e0a3..5bd922536d7b 100644
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Openstreetmap mapping program
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libquazip5.so:${PORTSDIR}/archivers/quazip-qt5 \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj \
+		libquazip5.so:archivers/quazip-qt5 \
+		libsqlite3.so:databases/sqlite3
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
@@ -32,11 +32,11 @@ OPTIONS_DEFAULT=	GEOIMAGE
 
 GEOIMAGE_DESC=	Enable geotagged images (needs exiv2)
 GEOIMAGE_QMAKE_ON=	GEOIMAGE=1
-GEOIMAGE_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+GEOIMAGE_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 
 ZBAR_DESC=	Read barcodes from walking papers (BROKEN)
 ZBAR_QMAKE_ON=	ZBAR=1
-ZBAR_LIB_DEPENDS=	libzbar.so:${PORTSDIR}/graphics/zbar
+ZBAR_LIB_DEPENDS=	libzbar.so:graphics/zbar
 # graphics/zbar needs to be built with Qt support (and needs a Qt5 version)
 ZBAR_BROKEN=	Does not build with option ZBAR selected
 
diff --git a/astro/mymoon/Makefile b/astro/mymoon/Makefile
index 3b939e0558da..23be7f4770b1 100644
--- a/astro/mymoon/Makefile
+++ b/astro/mymoon/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://makemebad.net/geek/codes/${PORTNAME}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show latitude and longitude of the moon
 
-LIB_DEPENDS=	libnova.so:${PORTSDIR}/astro/libnova
+LIB_DEPENDS=	libnova.so:astro/libnova
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index f837b45cde4a..55686ab9a0b9 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -27,15 +27,15 @@ GNOME_VARS=		INSTALLS_OMF=yes
 
 OPENGL_CONFIGURE_ON=	--with-lib-GL
 OPENGL_CONFIGURE_OFF=	--disable-opengl
-OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:${PORTSDIR}/x11-toolkits/gtkglarea2
+OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 OPENGL_USE=		GL=glut
 
 PGPLOT_DESC=		PGPLOT support
 PGPLOT_CONFIGURE_ON=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 PGPLOT_CONFIGURE_OFF=	--with-gnuplot
-PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
-PGPLOT_RUN_DEPENDS_OFF=	gnuplot:${PORTSDIR}/math/gnuplot
+PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
+PGPLOT_RUN_DEPENDS_OFF=	gnuplot:math/gnuplot
 PGPLOT_USES=		fortran
 
 .include <bsd.port.pre.mk>
diff --git a/astro/osmium/Makefile b/astro/osmium/Makefile
index 49dcc925bac1..99abf051f473 100644
--- a/astro/osmium/Makefile
+++ b/astro/osmium/Makefile
@@ -12,14 +12,14 @@ COMMENT=	C++/Javascript framework for working with OSM files
 LICENSE=	GPLv3 LGPL3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libboost_regex.so:${PORTSDIR}/devel/boost-libs \
-		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libgeos.so:${PORTSDIR}/graphics/geos \
-		libprotobuf.so:${PORTSDIR}/devel/protobuf
-BUILD_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
-RUN_DEPENDS=	google-sparsehash>=2.0.2:${PORTSDIR}/devel/google-sparsehash
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libboost_regex.so:devel/boost-libs \
+		libsqlite3.so:databases/sqlite3 \
+		libexpat.so:textproc/expat2 \
+		libgeos.so:graphics/geos \
+		libprotobuf.so:devel/protobuf
+BUILD_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
+RUN_DEPENDS=	google-sparsehash>=2.0.2:devel/google-sparsehash
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	joto
@@ -35,12 +35,12 @@ OPTIONS_DEFINE=	JAVASCRIPT DOXYGEN DOCS
 OPTIONS_DEFAULT=JAVASCRIPT
 JAVASCRIPT_DESC=Enable javascript support
 
-JAVASCRIPT_LIB_DEPENDS=	libv8.so:${PORTSDIR}/lang/v8 \
-			libshp.so:${PORTSDIR}/devel/shapelib \
-			libicuuc.so:${PORTSDIR}/devel/icu
+JAVASCRIPT_LIB_DEPENDS=	libv8.so:lang/v8 \
+			libshp.so:devel/shapelib \
+			libicuuc.so:devel/icu
 
 DOXYGEN_IMPLIES=	DOCS
-DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 do-build-DOXYGEN-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
diff --git a/astro/p5-Astro-ADS/Makefile b/astro/p5-Astro-ADS/Makefile
index f769daf94d7c..37a980356e18 100644
--- a/astro/p5-Astro-ADS/Makefile
+++ b/astro/p5-Astro-ADS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO Perl interface to the ADS abstract service
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-Catalog/Makefile b/astro/p5-Astro-Catalog/Makefile
index 50dd09c4f84c..55d966817177 100644
--- a/astro/p5-Astro-Catalog/Makefile
+++ b/astro/p5-Astro-Catalog/Makefile
@@ -15,16 +15,16 @@ COMMENT=	Generic stellar catalogue object
 LICENSE=	GPLv3
 
 # p5-Astro-FITS-CFITSIO is a recommended dependency
-BUILD_DEPENDS=	p5-Astro-Coords>=0.12:${PORTSDIR}/astro/p5-Astro-Coords \
-		p5-Astro-FITS-CFITSIO>=1.03:${PORTSDIR}/astro/p5-Astro-FITS-CFITSIO \
-		p5-Astro-Flux>=0.01:${PORTSDIR}/astro/p5-Astro-Flux \
-		p5-Astro-Telescope>=0.50:${PORTSDIR}/astro/p5-Astro-Telescope \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-DateTime-Format-ISO8601>=0:${PORTSDIR}/devel/p5-DateTime-Format-ISO8601 \
-		p5-Misc-Quality>=0.1:${PORTSDIR}/astro/p5-Misc-Quality \
-		p5-Number-Uncertainty>=0.1:${PORTSDIR}/math/p5-Number-Uncertainty \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-libwww>=5.53:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-Astro-Coords>=0.12:astro/p5-Astro-Coords \
+		p5-Astro-FITS-CFITSIO>=1.03:astro/p5-Astro-FITS-CFITSIO \
+		p5-Astro-Flux>=0.01:astro/p5-Astro-Flux \
+		p5-Astro-Telescope>=0.50:astro/p5-Astro-Telescope \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-DateTime-Format-ISO8601>=0:devel/p5-DateTime-Format-ISO8601 \
+		p5-Misc-Quality>=0.1:astro/p5-Misc-Quality \
+		p5-Number-Uncertainty>=0.1:math/p5-Number-Uncertainty \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-libwww>=5.53:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/astro/p5-Astro-Coords/Makefile b/astro/p5-Astro-Coords/Makefile
index 6900e64ef7f6..f0d500b08a28 100644
--- a/astro/p5-Astro-Coords/Makefile
+++ b/astro/p5-Astro-Coords/Makefile
@@ -14,12 +14,12 @@ COMMENT=	Class for handling astronomical coordinates
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-PAL>=0:${PORTSDIR}/astro/p5-Astro-PAL \
-		p5-Astro-Telescope>=0.71:${PORTSDIR}/astro/p5-Astro-Telescope \
-		p5-DateTime>=0.76:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-Astro-PAL>=0:astro/p5-Astro-PAL \
+		p5-Astro-Telescope>=0.71:astro/p5-Astro-Telescope \
+		p5-DateTime>=0.76:devel/p5-DateTime
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-Test-Number-Delta>=0:${PORTSDIR}/devel/p5-Test-Number-Delta \
-		p5-Test-Pod>=1:${PORTSDIR}/devel/p5-Test-Pod
+TEST_DEPENDS=	p5-Test-Number-Delta>=0:devel/p5-Test-Number-Delta \
+		p5-Test-Pod>=1:devel/p5-Test-Pod
 
 NO_ARCH=	yes
 USE_PERL5=	modbuild
diff --git a/astro/p5-Astro-DSS/Makefile b/astro/p5-Astro-DSS/Makefile
index 649b8c272447..e975e2618a29 100644
--- a/astro/p5-Astro-DSS/Makefile
+++ b/astro/p5-Astro-DSS/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO interface to the 1st and 2nd Digital Sky Surveys
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-FITS-CFITSIO/Makefile b/astro/p5-Astro-FITS-CFITSIO/Makefile
index 0d273fa8de12..6d10c6a127dc 100644
--- a/astro/p5-Astro-FITS-CFITSIO/Makefile
+++ b/astro/p5-Astro-FITS-CFITSIO/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for using the cfitsio library
 
-LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 
 CONFIGURE_ENV=	CFITSIO=${LOCALBASE}
 USES=		perl5
diff --git a/astro/p5-Astro-Flux/Makefile b/astro/p5-Astro-Flux/Makefile
index 1c2859827057..d7abdb8cc136 100644
--- a/astro/p5-Astro-Flux/Makefile
+++ b/astro/p5-Astro-Flux/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Class for handling astronomical flux quantities
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-WaveBand>=0:${PORTSDIR}/astro/p5-Astro-WaveBand \
-		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
-		p5-Misc-Quality>=0:${PORTSDIR}/astro/p5-Misc-Quality \
-		p5-Number-Uncertainty>=0:${PORTSDIR}/math/p5-Number-Uncertainty
+BUILD_DEPENDS=	p5-Astro-WaveBand>=0:astro/p5-Astro-WaveBand \
+		p5-DateTime>=0:devel/p5-DateTime \
+		p5-Misc-Quality>=0:astro/p5-Misc-Quality \
+		p5-Number-Uncertainty>=0:math/p5-Number-Uncertainty
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/astro/p5-Astro-Hipparcos/Makefile b/astro/p5-Astro-Hipparcos/Makefile
index 6be52ee43330..09c528aa8cb8 100644
--- a/astro/p5-Astro-Hipparcos/Makefile
+++ b/astro/p5-Astro-Hipparcos/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for reading the Hipparcos star catalog
 
-BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:${PORTSDIR}/devel/p5-ExtUtils-XSpp
+BUILD_DEPENDS=	p5-ExtUtils-XSpp>=0.06:devel/p5-ExtUtils-XSpp
 
 MAKE_ARGS+=	CC="${CXX}"
 USES=		perl5
diff --git a/astro/p5-Astro-PAL/Makefile b/astro/p5-Astro-PAL/Makefile
index 4b17ca3022f3..228a80cf0c4b 100644
--- a/astro/p5-Astro-PAL/Makefile
+++ b/astro/p5-Astro-PAL/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Perl interface to Starlink PAL positional astronomy library
 
 LICENSE=	GPLv3
 
-TEST_DEPENDS=	p5-Test-Number-Delta>=1:${PORTSDIR}/devel/p5-Test-Number-Delta
+TEST_DEPENDS=	p5-Test-Number-Delta>=1:devel/p5-Test-Number-Delta
 
 USE_PERL5=	modbuild
 USES=		perl5
diff --git a/astro/p5-Astro-SIMBAD-Client/Makefile b/astro/p5-Astro-SIMBAD-Client/Makefile
index 5ebc49bef609..f44fd727cdc6 100644
--- a/astro/p5-Astro-SIMBAD-Client/Makefile
+++ b/astro/p5-Astro-SIMBAD-Client/Makefile
@@ -13,11 +13,11 @@ COMMENT=	OO interface to SIMBAD4
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Message>=0:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-XML-DoubleEncodedEntities>=1:${PORTSDIR}/textproc/p5-XML-DoubleEncodedEntities \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Message>=0:www/p5-HTTP-Message \
+		p5-SOAP-Lite>=0:net/p5-SOAP-Lite \
+		p5-URI>=0:net/p5-URI \
+		p5-XML-DoubleEncodedEntities>=1:textproc/p5-XML-DoubleEncodedEntities \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Astro-SIMBAD/Makefile b/astro/p5-Astro-SIMBAD/Makefile
index 53e1c425f15a..89cec671974d 100644
--- a/astro/p5-Astro-SIMBAD/Makefile
+++ b/astro/p5-Astro-SIMBAD/Makefile
@@ -11,8 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OO Perl interface to the SIMBAD astronomical database
 
-BUILD_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>=0:www/p5-libwww
+RUN_DEPENDS=	p5-libwww>=0:www/p5-libwww
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-Astro-SpaceTrack/Makefile b/astro/p5-Astro-SpaceTrack/Makefile
index 637ff2c709ef..04350e4b6115 100644
--- a/astro/p5-Astro-SpaceTrack/Makefile
+++ b/astro/p5-Astro-SpaceTrack/Makefile
@@ -13,12 +13,12 @@ COMMENT=	Retrieve orbital data from www.space-track.org
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTTP-Date>=0:${PORTSDIR}/www/p5-HTTP-Date \
-		p5-HTTP-Message>=6.03:${PORTSDIR}/www/p5-HTTP-Message \
-		p5-JSON>=0:${PORTSDIR}/converters/p5-JSON \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTTP-Date>=0:www/p5-HTTP-Date \
+		p5-HTTP-Message>=6.03:www/p5-HTTP-Message \
+		p5-JSON>=0:converters/p5-JSON \
+		p5-LWP-Protocol-https>=0:www/p5-LWP-Protocol-https \
+		p5-URI>=0:net/p5-URI \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	limit:^[0-9\.]*$$
diff --git a/astro/p5-Astro-SunTime/Makefile b/astro/p5-Astro-SunTime/Makefile
index f6aac1359d58..32cfb37d8fa8 100644
--- a/astro/p5-Astro-SunTime/Makefile
+++ b/astro/p5-Astro-SunTime/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to calculate sunrise/sunset times
 
-BUILD_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+BUILD_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Astro-Sunrise/Makefile b/astro/p5-Astro-Sunrise/Makefile
index 6d9dfc5efb13..e20b5f51ca3a 100644
--- a/astro/p5-Astro-Sunrise/Makefile
+++ b/astro/p5-Astro-Sunrise/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Perl extension for computing the sunrise/sunset on a given day
 
-BUILD_DEPENDS=	p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime
+BUILD_DEPENDS=	p5-DateTime>=0:devel/p5-DateTime
 
 USES=		perl5
 USE_PERL5=	configure patch
diff --git a/astro/p5-Astro-Telescope/Makefile b/astro/p5-Astro-Telescope/Makefile
index dc2dab1d8373..22a85e36403d 100644
--- a/astro/p5-Astro-Telescope/Makefile
+++ b/astro/p5-Astro-Telescope/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Class for obtaining telescope information
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-PAL>=0.99:${PORTSDIR}/astro/p5-Astro-PAL
+BUILD_DEPENDS=	p5-Astro-PAL>=0.99:astro/p5-Astro-PAL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 NO_ARCH=	yes
diff --git a/astro/p5-Astro-satpass/Makefile b/astro/p5-Astro-satpass/Makefile
index f5857d937418..9177e5ecf00c 100644
--- a/astro/p5-Astro-satpass/Makefile
+++ b/astro/p5-Astro-satpass/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Classes and app to compute satellite visibility
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Date-Manip>=1.14:${PORTSDIR}/devel/p5-Date-Manip
+BUILD_DEPENDS=	p5-Date-Manip>=1.14:devel/p5-Date-Manip
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-TEST_DEPENDS=	p5-JSON>=0:${PORTSDIR}/converters/p5-JSON
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
 OPTIONS_DEFINE=	GEOCODER_US SIMBAD SOAPLITE SPACETRACK USGS
 OPTIONS_DEFAULT=GEOCODER_US SIMBAD SPACETRACK USGS
@@ -32,10 +32,10 @@ NO_ARCH=	yes
 USES=		perl5
 USE_PERL5=	configure
 
-GEOCODER_US_RUN_DEPENDS=p5-Geo-Coder-Geocoder-US>=0:${PORTSDIR}/misc/p5-Geo-Coder-Geocoder-US
-SIMBAD_RUN_DEPENDS=	p5-Astro-SIMBAD-Client>=0:${PORTSDIR}/astro/p5-Astro-SIMBAD-Client
-SOAPLITE_RUN_DEPENDS=	p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
-SPACETRACK_RUN_DEPENDS=	p5-Astro-SpaceTrack>=0:${PORTSDIR}/astro/p5-Astro-SpaceTrack
-USGS_RUN_DEPENDS=	p5-Geo-WebService-Elevation-USGS>=0:${PORTSDIR}/science/p5-Geo-WebService-Elevation-USGS
+GEOCODER_US_RUN_DEPENDS=p5-Geo-Coder-Geocoder-US>=0:misc/p5-Geo-Coder-Geocoder-US
+SIMBAD_RUN_DEPENDS=	p5-Astro-SIMBAD-Client>=0:astro/p5-Astro-SIMBAD-Client
+SOAPLITE_RUN_DEPENDS=	p5-SOAP-Lite>=0:net/p5-SOAP-Lite
+SPACETRACK_RUN_DEPENDS=	p5-Astro-SpaceTrack>=0:astro/p5-Astro-SpaceTrack
+USGS_RUN_DEPENDS=	p5-Geo-WebService-Elevation-USGS>=0:science/p5-Geo-WebService-Elevation-USGS
 
 .include <bsd.port.mk>
diff --git a/astro/p5-GPS-Babel/Makefile b/astro/p5-GPS-Babel/Makefile
index 18862c0f3414..de5fb91ad289 100644
--- a/astro/p5-GPS-Babel/Makefile
+++ b/astro/p5-GPS-Babel/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to gpsbabel
 
-BUILD_DEPENDS=	p5-Geo-Gpx>=0.25:${PORTSDIR}/graphics/p5-Geo-Gpx \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
-RUN_DEPENDS=	p5-Geo-Gpx>=0.25:${PORTSDIR}/graphics/p5-Geo-Gpx \
-		p5-File-Which>=0.05:${PORTSDIR}/sysutils/p5-File-Which
+BUILD_DEPENDS=	p5-Geo-Gpx>=0.25:graphics/p5-Geo-Gpx \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
+RUN_DEPENDS=	p5-Geo-Gpx>=0.25:graphics/p5-Geo-Gpx \
+		p5-File-Which>=0.05:sysutils/p5-File-Which
 
 USES=		perl5
 USE_PERL5=	configure
diff --git a/astro/p5-GPS/Makefile b/astro/p5-GPS/Makefile
index 35ec72bb6d42..78ed4b9ee477 100644
--- a/astro/p5-GPS/Makefile
+++ b/astro/p5-GPS/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	perl-GPS-${PORTVERSION}
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Perl interface to GPS receivers
 
-BUILD_DEPENDS=	p5-Device-SerialPort>=0.07:${PORTSDIR}/comms/p5-Device-SerialPort
+BUILD_DEPENDS=	p5-Device-SerialPort>=0.07:comms/p5-Device-SerialPort
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/astro/p5-Starlink-AST/Makefile b/astro/p5-Starlink-AST/Makefile
index 0ffde6f6ba65..0ba8ed2fef30 100644
--- a/astro/p5-Starlink-AST/Makefile
+++ b/astro/p5-Starlink-AST/Makefile
@@ -14,10 +14,10 @@ COMMENT=	Interface to the Starlink AST library
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-Astro-FITS-CFITSIO>=0:${PORTSDIR}/astro/p5-Astro-FITS-CFITSIO \
-		p5-Astro-FITS-Header>=0:${PORTSDIR}/astro/p5-Astro-FITS-Header
+BUILD_DEPENDS=	p5-Astro-FITS-CFITSIO>=0:astro/p5-Astro-FITS-CFITSIO \
+		p5-Astro-FITS-Header>=0:astro/p5-Astro-FITS-Header
 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
 
 USES=		perl5
 USE_PERL5=	modbuild
diff --git a/astro/p5-Weather-Underground/Makefile b/astro/p5-Weather-Underground/Makefile
index 80aab1e39248..35fe5721aadf 100644
--- a/astro/p5-Weather-Underground/Makefile
+++ b/astro/p5-Weather-Underground/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Retrieve weather information from wunderground.com
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+BUILD_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-libwww>=0:www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_PERL5=	configure
diff --git a/astro/p5-ZConf-Weather/Makefile b/astro/p5-ZConf-Weather/Makefile
index 059a8a5d8efb..3d410b59bef5 100644
--- a/astro/p5-ZConf-Weather/Makefile
+++ b/astro/p5-ZConf-Weather/Makefile
@@ -12,9 +12,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	ZConf module to assist with fetching/printing weather information
 
-BUILD_DEPENDS=	p5-ZConf>=6.1.0:${PORTSDIR}/net/p5-ZConf \
-		p5-Text-NeatTemplate>=0.10.01:${PORTSDIR}/textproc/p5-Text-NeatTemplate \
-		p5-Weather-Underground>=3.03:${PORTSDIR}/astro/p5-Weather-Underground
+BUILD_DEPENDS=	p5-ZConf>=6.1.0:net/p5-ZConf \
+		p5-Text-NeatTemplate>=0.10.01:textproc/p5-Text-NeatTemplate \
+		p5-Weather-Underground>=3.03:astro/p5-Weather-Underground
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index e7a91d1ccef1..4e8112b93f78 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Displays U.S. Census Bureau populated places on a map
 
-LIB_DEPENDS=	libtkgeomap.so:${PORTSDIR}/astro/tkgeomap
+LIB_DEPENDS=	libtkgeomap.so:astro/tkgeomap
 
 USES+=		tk:run
 NO_BUILD=	yes
diff --git a/astro/py-RO/Makefile b/astro/py-RO/Makefile
index 71f5452f0973..4c82c8cbc41f 100644
--- a/astro/py-RO/Makefile
+++ b/astro/py-RO/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Package of Python astronomical utilities
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:${PORTSDIR}/math/py-numpy
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/numpy/core/numeric.py:math/py-numpy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=		MATPLOTLIB PYFITS PYGAME
@@ -25,8 +25,8 @@ PYGAME_DESC=		Add Support for PyGame
 USES=		python
 USE_PYTHON=	autoplist distutils
 
-MATPLOTLIB_RUN_DEPENDS=	${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
-PYFITS_RUN_DEPENDS=	${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits
-PYGAME_RUN_DEPENDS=	${PKGNAMEPREFIX}game>=1.8.1:${PORTSDIR}/devel/py-game
+MATPLOTLIB_RUN_DEPENDS=	${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
+PYFITS_RUN_DEPENDS=	${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits
+PYGAME_RUN_DEPENDS=	${PKGNAMEPREFIX}game>=1.8.1:devel/py-game
 
 .include <bsd.port.mk>
diff --git a/astro/py-aipy/Makefile b/astro/py-aipy/Makefile
index d63e2d0b02f6..0fe0d4fed7e0 100644
--- a/astro/py-aipy/Makefile
+++ b/astro/py-aipy/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	wen@FreeBSD.org
 COMMENT=	Astronomical Interferometry in PYthon
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_SITELIBDIR}/ephem/__init__.py:${PORTSDIR}/astro/pyephem \
-		${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits \
-		${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
+		${PYTHON_SITELIBDIR}/ephem/__init__.py:astro/pyephem \
+		${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \
+		${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
diff --git a/astro/py-astLib/Makefile b/astro/py-astLib/Makefile
index fcdbb24faa71..ca98c90be09c 100644
--- a/astro/py-astLib/Makefile
+++ b/astro/py-astLib/Makefile
@@ -15,10 +15,10 @@ LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PKGNAMEPREFIX}scipy>=0.7.0:${PORTSDIR}/science/py-scipy \
-		${PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
-		${PKGNAMEPREFIX}pyfits>=1.1:${PORTSDIR}/astro/py-pyfits \
-		${PKGNAMEPREFIX}matplotlib>=0.98:${PORTSDIR}/math/py-matplotlib
+		${PKGNAMEPREFIX}scipy>=0.7.0:science/py-scipy \
+		${PKGNAMEPREFIX}pillow>0:graphics/py-pillow \
+		${PKGNAMEPREFIX}pyfits>=1.1:astro/py-pyfits \
+		${PKGNAMEPREFIX}matplotlib>=0.98:math/py-matplotlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PORTSCOUT=	skipv:0.15,0.17,0.17.1 # incorrect versioning upstream
diff --git a/astro/py-pyfits/Makefile b/astro/py-pyfits/Makefile
index 0564f17e4cf4..c8c966b5d7ce 100644
--- a/astro/py-pyfits/Makefile
+++ b/astro/py-pyfits/Makefile
@@ -14,10 +14,10 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}d2to1>=0:${PORTSDIR}/devel/py-d2to1 \
-		${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:${PORTSDIR}/devel/py-stsci.distutils
+		${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1 \
+		${PYTHON_PKGNAMEPREFIX}stsci.distutils>=0:devel/py-stsci.distutils
 RUN_DEPENDS=	${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}d2to1>=0:${PORTSDIR}/devel/py-d2to1
+		${PYTHON_PKGNAMEPREFIX}d2to1>=0:devel/py-d2to1
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index d0483bef509d..ad02d2caf18d 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -11,9 +11,9 @@ COMMENT=	The ultimate outdoor aficionado's tool
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libproj.so:${PORTSDIR}/graphics/proj \
-		libgps.so:${PORTSDIR}/astro/gpsd
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj \
+		libgps.so:astro/gpsd
 
 USES=		cmake desktop-file-utils
 USE_QT4=	dbus gui opengl network sql xml linguist_build \
diff --git a/astro/qmapshack/Makefile b/astro/qmapshack/Makefile
index 8c04aac1cd04..225bbcd84eaa 100644
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@@ -13,8 +13,8 @@ LICENSE=	GPLv3
 
 BROKEN=		unfetchable
 
-LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libroutino.so:${PORTSDIR}/astro/routino
+LIB_DEPENDS=	libgdal.so:graphics/gdal \
+		libroutino.so:astro/routino
 
 USES=		cmake desktop-file-utils
 USE_QT5=	buildtools linguisttools qmake script sql webkit widgets xml
diff --git a/astro/readosm/Makefile b/astro/readosm/Makefile
index 328b44c36084..e4b8baf21c0d 100644
--- a/astro/readosm/Makefile
+++ b/astro/readosm/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Extract valid data from within an Open Street Map input file
 LICENSE=	MPL LGPL21 GPLv2
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}e
 GNU_CONFIGURE=	yes
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 08146e4fe1a4..c5ca8a05d63f 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Generates images of the Earth centered at a particular location
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd
+LIB_DEPENDS=	libgd.so:graphics/gd
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index 146f19ed787e..8150baad9e35 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Vector-based GPS moving map
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 248fd83ea5c7..f3b1817cd66c 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Shows which portion of the Earth's surface is illuminated by the Sun
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 40658948ab1e..24f9fd25ea8e 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Read, manipulate, and display geo data
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libtclgeomap.so:${PORTSDIR}/astro/tclgeomap
+LIB_DEPENDS=	libtclgeomap.so:astro/tclgeomap
 
 USES+=		tk
 GNU_CONFIGURE=	yes
diff --git a/astro/viking/Makefile b/astro/viking/Makefile
index 4d2a0364e55e..fa237db1c47e 100644
--- a/astro/viking/Makefile
+++ b/astro/viking/Makefile
@@ -12,15 +12,15 @@ COMMENT=	Program to manage GPS data (tracks, waypoints, etc.)
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libexpat.so:${PORTSDIR}/textproc/expat2 \
-		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libgexiv2.so:${PORTSDIR}/graphics/gexiv2 \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libpng.so:${PORTSDIR}/graphics/png \
-		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libexpat.so:textproc/expat2 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libgexiv2.so:graphics/gexiv2 \
+		libpcre.so:devel/pcre \
+		libpng.so:graphics/png \
+		libpthread-stubs.so:devel/libpthread-stubs
+RUN_DEPENDS=	gpsbabel:astro/gpsbabel
 
 USES=		compiler:c++11-lib gmake iconv desktop-file-utils perl5 pkgconfig tar:bzip2
 USE_XORG=	pixman x11 xau xcb xcomposite xcursor xdamage xdmcp xext \
@@ -57,20 +57,20 @@ GEOCACHES_SUB_FILES=	pkg-message
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext
 
-GEOTAG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+GEOTAG_LIB_DEPENDS=	libexif.so:graphics/libexif
 GEOTAG_CONFIGURE_ENABLE=geotag
 
-GPSD_LIB_DEPENDS=	libgpsd.so:${PORTSDIR}/astro/gpsd
+GPSD_LIB_DEPENDS=	libgpsd.so:astro/gpsd
 GPSD_CONFIGURE_ENABLE=	realtime-gps-tracking
 
-MAPNIK_LIB_DEPENDS=	libmapnik.so:${PORTSDIR}/graphics/mapnik
+MAPNIK_LIB_DEPENDS=	libmapnik.so:graphics/mapnik
 MAPNIK_CONFIGURE_ENABLE=	mapnik
 
 MBTILES_USES=		sqlite
 MBTILES_CONFIGURE_ENABLE=	mbtiles
 
-JOSM_RUN_DEPENDS=	josm:${PORTSDIR}/astro/josm
-MERKAATOR_RUN_DEPENDS=	merkaartor:${PORTSDIR}/astro/merkaartor
+JOSM_RUN_DEPENDS=	josm:astro/josm
+MERKAATOR_RUN_DEPENDS=	merkaartor:astro/merkaartor
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^AM_CFLAGS/s| -g | |' ${WRKSRC}/src/Makefile.in
diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index 0145cb703d88..cf98f2f3c316 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -26,9 +26,9 @@ CFITSIO_DESC=	Add cfitsio support (for tests only)
 PGPLOT_DESC=	Add pgplot support (for tests only)
 
 CFITSIO_CONFIGURE_WITH=	cfitsio
-CFITSIO_LIB_DEPENDS=	libcfitsio.so:${PORTSDIR}/astro/cfitsio
+CFITSIO_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
 PGPLOT_CONFIGURE_WITH=	pgplot
-PGPLOT_LIB_DEPENDS=	libpgplot.so:${PORTSDIR}/graphics/pgplot
+PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#%%PKGDIR%%#${STAGEDIR}${PREFIX}/libdata#g' \
diff --git a/astro/weatherspect/Makefile b/astro/weatherspect/Makefile
index b62729013ba5..b0a76ce285fb 100644
--- a/astro/weatherspect/Makefile
+++ b/astro/weatherspect/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Weather simulation in ASCII art
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-Term-Animation>=0:${PORTSDIR}/devel/p5-Term-Animation \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+RUN_DEPENDS=	p5-HTML-Parser>=0:www/p5-HTML-Parser \
+		p5-Term-Animation>=0:devel/p5-Term-Animation \
+		p5-libwww>=0:www/p5-libwww
 
 PORTSCOUT=	skipv:1.31
 
diff --git a/astro/wmspaceweather/Makefile b/astro/wmspaceweather/Makefile
index 7cf4802782cd..73c8032fe30c 100644
--- a/astro/wmspaceweather/Makefile
+++ b/astro/wmspaceweather/Makefile
@@ -14,7 +14,7 @@ COMMENT=	DockApp that shows the weather at geosynchronous orbit
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+RUN_DEPENDS=	p5-Time-modules>=0:devel/p5-Time-modules
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmSpaceWeather
 
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index 7a7b6d90012f..da00e8ac7f50 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/tkgeomap/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small demo for tkgeomap
 
-LIB_DEPENDS=	libtkgeomap.so:${PORTSDIR}/astro/tkgeomap
+LIB_DEPENDS=	libtkgeomap.so:astro/tkgeomap
 
 USES=		tk:run
 NO_BUILD=	yes
diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile
index 7719228cde4d..f4569378fd91 100644
--- a/astro/xephem/Makefile
+++ b/astro/xephem/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Interactive astronomical ephemeris program
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		gmake jpeg motif
 LDFLAGS+=	-lfontconfig
diff --git a/astro/xmoontool/Makefile b/astro/xmoontool/Makefile
index 51af1216d2ef..f429e53cb6e9 100644
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@@ -21,7 +21,7 @@ PORTDOCS=	NOTES
 PLIST_FILES=	bin/xmoontool man/man1/xmoontool.1.gz
 
 LIBNOVA_MAKE_ENV_OFF=	WITHOUT_LIBNOVA=yes
-LIBNOVA_LIB_DEPENDS=	libnova.so:${PORTSDIR}/astro/libnova
+LIBNOVA_LIB_DEPENDS=	libnova.so:astro/libnova
 MONOCHROME_MAKE_ENV=	DEFINES=""
 
 do-install:
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 2caf32b24367..431700d7cc76 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -21,19 +21,19 @@ OPTIONS_DEFINE=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 OPTIONS_DEFAULT=	FREETYPE PANGO GIF JPEG PNG PNM TIFF
 
 FREETYPE_CONFIGURE_WITH=	--with-freetype
-FREETYPE_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 PANGO_CONFIGURE_WITH=	pango
 PANGO_USE=	GNOME=pango
 GIF_CONFIGURE_WITH=	gif
-GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	png
-PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
+PNG_LIB_DEPENDS+=	libpng.so:graphics/png
 PNM_CONFIGURE_WITH=	pnm
-PNM_LIB_DEPENDS=	libnetpbm.so:${PORTSDIR}/graphics/netpbm
+PNM_LIB_DEPENDS=	libnetpbm.so:graphics/netpbm
 TIFF_CONFIGURE_WITH=	tiff
-TIFF_LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 
 post-extract:
 	@${REINPLACE_CMD} -e "s/default/default.sample/g" ${WRKSRC}/Makefile.in
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 19298e016da3..11a7215dde5b 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Harmonic tide clock and tide predictor
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:graphics/png
 
 USES=		compiler:c++0x gmake libtool localbase tar:bzip2
 GNU_CONFIGURE=	yes