Convert a bunch of USE_BZIP2 to USES=tar:bzip2

Approved by:	portmgr (not really, but touches unstaged ports)

20 files changed, 20 insertions, 40 deletions

diff --git a/deskutils/alacarte/Makefile b/deskutils/alacarte/Makefile
index deae22f6a333..8eb830375be9 100644
--- a/deskutils/alacarte/Makefile
+++ b/deskutils/alacarte/Makefile
@@ -12,9 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Editor for the freedesktop.org menu specification
 
-USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnomedesktop intlhack
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 USE_PYTHON=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/cdcat/Makefile b/deskutils/cdcat/Makefile
index 758f6acae67d..5e16201d8628 100644
--- a/deskutils/cdcat/Makefile
+++ b/deskutils/cdcat/Makefile
@@ -30,8 +30,7 @@ OPTIONS_DEFINE=	DOCS
 CONFIGURE_WRKSRC=	${WRKSRC}/src
 BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 
-USE_BZIP2=	yes
-USES=		qmake:norecursive
+USES=		qmake:norecursive tar:bzip2
 USE_QT4=	corelib gui xml linguist_build moc_build uic_build
 QMAKE_ARGS=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
 		INCLUDEPATH+="${MIF_WRKSRC}/MediaInfoLib/Source" \
diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 2f2fc280e191..847769203fcf 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -15,8 +15,7 @@ COMMENT=	Omnipresent versatile search interface
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus
 
-USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES=		pathfix gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix pygnomedesktop intlhack
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/gnome-blog/Makefile b/deskutils/gnome-blog/Makefile
index 6f51c8d09fd0..88dd42674094 100644
--- a/deskutils/gnome-blog/Makefile
+++ b/deskutils/gnome-blog/Makefile
@@ -12,9 +12,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME app to post to blogs
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnomeprefix pygnome2 intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/gnome-main-menu/Makefile b/deskutils/gnome-main-menu/Makefile
index 7a5d7a2b26c4..7922cb5519c7 100644
--- a/deskutils/gnome-main-menu/Makefile
+++ b/deskutils/gnome-main-menu/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Provides easy access to sets of GNOME applications
 
 LIB_DEPENDS=	libgtop-2.0.so:${PORTSDIR}/devel/libgtop
 
-USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomepanel intlhack eel2 gnomedesktop \
 		libgnomeui
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `pkg-config --cflags libgnomeui-2.0`
 LIBS+=		-L${LOCALBASE}/lib `pkg-config --libs libgnomeui-2.0`
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index a833411cd2e6..6cf8bf9e5119 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -20,8 +20,7 @@ CONFLICTS=	baobob-3.[0-9]* gnome-dictionary-3.[0-9]* \
 		gnome-font-viewer-3.[0-9]* gnome-screenshot-3.[0-9]* \
 		gnome-search-tool-3.[0-9]* gnome-system-log-3.[0-9]*
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gtweakui/Makefile b/deskutils/gtweakui/Makefile
index 33847123d534..c409fdcb1786 100644
--- a/deskutils/gtweakui/Makefile
+++ b/deskutils/gtweakui/Makefile
@@ -12,8 +12,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of simple dialogs as a front end to GConf
 
-USE_BZIP2=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gnomeprefix libgnomeui gconf2 libglade2 intlhack
 GNU_CONFIGURE=	yes
 
