- USE_(BZIP2|XZ) -> USES= tar:(bzip2|xz)

52 files changed, 61 insertions, 113 deletions

diff --git a/audio/aften/Makefile b/audio/aften/Makefile
index 2b32bfb5adbd..de99b22fe6bb 100644
--- a/audio/aften/Makefile
+++ b/audio/aften/Makefile
@@ -9,9 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	Gabor@Zahemszky.HU
 COMMENT=	ATSC A/52 audio encoder
 
-USE_BZIP2=	yes
-
-USES=		cmake:outsource
+USES=		tar:bzip2 cmake:outsource
 
 OPTIONS_DEFINE=		SHARED_LIB CXX_BINDINGS DOUBLE
 OPTIONS_DEFAULT=	
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 6af107fffdbc..e7aa42201e47 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ALSA/lib \
 MAINTAINER=	aragon@phat.za.net
 COMMENT=	ALSA compatibility library
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-pkgconfdir="\$${prefix}/libdata/pkgconfig"
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index f9f1796360a6..fbc72e7b46fb 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -13,9 +13,8 @@ COMMENT=	ALSA compatibility library plugins
 
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		tar:bzip2 pkgconfig
 LDFLAGS+=	-L${LOCALBASE}/lib
 EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
 
diff --git a/audio/amb-plugins/Makefile b/audio/amb-plugins/Makefile
index 281992c55130..5b2a4bb97a6b 100644
--- a/audio/amb-plugins/Makefile
+++ b/audio/amb-plugins/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-USES=		gmake
-USE_BZIP2=	yes
-
+USES=		tar:bzip2 gmake
 PLIST_FILES=	lib/ladspa/ambisonic0.so lib/ladspa/ambisonic1.so \
 		lib/ladspa/ambisonic2.so lib/ladspa/ambisonic3.so \
 		share/ladspa/rdf/fa-plugins.rdf
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 2744f19fd45e..cd75873e8f2a 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -20,8 +20,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
 
 USE_AUTOTOOLS=	aclocal autoconf
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gmake gettext pkgconfig shared-mime-info
-USE_XZ=		yes
+USES=		tar:xz desktop-file-utils gmake gettext pkgconfig shared-mime-info
 USE_WX=		2.8
 WX_UNICODE=	yes
 WX_COMPS=	wx
diff --git a/audio/audex/Makefile b/audio/audex/Makefile
index cf01905088bc..a3a14c535d19 100644
--- a/audio/audex/Makefile
+++ b/audio/audex/Makefile
@@ -12,8 +12,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
 
-USE_XZ=		yes
-USES=		cmake
+USES=		tar:xz cmake
 USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb libkcompactdisc
 USE_QT4=	gui dbus network svg xml \
 		qmake_build moc_build rcc_build uic_build
diff --git a/audio/audiotag/Makefile b/audio/audiotag/Makefile
index c440b83ab851..098d7fb361ad 100644
--- a/audio/audiotag/Makefile
+++ b/audio/audiotag/Makefile
@@ -16,8 +16,7 @@ OPTIONS_DEFAULT=	VORBIS ID3 MP4 FLAC
 
 NO_BUILD=	yes
 
-USES=		shebangfix perl5
-USE_BZIP2=	yes
+USES=		tar:bzip2 shebangfix perl5
 USE_PERL5=	run
 USE_GITHUB=	yes
 GH_ACCOUNT=	Daenyth
@@ -38,8 +37,6 @@ do-install:
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/aumix/Makefile b/audio/aumix/Makefile
index 631396baa6c1..8d812e5ff370 100644
--- a/audio/aumix/Makefile
+++ b/audio/aumix/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Audio mixer for X11, terminal, or command line
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir="${LOCALBASE}/include" \
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index 77fe60007d96..fe167e19cbc7 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 OPTIONS_DEFINE=		DEBUG
 OPTIONS_DEFINE_i386=	SSE
 
