Switch some dependencies from a directory name or a file generated by pkg-install

to a package name,  as the former can't be attributed to a package

54 files changed, 96 insertions, 97 deletions

diff --git a/audio/linux-c6-alsa-lib/Makefile b/audio/linux-c6-alsa-lib/Makefile
index 664824b5a01a..8f7da9e1820b 100644
--- a/audio/linux-c6-alsa-lib/Makefile
+++ b/audio/linux-c6-alsa-lib/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Advanced Linux Sound Architecture libraries (Linux CentOS ${LINUX_DIST_
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS=	alsa-lib>0:${PORTSDIR}/audio/alsa-lib
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]* linux-f10-alsa-lib-[0-9]*
 
diff --git a/audio/linux-f10-alsa-lib/Makefile b/audio/linux-f10-alsa-lib/Makefile
index a60e63b0eb02..573c8d7b4ca6 100644
--- a/audio/linux-f10-alsa-lib/Makefile
+++ b/audio/linux-f10-alsa-lib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Advanced Linux Sound Architecture libraries (Linux Fedora 10)
 
-RUN_DEPENDS=	${LOCALBASE}/etc/asound.conf:${PORTSDIR}/audio/alsa-lib
+RUN_DEPENDS=	alsa-lib>0:${PORTSDIR}/audio/alsa-lib
 
 CONFLICTS=	linux-alsa-lib-[0-9]* linux-f8-alsa-lib-[0-9]*
 
diff --git a/audio/linux-mbrola/Makefile b/audio/linux-mbrola/Makefile
index 24de33a78a9c..e28e3ee6f6cb 100644
--- a/audio/linux-mbrola/Makefile
+++ b/audio/linux-mbrola/Makefile
@@ -14,7 +14,7 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MBROLA speech synthesizer for Linux
 
-RUN_DEPENDS=	${LOCALBASE}/share/mbrolavox:${PORTSDIR}/audio/mbrolavox
+RUN_DEPENDS=	mbrolavox>0:${PORTSDIR}/audio/mbrolavox
 
 CONFLICTS=	mbrola-*
 NO_BUILD=	yes
diff --git a/cad/geda-gattrib/Makefile b/cad/geda-gattrib/Makefile
index 34c09bd69d2c..acf38a697df9 100644
--- a/cad/geda-gattrib/Makefile
+++ b/cad/geda-gattrib/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The gEDA's attribute editor
 
-RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	geda-symbols>0:${PORTSDIR}/cad/geda-symbols
 LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/libgeda
 
 DATADIR=	${PREFIX}/share/geda
diff --git a/cad/geda-gschem/Makefile b/cad/geda-gschem/Makefile
index d2b19a741251..42d7490e5cd4 100644
--- a/cad/geda-gschem/Makefile
+++ b/cad/geda-gschem/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The gEDA's electronic schematic capture tool
 
-RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	geda-symbols>0:${PORTSDIR}/cad/geda-symbols
 LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/libgeda
 
 DOCSDIR=	${PREFIX}/share/doc/geda
diff --git a/cad/geda-netlist/Makefile b/cad/geda-netlist/Makefile
index 138d2b103765..46aede750269 100644
--- a/cad/geda-netlist/Makefile
+++ b/cad/geda-netlist/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The gEDA's netlister
 
 LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/libgeda
-RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	geda-symbols>0:${PORTSDIR}/cad/geda-symbols
 
 DATADIR=	${PREFIX}/share/geda
 DOCSDIR=	${PREFIX}/share/doc/geda
diff --git a/cad/geda-symcheck/Makefile b/cad/geda-symcheck/Makefile
index 046d39ef11f1..cd6d4a7c3486 100644
--- a/cad/geda-symcheck/Makefile
+++ b/cad/geda-symcheck/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PKGNAMEPREFIX}g${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The gEDA's symbol checking utility
 
-RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	geda-symbols>0:${PORTSDIR}/cad/geda-symbols
 LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/libgeda
 
 DOCSDIR=	${PREFIX}/share/doc/geda
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index ceb1146bbdd6..e10a88ecd1a1 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The gEDA's utilities
 
-RUN_DEPENDS=	${LOCALBASE}/share/geda/sym:${PORTSDIR}/cad/geda-symbols
+RUN_DEPENDS=	geda-symbols>0:${PORTSDIR}/cad/geda-symbols
 LIB_DEPENDS=	libgeda.so:${PORTSDIR}/cad/libgeda
 
 DOCSDIR=	${PREFIX}/share/doc/geda
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index c568fdb250ac..55445b2e992c 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -94,7 +94,7 @@ CONFIGURE_ARGS+=--disable-nls
 .endif
 
 .if exists(${LOCALBASE}/lib/X11/fonts/dejavu) || ${PORT_OPTIONS:MDEJAVU}
-RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+RUN_DEPENDS+=	dejavu>0:${PORTSDIR}/x11-fonts/dejavu
 .endif
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index d045e7b7f1c2..9689875531ce 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -41,7 +41,7 @@ PLIST_SUB=	VER=${VER}
 PKGNAMESUFFIX=	-insight
 USES+=		tk
 LIB_DEPENDS=	libitk.so:${PORTSDIR}/x11-toolkits/itk
-RUN_DEPENDS=	${LOCALBASE}/lib/iwidgets:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
 DISTFILES+=	gdbtk-6.6${EXTRACT_SUFX}:gdbtk
 PLIST_SUB+=	INSIGHT=''
 EXTRA_PATCHES=	${FILESDIR}/itcl33-patch \
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index b77dacbeffed..0903b7330438 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python/Tkinter based source browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE_GPL2.txt
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6616a43f3792..bf212044ebcf 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -51,11 +51,11 @@ GTKMM_USE=		GNOME=gtkmm24
 GTKMM_CONFIGURE_ON=	--enable-gtkmm
 GTKMM_CONFIGURE_OFF=	--disable-gtkmm
 GUILE1_LIB_DEPENDS=     libguile.so:${PORTSDIR}/lang/guile
-GUILE1_BUILD_DEPENDS=	${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
-GUILE1_RUN_DEPENDS=	${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
+GUILE1_BUILD_DEPENDS=	slib-guile>0:${PORTSDIR}/lang/slib-guile
+GUILE1_RUN_DEPENDS=	slib-guile>0:${PORTSDIR}/lang/slib-guile
 GUILE2_LIB_DEPENDS=     libguile-2.0.so:${PORTSDIR}/lang/guile2
-GUILE2_BUILD_DEPENDS=	${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2
-GUILE2_RUN_DEPENDS=	${LOCALBASE}/share/guile/2.0/slibcat:${PORTSDIR}/lang/slib-guile2
+GUILE2_BUILD_DEPENDS=	slib-guile2>0:${PORTSDIR}/lang/slib-guile2
+GUILE2_RUN_DEPENDS=	slib-guile2>0:${PORTSDIR}/lang/slib-guile2
 
 USE_XORG=	x11
 USES=		desktop-file-utils gettext gmake libtool perl5 pkgconfig shebangfix tar:bzip2
diff --git a/french/aster/Makefile b/french/aster/Makefile
index a43264d2e1c9..d974905bee97 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -31,7 +31,7 @@ LICENSE=	GPLv2
 #
 #-----------------------------------------------------------------------
 
-BUILD_DEPENDS+=	${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	\
+BUILD_DEPENDS+=	astk-serveur>0:${PORTSDIR}/cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
 		${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch		\
 		python:${PORTSDIR}/lang/python					\
@@ -39,10 +39,10 @@ BUILD_DEPENDS+=	${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur	\
 LIB_DEPENDS+=	libhdf5.so:${PORTSDIR}/science/hdf5				\
 		libmed.so:${PORTSDIR}/french/med				\
 		libmetis.so.0:${PORTSDIR}/math/metis-edf
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot	\
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:${PORTSDIR}/math/py-gnuplot	\
 		${LOCALBASE}/bin/onmetis:${PORTSDIR}/math/metis-edf		\
 		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}		\
-		${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur
+		astk-serveur>0:${PORTSDIR}/cad/astk-serveur
 
 USES=		bison fortran tk python:2
 
@@ -80,13 +80,13 @@ FLAGARCH=	-DLINUX64
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
-RUN_DEPENDS+=	${ASTKDIR}:${PORTSDIR}/cad/astk-client
+RUN_DEPENDS+=	astk-client>0:${PORTSDIR}/cad/astk-client
 PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
 .if !defined(WITHOUT_EFICAS)
-RUN_DEPENDS+=	${LOCALBASE}/apps/eficas:${PORTSDIR}/french/eficas
+RUN_DEPENDS+=	fr-eficas>0:${PORTSDIR}/french/eficas
 PLIST_SUB+=	EFICAS=""
 .else
 PLIST_SUB+=	EFICAS="@comment "
diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 31ed84116e9d..63fcc0852d4e 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -11,8 +11,8 @@ COMMENT=	ASter Command FIle Editor
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw	\
-		${PYTHON_SITELIBDIR}/mx:${PORTSDIR}/lang/py-mx-base		\
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw	\
+		${PYTHON_PKGNAMEPREFIX}mx-base>0:${PORTSDIR}/lang/py-mx-base		\
 		bash:${PORTSDIR}/shells/bash					\
 		${PYNUMPY}
 
diff --git a/games/doom-data/Makefile.include b/games/doom-data/Makefile.include
index 94aaa17126fa..c73dc7faca71 100644
--- a/games/doom-data/Makefile.include
+++ b/games/doom-data/Makefile.include
@@ -12,5 +12,5 @@ PLIST_SUB+=	DMDIR="${DMDIR:S/${LOCALBASE}\///}"
 SUB_LIST+=	DMDIR="${DMDIR}"
 
 .if ${PORTNAME} != "data"
-RUN_DEPENDS+=	${DMDIR}:${PORTSDIR}/games/doom-data
+RUN_DEPENDS+=	doom-data>0:${PORTSDIR}/games/doom-data
 .endif
diff --git a/games/iourbanterror/Makefile b/games/iourbanterror/Makefile
index c9d4d8188429..ce61fcb266f4 100644
--- a/games/iourbanterror/Makefile
+++ b/games/iourbanterror/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	ioquake3-${DISTVERSION}
 MAINTAINER=	kamikaze@bsdforen.de
 COMMENT=	Quake 3 engine modified for Urban Terror (based on ioquake3)
 
-RUN_DEPENDS=	${Q3DIR}/q3ut4:${PORTSDIR}/games/urbanterror-data
+RUN_DEPENDS=	urbanterror-data>0:${PORTSDIR}/games/urbanterror-data
 
 MASTERDIR=	${.CURDIR}/../ioquake3
 
diff --git a/games/noegnud-littlehack/Makefile b/games/noegnud-littlehack/Makefile
index 92174bece2ba..c4f7e88ec683 100644
--- a/games/noegnud-littlehack/Makefile
+++ b/games/noegnud-littlehack/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The noeGNUd UI for the LittleHack variation of Nethack
 
-RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison tar:bzip2
diff --git a/games/noegnud-nethack-deet/Makefile b/games/noegnud-nethack-deet/Makefile
index fa25afc83835..f4cf078b47d2 100644
--- a/games/noegnud-nethack-deet/Makefile
+++ b/games/noegnud-nethack-deet/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The noeGNUd UI for Nethack with DeeT's hack font patch
 
-RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison tar:bzip2
diff --git a/games/noegnud-nethack/Makefile b/games/noegnud-nethack/Makefile
index 8481a2e4229c..7e96fa6c33d6 100644
--- a/games/noegnud-nethack/Makefile
+++ b/games/noegnud-nethack/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The noeGNUd UI for the vanilla Nethack
 
-RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison gmake tar:bzip2
diff --git a/games/noegnud-slashem/Makefile b/games/noegnud-slashem/Makefile
index 3b3527e148ac..0737464537ec 100644
--- a/games/noegnud-slashem/Makefile
+++ b/games/noegnud-slashem/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}_linux_src-minimal${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The noeGNUd UI for the SLASH'EM variant of Nethack
 
-RUN_DEPENDS=	${LOCALBASE}/share/${NOEGNUDVERSION}/data/gui:${PORTSDIR}/games/noegnud-data
+RUN_DEPENDS=	noegnud-data>0:${PORTSDIR}/games/noegnud-data
 
 NOEGNUDVERSION=	${PORTNAME}-0.8.0
 USES=		bison gmake tar:bzip2
diff --git a/games/quake2-data/Makefile.include b/games/quake2-data/Makefile.include
index 2f52221b769c..427ad958a7a2 100644
--- a/games/quake2-data/Makefile.include
+++ b/games/quake2-data/Makefile.include
@@ -58,5 +58,5 @@ SUB_LIST+=	Q2DIR="${Q2DIR}"
 
 .if ${PORTNAME} != data
 # Not depending on the particular .pak file since they are OPTIONS-dependent
-RUN_DEPENDS+=	${Q2DIR}:${PORTSDIR}/games/quake2-data
+RUN_DEPENDS+=	quake2-data>0:${PORTSDIR}/games/quake2-data
 .endif
diff --git a/games/uhexen2-extras/Makefile b/games/uhexen2-extras/Makefile
index 6bab518c79e1..e47f8c3ee28f 100644
--- a/games/uhexen2-extras/Makefile
+++ b/games/uhexen2-extras/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hexen II source port extras (demos, mods, etc)
 
-RUN_DEPENDS=	${DATADIR}:${PORTSDIR}/games/uhexen2
+RUN_DEPENDS=	uhexen2>0:${PORTSDIR}/games/uhexen2
 
 NO_BUILD=	yes
 
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index 60b764629dd6..e2fbb112b883 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -17,9 +17,9 @@ LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang \
-		${LOCALBASE}/lib/erlang/lib/esdl/include/sdl.hrl:${PORTSDIR}/devel/esdl
+		esdl>0:${PORTSDIR}/devel/esdl
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang \
-		${LOCALBASE}/lib/erlang/lib/esdl/include/sdl.hrl:${PORTSDIR}/devel/esdl
+		esdl>0:${PORTSDIR}/devel/esdl
 
 MAKE_ENV=	ESDL_PATH=${LOCALBASE}/lib/erlang/lib/esdl
 PLIST_SUB=	VERSION="${PORTVERSION}"
diff --git a/hebrew/he2/Makefile b/hebrew/he2/Makefile
index 4085cf926122..045c57030298 100644
--- a/hebrew/he2/Makefile
+++ b/hebrew/he2/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Editor for editing (primarily LaTeX) Hebrew files
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/hebrew:${PORTSDIR}/hebrew/elmar-fonts
+RUN_DEPENDS=	iw-elmar-fonts>0:${PORTSDIR}/hebrew/elmar-fonts
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 41252037ee54..0873f21b7359 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Oracle's Java 6 virtual machine release under the GPL v2
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS=	java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
 
 ONLY_FOR_ARCHS=	amd64 i386
 
diff --git a/java/eclipse-datatools/Makefile b/java/eclipse-datatools/Makefile
index a3bf8cc4dace..1f206f56a95b 100644
--- a/java/eclipse-datatools/Makefile
+++ b/java/eclipse-datatools/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	ljboiler@gmail.com
 COMMENT=	Data Tools Platform for the Eclipse IDE
 
 RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+		eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
 
 LICENSE=	EPL
 
diff --git a/java/eclipse-hibernatetools/Makefile b/java/eclipse-hibernatetools/Makefile
index 2708d348a2f8..1c1808a51abf 100644
--- a/java/eclipse-hibernatetools/Makefile
+++ b/java/eclipse-hibernatetools/Makefile
@@ -19,8 +19,8 @@ LICENSE_COMB=	multi
 ## XXX - Notify the maintainer if the dependencies on either
 ## java/eclipse-gef of java/eclipse-webtools change
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef \
-		${LOCALBASE}/share/eclipse/dropins/webtools:${PORTSDIR}/java/eclipse-webtools
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef \
+		eclipse-webtools>0:${PORTSDIR}/java/eclipse-webtools
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/java/eclipse-ocl/Makefile b/java/eclipse-ocl/Makefile
index 33dc7b23266f..f4fba2058599 100644
--- a/java/eclipse-ocl/Makefile
+++ b/java/eclipse-ocl/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	vj562001@yahoo.de
 COMMENT=	Implementation of the OCL OMG standard for EMF-based models
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf
+		eclipse-emf>0:${PORTSDIR}/java/eclipse-emf
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/java/eclipse-quantum/Makefile b/java/eclipse-quantum/Makefile
index 054fde683241..208b466af69d 100644
--- a/java/eclipse-quantum/Makefile
+++ b/java/eclipse-quantum/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Database access and SQL editor for the Eclipse IDE
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
 
 USES=		zip
 NO_WRKSUBDIR=	yes
diff --git a/java/eclipse-sqlexplorer/Makefile b/java/eclipse-sqlexplorer/Makefile
index 304b460523ac..5a606ca147c9 100644
--- a/java/eclipse-sqlexplorer/Makefile
+++ b/java/eclipse-sqlexplorer/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual database query tool for Eclipse
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/java/eclipse-uml/Makefile b/java/eclipse-uml/Makefile
index cea7e6fabcad..388c452cf75c 100644
--- a/java/eclipse-uml/Makefile
+++ b/java/eclipse-uml/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework creating UML diagrams in Eclipse
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf
+		eclipse-emf>0:${PORTSDIR}/java/eclipse-emf
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/java/eclipse-vep/Makefile b/java/eclipse-vep/Makefile
index 628494eaf74f..f7c175002f04 100644
--- a/java/eclipse-vep/Makefile
+++ b/java/eclipse-vep/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for creating GUI builders for Eclipse
 
 RUN_DEPENDS=	eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef
+		eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef
 
 USES=		zip
 NO_BUILD=	yes
diff --git a/java/eclipse-webtools/Makefile b/java/eclipse-webtools/Makefile
index 68d6d404475b..1a022e3a81ee 100644
--- a/java/eclipse-webtools/Makefile
+++ b/java/eclipse-webtools/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Webtools for eclipse
 LICENSE=	EPL
 
 RUN_DEPENDS=	${LOCALBASE}/bin/eclipse:${PORTSDIR}/java/eclipse \
-		${LOCALBASE}/share/eclipse/dropins/emf:${PORTSDIR}/java/eclipse-emf \
-		${LOCALBASE}/share/eclipse/dropins/gef:${PORTSDIR}/java/eclipse-gef \
-		${LOCALBASE}/share/eclipse/dropins/datatools:${PORTSDIR}/java/eclipse-datatools
+		eclipse-emf>0:${PORTSDIR}/java/eclipse-emf \
+		eclipse-gef>0:${PORTSDIR}/java/eclipse-gef \
+		eclipse-datatools>0:${PORTSDIR}/java/eclipse-datatools
 
 WRKSRC=		${WRKDIR}/eclipse
 USES=		zip
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 4050e14adc9f..f79185b9fd0c 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -28,7 +28,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
 
 OPENJDK_BUILDDATE=	20_jan_2015
 
@@ -79,7 +79,7 @@ CATEGORIES+=	ipv6
 .endif
 
 .if ${PORT_OPTIONS:MTZUPDATE}
-RUN_DEPENDS+=  ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+RUN_DEPENDS+=	java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
 .endif
 
 # avoid ARCH in MAKEFLAGS, breaks build
@@ -157,7 +157,7 @@ EXTRA_PATCHES+=	${FILESDIR}/alsa-disable.patch
 .if ${PORT_OPTIONS:MTEST}
 DISTFILES+=	${JTREGFILE}:jtreg
 EXTRACT_ONLY+=	${JTREGFILE}
-BUILD_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+BUILD_DEPENDS+=	dejavu>0:${PORTSDIR}/x11-fonts/dejavu
 USES+=		display:test
 .else
 EXTRA_PATCHES+=	${FILESDIR}/test_gamma-disable.patch
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index e0bf206c0e32..682d91df9902 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -57,7 +57,7 @@ BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
 
 DOS2UNIX_FILES=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
 
@@ -106,7 +106,7 @@ BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk7 \
 
 DEBUG_MAKE_ENV=	ALT_OBJCOPY=${NONEXISTENT}
 POLICY_MAKE_ENV=	UNLIMITED_CRYPTO=1
-TZUPDATE_RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+TZUPDATE_RUN_DEPENDS=	java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
 
 .include <bsd.port.options.mk>
 
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 2bfa0c571614..86ee4bf87a48 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libgif.so:${PORTSDIR}/graphics/giflib
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+		dejavu>0:${PORTSDIR}/x11-fonts/dejavu
 
 USES=		compiler:features dos2unix gmake iconv pkgconfig shebangfix
 USE_AUTOTOOLS=	autoconf
@@ -105,7 +105,7 @@ POLICY_DESC=		Install the Unlimited Strength Policy Files
 TZUPDATE_DESC=		Update the time zone data
 
 POLICY_CONFIGURE_ENABLE=unlimited-crypto
-TZUPDATE_RUN_DEPENDS=	${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo
+TZUPDATE_RUN_DEPENDS=	java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
 
 JAVAVMS_COMMENT=	OpenJDK${JDK_MAJOR_VERSION}
 
diff --git a/mail/squirrelmail-plugins/Makefile b/mail/squirrelmail-plugins/Makefile
index 73e68dd03aff..338a1fbe3c9a 100644
--- a/mail/squirrelmail-plugins/Makefile
+++ b/mail/squirrelmail-plugins/Makefile
@@ -21,70 +21,70 @@ OPTIONS_DEFINE=	BUTTONS CALENDAR LDAPPW LGAUTH LGNOTES MAILFT MLOGIN \
 	SQLPW TIMEOUT TMDA VLOGIN WEBSEARCH WETTER
 
 BUTTONS_DESC=	Custom (spam/ham/etc.) buttons
-BUTTONS_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/spam_buttons:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin
+BUTTONS_RUN_DEPENDS=	squirrelmail-spam-buttons-plugin>0:${PORTSDIR}/mail/squirrelmail-spam-buttons-plugin
 
 CALENDAR_DESC=	Shared Calendars plugin
-CALENDAR_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/calendar:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin
+CALENDAR_RUN_DEPENDS=	squirrelmail-shared_calendars-plugin>0:${PORTSDIR}/mail/squirrelmail-shared_calendars-plugin
 
 LDAPPW_DESC=	Change LDAP passwords plugin
-LDAPPW_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/change_ldappass:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin
+LDAPPW_RUN_DEPENDS=	squirrelmail-change_ldappass-plugin>0:${PORTSDIR}/mail/squirrelmail-change_ldappass-plugin
 
 LGAUTH_DESC=	HTTP-auth based login plugin
-LGAUTH_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/login_auth:${PORTSDIR}/mail/squirrelmail-login_auth-plugin
+LGAUTH_RUN_DEPENDS=	squirrelmail-login_auth-plugin>0:${PORTSDIR}/mail/squirrelmail-login_auth-plugin
 
 LGNOTES_DESC=	Notes on login screen plugin
-LGNOTES_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/login_notes:${PORTSDIR}/mail/squirrelmail-login_notes-plugin
+LGNOTES_RUN_DEPENDS=	squirrelmail-login_notes-plugin>0:${PORTSDIR}/mail/squirrelmail-login_notes-plugin
 
 MAILFT_DESC=	E-mail footer plugin
-MAILFT_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/email_footer:${PORTSDIR}/mail/squirrelmail-email_footer-plugin
+MAILFT_RUN_DEPENDS=	squirrelmail-email_footer-plugin>0:${PORTSDIR}/mail/squirrelmail-email_footer-plugin
 
 MLOGIN_DESC=	Multilogin plugin
-MLOGIN_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/multilogin:${PORTSDIR}/mail/squirrelmail-multilogin-plugin
+MLOGIN_RUN_DEPENDS=	squirrelmail-multilogin-plugin>0:${PORTSDIR}/mail/squirrelmail-multilogin-plugin
 
 NOTES_DESC=	Notes plugin
-NOTES_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/notes:${PORTSDIR}/mail/squirrelmail-notes-plugin
+NOTES_RUN_DEPENDS=	squirrelmail-notes-plugin>0:${PORTSDIR}/mail/squirrelmail-notes-plugin
 
 NOTIFY_DESC=	New mail notify plugin
-NOTIFY_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/notify:${PORTSDIR}/mail/squirrelmail-notify-plugin
+NOTIFY_RUN_DEPENDS=	squirrelmail-notify-plugin>0:${PORTSDIR}/mail/squirrelmail-notify-plugin
 
 PUPDATE_DESC=	Plugin update check plugin
-PUPDATE_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/pupdate:${PORTSDIR}/mail/squirrelmail-pupdate-plugin
+PUPDATE_RUN_DEPENDS=	squirrelmail-pupdate-plugin>0:${PORTSDIR}/mail/squirrelmail-pupdate-plugin
 
 PW4GET_DESC=	Password forget plugin
-PW4GET_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/password_forget:${PORTSDIR}/mail/squirrelmail-password_forget-plugin
+PW4GET_RUN_DEPENDS=	squirrelmail-password_forget-plugin>0:${PORTSDIR}/mail/squirrelmail-password_forget-plugin
 
 QMADMIN_DESC=	Qmailadmin login plugin
-QMADMIN_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/qmailadmin_login:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin
+QMADMIN_RUN_DEPENDS=	squirrelmail-qmailadmin_login-plugin>0:${PORTSDIR}/mail/squirrelmail-qmailadmin_login-plugin
 
 QUOTA_DESC=	Quota usage plugin
-QUOTA_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/quota_usage:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin
+QUOTA_RUN_DEPENDS=	squirrelmail-quota_usage-plugin>0:${PORTSDIR}/mail/squirrelmail-quota_usage-plugin
 
 SASQL_DESC=	SpamAssassin SQL plugin
-SASQL_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/sasql:${PORTSDIR}/mail/squirrelmail-sasql-plugin
+SASQL_RUN_DEPENDS=	squirrelmail-sasql-plugin>0:${PORTSDIR}/mail/squirrelmail-sasql-plugin
 
 SIEVE_DESC=	Sieve Mail Filters plugin
-SIEVE_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/avelsieve:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin
+SIEVE_RUN_DEPENDS=	squirrelmail-avelsieve-plugin>0:${PORTSDIR}/mail/squirrelmail-avelsieve-plugin
 
 SLOGIN_DESC=	SSL login plugin
-SLOGIN_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/secure_login:${PORTSDIR}/mail/squirrelmail-secure_login-plugin
+SLOGIN_RUN_DEPENDS=	squirrelmail-secure_login-plugin>0:${PORTSDIR}/mail/squirrelmail-secure_login-plugin
 
 SQLPW_DESC=	Change *SQL passwords plugin
-SQLPW_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/change_sqlpass:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin
+SQLPW_RUN_DEPENDS=	squirrelmail-change-sqlpass-plugin>0:${PORTSDIR}/mail/squirrelmail-change_sqlpass-plugin
 
 TIMEOUT_DESC=	User session timeout plugin
-TIMEOUT_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/timeout_user:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin
+TIMEOUT_RUN_DEPENDS=	squirrelmail-timeout_user-plugin>0:${PORTSDIR}/mail/squirrelmail-timeout_user-plugin
 
 TMDA_DESC=	TMDA plugin
-TMDA_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/tmdatools:${PORTSDIR}/mail/squirrelmail-tmda-plugin
+TMDA_RUN_DEPENDS=	squirrelmail-tmda-plugin>0:${PORTSDIR}/mail/squirrelmail-tmda-plugin
 
 VLOGIN_DESC=	Multi-site-hosting capabilities plugin
-VLOGIN_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/vlogin:${PORTSDIR}/mail/squirrelmail-vlogin-plugin
+VLOGIN_RUN_DEPENDS=	squirrelmail-vlogin-plugin>0:${PORTSDIR}/mail/squirrelmail-vlogin-plugin
 
 WEBSEARCH_DESC=	Web search engines plugin
-WEBSEARCH_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/web_search:${PORTSDIR}/mail/squirrelmail-websearch-plugin
+WEBSEARCH_RUN_DEPENDS=	squirrelmail-web_search-plugin>0:${PORTSDIR}/mail/squirrelmail-websearch-plugin
 
 WETTER_DESC=	Weather in Germany plugin
-WETTER_RUN_DEPENDS=	${SQUIRRELDIR}/plugins/wetteronline:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin
+WETTER_RUN_DEPENDS=	squirrelmail-wetteronline-plugin>0:${PORTSDIR}/mail/squirrelmail-wetteronline-plugin
 
 do-install: build
 	@${DO_NADA}
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 2640d231eaa1..3612fe493f3e 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-1.4.0
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	iCal-compliant calendaring for SquirrelMail
 
-RUN_DEPENDS=	${SQUIRRELDIR}/plugins/calendar_file_backend:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
+RUN_DEPENDS=	squirrelmail-calendar_file_backend-plugin>0:${PORTSDIR}/mail/squirrelmail-calendar_file_backend-plugin
 
 USE_SM_COMPAT=	yes
 USE_GENERIC_PKGMESSAGE=	yes
diff --git a/mail/squirrelmail/bsd.squirrelmail.mk b/mail/squirrelmail/bsd.squirrelmail.mk
index 2480e8a2e18d..f49d905f334e 100644
--- a/mail/squirrelmail/bsd.squirrelmail.mk
+++ b/mail/squirrelmail/bsd.squirrelmail.mk
@@ -36,7 +36,7 @@ DIST_SUBDIR?=	squirrelmail
 RUN_DEPENDS+=	${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail
 
 .ifdef USE_SM_COMPAT
-RUN_DEPENDS+=	${SQUIRRELDIR}/plugins/compatibility:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
+RUN_DEPENDS+=	squirrelmail-compatibility-plugin>0:${PORTSDIR}/mail/squirrelmail-compatibility-plugin
 .endif
 
 .ifndef WITHOUT_ACTIVATE
diff --git a/mail/vqregister/Makefile b/mail/vqregister/Makefile
index 657ea672d898..8866e7b63664 100644
--- a/mail/vqregister/Makefile
+++ b/mail/vqregister/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.inter7.com/vqregister/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Admin-configurable email user signup CGI
 
-BUILD_DEPENDS=	${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail
-RUN_DEPENDS=	${VPOPMAIL_DIR}:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail
+RUN_DEPENDS=	vpopmail>0:${PORTSDIR}/mail/vpopmail
 
 USE_APACHE_RUN=	22+
 VPOPMAIL_DIR?=	${LOCALBASE}/vpopmail
diff --git a/math/py-basemap/Makefile b/math/py-basemap/Makefile
index 22e0f3677269..2ae2f377e880 100644
--- a/math/py-basemap/Makefile
+++ b/math/py-basemap/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Plots data on map projections with continental and political boundaries
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/matplotlib/:${PORTSDIR}/math/py-matplotlib
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 60b17f981af0..90bd01301b13 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -87,8 +87,7 @@ USE_XORG+=	xxf86dga
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
-USE_XORG+=	glproto
-LIB_DEPENDS+=	libGL.so:${PORTSDIR}/graphics/libGL
+USE_GL+=	gl
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 6b0c0b9b64b0..e11c9cdb938d 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Graphical client for the Gale instant messaging system
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pmw>0:${PORTSDIR}/x11-toolkits/py-Pmw
 
 USE_OPENSSL=	yes
 USES=		python
diff --git a/net/smm++/Makefile b/net/smm++/Makefile
index aec8e600e68f..10c77337d9f5 100644
--- a/net/smm++/Makefile
+++ b/net/smm++/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	smm611
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Graphical mudclient with mapper
 
-RUN_DEPENDS=	${LOCALBASE}/lib/iwidgets4.0.1/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
 BUILD_DEPENDS=	${LOCALBASE}/lib/libitk.so:${PORTSDIR}/x11-toolkits/itk \
 		${LOCALBASE}/lib/libitcl.so:${PORTSDIR}/lang/itcl
 
diff --git a/security/sguil/Makefile b/security/sguil/Makefile
index b765d4ff4f2a..0436cb69ce44 100644
--- a/security/sguil/Makefile
+++ b/security/sguil/Makefile
@@ -45,7 +45,7 @@ SERVER_RUN_DEPENDS=	p0f:${PORTSDIR}/net-mgmt/p0f \
 	                tcpflow:${PORTSDIR}/net/tcpflow \
 	                dtplite:${PORTSDIR}/devel/tcllib
 CLIENT_RUN_DEPENDS=	dtplite:${PORTSDIR}/devel/tcllib \
-			${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets \
+			iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets \
 			gpg2:${PORTSDIR}/security/gnupg
 SENSOR_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2-sguil
 MYSQL_LIB_DEPENDS=	libmysqltcl3.052.so:${PORTSDIR}/databases/mysqltcl
diff --git a/sysutils/yum/Makefile b/sysutils/yum/Makefile
index 3dd7fc247f5f..ec38137dea1c 100644
--- a/sysutils/yum/Makefile
+++ b/sysutils/yum/Makefile
@@ -14,11 +14,11 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		msgfmt:${PORTSDIR}/devel/gettext \
 		intltool-update:${PORTSDIR}/textproc/intltool
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/rpm:${PORTSDIR}/archivers/rpm4 \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/rpm/__init__.py:${PORTSDIR}/archivers/rpm4 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/sqlitecachec.py:${PORTSDIR}/devel/py-yum-metadata-parser \
-		${PYTHON_SITELIBDIR}/iniparse:${PORTSDIR}/devel/py-iniparse \
-		${PYTHON_SITELIBDIR}/urlgrabber:${PORTSDIR}/www/py-urlgrabber
+		${PYTHON_PKGNAMEPREFIX}iniparse>0:${PORTSDIR}/devel/py-iniparse \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>0:${PORTSDIR}/www/py-urlgrabber
 
 USES=		gettext gmake python
 
diff --git a/textproc/lasem/Makefile b/textproc/lasem/Makefile
index d16df16dd794..12c2c2c726e8 100644
--- a/textproc/lasem/Makefile
+++ b/textproc/lasem/Makefile
@@ -13,7 +13,7 @@ COMMENT=	SVG/Mathml renderer and editor
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/stix:${PORTSDIR}/x11-fonts/stix-fonts
+RUN_DEPENDS=	stixfonts>0:${PORTSDIR}/x11-fonts/stix-fonts
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index 37fad20a0025..52ec89a97cba 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.billposer.org/Software/Downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual regexp development and execution
 
-RUN_DEPENDS=	${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwidgets
+RUN_DEPENDS=	iwidgets>0:${PORTSDIR}/x11-toolkits/iwidgets
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/textproc/resume-extensions/Makefile b/textproc/resume-extensions/Makefile
index 7ff58def6239..1070a987dcd1 100644
--- a/textproc/resume-extensions/Makefile
+++ b/textproc/resume-extensions/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	xml${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extends the XML Resume library
 
-RUN_DEPENDS=	${LOCALBASE}/share/xsl/resume:${PORTSDIR}/textproc/resume \
+RUN_DEPENDS=	resume>0:${PORTSDIR}/textproc/resume \
 		${LOCALBASE}/share/xsl/string/print-n-times.xsl:${PORTSDIR}/textproc/print-n-times \
 		${LOCALBASE}/share/xsl/xhtml/add-css-links.xsl:${PORTSDIR}/textproc/add-css-links
 
diff --git a/www/drupal6-wysiwyg/Makefile b/www/drupal6-wysiwyg/Makefile
index 55396ebe71ac..df7bb96a293a 100644
--- a/www/drupal6-wysiwyg/Makefile
+++ b/www/drupal6-wysiwyg/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Allows implementation of WYSIWYG editors for editing Drupal content
 TINYMCEDIR=	www/tinymce
 
 # we support either tinymce2 or tinymce3
-RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}:${PORTSDIR}/www/tinymce3
+RUN_DEPENDS+=	${LOCALBASE}/${TINYMCEDIR}/changelog.txt:${PORTSDIR}/www/tinymce3
 
 PLIST_FILES+=	${DRUPAL_MODDIR}/tinymce
 
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 1122133b6dd3..642d1fceabb1 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	34132-Gray
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gray theme for GTK+ 2.0
 
-RUN_DEPENDS=	${LOCALBASE}/share/icons/Tango:${PORTSDIR}/x11-themes/icons-tango
+RUN_DEPENDS=	icons-tango>0:${PORTSDIR}/x11-themes/icons-tango
 
 NO_BUILD=	yes
 USE_GNOME=	gtk20
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index 96b0de0e9d0e..5a54d96c24f1 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	fontconfig>=2.10.91:${PORTSDIR}/x11-fonts/fontconfig \
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libharfbuzz.so:${PORTSDIR}/print/harfbuzz \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
-RUN_DEPENDS=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
+RUN_DEPENDS=	xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 
 USES+=		gettext gmake libtool pathfix pkgconfig
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index a85104eb6ffa..cec41e89eb6d 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -71,7 +71,7 @@ CONFIGURE_ARGS+=-no-gtkstyle
 .endif
 
 .if defined(PACKAGE_BUILDING)
-RUN_DEPENDS+=	${FONTSCALE}:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
+RUN_DEPENDS+=	xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype \
 		${FONTENCOD}:${PORTSDIR}/x11-fonts/encodings
 .endif
 
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index 413351ebe2a2..52216e5c0dc8 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -58,7 +58,7 @@ QT_CONFIG=	accessibility accessibility-atspi-bridge dbus \
 # Inherited from Qt 4.
 .if defined(PACKAGE_BUILDING)
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
-		${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
+		xorg-fonts-truetype>0:${PORTSDIR}/x11-fonts/xorg-fonts-truetype
 .endif
 
 CFLAGS_powerpc64=	-mminimal-toc