diff --git a/deskutils/hamster-applet/Makefile b/deskutils/hamster-applet/Makefile
index fdf69d50bb55..5dcc624a4cbb 100644
--- a/deskutils/hamster-applet/Makefile
+++ b/deskutils/hamster-applet/Makefile
@@ -17,8 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \
 		${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 USE_PYTHON=	yes
 USE_XORG=	xscrnsaver
 USE_GNOME=	gnomeprefix intlhack gnomehack pygnomedesktop \
diff --git a/deskutils/libgcal/Makefile b/deskutils/libgcal/Makefile
index d243bcac88dd..9bd07a54aabc 100644
--- a/deskutils/libgcal/Makefile
+++ b/deskutils/libgcal/Makefile
@@ -16,8 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libxml2.so:${PORTSDIR}/textproc/libxml2
 
-USE_BZIP2=	yes
-USES=		cmake iconv
+USES=		cmake iconv tar:bzip2
 CMAKE_ARGS=	-DLIB_INSTALL_DIR="${LOCALBASE}/lib" \
 		-DENABLE_TESTS=OFF
 USE_LDCONFIG=	yes
diff --git a/deskutils/libopensync-plugin-python/Makefile b/deskutils/libopensync-plugin-python/Makefile
index ca2c19ffa157..67e8eb3eb5da 100644
--- a/deskutils/libopensync-plugin-python/Makefile
+++ b/deskutils/libopensync-plugin-python/Makefile
@@ -13,8 +13,7 @@ LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync022
 
 CONFLICTS=	libopensync-plugin-python-devel-[0-9]*
 
-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 
diff --git a/deskutils/libopensync-plugin-sunbird/Makefile b/deskutils/libopensync-plugin-sunbird/Makefile
index 6536212ee84b..303214d4f861 100644
--- a/deskutils/libopensync-plugin-sunbird/Makefile
+++ b/deskutils/libopensync-plugin-sunbird/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Sunbird plugin for the OpenSync framework
 LIB_DEPENDS=	libopensync.so:${PORTSDIR}/devel/libopensync022 \
 		libneon.so:${PORTSDIR}/www/neon29
 
-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 libxml2
 
diff --git a/deskutils/logjam/Makefile b/deskutils/logjam/Makefile
index 258383e7840e..b31c7fd8c01d 100644
--- a/deskutils/logjam/Makefile
+++ b/deskutils/logjam/Makefile
@@ -13,8 +13,7 @@ COMMENT=	GTK2 interface to livejournals, ie www.livejournal.com
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
 		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
 
-USES=		pkgconfig gmake pathfix
-USE_BZIP2=	yes
+USES=		pkgconfig gmake pathfix tar:bzip2
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gtk20 libxml2 intlhack
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index 3b4e3e308339..905c38a5d65c 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -12,9 +12,8 @@ COMMENT=	GTK2-based toolbar, like a smaller GNOME panel
 
 LICENSE=	GPLv2 # (or later)
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/deskutils/notification-daemon/Makefile b/deskutils/notification-daemon/Makefile
index 146a086a0ff9..7e6d38f1b876 100644
--- a/deskutils/notification-daemon/Makefile
+++ b/deskutils/notification-daemon/Makefile
@@ -16,9 +16,8 @@ LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus \
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
-USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack gtk30
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
diff --git a/deskutils/qlabels/Makefile b/deskutils/qlabels/Makefile
index f4b62e45b0a7..6f97b35bbb54 100644
--- a/deskutils/qlabels/Makefile
+++ b/deskutils/qlabels/Makefile
@@ -12,8 +12,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Labels and business cards creating
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		qmake tar:bzip2
 USE_QT4=	xml gui corelib uic_build moc_build rcc_build
 WRKSRC=		${WRKDIR}/${DISTNAME:C/_/-/}
 
diff --git a/deskutils/qtm/Makefile b/deskutils/qtm/Makefile
index d20f8ab3f033..816e7dcedf21 100644
--- a/deskutils/qtm/Makefile
+++ b/deskutils/qtm/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Blog management application based on Qt 4
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_QT4=	corelib dbus gui network xml \
 		moc_build qmake_build rcc_build uic_build
 USE_OPENSSL=	yes
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2ae152fcfcdd..1d6765bad44f 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -17,8 +17,7 @@ NO_OCAML_RUNDEPENDS=	yes
 USE_PYTHON=	yes
 USE_QT4=	corelib gui linguist_build svg webkit xml \
 		moc_build qmake_build uic_build
-USES=		pkgconfig shebangfix
-USE_BZIP2=	yes
+USES=		pkgconfig shebangfix tar:bzip2
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS}" \
 		PATH="${KDE4_PREFIX}/bin:$$PATH" \
 		WAF_HOME="${WRKSRC}"
diff --git a/deskutils/strigi/Makefile.common b/deskutils/strigi/Makefile.common
index 5a721ef3af72..80619445b8c5 100644
--- a/deskutils/strigi/Makefile.common
+++ b/deskutils/strigi/Makefile.common
@@ -8,8 +8,7 @@ DESCR=			${.CURDIR}/../strigi/pkg-descr
 
 CONFLICTS_INSTALL=	strigi-0.7.[0-7]* strigi-0.7.8 strigi-0.7.8_1
 
-USE_BZIP2=		yes
-USES+=			cmake:outsource
+USES+=			cmake:outsource tar:bzip2
 CMAKE_SOURCE_PATH=	${WRKSRC}/${PORTNAME}
 
 PLIST_SUB=		SHLIB_VER=${STRIGI_VERSION}
diff --git a/deskutils/tel/Makefile b/deskutils/tel/Makefile
index 714bd537dd86..36f1562cecec 100644
--- a/deskutils/tel/Makefile
+++ b/deskutils/tel/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	CENKES BERLIOS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Little console-based phone book manager
 
-USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext tar:bzip2
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 NO_STAGE=	yes
diff --git a/deskutils/vym/Makefile b/deskutils/vym/Makefile
index 1b58238689c9..23db13c15ffd 100644
--- a/deskutils/vym/Makefile
+++ b/deskutils/vym/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	SF/vym/${PORTVERSION}
 MAINTAINER=	lichray@gmail.com
 COMMENT=	VYM is a tool to generate and manipulate mind maps
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		qmake tar:bzip2
 USE_QT4=	uic_build moc_build qt3support_build \
 		network xml dbus svg
 QMAKE_ARGS=	DATADIR=${DATADIR:C,/vym$,,} \