-USE_BZIP2=	yes
-USES=		desktop-file-utils gmake gettext pathfix pkgconfig shared-mime-info
+USES=		tar:bzip2 desktop-file-utils gmake gettext pathfix pkgconfig shared-mime-info
 USE_GCC=	yes
 USE_GNOME=	gnomehier libgnomecanvas
 GNU_CONFIGURE=	yes
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 1db68918186c..1454fce80880 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -13,7 +13,7 @@ COMMENT=	CDDB client bundle GNUstep
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
diff --git a/audio/cmus/Makefile b/audio/cmus/Makefile
index ecc0355f7a24..62cc93643a6b 100644
--- a/audio/cmus/Makefile
+++ b/audio/cmus/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Console-based music player with really cool features
 
-USES=		gmake pkgconfig iconv ncurses
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig iconv ncurses
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOSTCC=${CC}
 CONFIGURE_ARGS+=prefix=${PREFIX} mandir=${MANPREFIX}/man \
diff --git a/audio/cutmp3/Makefile b/audio/cutmp3/Makefile
index 492619dae223..6bb9bc4204ca 100644
--- a/audio/cutmp3/Makefile
+++ b/audio/cutmp3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.puchalla-online.de/ \
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A small and fast command line MP3 editor
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 PLIST_FILES=	bin/cutmp3 man/man1/cutmp3.1.gz
 
diff --git a/audio/dvda-author/Makefile b/audio/dvda-author/Makefile
index 2ac794737ef5..6e0cee34a5ab 100644
--- a/audio/dvda-author/Makefile
+++ b/audio/dvda-author/Makefile
@@ -23,7 +23,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/FLAC
 
 USE_AUTOTOOLS=	libltdl
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-flac=${LOCALBASE}/lib/libFLAC.so \
 	--with-ogg=${LOCALBASE}/lib/libogg.so \
diff --git a/audio/festvox-russian/Makefile b/audio/festvox-russian/Makefile
index ece5fa8cddeb..79863e8b1410 100644
--- a/audio/festvox-russian/Makefile
+++ b/audio/festvox-russian/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Russian male voice for Festival speech synthesis system
 
 RUN_DEPENDS=	festival:${PORTSDIR}/audio/festival
 
-USE_BZIP2=	YES
+USES=		tar:bzip2
 
 WRKSRC=		${WRKDIR}/msu_ru_nsh_clunits
 
@@ -30,6 +30,6 @@ post-extract:
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FHOME}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FHOME}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${FHOME})
 
 .include <bsd.port.mk>
diff --git a/audio/flite/Makefile b/audio/flite/Makefile
index 46373c8acd60..cc794840a989 100644
--- a/audio/flite/Makefile
+++ b/audio/flite/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Small run-time speech synthesis engine
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		gmake desthack
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake desthack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared=yes
 USE_LDCONFIG=	yes
@@ -26,7 +25,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-pd|-p|g' ${WRKSRC}/main/Makefile
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index 1dc4429be34e..74e0361595dd 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -23,9 +23,8 @@ LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
 		liblo.so:${PORTSDIR}/audio/liblo \
 		libjack.so:${PORTSDIR}/audio/jack
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk20
-USES=		gmake pkgconfig
+USES=		tar:bzip2 gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-jackmidi
 
diff --git a/audio/gimmix/Makefile b/audio/gimmix/Makefile
index 58c3bda076f5..ef497c97d483 100644
--- a/audio/gimmix/Makefile
+++ b/audio/gimmix/Makefile
@@ -20,10 +20,9 @@ LICENSE=	GPLv2
 OPTIONS_DEFINE=	NLS
 
 USE_GNOME=	gtk20 intltool libglade2
-USE_BZIP2=	yes
 
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gmake pkgconfig
+USES=		tar:bzip2 desktop-file-utils gmake pkgconfig
 
 CONFIGURE_ENV=	DATADIRNAME=share
 
diff --git a/audio/gnuitar/Makefile b/audio/gnuitar/Makefile
index 2573aa30acd9..c55c10d9bb8f 100644
--- a/audio/gnuitar/Makefile
+++ b/audio/gnuitar/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The real-time guitar processor
 
-USE_BZIP2=	yes
 USE_GNOME=	gtk20
+USES=		tar:bzip2 gmake pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gtk2 \
 		--enable-clip-everywhere \
