7 files changed, 12 insertions, 11 deletions

diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 5ad3a785162c..7692b6ef8b68 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xfstt
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://download.berlios.de/xfstt/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A TrueType font server for X11
 
-USE_X_PREFIX=	yes
+USE_XORG=	fontsproto xproto
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index d74459512d17..db2751f94333 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -29,7 +29,7 @@ ONLY_FOR_ARCHS=	i386
 CFLAGS+=	-O
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure.in \
 		${WRKSRC}/h3/glide3/src/Makefile.am \
 		${WRKSRC}/h5/glide3/src/Makefile.am
diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index ac3ae9917682..cf56a40d12cb 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mga_hal
 PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	ftp://ftp.matrox.com/pub/mga/archive/linux/%SUBDIR%/:i386,amd64
 MASTER_SITE_SUBDIR=	2006/:i386 2006/64bit/:amd64
@@ -19,7 +19,6 @@ COMMENT=	Module for additional features with X.Org/XFree86 Matrox driver
 RESTRICTED=	Matrox drivers may not be distributed.
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index 7819adc010b9..6fc9d07e9655 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x2vnc
 PORTVERSION=	1.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://fredrik.hubbe.net/x2vnc/
 DISTNAME=	${PORTNAME}-1.7.2
@@ -15,10 +15,12 @@ DISTNAME=	${PORTNAME}-1.7.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to link multiple X and VNC servers together
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
+USE_XORG=	x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm
 MAN1=		x2vnc.1
 PLIST_FILES=	bin/x2vnc
 
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index b8626d13751a..fadee0ad7e9c 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-dmx
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -26,7 +26,7 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		compositeproto trapproto recordproto resourceproto \
 		xineramaproto evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
-		xau dmx xtst xres pixman
+		xau dmx xtst xres pixman xtrans
 		
 CONFIGURE_ARGS=	--disable-xprint --disable-xvfb --disable-xorg --disable-xnest \
 		--enable-dmx --localstatedir=/var
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 0ba3f4574f53..29111a4271c8 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*
 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 64bb6924949a..0f5d45f228d7 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*