- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

7 files changed, 11 insertions, 9 deletions

diff --git a/sysutils/asr-utils/Makefile b/sysutils/asr-utils/Makefile
index 57dab9435f1a..59d122aa20f4 100644
--- a/sysutils/asr-utils/Makefile
+++ b/sysutils/asr-utils/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	asr-utils
 PORTVERSION=	3.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.adaptec.com/raid/u160raid/unix/ \
 		ftp://ftp.adaptec.com/raid/u160raid/unix/
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 NO_WRKSUBDIR=	yes
 BINS=		raidutil dpteng dptcom dptsig
 .ifndef (WITHOUT_X11)
-USE_XLIB=	yes
+USE_XORG=	x11
 BINS+=		dptscom dptmgr
 .endif
 MAN8=		raidutil.8
diff --git a/sysutils/conky-awesome/Makefile b/sysutils/conky-awesome/Makefile
index 3bb1a698aa6a..f8151cf82a79 100644
--- a/sysutils/conky-awesome/Makefile
+++ b/sysutils/conky-awesome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +17,9 @@ COMMENT=	An advanced, highly configurable system monitor for X
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext xdamage
+USE_GNOME=	pkgconfig
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-proc-uptime \
 			--disable-hddtemp
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 3bb1a698aa6a..f8151cf82a79 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	conky
 PORTVERSION=	1.4.9
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +17,9 @@ COMMENT=	An advanced, highly configurable system monitor for X
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext xdamage
+USE_GNOME=	pkgconfig
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-proc-uptime \
 			--disable-hddtemp
diff --git a/sysutils/gkrellfire/Makefile b/sysutils/gkrellfire/Makefile
index b2d859ffc885..ccf699006226 100644
--- a/sysutils/gkrellfire/Makefile
+++ b/sysutils/gkrellfire/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gkrellfire
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://people.freenet.de/thomas-steinke/ \
 		${MASTER_SITE_LOCAL}
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrell
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 PLIST_FILES=	libexec/gkrellm2/plugins/${PORTNAME}.so
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}"
 
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index d10f83a7c581..4cf29b8fa670 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -21,7 +21,6 @@ CONFLICTS=	gkrellm-2.*
 NO_LATEST_LINK=	yes
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/torsmo/Makefile b/sysutils/torsmo/Makefile
index c94053758abb..346f3953844c 100644
--- a/sysutils/torsmo/Makefile
+++ b/sysutils/torsmo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torsmo
 PORTVERSION=	0.18
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,8 +16,8 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	System monitor that renders text on desktop
 
 GNU_CONFIGURE=	yes
+USE_XORG=	x11
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
-USE_X_PREFIX=	yes
 MAN1=		torsmo.1
 
 PLIST_FILES=	bin/torsmo \
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 02214fb4fb0c..628c656b3e55 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -23,7 +23,6 @@ OPTIONS=	GTK2	"Enable GTK2 support"		off \
 		NONROOT	"Use xcdroast w/o being root"	off \
 		NLS	"Native language support"	on
 
-USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_CDRTOOLS=	yes