49 files changed, 50 insertions, 86 deletions

diff --git a/databases/kbibtex/Makefile b/databases/kbibtex/Makefile
index 7af85d37bc87..7ab9b7df8d51 100644
--- a/databases/kbibtex/Makefile
+++ b/databases/kbibtex/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Bibliography editor for KDE
 
 LIB_DEPENDS=	libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 
-USE_BZIP2=	yes
-USES=		cmake shared-mime-info
+USES=		cmake shared-mime-info tar:bzip2
 USE_GNOME=	libxml2 libxslt
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build \
diff --git a/deskutils/plasma-applet-qstardict/Makefile b/deskutils/plasma-applet-qstardict/Makefile
index d6ec3302102c..d4b6e71e35d5 100644
--- a/deskutils/plasma-applet-qstardict/Makefile
+++ b/deskutils/plasma-applet-qstardict/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Dictionary plasma applet for KDE
 
 RUN_DEPENDS=	${QSTARDICT_PLUGIN_PATH}/libstardict.so:${PORTSDIR}/textproc/qstardict
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_QT4=	qmake_build uic_build moc_build rcc_build
 USE_KDE4=	automoc4 kdeprefix kdelibs
 CMAKE_SOURCE_PATH=	${WRKSRC}/kdeplasma
diff --git a/editors/kile-kde4/Makefile b/editors/kile-kde4/Makefile
index 235a1d678683..341c3b911d3b 100644
--- a/editors/kile-kde4/Makefile
+++ b/editors/kile-kde4/Makefile
@@ -12,8 +12,7 @@ COMMENT=	LaTeX source editor for KDE
 
 RUN_DEPENDS=	identify:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USES=		cmake shared-mime-info
+USES=		cmake shared-mime-info tar:bzip2
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_KDE4=	kdeprefix kdelibs automoc4 kate_run
 USE_TEX=	latex
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index 313437d68487..7aeeece65660 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -13,8 +13,7 @@ COMMENT=	LaTeX Development Environment
 LIB_DEPENDS=	libpoppler.so:${PORTSDIR}/graphics/poppler \
 		libpoppler-qt4.so:${PORTSDIR}/graphics/poppler-qt4
 
-USES=		desktop-file-utils pkgconfig qmake
-USE_BZIP2=	yes
+USES=		desktop-file-utils pkgconfig qmake tar:bzip2
 USE_GHOSTSCRIPT_RUN=	yes
 USE_QT4=	gui network xml webkit \
 		moc_build rcc_build uic_build
diff --git a/emulators/aqemu/Makefile b/emulators/aqemu/Makefile
index b9695e1cd969..b3ced03140b8 100644
--- a/emulators/aqemu/Makefile
+++ b/emulators/aqemu/Makefile
@@ -10,10 +10,9 @@ COMMENT=	Qt 4 based Qemu frontend
 
 LIB_DEPENDS=	libvncclient.so:${PORTSDIR}/net/libvncserver
 
-USE_BZIP2=	yes
 USE_QT4=	gui qtestlib xml qmake_build uic_build moc_build rcc_build \
 		linguist_build
-USES=		cmake
+USES=		cmake tar:bzip2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S,.0$,,}
 
 .include <bsd.port.mk>
diff --git a/emulators/dboxfe/Makefile b/emulators/dboxfe/Makefile
index 81aad1da4fa2..c067ed05b17c 100644
--- a/emulators/dboxfe/Makefile
+++ b/emulators/dboxfe/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Qt4 based configuration manager for DOSBox
 
 RUN_DEPENDS=	dosbox:${PORTSDIR}/emulators/dosbox
 
-USE_BZIP2=	yes
 USE_QT4=	gui network xml uic_build moc_build qmake_build rcc_build
-USES=		qmake
+USES=		qmake tar:bzip2
 
 PLIST_FILES=	bin/dboxfe \
 		bin/dboxfetray \
