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)

9 files changed, 18 insertions, 9 deletions

diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index d09953d640ed..3d1647ee0128 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	contool
 PORTVERSION=	3.3a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nsayer
@@ -20,6 +20,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 NO_CDROM=	"source code cannot be sold, nor can you incorporate the source code into a product which is subsequently sold"
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 
 MAN1=		contool.1
 
diff --git a/sysutils/mmore/Makefile b/sysutils/mmore/Makefile
index ca5a454339df..1f1f210c2859 100644
--- a/sysutils/mmore/Makefile
+++ b/sysutils/mmore/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmore
 PORTVERSION=	1.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://matt.sixxgate.com/files/
 
@@ -17,6 +17,7 @@ COMMENT=	An Motif/X file/stream viewer
 USE_MOTIF=	yes
 USE_BZIP2=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xmu xt
 MAN1=		mmore.1
 MANCOMPRESSED=	yes
 
diff --git a/sysutils/perf/Makefile b/sysutils/perf/Makefile
index a6376b3a8442..fb5cc8ae8216 100644
--- a/sysutils/perf/Makefile
+++ b/sysutils/perf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perf
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.spyz.org/perf/
 
@@ -17,6 +17,7 @@ COMMENT=	Xview-based system monitoring tool
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 USE_IMAKE=		yes
+USE_XORG=		x11 xext
 MAN1=			perf.1
 PLIST_FILES=		bin/perf
 XFREE86_HTML_MAN=	no
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index 551ea0b9de77..91152c7ec6d9 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	roottail
 PORTVERSION=	1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 DISTNAME=	root-tail-${PORTVERSION}
@@ -24,6 +24,7 @@ COMMENT=	Print text directly to X11 root window
 MAN1=		root-tail.1
 PLIST_FILES=	bin/root-tail
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAKE_ARGS=	CC="${CC}"
 
 pre-everything::
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 968a9e5249c9..0681645811f5 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xbattbar
 PORTVERSION=	1.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 MASTER_SITES=	http://iplab.aist-nara.ac.jp/member/suguru/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -16,6 +16,7 @@ MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	Simple battery meter
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 WRKSRC=		${WRKDIR}/xbattbar-${PORTVERSION}
 MAN1=		xbattbar.1
 PLIST_FILES=	bin/xbattbar
diff --git a/sysutils/xcpustate/Makefile b/sysutils/xcpustate/Makefile
index d15ace312e75..6b8e2e4fa9ee 100644
--- a/sysutils/xcpustate/Makefile
+++ b/sysutils/xcpustate/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xcpustate
 PORTVERSION=	2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.cs.toronto.edu/pub/jdd/xcpustate/  \
 		${MASTER_SITE_XCONTRIB}
@@ -22,6 +22,7 @@ EXTRACT_CMD=	${CAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 NO_WRKSUBDIR=	yes
 
 MAN1=		xcpustate.1
diff --git a/sysutils/xdu/Makefile b/sysutils/xdu/Makefile
index e2261ffaff07..e244e789efbe 100644
--- a/sysutils/xdu/Makefile
+++ b/sysutils/xdu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdu
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://sd.wareonearth.com/~phil/xdu/
 EXTRACT_SUFX=	.tar.Z
@@ -17,6 +17,7 @@ COMMENT=	Graphically display output of du
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 PLIST_FILES=	bin/xdu lib/X11/app-defaults/XDu
 MAN1=		xdu.1
 
diff --git a/sysutils/xloadface/Makefile b/sysutils/xloadface/Makefile
index caa97c0cf776..5d3225679d27 100644
--- a/sysutils/xloadface/Makefile
+++ b/sysutils/xloadface/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xloadface
 PORTVERSION=	1.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.kazu.kz/freebsd/
 
@@ -18,6 +18,7 @@ BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 PATCH_STRIP=	-p1
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 XLOADFACEDIR=	$(LOCALBASE)/lib/X11/xloadface
 
 MAN1=		xloadface.1
diff --git a/sysutils/xwipower/Makefile b/sysutils/xwipower/Makefile
index c2fe558c99eb..90d4d9480f9c 100644
--- a/sysutils/xwipower/Makefile
+++ b/sysutils/xwipower/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xwipower
 PORTVERSION=	20000623
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.fumi.org/pub/xwipower/
 EXTRACT_SUFX=	.tgz
@@ -19,6 +19,7 @@ ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/xwipower
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 
 .include <bsd.port.pre.mk>