27 files changed, 27 insertions, 20 deletions

diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index a942909ce5c3..95b2c312f0e5 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -12,8 +12,8 @@ COMMENT=	New flavor of asclock
 MAKE_JOBS_UNSAFE=	yes
 
 WRKSRC=		${WRKDIR}/asclock-xlib
+USES=		imake xorg
 USE_XORG=	xpm x11
-USES=		imake
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index b73a1135eb51..b3fd0b15edfb 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -15,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 
 CONFLICTS=	asclock-gtk-[0-9]* asclock-xlib-[0-9]*
 
-USES=		tar:tgz imake
+USES=		imake tar:tgz xorg
 USE_XORG=	xpm xext x11
 PLIST_FILES=	bin/asclock man/man1/asclock.1.gz
 
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 54e1530357b6..af3ff7f3c93f 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Time/Date applet for WindowMaker
 
 LICENSE=	GPLv2
 
+USES=		xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xpm-includes=${LOCALBASE}/include \
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 09eab1ada779..2efa45df4278 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.eyesbeyond.com/freebsddom/astzclock/
 MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Afterstep clock with some timezone extensions
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xpm
 PLIST_FILES=	bin/astzclock man/man1/${PORTNAME}.1.gz
 
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index 86ca62cfb022..8888f002de79 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -14,6 +14,7 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
+USES=		xorg
 USE_XORG=	x11 xau xdmcp xext xfixes xi xrandr ice sm
 
 PLIST_FILES=	bin/bbdate share/bbtools/README.bbdate \
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index e759aebf0004..d11e1fccb450 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/X11/clocks
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Round, analog X11 clock with Bezier curve hands
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xext xmu xt
 
 PLIST_FILES=	bin/bclock \
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 31a3a722b154..5495f94b0600 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	libcairo.so:graphics/cairo
 
 WRKSRC=		${WRKDIR}/buici
 
+USES=		tar:xz bison gmake pkgconfig autoreconf xorg
 USE_XORG=	x11 xext
-USES=		tar:xz bison gmake pkgconfig autoreconf
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 2ad8456ba5af..e8a80fba4b47 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	http://opencircuitdesign.com/~tim/programs/dclock/archive/
 MAINTAINER=	romain@FreeBSD.org
 COMMENT=	7-segment digital clock with some optional features
 
+USES=		pkgconfig tar:tgz xorg
 USE_XORG=	x11 xt
-USES=		pkgconfig tar:tgz
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lXt -lm
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 8d784e0a6152..5e67afea0340 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -15,7 +15,7 @@ LICENSE_NAME=	Emi Clock for X11
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT.en
 LICENSE_PERMS=  dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
-USES=		iconv:build imake
+USES=		iconv:build imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 LANGRES=	resources/R6/EUC/EmiClock.ad
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index 8c58b119384e..a9cda8ed6f45 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -13,8 +13,8 @@ COMMENT=	Clock with eyes following the mouse pointer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ENV=	X11BASE=${LOCALBASE}
+USES=		tar:tgz xorg
 USE_XORG=	x11 xau xdmcp xpm xt ice
-USES=		tar:tgz
 
 DESKTOP_ENTRIES="EyeClock" "" "" "eyeclock" "" ""
 
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index a001d3fd3709..50d8a5fb646c 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -10,6 +10,7 @@ MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OpenGL spinning pocket watch demo and benchmark utility
 
+USES=		gl xorg
 USE_XORG=	xi xmu xext x11
 USE_GL=		gl glu glut
 MAKEFILE=	makefile
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 7290cff43e7d..6b97d11afa59 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/ehaupt
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Xerox Lisp machine clock clone
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/lmclock
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index 2d2583e29346..ef5b889433c6 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Clock for mlvwm window manager
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USES=		xorg
 USE_XORG=	x11 xau xdmcp
 
 PLIST_FILES=	bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index 4849a43c3b71..c070d47dc989 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Display the current time using the X root cursor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		imake:notall
+USES=		imake:notall xorg
 USE_XORG=	x11
 
 OPTIONS_DEFINE=	DOCS
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 48747835dd1b..2e9103f78b6c 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Analog clock for X w/appointment reminder and mail notification
 
 LICENSE=	GPLv2+
 
+USES=		xorg
 USE_XORG=	x11 xau xdmcp ice xpm xv
 GNU_CONFIGURE=	yes
 ALL_TARGET=	clock
diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile
index b14873c635d9..51c6cf836395 100644
--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@@ -19,7 +19,7 @@ EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SH}
 
 NO_WRKSUBDIR=	yes
-USES=		imake
+USES=		imake xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/t3d man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 06c070241f2d..7309e1716f11 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Transparent analog clock for x11
 LICENSE=	GPLv1
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		imake tar:Z
+USES=		imake tar:Z xorg
 USE_XORG=	x11 xext
 
 PLIST_FILES=	bin/tclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 943a18ade0d0..0033b34efea8 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	engerim42
 
 PLIST_FILES=	bin/wmBinClock
-USES=		gmake
+USES=		gmake xorg
 USE_XORG=	xpm
 
 post-patch:
diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile
index 58ff917aee30..d400a0dfcacb 100644
--- a/x11-clocks/wmblueclock/Makefile
+++ b/x11-clocks/wmblueclock/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple dockable clock application
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:bzip2
+USES=		tar:bzip2 xorg
 USE_XORG=	x11 xau xdmcp xext xpm
 
 PLIST_FILES=	bin/wmblueclock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index 95a29b62edc0..4a9f1e0be650 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Another Window Maker calendar/clock dockapp
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
+USES=		xorg
 USE_XORG=	xpm
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 PLIST_FILES=	bin/wmCalClock man/man1/${PORTNAME}.1.gz
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 97a5af864891..f08e528389fa 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 WRKSRC=		${WRKDIR}/dockapps-daaf3aa
 
-USES=		autoreconf gmake pkgconfig
+USES=		autoreconf gmake pkgconfig xorg
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index 9e7243f4ff02..cb37cca3fc98 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Time/date applet for WindowMaker with fishes swimming around
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		gnome pkgconfig
+USES=		gnome pkgconfig xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
 
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index 183872d6c009..0bbd5552d2d0 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Time/Date applet for WindowMaker
 
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
-USES=		imake
+USES=		imake xorg
 USE_XORG=	xpm
 USE_CSTD=	gnu89
 
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 92633ef880e4..a8bf25484830 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Multi-Function timer dockapp for WindowMaker
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmtimer
 PORTDOCS=	README
 PLIST_FILES=	bin/wmtimer
-USES=		gmake pkgconfig
+USES=		gmake gnome pkgconfig xorg
 USE_CSTD=	gnu89
 USE_XORG=	x11 xau xcomposite xcursor xdamage xdmcp xext xfixes xi \
 		xinerama xpm xrandr xrender
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 7aecd85bed17..b3c78760186d 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	XCONTRIB/utilities
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	X based alarm clock
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 pre-install:
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index b74a2829400c..a77c39bedfda 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -12,6 +12,7 @@ COMMENT=	Rather neat animated clock
 WRKSRC=		${WRKDIR}/${DISTNAME}/X11
 
 GNU_CONFIGURE=	yes
+USES=		xorg
 USE_XORG=	xt sm ice xext x11
 PLIST_FILES=	bin/xdaliclock man/man1/${PORTNAME}.1.gz
 
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index 189312feaa40..89a7c6742899 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Simple digital timer for X11
 
 BROKEN=		unfetchable
 
-USES=		imake
+USES=		imake xorg
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 PLIST_FILES=	bin/xtimer man/man1/${PORTNAME}.1.gz