13 files changed, 13 insertions, 24 deletions

diff --git a/graphics/gimp-lqr-plugin/Makefile b/graphics/gimp-lqr-plugin/Makefile
index 2e3c7d7c9be2..ba370c5577d8 100644
--- a/graphics/gimp-lqr-plugin/Makefile
+++ b/graphics/gimp-lqr-plugin/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Liquid rescale GIMP plug-in
 LIB_DEPENDS=	libgimp-2.0.so:${PORTSDIR}/graphics/gimp-app \
 		liblqr-1.so:${PORTSDIR}/graphics/liblqr-1
 
-USE_BZIP2=	yes
+USES=		tar:bzip2 gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pkgconfig
 USE_GNOME=	gtk20
 
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
diff --git a/graphics/kudu/Makefile b/graphics/kudu/Makefile
index 39a7880fa1a4..8000f5025e64 100644
--- a/graphics/kudu/Makefile
+++ b/graphics/kudu/Makefile
@@ -14,9 +14,8 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
-USE_BZIP2=	yes
+USES=		tar:bzip2 pkgconfig
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
 USE_GL=		gl
 USE_PYTHON=	yes
 
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 1d8d5f3f60e8..00a8a50e4220 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -11,9 +11,8 @@ MASTER_SITES=	http://liblqr.wdfiles.com/local--files/en:download-page/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An easy to use C/C++ seam carving library
 
+USES=		tar:bzip2 gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 
diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile
index 52d5393697b7..c76921bd2353 100644
--- a/graphics/lprof-devel/Makefile
+++ b/graphics/lprof-devel/Makefile
@@ -17,11 +17,10 @@ LIB_DEPENDS=	liblcms.so:${PORTSDIR}/graphics/lcms \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libvigraimpex.so:${PORTSDIR}/graphics/vigra
 
-USE_BZIP2=	yes
+USES=		tar:bzip2 cmake
 USE_XORG=	x11 xext sm ice xxf86vm
 USE_QT4=	corelib gui qt3support assistantclient \
 		linguist_build qmake_build moc_build uic_build rcc_build
-USES=		cmake
 
 CMAKE_ARGS=	-DQTTRANS_LRELEASE_EXECUTABLE="${LOCALBASE}/bin/lrelease-qt4"
 
diff --git a/graphics/quesoglc/Makefile b/graphics/quesoglc/Makefile
index e9fad646d192..abce2d053f17 100644
--- a/graphics/quesoglc/Makefile
+++ b/graphics/quesoglc/Makefile
@@ -14,9 +14,8 @@ LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_BZIP2=	yes
+USES=		tar:bzip2 pathfix gmake
 GNU_CONFIGURE=	yes
-USES=		pathfix gmake
 USE_GL=		gl glu glut
 USE_LDCONFIG=	yes
 
diff --git a/graphics/sharpconstruct/Makefile b/graphics/sharpconstruct/Makefile
index 201b62196c58..5c6d4620c567 100644
--- a/graphics/sharpconstruct/Makefile
+++ b/graphics/sharpconstruct/Makefile
@@ -13,8 +13,7 @@ COMMENT=	3D modeller for organic shapes
 LIB_DEPENDS=	libgtkglextmm-x11-1.2.so:${PORTSDIR}/x11-toolkits/gtkglextmm \
 		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig
 USE_GL=		yes
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/wings/Makefile b/graphics/wings/Makefile
index de176745f826..ad9ac538106f 100644
--- a/graphics/wings/Makefile
+++ b/graphics/wings/Makefile
@@ -22,8 +22,7 @@ MAKE_JOBS_UNSAFE=yes
 
 SUB_FILES=	${PORTNAME}.sh
 
-USE_BZIP2=	yes
-USES=		gmake
+USES=		tar:bzip2 gmake
 
 PORTSCOUT=	limitw:1,even
 
diff --git a/lang/tolua++/Makefile b/lang/tolua++/Makefile
index 5d9181d050bd..55625d3e89a5 100644
--- a/lang/tolua++/Makefile
+++ b/lang/tolua++/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.codenix.com/~tolua/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	An extended version of tolua, a tool to integrate C/C++ code with Lua
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_LUA=	5.1
 USE_SCONS=	yes
 SCONS_ARGS=	prefix=${PREFIX} SONAME="libtolua++-${LUA_VER}.so"
diff --git a/misc/metromap/Makefile b/misc/metromap/Makefile
index 68013f676db4..68e66a745d63 100644
--- a/misc/metromap/Makefile
+++ b/misc/metromap/Makefile
@@ -14,10 +14,9 @@ COMMENT=	A simple application for finding paths in different subways maps
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/doc/COPYING
 
+USES=		tar:bzip2 gettext gmake
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2
-USE_BZIP2=	yes
-USES=		gettext gmake
 
 PORTDOCS=	AUTHORS NEWS README README.data TODO
 
diff --git a/sysutils/iat/Makefile b/sysutils/iat/Makefile
index 204a0cea3596..724c53ba27eb 100644
--- a/sysutils/iat/Makefile
+++ b/sysutils/iat/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Converter of many types of CD-ROM image file formats into ISO-9660
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/iat man/man1/iat.1.gz
diff --git a/x11-themes/qt4-style-float/Makefile b/x11-themes/qt4-style-float/Makefile
index a024b67b7d86..89a0946624d4 100644
--- a/x11-themes/qt4-style-float/Makefile
+++ b/x11-themes/qt4-style-float/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Style for Qt 4 and KDE
 
 LICENSE=	GPLv2
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 qmake
 USE_QT4=	corelib gui moc_build rcc_build
 
 WRKSRC=		${WRKDIR}/floatstyle-${PORTVERSION}
diff --git a/x11-themes/qt4-style-phase/Makefile b/x11-themes/qt4-style-phase/Makefile
index de220d58fd38..84f55099a261 100644
--- a/x11-themes/qt4-style-phase/Makefile
+++ b/x11-themes/qt4-style-phase/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Widget style for Qt 4 and KDE 4
 
 LICENSE=	MIT
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 qmake
 USE_QT4=	corelib gui moc_build
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile
index c17f47eaee76..45fb34e725b0 100644
--- a/x11/eaglemode/Makefile
+++ b/x11/eaglemode/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		perl5 pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 perl5 pkgconfig
 USE_PERL5=	build
 USE_XORG=	x11 xext xxf86vm
 SUB_FILES=	eaglemode.sh