diff --git a/emulators/qtemu/Makefile b/emulators/qtemu/Makefile
index a41692205cc9..85abd83d84a1 100644
--- a/emulators/qtemu/Makefile
+++ b/emulators/qtemu/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES=	SF
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based frontend for QEMU
 
-USE_BZIP2=	yes
 USE_QT4=	gui xml uic_build moc_build rcc_build
-USES=		qmake
+USES=		qmake tar:bzip2
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 
 DESKTOP_ENTRIES="QtEmu" "QEMU frontend" "" \
diff --git a/ftp/plasma-applet-ftpmonitor/Makefile b/ftp/plasma-applet-ftpmonitor/Makefile
index da07dbcda178..6f764be1653d 100644
--- a/ftp/plasma-applet-ftpmonitor/Makefile
+++ b/ftp/plasma-applet-ftpmonitor/Makefile
@@ -10,8 +10,7 @@ PKGNAMEPREFIX=	plasma-applet-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE4 Plasma applet, which monitors connections to ftp daemons
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_KDE4=	kdelibs kdeprefix automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 
diff --git a/games/hexxagon/Makefile b/games/hexxagon/Makefile
index 4482e426b552..c46f8b693ace 100644
--- a/games/hexxagon/Makefile
+++ b/games/hexxagon/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Strategy hexagon game
 
 LIB_DEPENDS=	libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 
 DESKTOP_ENTRIES="Hexxagon" "Strategy Game" "" \
diff --git a/games/kmancala/Makefile b/games/kmancala/Makefile
index 6dc98dcb2458..331d76b5cbb8 100644
--- a/games/kmancala/Makefile
+++ b/games/kmancala/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	kMancala-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Board game for KDE, also known as Mancala or Kalah
 
-USE_BZIP2=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:bzip2
 USE_KDE4=	kdelibs kdeprefix automoc4 libkdegames
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/games/supertux-devel/Makefile b/games/supertux-devel/Makefile
index 6ad1a8199146..3b7d3161e4d7 100644
--- a/games/supertux-devel/Makefile
+++ b/games/supertux-devel/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USE_BZIP2=	yes
 USE_SDL=	image
 USE_GL=		glew
-USES=		cmake:outsource iconv openal:al
+USES=		cmake:outsource iconv openal:al tar:bzip2
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 
 post-patch:
diff --git a/games/supertux/Makefile b/games/supertux/Makefile
index 343a7228a6a6..2784bfdf17c7 100644
--- a/games/supertux/Makefile
+++ b/games/supertux/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Side-scroller game similar to Super Mario Brothers
 
-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 USE_SDL=	image mixer
 USE_GL=		gl
 GNU_CONFIGURE=	yes
diff --git a/games/trigger/Makefile b/games/trigger/Makefile
index 72d2e9d026a0..e284da8240eb 100644
--- a/games/trigger/Makefile
+++ b/games/trigger/Makefile
@@ -15,10 +15,9 @@ COMMENT=	Rally car racing game
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam
 LIB_DEPENDS=	libphysfs.so:${PORTSDIR}/devel/physfs
 
-USES=		openal:al,alut
+USES=		openal:al,alut tar:bzip2
 USE_SDL=	sdl image
 USE_GL=		glu
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
diff --git a/games/warmux/Makefile b/games/warmux/Makefile
index 516faf035ed5..e4d5111953b4 100644
--- a/games/warmux/Makefile
+++ b/games/warmux/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libxml++-2.6.so:${PORTSDIR}/textproc/libxml++26 \
 
 CONFLICTS_INSTALL=	wormux-*
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 USE_SDL=	sdl image mixer ttf gfx net
 USE_DOS2UNIX=	fixed_class.h
 
diff --git a/graphics/fraqtive/Makefile b/graphics/fraqtive/Makefile
index 7f60304d8fd7..62fa40013585 100644
--- a/graphics/fraqtive/Makefile
+++ b/graphics/fraqtive/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/fraqtive/Fraqtive/Fraqtive%20${PORTVERSION}/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Draws Mandelbrot and Julia fractals
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_QT4=	gui opengl xml qmake_build uic_build moc_build rcc_build
 QT_NONSTANDARD=	yes
 USE_GL=		glu
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index 386cb2a01e45..2b85f3e23239 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -22,12 +22,11 @@ COMMENT?=	IRC client for KDE 4
 CONFLICTS_INSTALL=	kvirc-qt4-4.*
 .endif
 