@@ -20,7 +20,6 @@ CONFIGURE_ARGS=	--with-gtk2 \
 TXT_DOCS=	AUTHORS COPYING FAQ INSTALL NEWS README TODO ChangeLog
 HTML_DOCS=	faq.html index.html install.html readme.html
 PORTDOCS=	${TXT_DOCS} ${HTML_DOCS}
-USES=		gmake pkgconfig
 
 OPTIONS_DEFINE=	SUID DOCS
 OPTIONS_DEFAULT=	SUID
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 2bea3528be19..271d320b322f 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS+=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_GNUSTEP=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index e78ae9c67159..027efadc3aec 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -31,8 +31,7 @@ OPTIONS_SUB=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/man --prefix=${PREFIX}
 
-USES=		pkgconfig gmake desktop-file-utils
-USE_XZ=		yes
+USES=		tar:xz pkgconfig gmake desktop-file-utils
 MAKE_ARGS=	CXX="${CXX}" LINK="${CXX}"
 INSTALLS_ICONS=	yes
 
diff --git a/audio/jack_ghero/Makefile b/audio/jack_ghero/Makefile
index e6c0a38d0f54..1c1f65592e49 100644
--- a/audio/jack_ghero/Makefile
+++ b/audio/jack_ghero/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 PLIST_FILES=	sbin/jack_ghero \
 		man/man8/jack_ghero.8.gz
diff --git a/audio/jack_umidi/Makefile b/audio/jack_umidi/Makefile
index ed50c210c183..d8f88385c7db 100644
--- a/audio/jack_umidi/Makefile
+++ b/audio/jack_umidi/Makefile
@@ -14,7 +14,7 @@ LICENSE=	BSD
 
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 PLIST_FILES=	sbin/jack_umidi \
 		man/man8/jack_umidi.8.gz
 
diff --git a/audio/libbs2b/Makefile b/audio/libbs2b/Makefile
index b7a2917a2a0d..0d4f8ab14b8d 100644
--- a/audio/libbs2b/Makefile
+++ b/audio/libbs2b/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	CFLAGS=`pkg-config --cflags sndfile` \
diff --git a/audio/libcddb-doc/Makefile b/audio/libcddb-doc/Makefile
index bdb5ff87e3b3..fbd2a79b8bbb 100644
--- a/audio/libcddb-doc/Makefile
+++ b/audio/libcddb-doc/Makefile
@@ -9,12 +9,12 @@ MASTER_SITES=	SF/libcddb/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libcddb documentation
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/output
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/audio/libgig/Makefile b/audio/libgig/Makefile
index 303c66da629b..814d4d8fd04e 100644
--- a/audio/libgig/Makefile
+++ b/audio/libgig/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
 
-USE_BZIP2=	yes
-USES=		gmake pathfix pkgconfig
+USES=		tar:bzip2 gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/audio/libgme/Makefile b/audio/libgme/Makefile
index 5a6d6a22bfd3..134e76cf4cdd 100644
--- a/audio/libgme/Makefile
+++ b/audio/libgme/Makefile
@@ -14,8 +14,7 @@ LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
 PROJECTHOST=	game-music-emu
-USE_BZIP2=	yes
-USES=		cmake dos2unix ninja
+USES=		tar:bzip2 cmake dos2unix ninja
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile
index 09ab809a2f42..61ad6fd7ebbc 100644
--- a/audio/libgpod/Makefile
+++ b/audio/libgpod/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libplist.so:${PORTSDIR}/devel/libplist \
 
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_SQLITE=	3
-USES=		gettext gmake pathfix pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-udev --without-hal \
 		--with-html-dir="${DOCSDIR:H}"
diff --git a/audio/libmpdclient/Makefile b/audio/libmpdclient/Makefile
index 593467ee6a17..20f597fa7cd6 100644
--- a/audio/libmpdclient/Makefile
+++ b/audio/libmpdclient/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES=	http://www.musicpd.org/download/libmpdclient/2/
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	API library for interfacing MPD
 
