diff --git a/graphics/fotoxx/Makefile b/graphics/fotoxx/Makefile
index 9bc46f665a60..daa7612d63f2 100644
--- a/graphics/fotoxx/Makefile
+++ b/graphics/fotoxx/Makefile
@@ -1,62 +1,61 @@
 # Created by: Rod Person <rodperson@rodperson.com>
 # $FreeBSD$
 
 PORTNAME=	fotoxx
 PORTVERSION=	14.02.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.kornelix.com/uploads/1/3/0/3/13035936/ \
 		LOCAL/mandree
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application to organize and edit image collections
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		ufraw-batch:${PORTSDIR}/graphics/ufraw \
 		exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		dcraw:${PORTSDIR}/graphics/dcraw
 
-USES=		gmake desktop-file-utils pkgconfig
+USES=		execinfo gmake desktop-file-utils pkgconfig
 USE_GNOME=	gtk30
 
 ALL_TARGET=	fotoxx
 INSTALL_TARGET=	install MANDIR=${PREFIX}/man/man1/
 
 LDFLAGS+=	-O3 -g -Wall -rdynamic -lexecinfo
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@# drop xdg-desktop-menu calls, they fail
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		-e '/xdg-desktop-menu/d' \
 		-e '/rm -f -R/d' \
 		${WRKSRC}/Makefile
 	@# replace obsolete include files
 	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/zfuncs.h
 	@# fix up icon path in XDG .desktop file
 	${REINPLACE_CMD} -e 's}/usr/share/fotoxx}${DATADIR}}' \
 		${WRKSRC}/desktop
 
 post-install:
 		${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fotoxx
 
 .include <bsd.port.pre.mk>
 
 # These hacks are required because the nginx server at the primary
 # master site and most of our fetch(1) versions do not get along well.
 #   This code can be removed once r261263 has been merged from
 # base/head into all ports-supported releases.
 # We depend on cURL unless wget is in $LOCALPATH:
 DISABLE_SIZE=	yes
 .if exists(${LOCALBASE}/bin/wget) && !exists(${PREFIX}/bin/curl)
 FETCH_CMD=		${LOCALBASE}/bin/wget -c -nc
 .else
 FETCH_DEPENDS=		curl:${PORTSDIR}/ftp/curl
 FETCH_CMD=		${PREFIX}/bin/curl -OL0C -
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index e3982bc56725..de4a0c0f05e1 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -1,73 +1,72 @@
 # Created by: Doug Barton <dougb@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
 PORTVERSION=	3.1.11
 PORTREVISION?=	0
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
 
 LICENSE=	GPLv2
 
 # ABI versions specified on purpose for libtorrent-rasterbar
-LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
-		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
 
-USES=		pkgconfig
+USES=		execinfo pkgconfig
 USE_QT4=	corelib network qmake_build linguist_build moc_build \
 		rcc_build uic_build
 QT_NONSTANDARD=	yes
 DESTDIRNAME=	INSTALL_ROOT
 
 .if !defined(SLAVE_PORT)
 LIB_DEPENDS+=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 USES+=		desktop-file-utils
 USE_QT4+=	gui xml
 INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=	DBUS
 .endif
 
 SUB_FILES=	pkg-message
 
 PORTDOCS=	AUTHORS Changelog README.md
 
 OPTIONS_DEFINE=	DEBUG DOCS DBUS
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DBUS_CONFIGURE_ENABLE=	qt-dbus
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDBUS}
 USE_QT4+=	dbus
 .endif
 
 do-configure:
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \
 		./configure --prefix=${PREFIX}
 .else
 	@cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \
 		./configure --prefix=${PREFIX} --disable-gui
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 .else
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent-nox
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 .endif
 
 .include <bsd.port.mk>