46 files changed, 48 insertions, 94 deletions

diff --git a/x11-wm/bbpager/Makefile b/x11-wm/bbpager/Makefile
index 060b52e29ebc..a91187996f1c 100644
--- a/x11-wm/bbpager/Makefile
+++ b/x11-wm/bbpager/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: bbpager
-# Date created:        17 June 2000
-# Whom:                Patrick Seal <patseal@hyperhost.net>
-#
+# Created by: Patrick Seal <patseal@hyperhost.net>
 # $FreeBSD$
-#
 
 PORTNAME=	bbpager
 DISTVERSION=	0.4.7
@@ -16,7 +12,7 @@ COMMENT=	A pager for the Blackbox window manager
 
 BUILD_DEPENDS=	blackbox:${PORTSDIR}/x11-wm/blackbox
 
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig
 USE_XORG=	xext sm x11 xau xcursor xi
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	`pkg-config --cflags xft`
diff --git a/x11-wm/e17-module-alarm/Makefile b/x11-wm/e17-module-alarm/Makefile
index 353268137d9d..4ba183362a27 100644
--- a/x11-wm/e17-module-alarm/Makefile
+++ b/x11-wm/e17-module-alarm/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-comp-scale/Makefile b/x11-wm/e17-module-comp-scale/Makefile
index db9f97329ab0..fd1b4cb8ecfc 100644
--- a/x11-wm/e17-module-comp-scale/Makefile
+++ b/x11-wm/e17-module-comp-scale/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile
index 8429ec1f1813..79f0017afa5c 100644
--- a/x11-wm/e17-module-cpu/Makefile
+++ b/x11-wm/e17-module-cpu/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile
index 75109bc50397..2c09ed127347 100644
--- a/x11-wm/e17-module-deskshow/Makefile
+++ b/x11-wm/e17-module-deskshow/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-diskio/Makefile b/x11-wm/e17-module-diskio/Makefile
index bcf82be6316a..c54c76c5bf5e 100644
--- a/x11-wm/e17-module-diskio/Makefile
+++ b/x11-wm/e17-module-diskio/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-eektool/Makefile b/x11-wm/e17-module-eektool/Makefile
index cfdc6f8b1bf4..3261600dbb78 100644
--- a/x11-wm/e17-module-eektool/Makefile
+++ b/x11-wm/e17-module-eektool/Makefile
@@ -17,9 +17,8 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-elfe/Makefile b/x11-wm/e17-module-elfe/Makefile
index b967ba331fe2..51d43e41eeb0 100644
--- a/x11-wm/e17-module-elfe/Makefile
+++ b/x11-wm/e17-module-elfe/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje elementary libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-empris/Makefile b/x11-wm/e17-module-empris/Makefile
index cae838a4c92c..f63d704e0f00 100644
--- a/x11-wm/e17-module-empris/Makefile
+++ b/x11-wm/e17-module-empris/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-engage/Makefile b/x11-wm/e17-module-engage/Makefile
index bd0eed257dfa..943bb81a08d0 100644
--- a/x11-wm/e17-module-engage/Makefile
+++ b/x11-wm/e17-module-engage/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-eooorg/Makefile b/x11-wm/e17-module-eooorg/Makefile
index d8103ba3404a..30e7840cd53a 100644
--- a/x11-wm/e17-module-eooorg/Makefile
+++ b/x11-wm/e17-module-eooorg/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-aspell/Makefile b/x11-wm/e17-module-everything-aspell/Makefile
index cd1905429f6e..bc37ca3a15fb 100644
--- a/x11-wm/e17-module-everything-aspell/Makefile
+++ b/x11-wm/e17-module-everything-aspell/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-mpris/Makefile b/x11-wm/e17-module-everything-mpris/Makefile
index d06b16f5494b..a711e45a16ba 100644
--- a/x11-wm/e17-module-everything-mpris/Makefile
+++ b/x11-wm/e17-module-everything-mpris/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-pidgin/Makefile b/x11-wm/e17-module-everything-pidgin/Makefile
index ceac156aa0ae..7a221459bd82 100644
--- a/x11-wm/e17-module-everything-pidgin/Makefile
+++ b/x11-wm/e17-module-everything-pidgin/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-places/Makefile b/x11-wm/e17-module-everything-places/Makefile
index e8ed63d45d37..f07a5f2a1e05 100644
--- a/x11-wm/e17-module-everything-places/Makefile
+++ b/x11-wm/e17-module-everything-places/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-shotgun/Makefile b/x11-wm/e17-module-everything-shotgun/Makefile
index 35a35af0f2f2..211e43d96b6c 100644
--- a/x11-wm/e17-module-everything-shotgun/Makefile
+++ b/x11-wm/e17-module-everything-shotgun/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-everything-wallpaper/Makefile b/x11-wm/e17-module-everything-wallpaper/Makefile
index 7463fa884e54..29935179d09e 100644
--- a/x11-wm/e17-module-everything-wallpaper/Makefile
+++ b/x11-wm/e17-module-everything-wallpaper/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-everything-websearch/Makefile b/x11-wm/e17-module-everything-websearch/Makefile
index a0720f0e354a..2e831d5da369 100644
--- a/x11-wm/e17-module-everything-websearch/Makefile
+++ b/x11-wm/e17-module-everything-websearch/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-exebuf/Makefile b/x11-wm/e17-module-exebuf/Makefile
index c2012cbdc882..08521f432e6e 100644
--- a/x11-wm/e17-module-exebuf/Makefile
+++ b/x11-wm/e17-module-exebuf/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 CONFIGURE_ARGS=	--disable-nls    # without this exebuf don't build
 
