- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,

  and make XFREE86_VERSION map to it.  XFREE86_VERSION is now deprecated.
- Make xorg the default X_WINDOW_SYSTEM on -current.
- Add several new X_*_PORT variables which point to various pieces of X11 based
  on the setting of X_WINDOW_SYSTEM, and make ports use them.
- Add information to CHANGES about how to handle the transition.

PR:		ports/68763
Approved by:	portmgr (marcus)
Approved by:	re (scottl)

32 files changed, 116 insertions, 108 deletions

diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index 3877fb660bc9..13edde71d937 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-100dpi-*
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -45,4 +44,8 @@ pre-build:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 ${MAKE} all)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 13249a193fb7..0b4dc79cc5ea 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-75dpi-*
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -45,4 +44,8 @@ pre-build:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 ${MAKE} all)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index cbc13f62210f..fae03aa572dd 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-cyrillic-*
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -45,4 +44,8 @@ pre-build:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 ${MAKE} all)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index 4ba471326ee7..c92b14dc4221 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -22,7 +22,6 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-miscbitmaps-*
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -52,4 +51,8 @@ pre-build:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 ${MAKE} all)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index 64f5e34d8a1b..ddb5e2a11173 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -20,7 +20,6 @@ BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/XFree86-4-clients
 
 CONFLICTS=	xorg-fonts-encodings-*
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -35,4 +34,8 @@ do-configure:
 	 ${MAKE} includes ; \
 	 ${MAKE} depend)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index abd68cb5fd1e..a4e66c0167a8 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -21,7 +21,6 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fo
 
 CONFLICTS=	xorg-fonts-type1-* xorg-fonts-truetype-* 
 
-XFREE86_VERSION=	4
 USE_IMAKE=		YES
 PROJECTROOT=		-DProjectRoot=${PREFIX}
 DIST_SUBDIR=		xc
@@ -90,4 +89,8 @@ pre-build:
 	(cd ${WRKDIR}/xc/fonts/encodings && \
 	 ${MAKE} all)
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index e6a5cc58b649..959e1eb0199d 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -14,14 +14,10 @@ DISTNAME=	libXg.utf.fonts
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UNICODE fonts for use with 9term and sam
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index dd8bdc79f439..80c174d244b1 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-${BITMAP_FONTS_VER}
 MAINTAINER=	shige@FreeBSD.org
 COMMENT=	Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 
 # distfile version
 BITMAP_FONTS_VER=	1.0
@@ -29,14 +29,6 @@ USE_X_PREFIX=	yes
 
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 3
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86
-.elif ${XFREE86_VERSION} == 4
-RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 do-build:
 	@(cd ${WRKSRC}; \
 	    for i in ${BITMAP_FONTS_SIZE} ; do \
@@ -64,4 +56,4 @@ post-install:
 	@${SETENV} PKG_PREFIX=${X11BASE} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 50f47ada02a3..63dcb107e9cb 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -24,7 +24,7 @@ USE_ZIP=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
 .endif
 
@@ -37,7 +37,7 @@ PLIST_SUB=	PKG_OLDXF86=${PKG_OLDXF86} \
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 OLDXF86=	""
 .else
 OLDXF86=	"@comment "
@@ -106,7 +106,7 @@ install-fonts:
 post-install: truetype-link display-message
 
 truetype-link:
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
 .endif
 
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 98cf5a400149..5cd7bd449809 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -16,8 +16,9 @@ EXTRACT_SUFX=	.bdfs.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Cyrillic X11 bitmap fonts from CYR-RFX project
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients \
-		mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT} \
+		mkfontdir:${X_CLIENTS_PORT}
+
 USE_X_PREFIX=	yes
 
 # See WWW for other available encodings
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index facbce5defe5..20b6bd124761 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -15,22 +15,18 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	mita@jp.FreeBSD.org
 COMMENT=	X11 supplemental fonts
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
 
 post-install:
 	@${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 2bdfdf848f59..ab3dc60eea76 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -157,7 +157,7 @@ MAN5=		fonts-conf.5
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 MTREE_FILE=	/etc/mtree/BSD.x11.dist
 .else
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 679b01867c1d..6b00723ca67f 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -17,7 +17,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 
 USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index 6b77350856e5..75acd711dfa8 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -13,13 +13,9 @@ MASTER_SITES=	http://www.jmknoble.net/fonts/
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Jim Knoble's font package for X
 
-USE_IMAKE=	yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_IMAKE=	yes
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/jmk
@@ -29,4 +25,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 589165378c8e..175241695a87 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR=	xfonts
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Fixed width fonts from the Linux Font Project
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+
 WRKSRC=		${WRKDIR}/lfpfonts-fix
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix
 	@${INSTALL_DATA} ${WRKSRC}/lfp-fix/*.pcf.gz ${PREFIX}/lib/X11/fonts/lfpfonts-fix
@@ -34,4 +30,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 17de98c803b9..4942e6bf0467 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -14,18 +14,14 @@ MASTER_SITE_SUBDIR=	xfonts
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Variable width fonts from the Linux Font Project
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+
 WRKSRC=		${WRKDIR}/lfpfonts-var
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-var
 	@${INSTALL_DATA} ${WRKSRC}/lfp-var/*.pcf.gz ${PREFIX}/lib/X11/fonts/lfpfonts-var
@@ -34,4 +30,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/libXft/Makefile b/x11-fonts/libXft/Makefile
index fc6f7d7f079c..1a26bff8d63e 100644
--- a/x11-fonts/libXft/Makefile
+++ b/x11-fonts/libXft/Makefile
@@ -27,8 +27,8 @@ MAN3=		Xft.3
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 3
-BROKEN=	Xft requires XFree86 4.x to build.
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+IGNORE=	Xft requires Render extension headers/library to build.
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile
index 445e282aa9d6..b7ed0bdca21f 100644
--- a/x11-fonts/mozilla-fonts/Makefile
+++ b/x11-fonts/mozilla-fonts/Makefile
@@ -15,14 +15,12 @@ MASTER_SITES=	http://www.happygiraffe.net/dist/
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	Web fonts for Netscape/Mozilla
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+
 USE_X_PREFIX=	true
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=  bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/mozilla-fonts
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index 526a42260c18..fede2c555dce 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -15,16 +15,12 @@ MASTER_SITE_SUBDIR=	xfonts
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Another font package for X
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 post-install:
 	@${CAT} ${DESCR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 30c1f50b14c7..01596f3ba96f 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -16,6 +16,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A script that helps install Postscript fonts in X Window System
 
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 USE_PERL5=	yes
 USE_XLIB=	yes
 NO_BUILD=	yes
@@ -30,10 +32,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/README.type1inst
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS+=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index e64a67ef7dc3..c6805c4e36b5 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Fonts from the SGI ProPack 1.4 (originally for Linux)
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	lib/X11/fonts/local/sgi
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 22215077859f..946eb71fca55 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -14,20 +14,15 @@ MASTER_SITES=	http://www.is-vn.bg/hamster/
 MAINTAINER=	gugod@gugod.org
 COMMENT=	Terminus Font - a clean fixed width font
 
-BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic
+BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic \
+		bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
 USE_X_PREFIX=	yes
 ALL_TARGET=	pcf
 SHAREMODE=	644
 XFONTDIR=	${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.pre.mk>
-
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS+=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 post-build:
 	@gzip ${WRKSRC}/*.pcf
 
@@ -36,4 +31,4 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${XFONTDIR}
 	@cd ${XFONTDIR}; mkfontdir
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index d673aee6d6de..c7ac1e4967b5 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://dl.bytesex.org/releases/${PORTNAME}/
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	A number of fonts which are useful for TV applications
 
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index e96315a32eba..7f2810493691 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -34,7 +34,7 @@ USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 RUN_DEPENDS=	xfstt:${PORTSDIR}/x11-servers/Xfstt
 .endif
 
@@ -54,7 +54,7 @@ PLIST_SUB=	PKG_OLDXF86=${PKG_OLDXF86} \
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 OLDXF86=
 .else
 OLDXF86=	"@comment "
@@ -179,7 +179,7 @@ install-fonts:
 post-install: truetype-link display-message
 
 truetype-link:
-.if ${XFREE86_VERSION} == 3
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
 	${LN} -fs ${FONTSDIR} ${TTFONTSDIR}/${FONTNAME}
 .endif
 
diff --git a/x11-fonts/xfs/Makefile b/x11-fonts/xfs/Makefile
index 3ab1c8bd9a1a..35e0b789d895 100644
--- a/x11-fonts/xfs/Makefile
+++ b/x11-fonts/xfs/Makefile
@@ -32,4 +32,8 @@ post-install:
 		${PREFIX}/lib/X11/fs/config.default
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index ed626d53ed42..e706acdff82e 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -25,4 +25,8 @@ XBUILD_DIRS=	fonts/encodings fonts/bdf/100dpi
 XINSTALL_DIRS=	fonts/bdf/100dpi
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index a581295f7442..b6bdaa3ae988 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -25,4 +25,8 @@ XBUILD_DIRS=	fonts/encodings fonts/bdf/75dpi
 XINSTALL_DIRS=	fonts/bdf/75dpi
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 9c177c3079d6..3f91285b8dbe 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -25,4 +25,8 @@ XBUILD_DIRS=	fonts/encodings fonts/bdf/cyrillic
 XINSTALL_DIRS=	fonts/bdf/cyrillic
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-encodings/Makefile b/x11-fonts/xorg-fonts-encodings/Makefile
index 533bb56ce02a..d9450f503edd 100644
--- a/x11-fonts/xorg-fonts-encodings/Makefile
+++ b/x11-fonts/xorg-fonts-encodings/Makefile
@@ -23,4 +23,8 @@ EXTRA_PATCHES=	${CF_PATCHES}
 XBUILD_DIRS=	fonts/encodings
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 28a9de3fd7c2..8a5190185bdc 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -25,4 +25,8 @@ XBUILD_DIRS=	fonts/encodings fonts/bdf/misc
 XINSTALL_DIRS=	fonts/bdf/misc
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index fe59c9cd832f..2610e044bb8c 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -28,4 +28,8 @@ XBUILD_DIRS=	fonts/encodings fonts/scaled/TTF
 XINSTALL_DIRS=	fonts/scaled/TTF
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 4a757ff9758d..b2e186e77f53 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -27,4 +27,8 @@ XBUILD_DIRS=	fonts/encodings fonts/scaled/Type1
 XINSTALL_DIRS=	fonts/scaled/Type1
 
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+.include <bsd.port.post.mk>