8 files changed, 16 insertions, 17 deletions

diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index c9fed00f405e..7c944dd94c1e 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		bbdock
 PORTVERSION=		0.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		x11
 MASTER_SITES=		http://bbdock.nethence.com/download/
 
@@ -20,7 +20,7 @@ PORTDOCS=		README
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=		yes
-USE_X_PREFIX=		yes
+USE_XORG=		ice sm x11 xau xcursor xdmcp xext xfixes xi
 USE_GCC=		3.3+
 
 PLIST_FILES=		bin/bbdock
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index f3d6c3978b3e..cb2024083261 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	x11
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -15,8 +16,6 @@ DISTNAME=	X11-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-USE_XLIB=	yes
-
 # include the version verbatim. This will require a revision bump
 # on updates, but the correct quoting of `ghc --numeric-version` in the various
 # places is a real nightmare.
@@ -32,6 +31,8 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
+USE_XORG=	x11 xext sm
+
 # 'owned' by lang/ghc:
 CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
diff --git a/x11/hs-x11-ghc/Makefile b/x11/hs-x11-ghc/Makefile
index f3d6c3978b3e..cb2024083261 100644
--- a/x11/hs-x11-ghc/Makefile
+++ b/x11/hs-x11-ghc/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	x11
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -15,8 +16,6 @@ DISTNAME=	X11-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-USE_XLIB=	yes
-
 # include the version verbatim. This will require a revision bump
 # on updates, but the correct quoting of `ghc --numeric-version` in the various
 # places is a real nightmare.
@@ -32,6 +31,8 @@ BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
+USE_XORG=	x11 xext sm
+
 # 'owned' by lang/ghc:
 CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index 3fa142366f7b..e4213ee0714a 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	numlockx
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://ktown.kde.org/~seli/numlockx/ \
 		http://caraldi.com/jbq/numlockx/
@@ -17,8 +17,8 @@ MAINTAINER=	jb.quenot@caraldi.com
 COMMENT=	This little thingy allows you to start X with NumLock turned on
 
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext
 PLIST_FILES=	bin/numlockx
-USE_X_PREFIX=	yes
 
 # Needed for the "configure" program to find XTest and XKB header files
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index 2952984ef003..16acb20afaed 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmmenu
 PORTVERSION=	1.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 
@@ -17,7 +17,6 @@ COMMENT=	A popup menu of icons that launch programs for the WindowMaker dock
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-USE_X_PREFIX=	yes
 USE_GNOME=	libcapplet gdkpixbuf
 USE_GMAKE=	yes
 
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index ab4b631d1a01..c5f17ae167a8 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xcalib
 PORTVERSION=	0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 graphics
 MASTER_SITES=	http://www.etg.e-technik.uni-erlangen.de/web/doe/xcalib/
 DISTNAME=	${PORTNAME}-source-${PORTVERSION}
@@ -15,10 +15,9 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 MAINTAINER=	hopet@ics.muni.cz
 COMMENT=	A program for display calibration of X11-Servers with ICC profiles
 
-USE_X_PREFIX=	yes
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	README README.profilers
+USE_XORG=	x11 xext sm xxf86vm
 
 DEFINES=	-DXCALIB_VERSION=\"${PORTVERSION}\" -DUNIX
 LDFLAGS+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lm -lX11 -lXxf86vm -lXext
diff --git a/x11/xnodecor/Makefile b/x11/xnodecor/Makefile
index 2c66402de325..63ce080b1576 100644
--- a/x11/xnodecor/Makefile
+++ b/x11/xnodecor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xnodecor
 PORTVERSION=	0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.42.org/pub/wmx/contrib/
 DISTFILES=	xnodecor.c
@@ -16,8 +16,8 @@ MAINTAINER=	katsura@cc.osaka-kyoiku.ac.jp
 COMMENT=	Utility to set override_redirect in XWindowAttributes to True
 
 NO_WRKSUBDIR=	yes
+USE_XORG=	x11
 PLIST_FILES=	bin/xnodecor
-USE_X_PREFIX=	yes
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index 2ec699a05b14..f851a842fc70 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	XScreenSaver.App
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	xscreensaverapp
@@ -18,7 +18,6 @@ COMMENT=	WindowMaker dockapp to control XScreenSaver
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 PLIST_FILES=	bin/XScreenSaver.App
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib" \
 		CPPFLAGS="-I${X11BASE}/include"