Convert a bunch of USE_BZIP2 to USES=tar:bzip2

Approved by: portmgr (not really, but touches unstaged ports)
svn path=/head/; revision=363371
2024-11-23 00:43:28 +00:00 · 2014-07-29 18:41:15 +00:00 · 2014-07-29 18:41:15 +00:00 · bbc8c4d740 · 2021-03-31 03:12:20 +00:00
commit bbc8c4d740
parent 7eb5003637
426 changed files with 426 additions and 853 deletions
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@ -17,8 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
    		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip

 USE_LDCONFIG=	yes
-USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake pathfix pkgconfig
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig tar:bzip2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix intlhack gnomedocutils gtk20 gconf2
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@ -32,8 +32,7 @@ USE_QT4=	corelib dbus designer gui network opengl \
 		phonon script sql svg webkit xml \
 		qmake_build moc_build rcc_build uic_build
 USE_XORG=	x11
-USE_BZIP2=	yes
-USES=		cmake pkgconfig shared-mime-info
+USES=		cmake pkgconfig shared-mime-info tar:bzip2
 USE_LDCONFIG=	yes

 BROKEN_sparc64=	does not build (GCC-related error)
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@ -13,9 +13,8 @@ DISTNAME=	sound-theme-freedesktop-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Sound theme based on the FreeDesktop specification

-USE_BZIP2=	yes
 USE_GNOME=	gnomehier intlhack
-USES=		gettext gmake
+USES=		gettext gmake tar:bzip2
 GNU_CONFIGURE=	yes

 .include <bsd.port.mk>
--- a/audio/ipod-sharp/Makefile
+++ b/audio/ipod-sharp/Makefile
@ -16,9 +16,8 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/podsleuth.pc:${PORTSDIR}/misc/podsle
 		${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-glib-1.0.pc:${PORTSDIR}/devel/ndesk-dbus-glib

 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 NO_STAGE=	yes
-USES=		gmake pathfix pkgconfig
+USES=		gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtksharp20

 .include <bsd.port.mk>
--- a/audio/lastfm-desktop/Makefile
+++ b/audio/lastfm-desktop/Makefile
@ -20,8 +20,7 @@ LIB_DEPENDS=	liblastfm.so:${PORTSDIR}/audio/liblastfm \
 		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libgpod.so:${PORTSDIR}/audio/libgpod

-USES=		pkgconfig qmake
-USE_BZIP2=	yes
+USES=		pkgconfig qmake tar:bzip2
 USE_QT4=	gui linguist_build moc_build network phonon \
 		rcc_build uic_build webkit xml
 LASTFM=		${PORTNAME}${PKGNAMESUFFIX}
--- a/audio/liquidsoap/Makefile
+++ b/audio/liquidsoap/Makefile
@ -61,7 +61,6 @@ WGET_DESC=		for downloading remote files (http, https, ftp)

 MAKE_JOBS_UNSAFE=	yes

-USE_BZIP2=	yes
 NO_STAGE=	yes

 USE_RC_SUBR=	liquidsoap
@ -72,7 +71,7 @@ NO_OCAML_RUNDEPENDS=	yes
 USE_AUTOTOOLS=	autoconf:env automake:env
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2

 CONFIGURE_ARGS=	--disable-gui --localstatedir=/var
 CFLAGS+=	-I${LOCALBASE}/${OCAML_LIBDIR}
--- a/biology/crux/Makefile
+++ b/biology/crux/Makefile
@ -10,8 +10,7 @@ MASTER_SITES=	http://www.canonware.com/download/Crux/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software toolkit for phylogenetic inference

-USES=		fortran gmake
-USE_BZIP2=	yes
+USES=		fortran gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python=${PYTHON_CMD} --disable-mpi
 USE_CSTD=	gnu99
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@ -19,10 +19,9 @@ LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 VERSION=	1.5.0.1
 SVNREVISION=	3978

-USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/pymol-${PORTVERSION}
 USE_GL=		glut glew
-USES=		gmake
+USES=		gmake tar:bzip2
 USE_PYTHON=	yes
 PLIST_SUB=	PYMOL_VER=${VERSION} PYTHON_VER=${PYTHON_VER}

--- a/comms/gammu-devel/Makefile
+++ b/comms/gammu-devel/Makefile
@ -19,10 +19,9 @@ CONFLICTS=	gammu-[1-9]* gammu-python-[1-9]*

 CMAKE_ARGS+=	-DINSTALL_LIBDATA_DIR=${LOCALBASE}/libdata

-USES=		cmake gettext pkgconfig
+USES=		cmake gettext pkgconfig tar:bzip2
 USE_PYTHON=	yes
 USE_GNOME=	glib20
-USE_BZIP2=	yes
 USE_LDCONFIG=	yes

 PORTDOCS=	*
--- a/comms/gtkmmorse/Makefile
+++ b/comms/gtkmmorse/Makefile
@ -14,9 +14,8 @@ LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
 		libgtkmm-2.4.so:${PORTSDIR}/x11-toolkits/gtkmm24 \
 		libgconfmm-2.6.so:${PORTSDIR}/devel/gconfmm26

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2

 PLIST_FILES=	bin/gtkmmorse \
 		man/man1/gtkmmorse.1.gz
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@ -16,7 +16,6 @@ USE_QT4=	gui moc_build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake pkgconfig tar:bzip2

 .include <bsd.port.mk>
--- a/comms/libfec/Makefile
+++ b/comms/libfec/Makefile
@ -15,8 +15,7 @@ COMMENT=	Several forward error correction (FEC) decoders
 MAKEFILE=	makefile

 GNU_CONFIGURE=	yes
-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 USE_LDCONFIG=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 PLIST_FILES=	include/fec.h		\
--- a/comms/libimobiledevice/Makefile
+++ b/comms/libimobiledevice/Makefile
@ -13,8 +13,7 @@ LICENSE?=	LGPL21

 SLAVE_PORT?=	no

-USES=		pkgconfig
-USE_BZIP2=	yes
+USES=		pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	openssl_LIBS=-lssl
 CFLAGS+=	-I${LOCALBASE}/include
--- a/comms/usbmuxd/Makefile
+++ b/comms/usbmuxd/Makefile
@ -10,8 +10,7 @@ COMMENT=	Daemon for multiplexing connections over USB to iPhone/iPod Touch

 LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist

-USE_BZIP2=	yes
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes

 PORTDOCS=	AUTHORS README README.devel
--- a/comms/wsjt/Makefile
+++ b/comms/wsjt/Makefile
@ -22,8 +22,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/scipy:${PORTSDIR}/science/py-scipy \
 		${PYNUMPY}

 ALL_TARGET=	build
-USES=		fortran gmake
-USE_BZIP2=	yes
+USES=		fortran gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gfortran --prefix=${LOCALBASE} \
 		--with-portaudio-include-dir=${LOCALBASE}/include/portaudio2 \
--- a/converters/wkhtmltopdf/Makefile
+++ b/converters/wkhtmltopdf/Makefile
@ -19,9 +19,8 @@ LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png

-USE_BZIP2=	yes

-USES=			pkgconfig gmake perl5 iconv
+USES=			pkgconfig gmake perl5 iconv tar:bzip2
 USE_XORG=		x11 xext xrender
 USE_PERL5=		build
 USE_LDCONFIG=		yes
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@ -18,9 +18,8 @@ LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm
 EXTRACT_AFTER_ARGS=	${DISTNAME}/ext/GDBM_File ${DISTNAME}/t/lib

 CFLAGS+=	-I${LOCALBASE}/include
-USES=		perl5
+USES=		perl5 tar:bzip2
 USE_PERL5=	configure
-USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/ext/GDBM_File

 .include <bsd.port.mk>
--- a/databases/postgresql-plruby/Makefile
+++ b/databases/postgresql-plruby/Makefile
@ -15,8 +15,7 @@ GH_ACCOUNT=	CraigCottingham
 GH_TAGNAME=	${GH_COMMIT}
 GH_COMMIT=	f8d9ced

-USES=	uidfix
-USE_BZIP2=	yes
+USES=	uidfix tar:bzip2
 USE_PGSQL=	server
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
--- a/databases/usogres/Makefile
+++ b/databases/usogres/Makefile
@ -9,9 +9,8 @@ MASTER_SITES=	http://usogres.good-day.net/download/
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Real-time backup utility for PostgreSQL

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake tar:bzip2
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message

--- 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
--- 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" \
--- 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
--- 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
--- 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`
--- 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
--- 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

--- 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 \
--- 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
--- 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

--- 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

--- 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
--- 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
--- 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
--- 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/_/-/}

--- 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
--- 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}"
--- 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}
--- 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
--- 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$,,} \
--- a/devel/acme/Makefile
+++ b/devel/acme/Makefile
@ -14,8 +14,7 @@ LICENSE=	GPLv2

 OPTIONS_DEFINE=	DOCS EXAMPLES

-USE_BZIP2=	yes
-USES=	gmake
+USES=	gmake tar:bzip2

 BUILD_WRKSRC=	${WRKSRC}/src
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
--- a/devel/arm-eabi-binutils/Makefile
+++ b/devel/arm-eabi-binutils/Makefile
@ -11,9 +11,8 @@ MAINTAINER=	kientzle@FreeBSD.org
 COMMENT=	GNU binutils for vanilla ARM cross-development

 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake tar:bzip2

-USE_BZIP2=	yes
 CONFIGURE_ARGS=	--disable-nls --target=${PKGNAMEPREFIX:S/-$//} --enable-werror=no
 INFO_PATH=	${PKGNAMEPREFIX:S/-$//}/info

--- a/devel/atlas-devel/Makefile
+++ b/devel/atlas-devel/Makefile
@ -15,9 +15,8 @@ OPTIONS_DEFINE=	DOCS

 PKGNAMESUFFIX=	-devel
 GNU_CONFIGURE=	yes
-USES=		pathfix compiler:c++11-lib
+USES=		pathfix compiler:c++11-lib tar:bzip2
 USE_LDCONFIG=	YES
-USE_BZIP2=	YES
 MAKE_ARGS=	docdir=${DOCSDIR}
 CONFIGURE_ARGS+=--program-transform-name=

--- a/devel/atlas/Makefile
+++ b/devel/atlas/Makefile
@ -14,10 +14,9 @@ COMMENT=	C++ reference implementation of the Atlas protocol
 OPTIONS_DEFINE=	DOCS

 GNU_CONFIGURE=	yes
-USES=	pathfix
+USES=	pathfix tar:bzip2
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	YES
-USE_BZIP2=	YES
 MAKE_ARGS=	docdir=${DOCSDIR}

 .include <bsd.port.mk>
--- a/devel/automoc4/Makefile
+++ b/devel/automoc4/Makefile
@ -12,8 +12,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Automatic moc for Qt 4 packages

 USE_QT4=	corelib moc qmake_build rcc_build uic_build
-USE_BZIP2=	yes
-USES=		cmake iconv
+USES=		cmake iconv tar:bzip2
 MAKE_JOBS_UNSAFE=	yes

 .include <bsd.port.mk>
--- a/devel/avarice/Makefile
+++ b/devel/avarice/Makefile
@ -12,8 +12,7 @@ COMMENT=	Atmel AVR JTAG programmer and debugging interface for avr-gdb

 LICENSE=	GPLv2

-USE_BZIP2=	yes
-USES=		perl5
+USES=		perl5 tar:bzip2

 GNU_CONFIGURE=	yes

--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@ -36,9 +36,8 @@ INSTALL_WRKSRC=		${BUILD_WRKSRC}
 CONFIGURE_SCRIPT=	../gcc-${PORTVERSION}/configure

 USE_PERL5=	build
-USE_BZIP2=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-USES=		bison gettext gmake perl5
+USES=		bison gettext gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes

 NO_STAGE=	yes
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@ -13,8 +13,7 @@ DISTNAME=	gdb-${PORTVERSION}
 MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	GNU GDB for the AVR target

-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=avr --program-prefix=avr --disable-nls
--- a/devel/bam/Makefile
+++ b/devel/bam/Makefile
@ -11,8 +11,7 @@ COMMENT=	Fast and flexible build system using Lua

 LICENSE=	ZLIB

-USES=		compiler
-USE_BZIP2=	yes
+USES=		compiler tar:bzip2

 PLIST_FILES=	bin/bam

--- a/devel/compiler-rt/Makefile
+++ b/devel/compiler-rt/Makefile
@ -18,8 +18,7 @@ INSTALL_WRKSRC=		${WRKDIR}/build

 CMAKE_SOURCE_PATH=	${WRKSRC}

-USES=		cmake
-USE_BZIP2=	yes
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes
 MAKE_ARGS=	VERBOSE=1

--- a/devel/dits/Makefile
+++ b/devel/dits/Makefile
@ -9,9 +9,8 @@ MASTER_SITES=	http://codeconcepts.com/
 MAINTAINER=	greg@codeconcepts.com
 COMMENT=	Data integrity verifying disk exercising test tool

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake
+USES=		gmake tar:bzip2

 PLIST_FILES=	bin/dits \
 		man/man1/dits.1.gz
--- a/devel/e_dbus/Makefile
+++ b/devel/e_dbus/Makefile
@ -16,9 +16,8 @@ LICENSE=	BSD
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig tar:bzip2
 USE_EFL=	eina evas ecore libtool_hack librt_hack
 USE_EFL_ECORE=	evas
 USE_LDCONFIG=	yes
--- a/devel/ecore-file/Makefile
+++ b/devel/ecore-file/Makefile
@ -15,10 +15,9 @@ COMMENT=	Enlightenment core abstraction library (file module)
 LICENSE=	BSD

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore libtool_hack
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_file
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
--- a/devel/ecore-ipc/Makefile
+++ b/devel/ecore-ipc/Makefile
@ -15,11 +15,10 @@ COMMENT=	Enlightenment core abstraction library (ipc module)
 LICENSE=	BSD

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	ecore libtool_hack
 USE_EFL_ECORE=	con
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_ipc
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
--- a/devel/eet/Makefile
+++ b/devel/eet/Makefile
@ -16,9 +16,8 @@ LICENSE=	BSD
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig tar:bzip2
 USE_EFL=	eina librt_hack libtool_hack
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
--- a/devel/eina/Makefile
+++ b/devel/eina/Makefile
@ -13,9 +13,8 @@ COMMENT=	Enlightenment API for data types
 LICENSE=	LGPL21

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix iconv
+USES=		pathfix iconv tar:bzip2
 USE_EFL=	librt_hack libtool_hack
 USE_LDCONFIG=	yes

--- a/devel/eio/Makefile
+++ b/devel/eio/Makefile
@ -13,9 +13,8 @@ COMMENT=	Enlightenment Input/Output Library
 LICENSE=	LGPL21

 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig tar:bzip2
 USE_EFL=	eina eet ecore libtool_hack
 USE_LDCONFIG=	yes

--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@ -14,7 +14,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Configuration database system for GNOME

-USE_BZIP2=	yes

 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
@ -24,7 +23,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 		libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit

-USES=		pathfix gettext gmake pkgconfig
+USES=		pathfix gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	gnomehier orbit2 gtk20 libxml2 ltverhack \
 		referencehack intlhack dconf introspection:build
 USE_LDCONFIG=	yes
--- a/devel/gitphp/Makefile
+++ b/devel/gitphp/Makefile
@ -10,8 +10,7 @@ COMMENT=	Web based git repository browser written in PHP

 LICENSE=	GPLv2

-USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext tar:bzip2
 USE_PHP=	bz2 fileinfo mbstring memcache posix simplexml spl zlib
 WANT_PHP_WEB=	yes
 NO_BUILD=	yes
--- a/devel/gjstest/Makefile
+++ b/devel/gjstest/Makefile
@ -25,8 +25,7 @@ LIB_DEPENDS=	libgflags.so:${PORTSDIR}/devel/gflags \
 ALL_TARGET=	default
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2
 CXXFLAGS+=	-L${LOCALBASE}/lib
-USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake tar:bzip2

 PROJECTHOST=	google-js-test
 SNAPSHOT=	20130304
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@ -12,10 +12,9 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME JavaScript common modules and tests

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack intltool
-USES=		pkgconfig gettext gmake
+USES=		pkgconfig gettext gmake tar:bzip2

 PORTDOCS=	AUTHORS COPYING INSTALL NEWS README ChangeLog

--- a/devel/gnulibiberty/Makefile
+++ b/devel/gnulibiberty/Makefile
@ -14,9 +14,8 @@ COMMENT=	Miscellaneous GNU functions

 WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/libiberty

-USES=		gmake
+USES=		gmake tar:bzip2

-USE_BZIP2=	yes
 CONFIGURE_ARGS=	--enable-install-libiberty
 GNU_CONFIGURE=	yes

--- a/devel/jrtplib/Makefile
+++ b/devel/jrtplib/Makefile
@ -12,8 +12,7 @@ COMMENT=	Object-oriented RTP library written in C++
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.MIT

-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes

 PLIST_SUB=	JRTPLIB_VER="${PORTVERSION}"
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@ -14,8 +14,7 @@ COMMENT=	Parser-generator from KDevplatform

 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex

-USE_BZIP2=	yes
-USES=		bison cmake:outsource compiler:c++11-lib
+USES=		bison cmake:outsource compiler:c++11-lib tar:bzip2
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
 USE_QT4=	qmake_build moc_build uic_build rcc_build

--- a/devel/libbfd/Makefile
+++ b/devel/libbfd/Makefile
@ -17,8 +17,7 @@ CONFLICTS=	mingw-binutils-[0-9]* binutils-[0-9]*

 WRKSRC=		${WRKDIR}/binutils-${PORTVERSION}/bfd

-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-install-libbfd \
 		--enable-commonbfdlib \
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@ -13,9 +13,8 @@ COMMENT=	GLib based implementation of the GData protocol

 LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome

-USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 intltool introspection:build
 CPPFLAGS+=	-I${LOCALBASE}/include 
--- a/devel/libiqxmlrpc/Makefile
+++ b/devel/libiqxmlrpc/Makefile
@ -20,9 +20,8 @@ DOCS_CMAKE_ARGS_OFF=	-Dbuild_docs=off

 LICENSE=	BSD

-USE_BZIP2=	yes
 USE_GNOME=	libxml2
-USES=		cmake
+USES=		cmake tar:bzip2
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
--- a/devel/libmowgli/Makefile
+++ b/devel/libmowgli/Makefile
@ -9,10 +9,9 @@ MASTER_SITES=	http://distfiles.atheme.org/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Development framework for C

-USES=		gmake
+USES=		gmake tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_BZIP2=	yes

 post-patch:
 	@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@ -20,10 +20,9 @@ CONFIGURE_ARGS=	--with-libwww
 MAKE_ENV=	INSTALL_STRIP_FLAG=${STRIP}
 MAKE_JOBS_UNSAFE=	yes
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
 USE_GNOME=	glib12 glib20
 USE_LDCONFIG=	yes
-USES=		pathfix tcl
+USES=		pathfix tcl tar:bzip2

 CPPFLAGS+=	-I${TCL_INCLUDEDIR} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/devel/libopendaap/Makefile
+++ b/devel/libopendaap/Makefile
@ -11,8 +11,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	C lib used to connect to iTunes(R) music shares

 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/devel/libopensync022/Makefile
+++ b/devel/libopensync022/Makefile
@ -14,11 +14,9 @@ COMMENT=	Freedesktop synchronization framework
 LIB_DEPENDS=	libsqlite3.so:${PORTSDIR}/databases/sqlite3

 SWIG_LANGUAGES=	python
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 USE_PYTHON=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig tar:bzip2
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes

--- a/devel/libplist/Makefile
+++ b/devel/libplist/Makefile
@ -13,8 +13,7 @@ LICENSE?=	LGPL21

 SLAVE_PORT?=	no

-USE_BZIP2=	yes
-USES=		cmake pkgconfig
+USES=		cmake pkgconfig tar:bzip2

 .if ${SLAVE_PORT} == "no"

--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@ -15,10 +15,9 @@ LIB_DEPENDS=	librcd.so:${PORTSDIR}/devel/librcd \
 		libenca.so:${PORTSDIR}/converters/enca \
 		libaspell.so:${PORTSDIR}/textproc/aspell

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	libxml2
-USES=		gmake iconv libtool:oldver pathfix pkgconfig
+USES=		gmake iconv libtool:oldver pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes

 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/devel/librcd/Makefile
+++ b/devel/librcd/Makefile
@ -10,9 +10,8 @@ MASTER_SITES=	http://dside.dyndns.org/files/rusxmms/ \
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	Library used by rusxmms for autodetection of Russian charset

-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		gmake pathfix tar:bzip2
 USE_LDCONFIG=	yes

 .include <bsd.port.mk>
--- a/devel/libspark2012/Makefile
+++ b/devel/libspark2012/Makefile
@ -12,7 +12,6 @@ COMMENT=	SPARK 2012 Spark.Ada library

 LICENSE=	GPLv3

-USES=		ada
-USE_BZIP2=	yes
+USES=		ada tar:bzip2

 .include <bsd.port.mk>
--- a/devel/libvanessa_logger/Makefile
+++ b/devel/libvanessa_logger/Makefile
@ -10,9 +10,8 @@ DISTNAME=	vanessa_logger-${PORTVERSION}
 MAINTAINER=	thomas@bsdunix.ch
 COMMENT=	Library that provides a generic logging layer

-USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=	pathfix tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_have_decl_facilitynames=yes
--- a/devel/libvanessa_socket/Makefile
+++ b/devel/libvanessa_socket/Makefile
@ -13,9 +13,8 @@ COMMENT=	Library that provides a simple layer for TCP/IP socket operations
 LIB_DEPENDS=	libvanessa_logger.so:${PORTSDIR}/devel/libvanessa_logger \
 		libpopt.so:${PORTSDIR}/devel/popt

-USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USES=	pathfix
+USES=	pathfix tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes

--- a/devel/libvolume_id/Makefile
+++ b/devel/libvolume_id/Makefile
@ -9,8 +9,7 @@ MASTER_SITES=	http://www.marcuscom.com/downloads/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to provide file system type information

-USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake tar:bzip2
 USE_LDCONFIG=	yes
 MAKE_ENV=	E=${ECHO_MSG} RANLIB=${RANLIB} AR=${AR} Q=@ \
 		prefix=${PREFIX}
--- a/devel/libzvbi/Makefile
+++ b/devel/libzvbi/Makefile
@ -13,8 +13,7 @@ COMMENT=	Routines to access raw VBI capture devices
 LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png \
 		libunicode.so:${PORTSDIR}/devel/libunicode

-USES=		gettext pathfix pkgconfig
-USE_BZIP2=	yes
+USES=		gettext pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/devel/llvm-devel/Makefile
+++ b/devel/llvm-devel/Makefile
@ -17,9 +17,8 @@ DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX}
 DATADIR=	${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX}
 UNIQUENAME=	${PORTNAME}${LLVM_SUFFIX}

-USES=		compiler:c++11-lib gmake perl5
+USES=		compiler:c++11-lib gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 GNU_CONFIGURE_PREFIX=	${LLVM_PREFIX}
 USE_LDCONFIG=	${LLVM_PREFIX}/lib

--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@ -15,8 +15,7 @@ COMMENT=	GNU Binutils for Windows cross-development

 BINUTILVERSION=	2.24

-USE_BZIP2=	yes
-USES=		gmake iconv
+USES=		gmake iconv tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
 		--with-gcc --with-gnu-ld --with-gnu-as \
--- a/devel/monodevelop-database/Makefile
+++ b/devel/monodevelop-database/Makefile
@ -15,9 +15,8 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/m
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/monodevelop.pc:${PORTSDIR}/devel/monodevelop

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:bzip2
 USE_GNOME=	gtksharp20
 MAKE_JOBS_UNSAFE=yes

--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@ -17,8 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libgdiplus.a:${PORTSDIR}/x11-toolkits/libgdiplus \

 USE_GNOME=	gtksharp20 gnomesharp20
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
-USES=		desktop-file-utils gettext gmake pathfix shared-mime-info
+USES=		desktop-file-utils gettext gmake pathfix shared-mime-info tar:bzip2
 INSTALLS_ICONS=	yes

 OPTIONS_DEFINE=	MONOEXT GIT SVN
--- a/devel/mq4cpp/Makefile
+++ b/devel/mq4cpp/Makefile
@ -13,8 +13,7 @@ COMMENT=	Message Queuing for C++
 OPTIONS_DEFINE=	DOCS

 USE_LDCONFIG=	yes
-USES=		dos2unix libtool:keepla pathfix pkgconfig
-USE_BZIP2=	yes
+USES=		dos2unix libtool:keepla pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes

 .include <bsd.port.mk>
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@ -12,8 +12,7 @@ PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 USE_OPENSSL=	yes
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		gmake pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 MAKEFILE=	GNUmakefile
 CONFIGURE_ENV+=	PYTHON=${PYTHON_CMD}
--- a/devel/p5-PCSC-Card/Makefile
+++ b/devel/p5-PCSC-Card/Makefile
@ -13,8 +13,7 @@ COMMENT=	Perl bindings for the PC/SC Lite Framework

 LIB_DEPENDS=	libpcsclite.so:${PORTSDIR}/devel/pcsc-lite

-USE_BZIP2=	yes
-USES=		perl5 pkgconfig
+USES=		perl5 pkgconfig tar:bzip2
 USE_PERL5=	configure
 MAKE_ENV=	"LOCALBASE=${LOCALBASE}"

--- a/devel/physfs/Makefile
+++ b/devel/physfs/Makefile
@ -9,8 +9,7 @@ MASTER_SITES=	http://offload1.icculus.org:9090/${PORTNAME}/downloads/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Library to provide abstract access to various archives

-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes

--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@ -12,11 +12,10 @@ COMMENT=	KDE/Qt IDE for microcontroller development

 LICENSE=	GPLv2 # (or later)

-USE_BZIP2=	yes
 DOS2UNIX_FILES=	cmake/Piklab.cmake
 USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
-USES=		cmake gettext readline dos2unix
+USES=		cmake gettext readline dos2unix tar:bzip2

 OPTIONS_DEFINE=	KDE4
 OPTIONS_DEFAULT=	KDE4
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@ -16,8 +16,7 @@ COMMENT=	Python bindings for ORBit2

 CONFLICTS=	py*-omniorb-[0-9]*

-USES=		pkgconfig gmake
-USE_BZIP2=	yes
+USES=		pkgconfig gmake tar:bzip2
 USE_GNOME=	gnomehack orbit2
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
--- a/devel/py-testoob/Makefile
+++ b/devel/py-testoob/Makefile
@ -19,7 +19,6 @@ HTML_DESC=	enable HTML output
 # bypass infrastructure bug (taken from www/py-django)
 OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options

-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_AUTOPLIST=	yes
@ -27,7 +26,7 @@ PYDISTUTILS_AUTOPLIST=	yes
 .include <bsd.port.pre.mk>

 .if ${PORT_OPTIONS:MTWISTED}
-USES+=		twisted
+USES+=		twisted tar:bzip2
 .endif

 .if ${PORT_OPTIONS:MHTML}
--- a/devel/qgit/Makefile
+++ b/devel/qgit/Makefile
@ -11,8 +11,7 @@ PKGNAMESUFFIX=	-qt4
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Graphical interface to git repositories

-USES=		qmake
-USE_BZIP2=	yes
+USES=		qmake tar:bzip2
 USE_QT4=	corelib gui moc_build rcc_build uic_build
 MAKE_JOBS_UNSAFE=	yes

--- a/devel/qjson/Makefile
+++ b/devel/qjson/Makefile
@ -11,8 +11,7 @@ COMMENT=	Library to manage JSON objects with Qt
 LICENSE=	LGPL21

 USE_QT4=	corelib moc_build qmake_build rcc_build uic_build
-USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake tar:bzip2
 USE_LDCONFIG=	yes

 PORTDOCS=	*
--- a/devel/sdl_gnat/Makefile
+++ b/devel/sdl_gnat/Makefile
@ -11,8 +11,7 @@ COMMENT=	Ada thin bindings for SDL (GPLv3)

 LICENSE=	GPLv3

-USES=		ada
-USE_BZIP2=	yes
+USES=		ada tar:bzip2
 USE_SDL=	sdl ttf
 USE_GL=		glu gl

--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@ -20,9 +20,8 @@ COMMENT=	Secure Internet Live Conferencing (SILC) network toolkit

 CONFLICTS=	silc-client-1.1.* silc-irssi-client-1.1.*

-USES=		gmake perl5
+USES=		gmake perl5 tar:bzip2
 USE_AUTOTOOLS=	libtool
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc/${PORTNAME}${PKGNAMESUFFIX} \
 		--with-simdir=${PREFIX}/lib/silcsim \
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@ -15,10 +15,9 @@ COMMENT=	Source code analysis tool

 LICENSE=	GPLv2

-USES=		shebangfix
+USES=		shebangfix tar:bzip2
 SHEBANG_FILES=	${WRKSRC}/snavigator/demo/c++/contrib/perl/sample_client
 USE_GCC=	yes
-USE_BZIP2=	yes
 USE_XORG=	x11

 HAS_CONFIGURE=	yes
--- a/devel/strace/Makefile
+++ b/devel/strace/Makefile
@ -12,8 +12,7 @@ COMMENT=	System call tracer

 LICENSE=	BSD3CLAUSE

-USES=		shebangfix perl5	# perl5 for strace-graph
-USE_BZIP2=	yes
+USES=		shebangfix perl5	# perl5 for strace-graph tar:bzip2
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	i386

--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@ -11,10 +11,9 @@ DIST_SUBDIR=	subversion

 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}

-USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_KDE4=	# Used below if KWallet support is enabled
-USES+=		pkgconfig
+USES+=		pkgconfig tar:bzip2

 LICENSE=	APACHE20

--- a/devel/tinyq/Makefile
+++ b/devel/tinyq/Makefile
@ -10,8 +10,7 @@ MASTER_SITES=	http://www.uwyn.com/download/tinyq/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Stripped down version of Qt 3 for use as a utility library

-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=-thread -stl -prefix ${PREFIX}/tinyq -docdir ${DOCSDIR}
 CONFIGURE_ENV+=	QTDIR="${WRKSRC}"
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@ -15,8 +15,7 @@ LIB_DEPENDS=	libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20
 OPTIONS_DEFINE=	DOCS

 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
-USES=		compiler:c++11-lib libtool:keepla pathfix pkgconfig
+USES=		compiler:c++11-lib libtool:keepla pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip

--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@ -13,9 +13,8 @@ COMMENT=	Xfce 4 development tools
 RUN_DEPENDS=	${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools

 GNU_CONFIGURE=	yes
-USE_BZIP2=	yes
 USE_XFCE=	configenv	# to get MASTER_SITE_SUBDIR something has to be defined
 USE_GNOME=	glib20
-USES=		pkgconfig
+USES=		pkgconfig tar:bzip2

 .include <bsd.port.mk>
--- a/devel/xsd/Makefile
+++ b/devel/xsd/Makefile
@ -27,8 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 MAKEFILE=	makefile
 MAKE_ARGS=	install_prefix=${STAGEDIR}${PREFIX} \
 		verbose=1
-USES=		gmake
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2

 OPTIONS_DEFINE=	DOCS EXAMPLES

--- a/Show More
+++ b/Show More