diff --git a/x11-wm/e17-module-execwatch/Makefile b/x11-wm/e17-module-execwatch/Makefile
index 802358e9a1bc..7da79199238b 100644
--- a/x11-wm/e17-module-execwatch/Makefile
+++ b/x11-wm/e17-module-execwatch/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile
index b0ce0b4b7187..688520f9e7de 100644
--- a/x11-wm/e17-module-flame/Makefile
+++ b/x11-wm/e17-module-flame/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-forecasts/Makefile b/x11-wm/e17-module-forecasts/Makefile
index bb1f51387a3a..ec18f74da7b7 100644
--- a/x11-wm/e17-module-forecasts/Makefile
+++ b/x11-wm/e17-module-forecasts/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-iiirk/Makefile b/x11-wm/e17-module-iiirk/Makefile
index 769cd2453b5b..a5a2bbab42ce 100644
--- a/x11-wm/e17-module-iiirk/Makefile
+++ b/x11-wm/e17-module-iiirk/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-itask/Makefile b/x11-wm/e17-module-itask/Makefile
index 209f4f864573..49f7f227fe47 100644
--- a/x11-wm/e17-module-itask/Makefile
+++ b/x11-wm/e17-module-itask/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile
index 6d0b781ee534..dd163385a235 100644
--- a/x11-wm/e17-module-mail/Makefile
+++ b/x11-wm/e17-module-mail/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index b753ca22a6cf..9280dd2aed3a 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index 587e847a6732..645495e37043 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-mpdule/Makefile b/x11-wm/e17-module-mpdule/Makefile
index 7b86e4a59dec..fdb6fd647706 100644
--- a/x11-wm/e17-module-mpdule/Makefile
+++ b/x11-wm/e17-module-mpdule/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-net/Makefile b/x11-wm/e17-module-net/Makefile
index f920b9c755a4..fffabf445121 100644
--- a/x11-wm/e17-module-net/Makefile
+++ b/x11-wm/e17-module-net/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-news/Makefile b/x11-wm/e17-module-news/Makefile
index ec8e2cf21184..c3682112679d 100644
--- a/x11-wm/e17-module-news/Makefile
+++ b/x11-wm/e17-module-news/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-penguins/Makefile b/x11-wm/e17-module-penguins/Makefile
index 93e274b534ab..e65906086c2b 100644
--- a/x11-wm/e17-module-penguins/Makefile
+++ b/x11-wm/e17-module-penguins/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-photo/Makefile b/x11-wm/e17-module-photo/Makefile
index fb6bf5e88bd1..38f755fa7a16 100644
--- a/x11-wm/e17-module-photo/Makefile
+++ b/x11-wm/e17-module-photo/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-places/Makefile b/x11-wm/e17-module-places/Makefile
index cc6633678111..e77fbbc78f31 100644
--- a/x11-wm/e17-module-places/Makefile
+++ b/x11-wm/e17-module-places/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile
index 737b17ede530..99174fde9e6a 100644
--- a/x11-wm/e17-module-rain/Makefile
+++ b/x11-wm/e17-module-rain/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-rmb/Makefile b/x11-wm/e17-module-rmb/Makefile
index e83492f94e66..4bbe859dbf91 100644
--- a/x11-wm/e17-module-rmb/Makefile
+++ b/x11-wm/e17-module-rmb/Makefile
@@ -19,6 +19,6 @@ DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
+USES=		pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile
index c9c2f507d280..afb810088dae 100644
--- a/x11-wm/e17-module-screenshot/Makefile
+++ b/x11-wm/e17-module-screenshot/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile
index 8c7917aec723..077875d7ac93 100644
--- a/x11-wm/e17-module-slideshow/Makefile
+++ b/x11-wm/e17-module-slideshow/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile
index f7272a5991f8..ba1f940d7465 100644
--- a/x11-wm/e17-module-snow/Makefile
+++ b/x11-wm/e17-module-snow/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-taskbar/Makefile b/x11-wm/e17-module-taskbar/Makefile
index c4092278e72e..70bb49bab0bc 100644
--- a/x11-wm/e17-module-taskbar/Makefile
+++ b/x11-wm/e17-module-taskbar/Makefile
@@ -18,9 +18,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-tclock/Makefile b/x11-wm/e17-module-tclock/Makefile
index 898e8c3a720f..36eccc9ce372 100644
--- a/x11-wm/e17-module-tclock/Makefile
+++ b/x11-wm/e17-module-tclock/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile
index 2caaa8979a8b..24994e90b51e 100644
--- a/x11-wm/e17-module-uptime/Makefile
+++ b/x11-wm/e17-module-uptime/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile
index b21c937c9ebd..05455b2ef8f8 100644
--- a/x11-wm/e17-module-weather/Makefile
+++ b/x11-wm/e17-module-weather/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-winlist-ng/Makefile b/x11-wm/e17-module-winlist-ng/Makefile
index 0c02ecfd5f17..a68f5c423a40 100644
--- a/x11-wm/e17-module-winlist-ng/Makefile
+++ b/x11-wm/e17-module-winlist-ng/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile
index d966f35518e3..28da7e168caa 100644
--- a/x11-wm/e17-module-winselector/Makefile
+++ b/x11-wm/e17-module-winselector/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USES=		gmake pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.mk>
diff --git a/x11-wm/e17-module-wlan/Makefile b/x11-wm/e17-module-wlan/Makefile
index cb42a050e5d3..be43d9f36a8c 100644
--- a/x11-wm/e17-module-wlan/Makefile
+++ b/x11-wm/e17-module-wlan/Makefile
@@ -14,11 +14,10 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
+USES=		gmake pkgconfig
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_EFL=	edje libtool_hack modarch_hack
-USE_GNOME=	pkgconfig
 
 .include <bsd.port.options.mk>
 
diff --git a/x11-wm/selectwm/Makefile b/x11-wm/selectwm/Makefile
index d08ae27c84f5..5a246c7fce35 100644
--- a/x11-wm/selectwm/Makefile
+++ b/x11-wm/selectwm/Makefile
@@ -7,10 +7,11 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://ordiluc.net/selectwm/
 
 MAINTAINER=	bhaga@absoludicrous.com
-COMMENT=	A GTK application to let you select a window manager when starting X
+COMMENT=	GTK application to let you select a window manager when starting X
 
 MAN1=		selectwm.1
 
+USES=		pkgconfig
 USE_BZIP2=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes