14 files changed, 20 insertions, 17 deletions

diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 1d941fb4367e..4be7dae26ba8 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -19,8 +19,8 @@ BROKEN_armv6=		fails to configure: has leading or trailing whitespace.  This is
 USE_GITHUB=	yes
 GH_ACCOUNT=	eranif
 
-USES=		cmake:noninja compiler:c++11-lib dos2unix gettext \
-		pathfix pkgconfig shebangfix sqlite
+USES=		cmake:noninja compiler:c++11-lib dos2unix gettext gnome pathfix \
+		pkgconfig shebangfix sqlite
 USE_GNOME+=	cairo gtk20
 DOS2UNIX_GLOB=	*.cpp *.txt
 SHEBANG_FILES=	Runtime/codelite_xterm
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 0a7ddfa870f4..7c1647caea60 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -13,7 +13,7 @@ BROKEN=		unfetchable
 
 LICENSE=	MPL20
 
-USES=		desktop-file-utils dos2unix fpc lazarus:flavors xorg
+USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-stl fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
diff --git a/editors/gmanedit/Makefile b/editors/gmanedit/Makefile
index 65d8814c5ff4..6443479d0d0e 100644
--- a/editors/gmanedit/Makefile
+++ b/editors/gmanedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}2/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME manpages editor
 
-USES=		pathfix gettext gmake pkgconfig
+USES=		gettext gmake gnome pathfix pkgconfig
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/editors/gobby/Makefile b/editors/gobby/Makefile
index 7e76ee5c1972..868ba4289eaf 100644
--- a/editors/gobby/Makefile
+++ b/editors/gobby/Makefile
@@ -20,7 +20,7 @@ OPTIONS_DEFINE=	GTKSPELL NLS
 GTKSPELL_DESC=	Enable GtkSpell support
 
 USE_GNOME=	gtksourceview2 intltool
-USES=		compiler:c++11-lang gmake pkgconfig pathfix
+USES=		compiler:c++11-lang gmake gnome pathfix pkgconfig
 USE_CXXSTD=	c++11
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index 2b01743572d6..e2e982afa2a8 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -13,7 +13,7 @@ COMMENT=	GTK+ based simple text editor
 LICENSE=	GPLv2
 
 USE_GNOME=	gtk20 intlhack
-USES=		desktop-file-utils gettext gmake pkgconfig
+USES=		desktop-file-utils gettext gmake gnome pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-chooser
 INSTALLS_ICONS=	yes
diff --git a/editors/linux-sublime/Makefile b/editors/linux-sublime/Makefile
index 59f34826d52b..6fbe24379062 100644
--- a/editors/linux-sublime/Makefile
+++ b/editors/linux-sublime/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sophisticated text editor for code, markup and prose
 
 INSTALLS_ICONS=	yes
-USES=		desktop-file-utils linux tar:bzip2
+USES=		desktop-file-utils gnome linux tar:bzip2
 USE_LINUX=	xorglibs gtk2
 WRKSRC=		${WRKDIR}/"Sublime Text 2"
 
diff --git a/editors/linux-sublime3/Makefile b/editors/linux-sublime3/Makefile
index e254982667bc..48ec400a5a8f 100644
--- a/editors/linux-sublime3/Makefile
+++ b/editors/linux-sublime3/Makefile
@@ -13,7 +13,7 @@ DISTNAME_i386=	sublime_text_3_build_${PORTVERSION:S/.//g}_x32
 MAINTAINER=	miguelmclara@gmail.com
 COMMENT=	Sophisticated text editor for code, markup and prose
 
-USES=		desktop-file-utils linux tar:bzip2
+USES=		desktop-file-utils gnome linux tar:bzip2
 USE_LINUX=	xorglibs gtk2
 
 INSTALLS_ICONS=	yes
diff --git a/editors/medit/Makefile b/editors/medit/Makefile
index e3b4383072e1..ab56318f2fb6 100644
--- a/editors/medit/Makefile
+++ b/editors/medit/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Programming and around-programming text editor
 
 LICENSE=	LGPL21
 
-USES=		compiler:c++11-lang gmake localbase pkgconfig python:2.7,build tar:bzip2
+USES=		compiler:c++11-lang gmake gnome localbase pkgconfig \
+		python:2.7,build tar:bzip2
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
diff --git a/editors/morla/Makefile b/editors/morla/Makefile
index 2481b5a61d9c..0090ef55cb4a 100644
--- a/editors/morla/Makefile
+++ b/editors/morla/Makefile
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gconf=auto
-USES=		gettext pkgconfig libtool
+USES=		gettext gnome libtool pkgconfig
 USE_GNOME=	gconf2 libgtkhtml libxslt
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index e2835ed1ee35..c27300c33614 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
-USES=		dos2unix fpc lazarus:flavors xorg
+USES=		dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
 		rtl-objpas x11
 USE_XORG=	x11
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 63a8b571de57..b63c794d27a9 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -19,7 +19,8 @@ LIB_DEPENDS=	libgtkspell3-3.so:textproc/gtkspell3 \
 		libicui18n.so:devel/icu \
 		liblucene++.so:textproc/luceneplusplus
 
-USES=		bdb compiler:c++11-lib desktop-file-utils gettext gmake pkgconfig
+USES=		bdb compiler:c++11-lib desktop-file-utils gettext gmake gnome \
+		pkgconfig
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
 WITH_BDB_HIGHEST=	yes
diff --git a/editors/py-room/Makefile b/editors/py-room/Makefile
index 4821c89a1837..58a3b7304c21 100644
--- a/editors/py-room/Makefile
+++ b/editors/py-room/Makefile
@@ -14,7 +14,7 @@ COMMENT=	PyRoom is a clone of WriteRoom and features "distraction-free writing"
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR}
 
-USES=		gettext python:2.7
+USES=		gettext gnome python:2.7
 USE_PYTHON=	distutils
 USE_GNOME=	pygtk2
 PYDISTUTILS_PKGNAME=	PyRoom
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 8b3dc4dcec27..64b893c701c3 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -86,6 +86,7 @@ NLS_USES=		gettext
 
 # UI
 ATHENA_PLIST_SUB=	GUI="" DESKTOP="@comment "
+ATHENA_USES=		xorg
 ATHENA_USE=		XORG=ice,sm,x11,xaw,xmu,xpm,xt
 ATHENA_VARS=		GUI=athena
 
@@ -101,19 +102,19 @@ GNOME_VARS=		GUI=gnome2 INSTALLS_ICONS=yes
 
 GTK2_PLIST_SUB=		GUI="" DESKTOP=""
 GTK2_USE=		GNOME=gdkpixbuf2,gtk20 XORG=ice,sm,x11,xpm,xt
-GTK2_USES=		desktop-file-utils gnome
+GTK2_USES=		desktop-file-utils gnome xorg
 GTK2_VARS=		GUI=gtk2 INSTALLS_ICONS=yes
 
 GTK3_PLIST_SUB=		GUI="" DESKTOP=""
 GTK3_USE=		GNOME=cairo,gdkpixbuf2,gtk30 XORG=ice,sm,x11,xpm,xt
-GTK3_USES=		desktop-file-utils gnome
+GTK3_USES=		desktop-file-utils gnome xorg
 GTK3_VARS=		GUI=gtk3 INSTALLS_ICONS=yes
 
 MOTIF_CONFIGURE_ENV=	MOTIFHOME=${LOCALBASE}
 MOTIF_CONFIGURE_WITH=	motif-lib="${MOTIFLIB}"
 MOTIF_PLIST_SUB=	GUI="" DESKTOP="@comment "
 MOTIF_USE=		XORG=ice,sm,x11,xmu,xt
-MOTIF_USES=		motif
+MOTIF_USES=		motif xorg
 MOTIF_VARS=		GUI=motif
 
 X11_CONFIGURE_WITH=	x
diff --git a/editors/xmlcopyeditor/Makefile b/editors/xmlcopyeditor/Makefile
index 62e5fe862793..2d83b195b97b 100644
--- a/editors/xmlcopyeditor/Makefile
+++ b/editors/xmlcopyeditor/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	libxerces-c.so.3:textproc/xerces-c3 \
 		libxml2.so:textproc/libxml2 \
 		libexpat.so:textproc/expat2
 
-USES=		compiler:c++11-lang dos2unix gettext gmake iconv libtool
+USES=		compiler:c++11-lang dos2unix gettext gmake gnome iconv libtool
 USE_WX=		2.8+
 WX_COMPS=	wx contrib
 WX_CONF_ARGS=	absolute