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)

18 files changed, 43 insertions, 32 deletions

diff --git a/graphics/SciPlot/Makefile b/graphics/SciPlot/Makefile
index fd8dec8588bc..0fcab823a726 100644
--- a/graphics/SciPlot/Makefile
+++ b/graphics/SciPlot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	SciPlot
 PORTVERSION=	1.36
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics math
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	widgets
@@ -17,6 +17,7 @@ COMMENT=	A full-featured Xt widget to display 2D data in a graph
 
 USE_MOTIF=	yes
 USE_IMAKE=	yes
+USE_XORG=	xp
 MAKE_ENV=	EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME}
 USE_LDCONFIG=	yes
 
diff --git a/graphics/gltk/Makefile b/graphics/gltk/Makefile
index df65a8ec9f58..e5033351f957 100644
--- a/graphics/gltk/Makefile
+++ b/graphics/gltk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gltk
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.sgi.com/opengl/contrib/ \
 		ftp://ftp.u-aizu.ac.jp/pub/os/sgi/misc/ftp.sgi.com/pub/opengl/contrib/
@@ -19,6 +19,7 @@ COMMENT=	An OpenGL/Tk interface
 
 USE_GL=		glut
 USE_IMAKE=	yes
+USE_XORG=	x11
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libtk.a ${PREFIX}/lib/libgltk.a
diff --git a/graphics/lfview/Makefile b/graphics/lfview/Makefile
index 041f26449208..6bb81713fc99 100644
--- a/graphics/lfview/Makefile
+++ b/graphics/lfview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lfview
 PORTVERSION=	1.1a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://hoshina.denpa.org/
 EXTRACT_SUFX=	.tgz
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphic viewer for Leaf products
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 USE_LDCONFIG=	yes
 NO_INSTALL_MANPAGES=	yes
 
diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile
index b6be89de1dd0..122813a6f5b6 100644
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libaux
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.freebsdbrasil.com.br/~jmelo/
 DISTFILES=	libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index 9e4204a3738d..fd4032268ffd 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	plotmtv
 PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 DISTNAME=	Plotmtv${PORTVERSION}
@@ -19,6 +19,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A multipurpose X11 plotting program
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xt
 ALL_TARGET=	World
 MAN1=		plotmtv.1
 
diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile
index 38d4d8d53454..6afbc964ff22 100644
--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	rawstudio
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawstudio.org/files/release/
 
@@ -23,7 +24,6 @@ USE_GMAKE=	yes
 CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GNOME=	gtk20 libxml2 gconf2
 
 .include <bsd.port.mk>
diff --git a/graphics/tgif/Makefile b/graphics/tgif/Makefile
index 99ea7bf70dd9..0428716f3c97 100644
--- a/graphics/tgif/Makefile
+++ b/graphics/tgif/Makefile
@@ -7,12 +7,11 @@
 
 PORTNAME=	tgif
 PORTVERSION=	4.1.45
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://bourbon.usc.edu/pub/tgif/ \
 		http://groups.yahoo.com/group/tgif4-announce/files/ \
-		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=tgif
+		SF
 DISTNAME=	${PORTNAME}-QPL-${PORTVERSION}
 
 MAINTAINER=	bmc@clapper.org
@@ -25,6 +24,7 @@ OPTIONS=	NLS "Enable native language support" on \
 
 USE_IMAKE=	yes
 PORTDOCS=	HISTORY README
+USE_XORG=	x11 xext xt sm ice
 
 MAN1=		tgif.1
 
diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index 3518fd5eb471..f648d71ec11d 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vertex
 PORTVERSION=	0.1.15
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://wolfpack.twu.net/users/wolfpack/
 
@@ -17,7 +17,6 @@ COMMENT=	A 3D modeller for generating efficient game models
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GL=		yes
 USE_GNOME=	imlib
 USE_GMAKE=	yes
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index af11149aedc2..e9ffbbfe9766 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfig
 PORTVERSION=	3.2.5.a5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full
@@ -26,7 +26,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:S,.a,-alpha,}
 
 LATEST_LINK=	xfig-devel
 USE_IMAKE=	yes
-USE_XORG=	xpm
+USE_XORG=	ice sm x11 xaw xext xi xmu xpm xt
 MAN1=		xfig.1
 
 MAKE_ENV+=	DOCSDIR=${DOCSDIR}
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index 10f048e92e11..6362291b80bb 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfig
 PORTVERSION=	3.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://files.xfig.org/
 DISTNAME=	${PORTNAME}.${PORTVERSION}.full
@@ -25,7 +25,7 @@ CONFLICTS=	xfig-[12].* xfig-3.1* xfig-3.2.[1234]*
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
 USE_IMAKE=	yes
-USE_XORG=	xpm
+USE_XORG=	ice sm x11 xaw xext xi xmu xpm xt
 MAN1=		xfig.1
 MANCOMPRESSED=	yes
 
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 1d8ffd886075..2d90ffed6ecf 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfpovray
 PORTVERSION=	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.batse.msfc.nasa.gov/~mallozzi/home/software/xforms/src/ \
 		${MASTER_SITE_SUNSITE}
@@ -21,6 +21,7 @@ LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext xpm
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index ce6ba3dd81a3..9e82cf6e9565 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgrasp
 PORTVERSION=	1.7d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display GL animations on X screen
 
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 MAN1=		glib.1 xgrasp.1
 
 NO_WRKSUBDIR=	yes
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index 829c93189090..b91fc6cf853d 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmagv
 PORTVERSION=	1.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/art/graphics/loader/mag/
 DISTFILES=	xmagv111.tgz
@@ -18,6 +18,7 @@ COMMENT=	Viewer for X Window System
 WRKSRC=		${WRKDIR}/${PORTNAME}
 GNU_CONFIGURE=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 XMKMF=		xmkmf
 MANLANG=	. ja
 MAN1=		xmagv.1
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index 1ca773cd5aa8..55383172eff8 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmandel
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cray.com/src/graphics/xmandel/
 # The README says the location is ftp.cray.com:/usr/ftp/src/graphics/xmandel,
@@ -22,6 +22,7 @@ EXTRACT_CMD=	${SH}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	# empty
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xt
 USE_PERL5_BUILD=yes
 NO_WRKSUBDIR=	yes
 MAN1=		xmandel.1
diff --git a/graphics/xoris/Makefile b/graphics/xoris/Makefile
index 35b140c5473c..b93fb7daad5b 100644
--- a/graphics/xoris/Makefile
+++ b/graphics/xoris/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	xoris
 PORTVERSION=	0.1e
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	alexander.gromnitsky@gmail.com
 COMMENT=	An X11 pixel color grabber
 
-USE_XLIB=	yes
 USE_IMAKE=	yes
+USE_XORG=	x11
 
 .if !defined(NOPORTDOCS)
 SUB_FILES=	pkg-message
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index 06bb3b717ef1..a48768c79749 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpx
 PORTVERSION=	1.41
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/xpx/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -17,6 +17,7 @@ COMMENT=	A simple pixel editing tool to make datas for KISS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_IMAKE=	yes
+USE_XORG=	x11 xext
 XMKMF=		xmkmf
 
 DOCSDIR=	${PREFIX}/share/doc/ja/${PORTNAME}
diff --git a/graphics/xtexcad/Makefile b/graphics/xtexcad/Makefile
index 3faab91ac375..8e077f6ba5da 100644
--- a/graphics/xtexcad/Makefile
+++ b/graphics/xtexcad/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xtexcad
 PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	graphics/xtexcad
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple drawing program enforcing limited slopes and diameters
 
 USE_IMAKE=	yes
+USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 MAN1=	xtexcad.1
 
diff --git a/graphics/xwpick/Makefile b/graphics/xwpick/Makefile
index ad5ea109469e..ca378c033d65 100644
--- a/graphics/xwpick/Makefile
+++ b/graphics/xwpick/Makefile
@@ -5,21 +5,22 @@
 # $FreeBSD$
 #
 
-PORTNAME=		xwpick
-PORTVERSION=		2.20
-PORTREVISION=	1
-CATEGORIES=		graphics
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	applications
+PORTNAME=	xwpick
+PORTVERSION=	2.20
+PORTREVISION=	2
+CATEGORIES=	graphics
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=applications
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image pick up utility for X Window System
 
-USE_IMAKE=		yes
-MAN1=			xwpick.1
+USE_IMAKE=	yes
+USE_XORG=	x11 xext
+MAN1=		xwpick.1
 
-post-install:
 .if !defined(NOPORTDOCS)
+post-install:
 	@${MKDIR} ${PREFIX}/share/doc/xwpick
 	${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/xwpick
 	${INSTALL_DATA} ${WRKSRC}/CNL_ARTICLE.PS ${PREFIX}/share/doc/xwpick