9 files changed, 16 insertions, 28 deletions

diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 2e3aec4f8b6d..7f8e00de1023 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    cdrdao
-# Date created:         7 April 1999
-# Whom:                 futatuki
-#
+# Created by: futatuki
 # $FreeBSD$
-#
 
 PORTNAME?=	cdrdao
 PORTVERSION=	1.2.3
@@ -17,7 +13,7 @@ MAINTAINER=	marius@FreeBSD.org
 COMMENT?=	Record CD-R[W]s in disk-at-once mode
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 MP3OGG_LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
@@ -25,7 +21,8 @@ MP3OGG_LIB_DEPENDS=	ao.4:${PORTSDIR}/audio/libao \
 			vorbis.4:${PORTSDIR}/audio/libvorbis
 
 .if ${PORTNAME} == "gcdmaster"
-USE_GNOME=		gnomehier pkgconfig
+USES+=			pkgconfig
+USE_GNOME=		gnomehier
 GCONF_SCHEMAS=		gcdmaster.schemas
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS} \
 			gnomeuimm-2.6.1:${PORTSDIR}/x11-toolkits/libgnomeuimm26
@@ -46,7 +43,7 @@ CONFIGURE_ARGS+=	--with-lame=no
 PLIST_SUB+=		TOC2MP3="@comment "
 .endif
 .if !defined(WITHOUT_MP3OGG)
-USE_GNOME=		pkgconfig
+USES+=			pkgconfig
 LIB_DEPENDS+=		${MP3OGG_LIB_DEPENDS}
 CONFIGURE_ENV+=		AO_CFLAGS=-I${LOCALBASE}/include \
 			AO_LIBS="-L${LOCALBASE}/lib -lao" \
diff --git a/sysutils/djmount/Makefile b/sysutils/djmount/Makefile
index 8543e4919cc0..ef863863aaaa 100644
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@@ -15,8 +15,7 @@ BUILD_DEPENDS=	iconv:${PORTSDIR}/converters/libiconv
 
 PLIST_FILES=	bin/${PORTNAME}
 GNU_CONFIGURE=	yes
-USES=		fuse
-USE_GNOME=	pkgconfig
+USES=		fuse pkgconfig
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-fuse-prefix=${LOCALBASE} \
 		--with-external-libupnp --with-libupnp-prefix=${LOCALBASE}
diff --git a/sysutils/eventlog/Makefile b/sysutils/eventlog/Makefile
index 73fce289b98b..b77b7584b7f3 100644
--- a/sysutils/eventlog/Makefile
+++ b/sysutils/eventlog/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	eventlog
-# Date created:		10 november 2006
-# Whom:			Ivan Lago <ivan.lago@ifom-ieo-campus.it>
-#
+# Created by: Ivan Lago <ivan.lago@ifom-ieo-campus.it>
 # $FreeBSD$
-#
 
 PORTNAME=	eventlog
 PORTVERSION=	0.2.12
@@ -15,7 +11,7 @@ MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Replacement of the simple syslog() API providing structure to messages
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/fusefs-gstfs/Makefile b/sysutils/fusefs-gstfs/Makefile
index 2145ea9128b5..cb7c3a25a576 100644
--- a/sysutils/fusefs-gstfs/Makefile
+++ b/sysutils/fusefs-gstfs/Makefile
@@ -11,8 +11,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	On-demand, transcoding filesystem (using GStreamer pipeline)
 
-USES=		fuse
-USE_GNOME=	pkgconfig
+USES=		fuse pkgconfig
 USE_GSTREAMER=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index b93c0d632980..1aa93a9cf50e 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Network UPS Tools
 
 USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
+USES=		gmake pkgconfig
 
 NUT_USER?=	uucp
 NUT_GROUP?=	uucp
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index 902371ebdc46..61c235a5331f 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	NVidia graphic card status and overclocking tool
 
 LICENSE=	GPLv2
 
-USE_GMAKE=	yes
+USES=		gmake
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/nvclock bin/smartdimmer
@@ -30,7 +30,7 @@ X11_DESC=	Build GUI program (requires GTK+ 2.x)
 
 .if ${PORT_OPTIONS:MNVCONTROL}
 USE_XORG=	xext
-USE_GNOME=	pkgconfig
+USES+=		pkgconfig
 .else
 CONFIGURE_ARGS+=	--disable-nvcontrol
 .endif
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index d90ec6cd260b..a1f39fa4ce39 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Complex IPMI management software
 
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	autoconf autoheader automake aclocal libtool
 
 AUTOMAKE_ARGS+=	--add-missing --copy --foreign
diff --git a/sysutils/pam_mount/Makefile b/sysutils/pam_mount/Makefile
index 85b9aba36302..7067a077df8b 100644
--- a/sysutils/pam_mount/Makefile
+++ b/sysutils/pam_mount/Makefile
@@ -11,8 +11,8 @@ COMMENT=	A PAM that can mount volumes for a user session
 
 LIB_DEPENDS=	HX:${PORTSDIR}/lang/libhx
 
-USE_GNOME=	pkgconfig libxml2
-USE_PERL5=	yes
+USES=		pkgconfig perl5
+USE_GNOME=	libxml2
 USE_XZ=		yes
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/usbutils/Makefile b/sysutils/usbutils/Makefile
index b78a21a4b100..3c8e45071867 100644
--- a/sysutils/usbutils/Makefile
+++ b/sysutils/usbutils/Makefile
@@ -16,8 +16,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--datadir=${DATADIR} --enable-zlib
-USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
+USES=		gmake pkgconfig
 
 MAN1=		usb-devices.1
 MAN8=		lsusb.8