- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG

- Bump PORTREVISION

Approved by:	portmgr (xorg cleanup)

8 files changed, 13 insertions, 15 deletions

diff --git a/sysutils/bubblemon-dockapp/Makefile b/sysutils/bubblemon-dockapp/Makefile
index 8ea603ed69d2..9a9769396c0e 100644
--- a/sysutils/bubblemon-dockapp/Makefile
+++ b/sysutils/bubblemon-dockapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bubblemon-dockapp
 PORTVERSION=	1.46
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.ne.jp/asahi/linux/timecop/software/ \
 		http://critical.ch/distfiles/ \
@@ -17,7 +17,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/0$//}
 MAINTAINER=	gurkan@linuks.mine.nu
 COMMENT=	X eye candy for displaying CPU and memory load in a dock
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
 MAKE_ARGS+=	PREFIX="${PREFIX}"
diff --git a/sysutils/lineak-defaultplugin/Makefile b/sysutils/lineak-defaultplugin/Makefile
index ba1aabc97f41..3e9481dc8a75 100644
--- a/sysutils/lineak-defaultplugin/Makefile
+++ b/sysutils/lineak-defaultplugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lineak-defaultplugin
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	lineak
@@ -20,8 +20,8 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd
 
 USE_AUTOTOOLS=	libtool:15
 GNU_CONFIGURE=	yes
+USE_XORG=       x11 xext xt xtst xfixes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS+=	--program-prefix=''
diff --git a/sysutils/lineak-xosdplugin/Makefile b/sysutils/lineak-xosdplugin/Makefile
index d02f392257a3..0c094dd3e249 100644
--- a/sysutils/lineak-xosdplugin/Makefile
+++ b/sysutils/lineak-xosdplugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lineak-xosdplugin
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils deskutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=lineak
@@ -20,7 +20,7 @@ LIB_DEPENDS=	lineak.8:${PORTSDIR}/sysutils/lineakd \
 		xosd.4:${PORTSDIR}/misc/xosd
 
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xext xt
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--program-prefix=''
diff --git a/sysutils/lineakd/Makefile b/sysutils/lineakd/Makefile
index 0424e4792e97..795c914a04f3 100644
--- a/sysutils/lineakd/Makefile
+++ b/sysutils/lineakd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lineakd
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=lineak
@@ -17,7 +17,7 @@ MAINTAINER=	kay_lehmann@web.de
 COMMENT=	Lineakd is a daemon which enables special keys on internet keyboards
 
 USE_GMAKE=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xext xt
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
diff --git a/sysutils/sensors-applet/Makefile b/sysutils/sensors-applet/Makefile
index 16a5532f6e60..33d235201747 100644
--- a/sysutils/sensors-applet/Makefile
+++ b/sysutils/sensors-applet/Makefile
@@ -18,7 +18,6 @@ COMMENT=	A GNOME applet displaying hardware sensor values
 RUN_DEPENDS=	mbmon:${PORTSDIR}/sysutils/mbmon \
 		smartctl:${PORTSDIR}/sysutils/smartmontools
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack gnomepanel
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/sysutils/synergy/Makefile b/sysutils/synergy/Makefile
index 20e485d30789..e98c1d16415b 100644
--- a/sysutils/synergy/Makefile
+++ b/sysutils/synergy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synergy
 PORTVERSION= 	1.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}2
@@ -16,7 +16,7 @@ MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Mouse and keyboard sharing utility
 
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	ice xtst x11 sm
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/sysutils/xacpim/Makefile b/sysutils/xacpim/Makefile
index aaa75a7601e7..93b623222061 100644
--- a/sysutils/xacpim/Makefile
+++ b/sysutils/xacpim/Makefile
@@ -6,14 +6,14 @@
 
 PORTNAME=	xacpim
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://shapeshifter.se/pub/xacpim/
 
 MAINTAINER=	henriknj@0xmilk.org
 COMMENT=	Utility to display battery status and temperature on the root-display
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 PLIST_FILES=	bin/xacpim
 
 do-install:
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 2371d4dddbe4..a9ccae58d4a4 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	xmbmon
-PORTREVISION=	8
+PORTREVISION=	9
 
 COMMENT=	A X motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240
 
 MASTERDIR=	${.CURDIR}/../mbmon
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xt
 EXTRA_PATCHES=	${.CURDIR}/files/patch-*
 
 PLIST_FILES=	lib/X11/app-defaults/XMBmon