-USE_BZIP2=	yes
 USE_OPENSSL=	yes
 USE_PERL5=	build
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		dbus gui network sql xml
-USES=		cmake gettext perl5
+USES=		cmake gettext perl5 tar:bzip2
 CMAKE_ARGS=	-DWANT_ESD=no -DWANT_DOXYGEN=no \
 		-DMANDIR=${MANPREFIX}
 INSTALLS_ICONS=	yes
diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index bf87004b75e9..d59914eeaca2 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
 		${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl:${PORTSDIR}/textproc/dsssl-docbook-modular
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 DATADIR=	${PREFIX}/share/qtiplot/manual
 WRKSRC=		${WRKDIR}/${DISTNAME}/manual
 
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 0caae34f395e..9ba459fe37bc 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl \
 # 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
 # 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
 
-USES=		dos2unix gmake qmake
-USE_BZIP2=	yes
+USES=		dos2unix gmake qmake tar:bzip2
 USE_QT4=	gui opengl svg qt3support network assistantclient \
 		moc_build rcc_build
 USE_GL=		glu
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index 930047d4683a..e1711709596e 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Subtitle editor for KDE
 
 LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu
 
-USE_BZIP2=	yes
-USES=		cmake:outsource gettext shared-mime-info
+USES=		cmake:outsource gettext shared-mime-info tar:bzip2
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build phonon
 
diff --git a/net-im/psi/Makefile b/net-im/psi/Makefile
index 72e5385bfeb2..db9f8fc57478 100644
--- a/net-im/psi/Makefile
+++ b/net-im/psi/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl \
 
 HAS_CONFIGURE=	yes
 QT_NONSTANDARD=	yes
-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 USE_QT4=	gui network xml imageformats_run \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	xscrnsaver
diff --git a/net-p2p/ktorrent/Makefile b/net-p2p/ktorrent/Makefile
index 63fae4fbe625..902034b716b0 100644
--- a/net-p2p/ktorrent/Makefile
+++ b/net-p2p/ktorrent/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libktorrent.so:${PORTSDIR}/net-p2p/libktorrent
 
-USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 pimlibs workspace
 USE_QT4=	corelib gui network qt3support qtestlib webkit \
 		qmake_build moc_build rcc_build uic_build
-USES=		cmake:outsource gettext
+USES=		cmake:outsource gettext tar:bzip2
 USE_LDCONFIG=	yes
 
 CONFLICTS_BUILD=	ktorrent-2*
diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile
index ce5500f5745b..80759ca9e027 100644
--- a/net-p2p/libktorrent/Makefile
+++ b/net-p2p/libktorrent/Makefile
@@ -14,10 +14,9 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libgmp.so:${PORTSDIR}/math/gmp \
 		libqca.so:${PORTSDIR}/devel/qca
 
-USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
 USE_QT4=	qtestlib_build qmake_build moc_build rcc_build uic_build
-USES=		cmake:outsource gettext
+USES=		cmake:outsource gettext tar:bzip2
 USE_LDCONFIG=	yes
 
 SHLIB_VER=	5.0.1
diff --git a/net/knemo-kde4/Makefile b/net/knemo-kde4/Makefile
index 2f2da8c4336c..87e75b5eabd7 100644
--- a/net/knemo-kde4/Makefile
+++ b/net/knemo-kde4/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	12956-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE network monitor
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 USE_KDE4=	kdeprefix kdelibs workspace automoc4
 
diff --git a/russian/stardict-bars/Makefile b/russian/stardict-bars/Makefile
index 8f9173d26ff2..1cecde5e411f 100644
--- a/russian/stardict-bars/Makefile
+++ b/russian/stardict-bars/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	stardict-en-ru-bars-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	New Comprehensive English-Russian dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/russian/stardict-dal/Makefile b/russian/stardict-dal/Makefile
index 50146ab5acf9..5a71071979a9 100644
--- a/russian/stardict-dal/Makefile
+++ b/russian/stardict-dal/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	${PORTNAME}-ru-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dal's Explanatory Dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/russian/stardict-mueller7/Makefile b/russian/stardict-mueller7/Makefile
index b705f7114cf3..8a27765ea5b5 100644
--- a/russian/stardict-mueller7/Makefile
+++ b/russian/stardict-mueller7/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/ru/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Mueller English-Russian dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/russian/stardict-mueller7accent/Makefile b/russian/stardict-mueller7accent/Makefile
index 9515faa641eb..3d6262a87eab 100644
--- a/russian/stardict-mueller7accent/Makefile
+++ b/russian/stardict-mueller7accent/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	stardict-Mueller7accentGPL-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Mueller English-Russian dictionary with accents
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 2a34d0f99c3b..1b7d95a6b24b 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -5,8 +5,7 @@ PORTNAME=	pinentry
 PORTVERSION=	0.8.3
 PORTREVISION?=	0
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_GNUPG}
-MASTER_SITE_SUBDIR=	pinentry
+MASTER_SITES=	GNUPG/pinentry
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT?=	Collection of simple PIN or passphrase entry dialogs
@@ -16,8 +15,7 @@ LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 
 CONFLICTS_INSTALL?=	pinentry-[a-z]*
 
