17 files changed, 17 insertions, 29 deletions

diff --git a/x11-wm/awesome-vicious/Makefile b/x11-wm/awesome-vicious/Makefile
index f4779c5b3b5b..4e01098b172f 100644
--- a/x11-wm/awesome-vicious/Makefile
+++ b/x11-wm/awesome-vicious/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	awesome:${PORTSDIR}/x11-wm/awesome
 
-USE_XZ=		yes
+USES=		tar:xz
 NO_BUILD=	yes
 NO_INSTALL=	yes
 PORTDOCS=	README TODO CHANGES LICENSE
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 7a12be33d821..333701385737 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms
 
 DIST_SUBDIR=	e17
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix iconv gmake pkgconfig
+USES=		pathfix iconv gmake pkgconfig tar:bzip2
 USE_EFL=	eina eet evas ecore eio edbus efreet edje \
 		libtool_hack librt_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	eet jpeg png
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index fd84d6811917..536c200161d9 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -14,9 +14,8 @@ LICENSE=	BSD
 OPTIONS_DEFINE=	ESOUND XINERAMA
 OPTIONS_DEFAULT=	XINERAMA
 
-USES=		perl5 gmake
+USES=		perl5 gmake tar:bzip2
 USE_PERL5=	build
-USE_BZIP2=	yes
 USE_XORG=	xpm
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index dac0f243509f..472a5e8638e9 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Alternative configuration system for Compiz
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compiz.pc:${PORTSDIR}/x11-wm/compiz
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 97da296afec8..50cf153452f5 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Standard library for Window Maker dock apps
 OPTIONS_DEFINE=	EXAMPLES
 OPTIONS_SUB=	yes
 
-USES=		libtool:keepla
-USE_BZIP2=	yes
+USES=		libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
 USE_XORG=	xext xpm
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/mcwm/Makefile b/x11-wm/mcwm/Makefile
index a8e41a31ddb9..f71aebe67e73 100644
--- a/x11-wm/mcwm/Makefile
+++ b/x11-wm/mcwm/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libxcb-util.so:${PORTSDIR}/x11/xcb-util \
 		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
 
 USE_XORG=	x11 xrandr
-USE_BZIP2=	yes
+USES=		tar:bzip2
 
 PLIST_FILES=	bin/mcwm bin/hidden man/man1/mcwm.1.gz man/man1/hidden.1.gz
 PORTDOCS=	README NEWS
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 2a6dac046e71..9cca7dae8572 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Pager for sawfish without GNOME
 BUILD_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 
-USE_XZ=		yes
 USE_GNOME=	gtk20
-USES=		gmake pkgconfig
+USES=		gmake pkgconfig tar:xz
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/sawfish/sawfishpager \
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index 40908f49d8f5..4a38138e8b60 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -12,9 +12,8 @@ COMMENT=	The Puto Amo Window Manager
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
 USE_XORG=	x11 xft xrandr xrender xpm
-USES=		cmake pkgconfig ninja
+USES=		cmake pkgconfig ninja tar:bzip2
 CMAKE_ARGS=	-DCMAKE_CONFIG_PREFIX:STRING="${PREFIX}/etc" \
 		-DX11_LIBRARY_DIRS:STRING="${LOCALBASE}/lib"
 LDFLAGS+=	-L${LOCALBASE}/lib -lXext -lXrender
diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile
index f1bb591ed2d9..c45b0146b10a 100644
--- a/x11-wm/peksystray/Makefile
+++ b/x11-wm/peksystray/Makefile
@@ -12,7 +12,7 @@ COMMENT=	System tray dockapp similar to the GNOME notification area applet
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_XORG=	x11 ice sm
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index d743db04a160..839e46e9a6e8 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Light, Unobtrusive, and configurable windowmanager
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png
 
-USES=		pkgconfig iconv gmake
+USES=		pkgconfig iconv gmake tar:bzip2
 USE_XORG=	xft xpm x11
-USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
 		--enable-xft --enable-image-xpm --enable-image-jpeg \
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index a4abd2d567fb..1181aaa7d369 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 LIB_DEPENDS=	librep.so:${PORTSDIR}/lang/librep
 RUN_DEPENDS=	rep-gtk2>=0.90:${PORTSDIR}/x11-toolkits/rep-gtk2
 
-USE_XZ=		yes
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig tar:xz
 USE_XORG=	ice sm x11 xft xinerama xrandr xtst
 USE_GNOME=	cairo gnomehier gtk20
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/simple-ccsm/Makefile b/x11-wm/simple-ccsm/Makefile
index 1405eab8b261..ec43fcd24be1 100644
--- a/x11-wm/simple-ccsm/Makefile
+++ b/x11-wm/simple-ccsm/Makefile
@@ -12,8 +12,7 @@ COMMENT=	A Python/GTK based settings manager for CompizConfig
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/compizconfig-python.pc:${PORTSDIR}/x11-wm/compizconfig-python
 
-USE_BZIP2=	yes
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig tar:bzip2
 USE_GNOME=	pygtk2
 USE_PYTHON=	2
 
diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile
index 518963b231b7..08ba84710c80 100644
--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@@ -14,8 +14,7 @@ LICENSE=	GPLv2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USE_BZIP2=	yes
-USES=		gmake imake:env
+USES=		gmake imake:env tar:bzip2
 USE_XORG=	x11 ice sm xext xmu xpm xt xxf86vm
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO
diff --git a/x11-wm/wmconfig/Makefile b/x11-wm/wmconfig/Makefile
index 290fa13c2160..7452ad7ca67e 100644
--- a/x11-wm/wmconfig/Makefile
+++ b/x11-wm/wmconfig/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Menu generation tool for X window managers
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog COPYING README TODO
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 5eea078b8feb..d4a60ee1b480 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -19,10 +19,9 @@ LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv garcon libmenu libutil libexo xfconf
-USES=	pathfix pkgconfig gmake
+USES=	pathfix pkgconfig gmake tar:bzip2
 USE_XORG=	x11 sm
 
 CONFIGURE_ARGS+=--enable-gio-unix \
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 4d4f421a618c..6b62993e1325 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -23,9 +23,8 @@ LIB_DEPENDS=	libwnck-1.so:${PORTSDIR}/x11-toolkits/libwnck \
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
 USE_GNOME=	gtk20 glib20 intltool intlhack
-USES=		pathfix pkgconfig gmake
+USES=		pathfix pkgconfig gmake tar:bzip2
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil xfconf
 USE_XORG=	x11 sm ice
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 201f986f35a3..883fb5ac1374 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -21,8 +21,7 @@ CONFIGURE_ARGS=	--enable-xsync \
 		--disable-kde-systray
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-USE_BZIP2=	yes
-USES=		pathfix pkgconfig gmake
+USES=		pathfix pkgconfig gmake tar:bzip2
 USE_GNOME=	gtk20 intltool intlhack
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libmenu libutil xfconf