- 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)

12 files changed, 24 insertions, 56 deletions

diff --git a/chinese/arphicttf/Makefile b/chinese/arphicttf/Makefile
index 4d44d9329d45..e43629daf8ac 100644
--- a/chinese/arphicttf/Makefile
+++ b/chinese/arphicttf/Makefile
@@ -23,17 +23,13 @@ WRKSRC=		${WRKDIR}/arphic
 USE_XLIB=	yes
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
-		WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X}
+INSTALL_ENV=	PKG_PREFIX=${PREFIX} WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WANT_GS)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
-.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
-RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
-.endif
 
 pre-fetch:
 .if defined(WANT_GS)
diff --git a/chinese/chinput/Makefile b/chinese/chinput/Makefile
index 7452185405f7..6d380d541ea8 100644
--- a/chinese/chinput/Makefile
+++ b/chinese/chinput/Makefile
@@ -16,12 +16,10 @@ DISTNAME=	zh-chinput-2.1
 MAINTAINER=	phj@cn.FreeBSD.org
 COMMENT=	Chinese GB2312,BIG5,Japanese code input server
 
-USE_XLIB=	yes
+BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT} \
+		mkfontdir:${X_CLIENTS_PORT}
 
-.if defined(XFREE86_VERSION) && ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4 \
-		mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_XLIB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/chinese/cmexfonts/Makefile b/chinese/cmexfonts/Makefile
index 419a0636ae68..4a1b8a8348ed 100644
--- a/chinese/cmexfonts/Makefile
+++ b/chinese/cmexfonts/Makefile
@@ -14,19 +14,15 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/cmexfonts/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Big5+ Chinese Mingti bitmap font (by CMEX & DynaLab) for X11
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 USE_X_PREFIX=	yes
 NO_BUILD=	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
-
 WRKSRC=		${WRKDIR}/cmexfonts
 
 post-install:
 	@${SETENV} ${INSTALL_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/cwtexttf/Makefile b/chinese/cwtexttf/Makefile
index 9179cdb248d0..9378fa9519bd 100644
--- a/chinese/cwtexttf/Makefile
+++ b/chinese/cwtexttf/Makefile
@@ -24,15 +24,11 @@ WRKSRC=		${WRKDIR}/texmf/fonts/truetype/cwTeX
 USE_XLIB=	yes
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
+INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
 		WANT_GS=${WANT_GS} WITHOUT_X=${WITHOUT_X}
 
 .include <bsd.port.pre.mk>
 
-.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
-RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
-.endif
-
 pre-fetch:
 .if defined(WANT_GS)
 	@${ECHO} "Ghostscript support will be added."
diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index c5b07da1ae64..7a7e613ca173 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -22,19 +22,15 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An xterm that speaks Chinese
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 WRKSRC=		${WRKDIR}/cxterm-5.0
 USE_IMAKE=	yes
 
 MAN1=		cit2tit.1 cxterm.1 hzimctrl.1 tit2cit.1
 MANCOMPRESSED=	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
-
 XMKMF=		xmkmf
 ALL_TARGET=	xrelease Makefiles includes all
 
@@ -53,4 +49,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Doc/input.doc ${PREFIX}/share/doc/cxterm
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/gugod-clean/Makefile b/chinese/gugod-clean/Makefile
index c3908e570732..5716e9231d48 100644
--- a/chinese/gugod-clean/Makefile
+++ b/chinese/gugod-clean/Makefile
@@ -11,12 +11,9 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/gugod/
 MAINTAINER=	gugod@gugod.org
 COMMENT=	A pretty font modifyed from X11 schumacher-clean that match kcfonts
 
-USE_X_PREFIX=	yes
-.include <bsd.port.pre.mk>
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_X_PREFIX=	yes
 
 FONTFILES=	gugod16.bdf gugod18.bdf gugod20.bdf gugod22.bdf
 
@@ -32,4 +29,4 @@ do-install:
 .endfor
 	@cd ${XFONTDIR} ; mkfontdir
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/chinese/kcfonts/Makefile b/chinese/kcfonts/Makefile
index 9068511dedab..e7616351369d 100644
--- a/chinese/kcfonts/Makefile
+++ b/chinese/kcfonts/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/distfiles/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kuo Chauo Chinese Fonts collection
 
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+
 USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
@@ -22,11 +25,6 @@ USE_X_PREFIX=	yes
 BROKEN=		"Does not build on sparc64"
 .endif
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
-
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.post.mk>
diff --git a/chinese/moettf/Makefile b/chinese/moettf/Makefile
index 51f59a961689..f3bd90f589fa 100644
--- a/chinese/moettf/Makefile
+++ b/chinese/moettf/Makefile
@@ -31,7 +31,7 @@ NO_BUILD=	yes
 SHAREMODE=	644
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
+INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
 		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
@@ -43,9 +43,6 @@ RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .if defined(WANT_GS)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
-.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
-RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
-.endif
 
 pre-fetch:
 .if defined(WANT_CJK)
diff --git a/chinese/ntuttf/Makefile b/chinese/ntuttf/Makefile
index d7899c38ab23..cb4cd299d24f 100644
--- a/chinese/ntuttf/Makefile
+++ b/chinese/ntuttf/Makefile
@@ -24,7 +24,7 @@ SHAREMODE=	644
 USE_XLIB=	yes
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
+INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
 		WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
@@ -36,9 +36,6 @@ RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .if defined(WANT_GS)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
-.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
-RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
-.endif
 
 pre-fetch:
 .if defined(WANT_CJK)
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index eda69facf8d7..0b83484ddc31 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://freebsd.sinica.edu.tw/pub/statue/ttfm/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Big5/GB enhanced TrueType Font Manager
 
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 FONTSDIR=	${PREFIX}/share/fonts/TrueType/
diff --git a/chinese/vflib/Makefile b/chinese/vflib/Makefile
index 344adb4d8264..07a12a193c57 100644
--- a/chinese/vflib/Makefile
+++ b/chinese/vflib/Makefile
@@ -21,7 +21,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Vector font library with free vector font, BIG5 and GB supported
 
-BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake-4
+BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
 
 VFLIB_VERSION=	2.25.1
 PLIST_SUB=	VFLIB_VERSION=${VFLIB_VERSION}
diff --git a/chinese/wangttf/Makefile b/chinese/wangttf/Makefile
index 83236c65f3a6..d46c9815a176 100644
--- a/chinese/wangttf/Makefile
+++ b/chinese/wangttf/Makefile
@@ -27,7 +27,7 @@ NO_BUILD=	yes
 SHAREMODE=	644
 FONTDIR=	${PREFIX}/share/fonts/TrueType
 XFONTDIR=	${X11BASE}/lib/X11/fonts/TrueType
-INSTALL_ENV=	PKG_PREFIX=${PREFIX} XFREE86_VERSION=${XFREE86_VERSION} \
+INSTALL_ENV=	PKG_PREFIX=${PREFIX} \
 		DEFAULT=${DEFAULT} WANT_CJK=${WANT_CJK} WANT_GS=${WANT_GS} \
 		WITHOUT_X=${WITHOUT_X}
 
@@ -39,9 +39,6 @@ RUN_DEPENDS+=	bg5latex:${PORTSDIR}/chinese/CJK
 .if defined(WANT_GS)
 RUN_DEPENDS+=	${LOCALBASE}/share/ghostscript/Resource/ai0/CMap/Identity-H:${PORTSDIR}/print/adobe-cmaps
 .endif
-.if ${XFREE86_VERSION} == 3 && !defined(WITHOUT_X)
-RUN_DEPENDS+=	mkfontdir.pl:${PORTSDIR}/x11-servers/XttXF86srv-common
-.endif
 
 pre-fetch:
 .if defined(WANT_CJK)