9 files changed, 10 insertions, 17 deletions

diff --git a/net-p2p/bnbt/Makefile b/net-p2p/bnbt/Makefile
index b015596dcc83..35cfccf5f75e 100644
--- a/net-p2p/bnbt/Makefile
+++ b/net-p2p/bnbt/Makefile
@@ -12,8 +12,7 @@ SNAPSHOT=	20060727
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	A C++ BitTorrent Tracker
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake tar:bzip2
 USE_DOS2UNIX=	yes
 
 SUB_FILES=	pkg-message
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index 1732c5e0cd39..c779cfe187d3 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -32,8 +32,7 @@ OPTIONS_MULTI_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
 
 USE_AUTOTOOLS=	libltdl libtool
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS =	--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
diff --git a/net-p2p/gtkhx/Makefile b/net-p2p/gtkhx/Makefile
index b221bcc60f89..40cab2560a6b 100644
--- a/net-p2p/gtkhx/Makefile
+++ b/net-p2p/gtkhx/Makefile
@@ -10,9 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ version of Hx, a UNIX Hotline Client
 
-USES=	pathfix
-USE_GNOME=	gdkpixbuf gnomehack
-USE_GMAKE=	yes
+USES=		pathfix gmake
+USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net-p2p/jigdo/Makefile b/net-p2p/jigdo/Makefile
index 16af53c26223..2b1a9cad4697 100644
--- a/net-p2p/jigdo/Makefile
+++ b/net-p2p/jigdo/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Utility used to retrieve large files over the Internet
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget
 
-USE_BZIP2=	yes
+USES=		gmake tar:bzip2
 USE_SUBMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 WITH_BDB_VER?=	43
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-p2p/libbt/Makefile b/net-p2p/libbt/Makefile
index 5432dedc1ea9..70dadbbeb50a 100644
--- a/net-p2p/libbt/Makefile
+++ b/net-p2p/libbt/Makefile
@@ -13,7 +13,7 @@ COMMENT=	C library implementing the core BitTorrent protocol
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index ae089864f192..c833d8615329 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -18,11 +18,9 @@ BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
 NO_LATEST_LINK=	yes
 CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
 
-USE_BZIP2=	yes
-USES=		iconv
+USES=		iconv tar:bzip2 gmake
 USE_AUTOTOOLS=	autoconf:env
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 ALL_TARGET=	opt
 MAKE_ENV+=	OCAMLRUNPARAM="l=256M"
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net-p2p/opendchub/Makefile b/net-p2p/opendchub/Makefile
index 40ad21d8b2fc..52e6200d94bc 100644
--- a/net-p2p/opendchub/Makefile
+++ b/net-p2p/opendchub/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES=	SF/${PORTNAME}/Open%20DC%20Hub/${PORTVERSION}
 MAINTAINER=	yashin.dm@gmail.com
 COMMENT=	Unofficial Unix version of the Direct Connect Hub software
 
-USES=		perl5
+USES=		perl5 gmake
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	README configfiles general scriptdoc
diff --git a/net-p2p/opennap/Makefile b/net-p2p/opennap/Makefile
index 5790a19622d4..c4987237533a 100644
--- a/net-p2p/opennap/Makefile
+++ b/net-p2p/opennap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	sam@cassiba.com
 COMMENT=	Open-source Napster server
 
-USE_GMAKE=	YES
+USES=		gmake
 GNU_CONFIGURE=	YES
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
diff --git a/net-p2p/teknap/Makefile b/net-p2p/teknap/Makefile
index eba639696495..7c84dfde479b 100644
--- a/net-p2p/teknap/Makefile
+++ b/net-p2p/teknap/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/TekNap
 PLIST_FILES=	bin/TekNap \
 		bin/TekNap-1.3g
 
-USE_GMAKE=	yes
+USES=	gmake
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 DOCSDIR=	${PREFIX}/share/doc/TekNap