-USE_XZ=		yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix
+USES=		tar:xz gmake pathfix
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
diff --git a/audio/mehdiaplayer/Makefile b/audio/mehdiaplayer/Makefile
index 060419891590..d7982bb050e2 100644
--- a/audio/mehdiaplayer/Makefile
+++ b/audio/mehdiaplayer/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Simple media player using Qt/Phonon
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 qmake
 USE_QT4=	gui xml uic_build moc_build \
 		rcc_build phonon
 
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index e76286ff28f6..2d52ccb3f01c 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	ftp://ftp.daper.net/pub/soft/moc/stable/
 MAINTAINER=	rzinkov@gmail.com
 COMMENT=	Console audio player designed to be powerful and easy to use
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 3518ea23651b..e86c3f3c84be 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Command-line player for MPEG Layer 1, 2, and 3 audio files
 
 LICENSE=	LGPL21
 
-USES=		gmake libtool:keepla pathfix
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake libtool:keepla pathfix
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	yes
 
diff --git a/audio/musescore/Makefile b/audio/musescore/Makefile
index 13f3e31a7bda..296294b9ac33 100644
--- a/audio/musescore/Makefile
+++ b/audio/musescore/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS=	qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 RUN_DEPENDS=	qtscriptgenerator>0:${PORTSDIR}/devel/qtscriptgenerator
 
-USE_BZIP2=	yes
-USES=		cmake:outsource
+USES=		tar:bzip2 cmake:outsource
 USE_QT4=	corelib designer gui network script scripttools svg webkit xml \
 		linguist_build moc_build qmake_build rcc_build uic_build
 CMAKE_SOURCE_PATH=	${WRKSRC}/mscore
diff --git a/audio/musicpc/Makefile b/audio/musicpc/Makefile
index 29c259512686..8edf0b9e96c6 100644
--- a/audio/musicpc/Makefile
+++ b/audio/musicpc/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 OPTIONS_DEFINE=	EXAMPLES DOCS ICONV
 OPTIONS_DEFAULT=	ICONV
 
-USES=		pkgconfig
-USE_XZ=		yes
+USES=		tar:xz pkgconfig
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
@@ -44,15 +43,11 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mpc ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/mpc.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-.endif
 