-USE_BZIP2=	yes
-USES=		iconv gmake pkgconfig
+USES=		iconv gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-pinentry-qt
 INFO=		pinentry
diff --git a/sysutils/krename-kde4/Makefile b/sysutils/krename-kde4/Makefile
index 43f94ba7d6b2..e3527a0cfcf7 100644
--- a/sysutils/krename-kde4/Makefile
+++ b/sysutils/krename-kde4/Makefile
@@ -13,8 +13,7 @@ LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
 		libexiv2.so:${PORTSDIR}/graphics/exiv2 \
 		libpodofo.so:${PORTSDIR}/graphics/podofo
 
-USE_BZIP2=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:bzip2
 USE_KDE4=	kdeprefix kdelibs automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 
diff --git a/textproc/qstardict/Makefile b/textproc/qstardict/Makefile
index 3af28c29f484..6edb6490c583 100644
--- a/textproc/qstardict/Makefile
+++ b/textproc/qstardict/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	http://qstardict.ylsoftware.com/files/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt 4 based dictionary program (stardict clone)
 
-USES=		dos2unix pkgconfig qmake
-USE_BZIP2=	yes
+USES=		dos2unix pkgconfig qmake tar:bzip2
 USE_QT4=	gui network xml uic_build moc_build rcc_build
 DOS2UNIX_FILES=	qstardict.pri
 
diff --git a/textproc/stardict-BritannicaConcise/Makefile b/textproc/stardict-BritannicaConcise/Makefile
index eb7418afc0fe..e7ba0f81cd37 100644
--- a/textproc/stardict-BritannicaConcise/Makefile
+++ b/textproc/stardict-BritannicaConcise/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/dict.org/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	The Britannica Concise Encyclopedia
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../../russian/stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/textproc/stardict-MerrianWebster/Makefile b/textproc/stardict-MerrianWebster/Makefile
index 5637de8b5c87..172bf7bc45b4 100644
--- a/textproc/stardict-MerrianWebster/Makefile
+++ b/textproc/stardict-MerrianWebster/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/dict.org/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Merrian Webster 10th dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../../russian/stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/textproc/stardict-OxfordCollocation/Makefile b/textproc/stardict-OxfordCollocation/Makefile
index c0b5fe7e534f..b8956be7e883 100644
--- a/textproc/stardict-OxfordCollocation/Makefile
+++ b/textproc/stardict-OxfordCollocation/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	stardict-oxford_collocations-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Oxford English Collocation Dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../../russian/stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/textproc/stardict-dictd_mova/Makefile b/textproc/stardict-dictd_mova/Makefile
index 404a12e883c2..e2ad7802177b 100644
--- a/textproc/stardict-dictd_mova/Makefile
+++ b/textproc/stardict-dictd_mova/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from www.mova.org for StarDict
 
 NO_BUILD=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 DATADIR=	${PREFIX}/share/stardict
 DICTDIR=	${DATADIR}/dic
diff --git a/textproc/stardict-longman/Makefile b/textproc/stardict-longman/Makefile
index a04d6b1bdabd..31af59436b03 100644
--- a/textproc/stardict-longman/Makefile
+++ b/textproc/stardict-longman/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/dict.org/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Longman Dictionary of Contemporary English
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../../russian/stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/textproc/stardict-oald/Makefile b/textproc/stardict-oald/Makefile
index e972aac6856c..5e1ebcedec3f 100644
--- a/textproc/stardict-oald/Makefile
+++ b/textproc/stardict-oald/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	http://abloz.com/huzheng/stardict-dic/dict.org/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Oxford Advanced Learner's Dictionary
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 .include "${.CURDIR}/../../russian/stardict-mueller7/files/Makefile.common"
 .include <bsd.port.mk>
diff --git a/textproc/stardict-quick/Makefile b/textproc/stardict-quick/Makefile
index 26a9cd4eb7b2..51fd222f4a39 100644
--- a/textproc/stardict-quick/Makefile
+++ b/textproc/stardict-quick/Makefile
@@ -12,7 +12,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Dictionaries from Quick for StarDict
 
 NO_BUILD=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 DATADIR=	${PREFIX}/share/stardict
 DICTDIR=	${DATADIR}/dic
diff --git a/textproc/stardict-rptts/Makefile b/textproc/stardict-rptts/Makefile
index b4e635d0b941..c3c9d3050dd8 100644
--- a/textproc/stardict-rptts/Makefile
+++ b/textproc/stardict-rptts/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Real People TTS for StarDict
 PROJECTHOST=	stardict-3
 
 NO_BUILD=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 do-install:
 		${TAR} jxvf ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} -C ${STAGEDIR}${PREFIX}/share
diff --git a/www/rekonq/Makefile b/www/rekonq/Makefile
index d4327ef5b2a2..47a03938dd86 100644
--- a/www/rekonq/Makefile
+++ b/www/rekonq/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:C,\..*,.0,}/
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Lightweight KDE browser based on WebKit
 
-USE_XZ=		yes
-USES=		cmake:outsource
+USES=		cmake:outsource tar:xz
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USE_QT4=	script webkit \
 		moc_build qmake_build rcc_build uic_build
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index c6be92ddbac8..6d0435d8c5c2 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -10,10 +10,9 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk20
 USE_QT4=	corelib gui moc_build rcc_build uic_build qmake_build
-USES=		cmake gettext pkgconfig
+USES=		cmake gettext pkgconfig tar:bzip2
 USE_KDE4=	kdelibs kdeprefix automoc4
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/x11-themes/kde4-style-polyester/Makefile b/x11-themes/kde4-style-polyester/Makefile
index 9728b3effb0e..41206be6bfea 100644
--- a/x11-themes/kde4-style-polyester/Makefile
+++ b/x11-themes/kde4-style-polyester/Makefile
@@ -11,9 +11,8 @@ PKGNAMEPREFIX=	kde4-style-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	KDE style and window decoration
 
-USE_BZIP2=	yes
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4
 USE_QT4=	qmake_build moc_build rcc_build uic_build
-USES=		cmake
+USES=		cmake tar:bzip2
 
 .include <bsd.port.mk>
diff --git a/x11-themes/qtcurve-gtk2/Makefile b/x11-themes/qtcurve-gtk2/Makefile
index 2244ed6a0350..06b3a9ddf0ca 100644
--- a/x11-themes/qtcurve-gtk2/Makefile
+++ b/x11-themes/qtcurve-gtk2/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	QtCurve-Gtk2-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	QtCurve GTK2 Theme Engine
 
-USE_BZIP2=	yes
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 
 .include <bsd.port.mk>
diff --git a/x11-themes/qtcurve-kde4/Makefile b/x11-themes/qtcurve-kde4/Makefile
index d55b27a3d354..888a729fed14 100644
--- a/x11-themes/qtcurve-kde4/Makefile
+++ b/x11-themes/qtcurve-kde4/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	QtCurve-KDE4-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	QtCurve KDE4 widget style
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_QT4=	qmake_build uic_build moc_build rcc_build
 USE_KDE4=	kdelibs workspace kdehier kdeprefix automoc4
 
diff --git a/x11-themes/qtcurve-qt4/Makefile b/x11-themes/qtcurve-qt4/Makefile
index 8bd8e70f907b..f50d7fd16a08 100644
--- a/x11-themes/qtcurve-qt4/Makefile
+++ b/x11-themes/qtcurve-qt4/Makefile
@@ -10,8 +10,7 @@ DISTNAME=	QtCurve-KDE4-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	QtCurve Qt4 widget style
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_QT4=	dbus gui svg imageformats_run \
 		qmake_build uic_build moc_build rcc_build
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/x11-toolkits/qwt5-designerplugin/Makefile b/x11-toolkits/qwt5-designerplugin/Makefile
index eeeedfe13499..b87b7721e262 100644
--- a/x11-toolkits/qwt5-designerplugin/Makefile
+++ b/x11-toolkits/qwt5-designerplugin/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	libqwt.so:${PORTSDIR}/x11-toolkits/qwt5
 
-USES=		gmake qmake
+USES=		gmake qmake tar:bzip2
 USE_QT4=	designer moc_build rcc_build
-USE_BZIP2=	yes
 QMAKE_ARGS+=	CONFIG+=QwtDesigner \
 		PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
 PORTSCOUT=	limit:^5\.
diff --git a/x11-toolkits/qwt5/Makefile b/x11-toolkits/qwt5/Makefile
index e7733afeac3b..2cb191dc4db7 100644
--- a/x11-toolkits/qwt5/Makefile
+++ b/x11-toolkits/qwt5/Makefile
@@ -9,9 +9,8 @@ PKGNAMESUFFIX=	5
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
-USES=		gmake qmake
+USES=		gmake qmake tar:bzip2
 USE_QT4=	gui svg moc_build
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 PORTSCOUT=	limit:^5\.
 
diff --git a/x11-toolkits/qwt6-designerplugin/Makefile b/x11-toolkits/qwt6-designerplugin/Makefile
index 3defd0541f45..9ff745d099a6 100644
--- a/x11-toolkits/qwt6-designerplugin/Makefile
+++ b/x11-toolkits/qwt6-designerplugin/Makefile
@@ -11,9 +11,8 @@ COMMENT=	Qt Designer plugin for Qwt
 
 LIB_DEPENDS=	libqwt6.so:${PORTSDIR}/x11-toolkits/qwt6
 
-USES=		gmake qmake
+USES=		gmake qmake tar:bzip2
 USE_QT4=	designer moc_build rcc_build
-USE_BZIP2=	yes
 QMAKE_ARGS+=	CONFIG+=QwtDesigner \
 		PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
 
diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index b0f781b19ba2..34b3430399f1 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -9,9 +9,8 @@ PKGNAMESUFFIX=	6
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Qt Widgets for Technical Applications
 
-USES=		gmake qmake
+USES=		gmake qmake tar:bzip2
 USE_QT4=	gui opengl svg xml moc_build
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 DOCSDIR=	${PREFIX}/share/doc/qwt6
 
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 3a2c6c05643e..0ea075eb69bc 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	gtk-chtheme-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	GTK2 theme changer
 
-USE_BZIP2=	yes
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 USE_GNOME=	gtk20
 
 PLIST_FILES=	bin/gtk-chtheme \