- Convert gmake,bzip2,xz to USES

Approved by:	portmgr

9 files changed, 9 insertions, 16 deletions

diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index a099f6db9732..4f83df2cc2a8 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -10,10 +10,8 @@ MASTER_SITES=	http://thekonst.net/download/
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A text mode menu- and window-driven IM interface
 
-USE_BZIP2=	yes
-USES=		iconv
+USES=		iconv gmake tar:bzip2
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 6b4d5f41f8b4..a0c9c65045cc 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -18,12 +18,10 @@ LIB_DEPENDS=	gee:${PORTSDIR}/devel/libgee06 \
 IGNORE=		Doesn't build currently, missing components
 CONFLICTS=	folks-0.4.[0-9]*
 
-USE_XZ=		yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack intlhack ltverhack evolutiondataserver3
-USES=		gettext
+USES=		gettext gmake tar:xz
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-im/jabber.el/Makefile b/net-im/jabber.el/Makefile
index 303274ccc8f1..3ea4598eded9 100644
--- a/net-im/jabber.el/Makefile
+++ b/net-im/jabber.el/Makefile
@@ -18,7 +18,7 @@ PORTDOCS+=	AUTHORS NEWS README
 
 USE_EMACS=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 NO_STAGE=	yes
 .include <bsd.port.pre.mk>
diff --git a/net-im/komclean/Makefile b/net-im/komclean/Makefile
index bee933212b36..686c366b2021 100644
--- a/net-im/komclean/Makefile
+++ b/net-im/komclean/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web based LysKOM client
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/Copyright.txt
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	x11 xext xextproto xpm
 INSTALLS_ICONS=	yes
 MAN1=		komclean
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 074045c99227..688d601babd3 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:${PORTSDIR}/net-im/papyon
 USE_PYTHON=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
-USE_GMAKE=	yes
+USES=		gmake
 
 NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index 286273958cf9..a0ce762b9ded 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -22,8 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig gmake
 USE_GNOME=	glib20 libxslt:build
 USE_SQLITE=	yes
 USE_OPENSSL=	yes
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 7ccccd50400e..4437c0dbc422 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig gmake
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_PYTHON_BUILD=yes
 
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index 2450ef5632dd..c7d57a84a64a 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
 USE_PYTHON=		yes
-USE_GMAKE=		yes
+USES=		gmake
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 1140edcb6ac5..a1ac57a7c651 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	avahi-glib.1:${PORTSDIR}/net/avahi-app \
 		soup-2.4.1:${PORTSDIR}/devel/libsoup
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		pkgconfig gmake
 USE_GNOME=	gnomehack glib20 libxslt:build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes