Convert most of remaining ports that depend on xorg-libraries to

modular xorg.

- supply corresponding USE_XORG for all imake-using ports that need it
- USE_IMAKE no longer implies USE_XLIB in absence of USE_XORG
- retire USE_X_PREFIX which is not really used anywhere after the
  above change
- a few minor nits like whitespace and SF macro

Tested by:	2 tinderbox runs by pav
Approved by:	portmgr (pav)

10 files changed, 20 insertions, 10 deletions

diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index ca6479ad7b0e..1cf7d519516d 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bclock
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A round, analog X11 clock with bezier curve hands
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xmu xt
 MAN1=		bclock.1
 
 PLIST_FILES=	bin/bclock \
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index dfe82b7f1df8..20202da0e24b 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dclock
 PORTVERSION=	2.1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/d/dclock
@@ -21,6 +21,7 @@ MAINTAINER=	yasu@utahime.org
 COMMENT=	A 7-segment digital clock with some optional features
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xt
 
 WRKSRC=		${WRKDIR}/dclock
 MAN1=		dclock.1
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index ed91bfd68dce..55ecb4c92b0e 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	emiclock
 PORTVERSION=	2.0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
 
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Hyper-animated face analog clock for X11
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		emiclock.1
 
 LANGRES=	resources/R6/EUC/EmiClock.ad
diff --git a/x11-clocks/lmclock/Makefile b/x11-clocks/lmclock/Makefile
index 0c15eee81589..4b5b1ad1c84a 100644
--- a/x11-clocks/lmclock/Makefile
+++ b/x11-clocks/lmclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lmclock
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://pantransit.reptiles.org/prog/ \
 		CRITICAL
@@ -16,6 +16,7 @@ MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	A Xerox Lisp machine clock clone
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAKE_JOBS_SAFE=	yes
 
 PLIST_FILES=	bin/lmclock
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index 8979f4564d46..f90704a802a7 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mouseclock
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
@@ -17,6 +17,7 @@ COMMENT=	Display the current time using the X root cursor
 
 USE_GMAKE=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 XMKMF=		xmkmf
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile
index 0db5300ff2ba..91a0b96aa2ae 100644
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	swisswatch
 PORTVERSION=	0.06
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.tar.Z
@@ -16,6 +16,7 @@ MAINTAINER=	sanpei@FreeBSD.org
 COMMENT=	A Swiss railway clock emulation, and a fancy default appearance
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xext xmu xt
 MAN1=		swisswatch.1
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile
index 5e011dc720a3..26ab571fcec2 100644
--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	t3d
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.jwdt.com/~paysan/
 DISTNAME=	t3d
@@ -22,6 +22,7 @@ EXTRACT_AFTER_ARGS=	| ${SH}
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 MAN1=		t3d.1
 PLIST_FILES=	bin/t3d
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 50ed1b555071..37bef3985e48 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tclock
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/		\
 		ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/
@@ -18,6 +18,7 @@ COMMENT=	Transparent analog clock for x11
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		tclock.1
 PLIST_FILES=	bin/tclock
 
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 2cde6e917272..441ad46a0e9b 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xalarm
 PORTVERSION=	3.06
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X based alarm clock
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 IS_INTERACTIVE=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index 1a7c0b86cbd6..e4405053f405 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtimer
 PORTVERSION=	0.8089
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bsddiary.net/xtimer/
 DISTNAME=	${PORTNAME}-8089
@@ -16,6 +16,7 @@ MAINTAINER=	candy@kgc.co.jp
 COMMENT=	A simple digital timer for X11
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 MAN1=		xtimer.1
 PLIST_FILES=	bin/xtimer