-.if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/mpc-completion.bash \
 		${STAGEDIR}${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/openal-soft/Makefile b/audio/openal-soft/Makefile
index 785e22d69c2d..d0884fd7ab37 100644
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@@ -13,8 +13,7 @@ LICENSE=	LGPL20
 
 CONFLICTS=	openal-200[0-9]*
 
-USE_BZIP2=	yes
-USES=		cmake
+USES=		tar:bzip2 cmake
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DALSA:BOOL=OFF -DPORTAUDIO:BOOL=OFF -DSOLARIS:BOOL=OFF \
 		-DDSOUND:BOOL=OFF -DSNDIO:BOOL=OFF -DEXAMPLES:BOOL=OFF \
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index c37dd639b537..87181cec7807 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -14,8 +14,7 @@ LICENSE=	BSD
 
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 
-USES=		kmod pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 kmod pkgconfig
 ALL_TARGET=	all install
 USE_GNOME=	gtk20
 USE_RC_SUBR=	oss
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index 248b387169d8..e7947ec876a9 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao \
 PLIST_FILES=	bin/pianobar \
 		man/man1/pianobar.1.gz
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig
 MAKE_ARGS+=	CC="${CC}" PREFIX="${PREFIX}"
 
 CFLAGS+=	-I${LOCALBASE}/include -std=c99
diff --git a/audio/qmpdclient/Makefile b/audio/qmpdclient/Makefile
index 842d809c73be..1559d82d46d3 100644
--- a/audio/qmpdclient/Makefile
+++ b/audio/qmpdclient/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Easy to use musicpd client written in Qt4
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		qmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 qmake
 USE_QT4=	moc_build rcc_build uic_build \
 		corelib gui network xml xmlpatterns
 INSTALLS_ICONS=	yes
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index cef147951c95..616d50c1f468 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 RUN_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
 		lilypond:${PORTSDIR}/print/lilypond
 
-USES=		desktop-file-utils gmake pkgconfig shared-mime-info
-USE_BZIP2=	yes
+USES=		tar:bzip2 desktop-file-utils gmake pkgconfig shared-mime-info
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	QTLIBDIR=${QT_LIBDIR}
 USE_QT4=	gui network xml rcc_build moc_build uic_build linguist_build
diff --git a/audio/ruby-mp3info/Makefile b/audio/ruby-mp3info/Makefile
index 85344c8ea75f..5f749b60a0e4 100644
--- a/audio/ruby-mp3info/Makefile
+++ b/audio/ruby-mp3info/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	A Ruby library to access to information on mp3 files
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_RUBY=	yes
 USE_RUBY_SETUP=	yes
 USE_RUBY_RDOC=	yes
diff --git a/audio/ruby-taglib/Makefile b/audio/ruby-taglib/Makefile
index 2486d0eb807c..f5ad51a6256a 100644
--- a/audio/ruby-taglib/Makefile
+++ b/audio/ruby-taglib/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A Ruby library wrapping the Taglib library
 LIB_DEPENDS=    libtag.so:${PORTSDIR}/audio/taglib
 
 USE_RUBY=	yes
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 RUBY_RD_FILES=	taglib.rb
 
@@ -29,9 +29,9 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 do-install:
-	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}/
-	${INSTALL_DATA} ${WRKSRC}/lib/taglib.rb ${STAGEDIR}${RUBY_SITELIBDIR}/
+	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/taglib.rb ${STAGEDIR}${RUBY_SITELIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
-	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${RUBY_MODDOCDIR}/
+	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${RUBY_MODDOCDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/rubyripper/Makefile b/audio/rubyripper/Makefile
index b39dc81deefa..541f7cfdcf5f 100644
--- a/audio/rubyripper/Makefile
+++ b/audio/rubyripper/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		cdrdao:${PORTSDIR}/sysutils/cdrdao \
 		cd-discid:${PORTSDIR}/audio/cd-discid
 
-USE_BZIP2=	yes
-USES=		gettext
+USES=		tar:bzip2 gettext
 USE_RUBY=	yes
 INSTALLS_ICONS=	yes
 
diff --git a/audio/scmpc/Makefile b/audio/scmpc/Makefile
index 7f5f4eb50e79..59db5e833541 100644
--- a/audio/scmpc/Makefile
+++ b/audio/scmpc/Makefile
@@ -15,8 +15,7 @@ LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
 		libcurl.so:${PORTSDIR}/ftp/curl \
 		libmpdclient.so:${PORTSDIR}/audio/libmpdclient
 
-USES=		gmake pkgconfig
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 
diff --git a/audio/spek/Makefile b/audio/spek/Makefile
index c964b5a0374d..9a63012f2cb0 100644
--- a/audio/spek/Makefile
+++ b/audio/spek/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 
-USE_XZ=		yes
-USES=		gmake pkgconfig desktop-file-utils compiler:c++11-lib desktop-file-utils
+USES=		tar:xz gmake pkgconfig desktop-file-utils compiler:c++11-lib desktop-file-utils
 USE_GNOME=	intltool
 USE_WX=	2.8+
 WX_UNICODE=	yes
diff --git a/audio/squash/Makefile b/audio/squash/Makefile
index 1e90e802b390..f351e2dc41ab 100644
--- a/audio/squash/Makefile
+++ b/audio/squash/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libao.so:${PORTSDIR}/audio/libao
 RUN_DEPENDS=	id3v2:${PORTSDIR}/audio/id3v2
 
-USE_BZIP2=	yes
-USES=		gmake
+USES=		tar:bzip2 gmake
 USE_RUBY=	yes
 MAKE_ARGS=	CC="${CC}"
 
@@ -28,9 +27,7 @@ OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|--std=gnu99|--std=gnu99 ${CFLAGS} ${PTHREAD_CFLAGS}|; \
@@ -50,11 +47,9 @@ do-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/musicdb_lib.rb ${STAGEDIR}${RUBY_SITELIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/extra/squash.conf ${STAGEDIR}${PREFIX}/etc/squash.conf.dist
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in README doc/FEATURES doc/LOCKS doc/INSTALL doc/USERS_GUIDE
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/audio/tagger/Makefile b/audio/tagger/Makefile
index 466ddb7967b8..c9810ce67b91 100644
--- a/audio/tagger/Makefile
+++ b/audio/tagger/Makefile
@@ -13,8 +13,7 @@ COMMENT=	CLI Ogg/Vorbis and MP3 ID3v1/ID3v1.1 tag editor
 DEPRECATED=	Ancient, unmaintained
 EXPIRATION_DATE=	2014-06-30
 
-USE_BZIP2=	yes
-USES=		gmake
+USES=		tar:bzip2 gmake
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	prefix=${PREFIX} mandir=${MANPREFIX}/man
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/tagtool/Makefile b/audio/tagtool/Makefile
index d5a0b24c518b..01eeb30a2a80 100644
--- a/audio/tagtool/Makefile
+++ b/audio/tagtool/Makefile
@@ -14,8 +14,7 @@ COMMENT=	GNOME MP3/Ogg file tagger
 LIB_DEPENDS=	libid3.so:${PORTSDIR}/audio/id3lib \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USE_BZIP2=	yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		tar:bzip2 gettext gmake pathfix pkgconfig
 USE_GNOME=	intlhack libglade2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/audio/terminatorx/Makefile b/audio/terminatorx/Makefile
index 81f1f4135798..a9e05740c83c 100644
--- a/audio/terminatorx/Makefile
+++ b/audio/terminatorx/Makefile
@@ -25,9 +25,8 @@ OPTIONS_DEFAULT=	JACK MPG123 SOX VORBIS MAD
 SOX_DESC=	sox (.au) support
 MPG123_DESC=	mpg123 support
 
-USE_BZIP2=	yes
 USE_XORG=	x11 xext xi xxf86dga ice sm
-USES=		gmake pathfix pkgconfig
+USES=		tar:bzip2 gmake pathfix pkgconfig
 USE_GNOME=	gnomehier gtk20 libxml2
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
diff --git a/audio/wavpack/Makefile b/audio/wavpack/Makefile
index ba46a34b5435..290e4d7ffdc1 100644
--- a/audio/wavpack/Makefile
+++ b/audio/wavpack/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Audio codec for lossless, lossy, and hybrid compression
 
 LICENSE=	BSD
 
-USE_BZIP2=	yes
-USES=		pathfix pkgconfig iconv
+USES=		tar:bzip2 pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile
index 5fe6a9e69c5d..429b634ff0e7 100644
--- a/audio/xfce4-mpc-plugin/Makefile
+++ b/audio/xfce4-mpc-plugin/Makefile
@@ -17,8 +17,7 @@ LICENSE=	BSD
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 RUN_DEPENDS=	musicpd:${PORTSDIR}/audio/musicpd
 
-USES=		gmake pkgconfig gettext
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake pkgconfig gettext
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libexo libmenu panel
diff --git a/audio/xfmpc/Makefile b/audio/xfmpc/Makefile
index 1e7144cdf590..7a655f677c0c 100644
--- a/audio/xfmpc/Makefile
+++ b/audio/xfmpc/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Graphical MPD client focusing on low footprint
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 
-USE_BZIP2=	yes
 INSTALLS_ICONS=	yes
-USES=		gettext gmake pkgconfig
+USES=		tar:bzip2 gettext gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20 intltool intlhack
 USE_XFCE=	configenv libmenu libutil
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index 717f0498a28e..c8fe74f7ef57 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -16,8 +16,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libmxml.so:${PORTSDIR}/textproc/mxml
 
-USE_BZIP2=	yes
-USES=		cmake pkgconfig
+USES=		tar:bzip2 cmake pkgconfig
 
 OPTIONS_DEFINE=	DOCS EXAMPLES GUI LASH LO JACK PORTAUDIO
 OPTIONS_DEFAULT=	GUI PORTAUDIO
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index 0ca948700555..b786eb72616f 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -41,9 +41,8 @@ UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_PORTVERSION}
 UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
 DIST?=		base
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig
+USES=		tar:xz gettext gmake libtool:keepla pathfix pkgconfig
 WANT_GSTREAMER=	yes
-USE_XZ=		yes
 USE_GNOME+=	glib20 gnomehier introspection:build libxml2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip