8 files changed, 15 insertions, 10 deletions

diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 6bd42693a17d..ad9ce936e2d8 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfstt
 PORTVERSION=	1.9.1
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://archive.hadrons.org/software/xfstt/
 
@@ -17,7 +18,7 @@ USE_RC_SUBR=	xfstt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
 
-TTFONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
+TTFONTDIR=	${PREFIX}/share/fonts/TrueType
 
 SUB_FILES=	pkg-message
 
@@ -30,7 +31,6 @@ post-install:
 	${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${FILESDIR}/xfstt.in \
 		> ${WRKSRC}/xfstt
 	${INSTALL_SCRIPT} ${WRKSRC}/xfstt ${STAGEDIR}${PREFIX}/etc/rc.d/
-	${MKDIR} ${STAGEDIR}${TTFONTDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for _file in INSTALL THANKS
 	${INSTALL_DATA} ${WRKSRC}/${_file} ${STAGEDIR}${DOCSDIR}
diff --git a/x11-servers/Xfstt/files/pkg-message.in b/x11-servers/Xfstt/files/pkg-message.in
index 8b6524bcfd75..62b44ae1be33 100644
--- a/x11-servers/Xfstt/files/pkg-message.in
+++ b/x11-servers/Xfstt/files/pkg-message.in
@@ -1,7 +1,7 @@
 ******************************************************************
 You will have to install your TrueType fonts in
 
-	%%PREFIX%%/lib/X11/fonts/TrueType
+	%%PREFIX%%/share/fonts/TrueType
 
 Remember to run the "xfstt --sync" command if you
 add fonts while the font server is running.
diff --git a/x11-servers/Xfstt/pkg-plist b/x11-servers/Xfstt/pkg-plist
index bf000c7896a4..daf5614259d8 100644
--- a/x11-servers/Xfstt/pkg-plist
+++ b/x11-servers/Xfstt/pkg-plist
@@ -2,6 +2,4 @@ bin/xfstt
 man/man1/xfstt.1x.gz
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
-@rmtry lib/X11/fonts/TrueType/ttname.dir
-@rmtry lib/X11/fonts/TrueType/ttinfo.dir
-@dir lib/X11/fonts/TrueType
+@dir share/fonts/TrueType
diff --git a/x11-servers/x11rdp/Makefile b/x11-servers/x11rdp/Makefile
index 5128c1011db7..f620a3bd4f1f 100644
--- a/x11-servers/x11rdp/Makefile
+++ b/x11-servers/x11rdp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	x11rdp
 PORTVERSION=	0.5.0.${X11RDPREVISION}
+PORTREVISION=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/:x11rdp
 DISTNAME=	${PORTNAME}_xorg71
diff --git a/x11-servers/x11rdp/files/patch-buildx_sh b/x11-servers/x11rdp/files/patch-buildx_sh
index 78e113a26d0d..86431acc2500 100644
--- a/x11-servers/x11rdp/files/patch-buildx_sh
+++ b/x11-servers/x11rdp/files/patch-buildx_sh
@@ -539,7 +539,7 @@
 +	  --with-mesa-source=$SRCDIR/Mesa-6.5 \
 +	  --disable-dmx \
 +	  --enable-xprint=no \
-+	  --with-fontdir=%%LOCALBASE%%/lib/X11/fonts \
++	  --with-fontdir=%%LOCALBASE%%/share/fonts \
 +	  --with-xkb-path=%%LOCALBASE%%/share/X11/xkb
 +  find . -name Makefile|xargs sed -i".bak" -e "s|-I%%LOCALBASE%%/include||g"
    if ! test $? -eq 0
diff --git a/x11-servers/xorg-nestserver/Makefile b/x11-servers/xorg-nestserver/Makefile
index 9d9a54644276..fc71f8891ca6 100644
--- a/x11-servers/xorg-nestserver/Makefile
+++ b/x11-servers/xorg-nestserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xorg-nestserver
 PORTVERSION=	1.14.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG
@@ -39,7 +40,9 @@ CONFIGURE_ARGS= --disable-dmx \
 		--disable-glx-tls \
 		--disable-vbe \
 		--disable-vgahw \
-		--disable-xvfb
+		--disable-xvfb \
+		--with-fontrootdir=${PREFIX}/share/fonts \
+		--with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins"
 
 USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		damageproto xcmiscproto xextproto xf86miscproto inputproto \
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index b01ad4d4fffc..dd566bd9080c 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=	xorg-server
 PORTVERSION=	1.14.7
-PORTREVISION?=	2
+PORTREVISION?=	3
 PORTEPOCH?=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index f06e9ce5dbc3..f46ce8012867 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xorg-vfbserver
 PORTVERSION=	1.14.7
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 MASTER_SITES=	XORG
@@ -39,7 +40,9 @@ CONFIGURE_ARGS=	--disable-dmx \
 		--disable-glx-tls \
 		--disable-vbe \
 		--disable-vgahw \
-		--enable-xvfb
+		--enable-xvfb \
+		--with-fontrootdir=${PREFIX}/share/fonts \
+		--with-default-font-path="catalogue:${LOCALBASE}/etc/X11/fontpath.d,built-ins"
 
 USE_XORG=	pixman x11 fixesproto damageproto xcmiscproto xtrans \
 		bigreqsproto randrproto renderproto xextproto inputproto \