- Remove USE_X_PREFIX

- Add USE_XORG= (modules)
- Bump portrevision

10 files changed, 23 insertions, 27 deletions

diff --git a/x11-clocks/abclock/Makefile b/x11-clocks/abclock/Makefile
index 67dd03fcf6c2..5e094edba89a 100644
--- a/x11-clocks/abclock/Makefile
+++ b/x11-clocks/abclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	abclock
 PORTVERSION=	1.0d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://odur.let.rug.nl/~kleiweg/abclock/
 
@@ -16,9 +16,10 @@ COMMENT=	Clock for X that displays hours and minutes in an analog fashion
 
 PLIST_FILES=	bin/abclock bin/abc_img
 
-USE_X_PREFIX=	yes
 MAKE_ARGS=	CC="${CC}" OPT="${CFLAGS}"
 
+USE_XORG=	x11 xau xdmcp
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/abclock ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/abc_img ${PREFIX}/bin
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index bb5e44a52cf7..b55f7db86014 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -7,16 +7,16 @@
 
 PORTNAME=	bbdate
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	bbtools
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tool made for Blackbox that displays the date in a decorated window
 
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xau xdmcp ice
 
 PLIST_FILES=	bin/bbdate share/bbtools/README.bbdate \
 		share/bbtools/bbdate.conf share/bbtools/bbdate.nobb \
diff --git a/x11-clocks/bdesktopclock/Makefile b/x11-clocks/bdesktopclock/Makefile
index e72653dfd81b..1187ac66e32a 100644
--- a/x11-clocks/bdesktopclock/Makefile
+++ b/x11-clocks/bdesktopclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bdesktopclock
 PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.bucote.com/opensource/bdesktopclock/
 
@@ -18,10 +18,11 @@ BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
 WRKSRC=		${WRKDIR}/BDesktopClock
 
-USE_X_PREFIX=	yes
 USE_QT_VER=	3
 MAKE_ENV+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
+USE_XORG=	x11 xau xcursor xdmcp xext xfixes xft xi xinerama \
+		xrandr xrender xt
 
 PLIST_FILES=	bin/BDesktopClock
 
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index a79f72fc7e8d..d26d11a05ac3 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	buici-clock
 PORTVERSION=	0.4.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.buici.com/pub/buici-clock/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -18,9 +18,9 @@ COMMENT=	Xlib implementation of an attractive, configurable clock
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_BISON=	build
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xau xdmcp xext ice
 
 MAN1=	buici-clock.1
 PLIST_FILES=	bin/buici-clock
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index a1f9961001e9..c3d029f5cb41 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eyeclock
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://download.vector.co.jp/pack/unix/personal/tokei/
 DISTNAME=	eyeclk20
@@ -17,9 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clock with eyes following the mouse pointer
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xau xdmcp xpm xt ice
 
 MAN1=		eyeclock.1
 
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index c0c0f2021b12..a546d77ae3de 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mlclock
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www2u.biglobe.ne.jp/~y-miyata/mlvwm/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clock for mlvwm window manager
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xau xdmcp
 
 PLIST_FILES=	bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji
 PLIST_DIRS=	%%DATADIR%%
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index 288f4865dd26..f21e3a37f054 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pclock
 PORTVERSION=	0.13.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
@@ -17,8 +17,7 @@ COMMENT=	Simple analog clock program for the Window Maker dock
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig/src
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xau xdmcp xext xpm
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \
 		INCDIR="-I. -I${X11BASE}/include ${CPPFLAGS}" \
 		LIBDIR="-L${X11BASE}/lib ${LDFLAGS}"
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 54dfda7e029f..67a94e676678 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -11,7 +11,7 @@
 
 PORTNAME=	rclock
 PORTVERSION=	2.7.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/%SUBDIR%/ \
 		ftp://mason.primenet.com.au/pub/rxvt/%SUBDIR%/ \
@@ -24,7 +24,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Analog clock for X w/appointment reminder and mail notification
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xau xdmcp ice
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-DMAIL_SPOOL='\"/var/mail/\"'"
 ALL_TARGET=	clock
diff --git a/x11-clocks/washerdryer/Makefile b/x11-clocks/washerdryer/Makefile
index 54ccd3c52b00..05d85e5d015f 100644
--- a/x11-clocks/washerdryer/Makefile
+++ b/x11-clocks/washerdryer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	washerdryer
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://lucille.dhs.org/
 DISTNAME=	washerDryer-${PORTVERSION}
@@ -16,11 +16,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockapp that keeps track of the loads in your washer and dryer
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/washerDryer
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
-USE_XPM=	yes
+USE_XORG=	x11 xau xdmcp xext xi xpm
 
 MANCOMPRESSED=	yes
 MAN1=		washerDryer.1
diff --git a/x11-clocks/wmblueclock/Makefile b/x11-clocks/wmblueclock/Makefile
index d2c5bd7c4ac5..8989a4ecf31f 100644
--- a/x11-clocks/wmblueclock/Makefile
+++ b/x11-clocks/wmblueclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmblueclock
 PORTVERSION=	0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/xutils
@@ -16,8 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple dockable clock application
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xau xdmcp xext xpm
 
 MAN1=		${PORTNAME}.1
 PLIST_FILES=	bin/wmblueclock