Index: head/net/sngrep/Makefile
===================================================================
--- head/net/sngrep/Makefile	(revision 412638)
+++ head/net/sngrep/Makefile	(revision 412639)
@@ -1,57 +1,57 @@
 # Created by: Talal Al Dik (tad@vif.com)
 # $FreeBSD$
 
 PORTNAME=	sngrep
 PORTVERSION=	1.3.0
 CATEGORIES=	net
 
 MAINTAINER=	tad@vif.com
 COMMENT=	SIP Packet display and capture
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libncurses.so:${PORTSDIR}/devel/ncurses \
-		libpcap.so:${PORTSDIR}/net/libpcap
+LIB_DEPENDS=	libncurses.so:devel/ncurses \
+		libpcap.so:net/libpcap
 
 #CPPFLAGS+=      -I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	irontec
 GH_TAGNAME=	v${PORTVERSION}
 
 OPTIONS_DEFINE=	OPENSSL PCRE UNICODE IPV6 EEP
 
 OPENSSL_DESC=	Adds OpenSSL support to parse TLS captured messages
 OPENSSL_CONFIGURE_ON=	--with-openssl
 OPENSSL_USE=		OPENSSL=yes
 
 PCRE_DESC=	Adds Perl Compatible regex support
 PCRE_CONFIGURE_ON=	--with-pcre
-PCRE_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 
 UNICODE_DESC=	Adds Ncurses UTF-8/Unicode support
 UNICODE_CONFIGURE_ON=	--enable-unicode
-UNICODE_LIB_DEPENDS=	libncursesw.so:${PORTSDIR}/devel/ncurses
+UNICODE_LIB_DEPENDS=	libncursesw.so:devel/ncurses
 
 IPV6_DESC=	Enable IPv6 packet capture support
 IPV6_CONFIGURE_ON=	--enable-ipv6
 
 EEP_DESC=	Enable EEP packet send/receive support
 EEP_CONFIGURE_ON=	--enable-eep
 
 GNU_CONFIGURE=	yes
 USES=autoreconf
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|ncursesw/ncurses.h|ncurses.h|g' \
 	${WRKSRC}/configure.ac \
 	${WRKSRC}/src/curses/scrollbar.h \
 	${WRKSRC}/src/curses/ui_panel.h
 
 .include <bsd.port.options.mk>
 
 .include <bsd.port.mk>
Index: head/sysutils/mcollective-puppet-agent/Makefile
===================================================================
--- head/sysutils/mcollective-puppet-agent/Makefile	(revision 412638)
+++ head/sysutils/mcollective-puppet-agent/Makefile	(revision 412639)
@@ -1,19 +1,19 @@
 # Created by: Anes Mukhametov <anes@anes.su>
 # $FreeBSD$
 
 PORTNAME=	mcollective-puppet-agent
 
 COMMENT=	MCollective agent to manage the Puppet Agent
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-puppet-common
+RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:sysutils/mcollective-puppet-common
 
 MASTERDIR=	${.CURDIR}/../mcollective-puppet-common
 
 PLIST_FILES=	share/mcollective/agent/puppet.rb
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.rb" ${STAGEDIR}${PREFIX}/share/mcollective
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/mcollective-puppet-client/Makefile
===================================================================
--- head/sysutils/mcollective-puppet-client/Makefile	(revision 412638)
+++ head/sysutils/mcollective-puppet-client/Makefile	(revision 412639)
@@ -1,20 +1,20 @@
 # $FreeBSD$
 
 PORTNAME=	mcollective-puppet-client
 
 COMMENT=	MCollective client to manage the Puppet Agent
 
 # See MASTERDIR for MAINTAINER.
 
-RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:${PORTSDIR}/sysutils/mcollective-puppet-common
+RUN_DEPENDS=	mcollective-puppet-common>=${PORTVERSION}:sysutils/mcollective-puppet-common
 
 MASTERDIR=	${.CURDIR}/../mcollective-puppet-common
 
 PLIST_FILES=	share/mcollective/application/puppet.rb \
 		share/mcollective/aggregate/boolean_summary.ddl \
 		share/mcollective/aggregate/boolean_summary.rb
 
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "aggregate application" ${STAGEDIR}${PREFIX}/share/mcollective
 
 .include "${MASTERDIR}/Makefile"
Index: head/sysutils/mcollective-puppet-common/Makefile
===================================================================
--- head/sysutils/mcollective-puppet-common/Makefile	(revision 412638)
+++ head/sysutils/mcollective-puppet-common/Makefile	(revision 412639)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME?=	mcollective-puppet-common
 PORTVERSION=	1.10.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	romain@FreeBSD.org
 COMMENT?=	MCollective common files to manage the Puppet Agent
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS?=	mcollective>=2:${PORTSDIR}/sysutils/mcollective
+RUN_DEPENDS?=	mcollective>=2:sysutils/mcollective
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	puppetlabs
 GH_PROJECT=	mcollective-puppet-agent
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PLIST_FILES?=	share/mcollective/agent/puppet.ddl \
 		share/mcollective/data/puppet_data.ddl \
 		share/mcollective/data/puppet_data.rb \
 		share/mcollective/data/resource_data.ddl \
 		share/mcollective/data/resource_data.rb \
 		share/mcollective/util/puppet_agent_mgr.rb \
 		share/mcollective/util/puppet_agent_mgr/mgr_v2.rb \
 		share/mcollective/util/puppet_agent_mgr/mgr_v3.rb \
 		share/mcollective/util/puppet_agent_mgr/mgr_windows.rb \
 		share/mcollective/util/puppet_server_address_validation.rb \
 		share/mcollective/util/puppetrunner.rb \
 		share/mcollective/validator/puppet_resource_validator.ddl \
 		share/mcollective/validator/puppet_resource_validator.rb \
 		share/mcollective/validator/puppet_server_address_validator.ddl \
 		share/mcollective/validator/puppet_server_address_validator.rb \
 		share/mcollective/validator/puppet_tags_validator.ddl \
 		share/mcollective/validator/puppet_tags_validator.rb \
 		share/mcollective/validator/puppet_variable_validator.ddl \
 		share/mcollective/validator/puppet_variable_validator.rb
 
 .if !target(do-install)
 do-install:
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "agent/*.ddl data util validator" ${STAGEDIR}${PREFIX}/share/mcollective
 .endif
 
 .include <bsd.port.mk>