From 67fe3229dc5e0669536107c8325742fcc1358c21 Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sun, 30 Mar 2014 19:44:48 +0000
Subject: [PATCH] - new USES=

---
 audio/mp3asm/Makefile           | 5 ++---
 databases/phppgadmin/Makefile   | 2 +-
 games/xscrabble/Makefile        | 3 +--
 graphics/giflib/Makefile        | 2 +-
 graphics/png/Makefile           | 3 +--
 net-im/licq/Makefile.inc        | 2 +-
 www/opera-linuxplugins/Makefile | 2 +-
 x11-toolkits/lesstif/Makefile   | 2 +-
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index ccef23cf6a5a..ac10ff951356 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -13,8 +13,7 @@ COMMENT=	MP3 frame level editor
 
 LICENSE=	GPLv2
 
-USES=		gmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-0.1
 PLIST_FILES=	bin/mp3asm
@@ -25,7 +24,7 @@ OPTIONS_DEFINE=	DOCS
 .include <bsd.port.options.mk>
 
 post-extract:
-	@${RM} ${WRKSRC}/config.cache
+	${RM} ${WRKSRC}/config.cache
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g' ${WRKSRC}/configure
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index cedb6163171d..db0b2f95f35f 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Web Based Postgres Administration
 
 LICENSE=	GPLv2
 
-USE_BZIP2=	YES
+USES=		tar:bzip2
 .if !defined(WITHOUT_PHP_DEPENDS)
 USE_PHP=	pgsql pcre session
 .endif
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index a4fc23766118..59ec587c8c6b 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,8 +11,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	X version of the popular board game
 
-USES=		imake
-USE_BZIP2=	yes
+USES=		tar:bzip2 imake
 USE_XORG=	xaw
 
 XSCRABBLEDIR=	${PREFIX}/lib/X11/xscrabble
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 4e762aca8a7b..ff2f368e3ae6 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Tools and library routines for working with GIF images
 CONFLICTS=	libungif-[0-9]*
 PORTSCOUT=	limit:^4\.
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 5b89c352011b..d0c6124ba469 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -13,9 +13,8 @@ COMMENT=	Library for manipulating PNG images
 
 PORTSCOUT=	limit:^1\.5\.
 
-USE_XZ=		yes
+USES=		tar:xz cmake
 GNU_CONFIGURE=	yes
-USES=		cmake
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS+=	-DPNG_MAN_DIR:STRING=man
diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc
index 07ed7ff9b1e7..845c5a5b4935 100644
--- a/net-im/licq/Makefile.inc
+++ b/net-im/licq/Makefile.inc
@@ -12,4 +12,4 @@ MASTER_SITES=		SF/licq/licq/${LICQ_VER}
 DISTNAME=		${PKGNAMEPREFIX}${LICQ_VER}
 DISTFILES=		${DISTNAME}.tar.bz2
 DISTINFO_FILE?=		${PORTSDIR}/${LICQ_PORT}/distinfo
-USE_BZIP2=		yes
+USES+=			tar:bzip2
diff --git a/www/opera-linuxplugins/Makefile b/www/opera-linuxplugins/Makefile
index 04d9afb2b2bf..1756080f4fe8 100644
--- a/www/opera-linuxplugins/Makefile
+++ b/www/opera-linuxplugins/Makefile
@@ -24,7 +24,7 @@ OPERA_VER?=	12.16
 OPERA_BUILD?=	1860
 MASTER_SITES_VER_PATH=	linux/${OPERA_VER:S/.//}/
 
-USE_XZ=		yes
+USES=		tar:xz
 USE_LINUX=	yes
 USE_LINUX_APPS=	xorglibs
 
diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index 46815d70d1b9..b666586a77fd 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 
 CONFLICTS?=	open-motif-*
 
-USE_BZIP2=	yes
+USES=		tar:bzip2
 USE_AUTOTOOLS=	automake:env autoconf libtool
 USE_XORG=	sm ice xt xp xext x11 xextproto xrender xft
 USE_LDCONFIG=	yes