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

6 files changed, 22 insertions, 46 deletions

diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index 249388839e85..c4f351cc9843 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -21,14 +21,10 @@ EXTRACT_ONLY=	baekmuk-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	cjh@freebsd.org
 COMMENT=	Free Hangul fonts for X11(baekmuk)
 
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_X_PREFIX=	yes
 
 FONTLIST=	batang10 batang10b batang12 batang12b batang14 batang14b \
 		batang16 batang16b batang18 batang18b batang20 batang20b \
@@ -71,4 +67,4 @@ do-install:
 .endfor
 	@(cd ${PREFIX}/${FONTSDIR} && mkfontdir .)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index 8bf8849a3df7..a1af9c892c3a 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -16,13 +16,9 @@ DISTNAME=	hanyang-font-pcf
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hanyang Hangul fonts for X11
 
-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
 
 NO_WRKSUBDIR=   yes
 
@@ -44,4 +40,4 @@ do-install:
 	done; \
 	mkfontdir ${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index 96b01e0ceb09..413185388f7e 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -14,14 +14,10 @@ DISTNAME=	hanterm-font-${PORTVERSION}
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hangul fonts for X11(johab) used in many hangul-related programs
 
-USE_IMAKE=	yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_IMAKE=	yes
 
 NO_INSTALL_MANPAGES= yes
 WRKSRC=		${WRKDIR}/hanterm-font/10-6-6
@@ -29,4 +25,4 @@ WRKSRC=		${WRKDIR}/hanterm-font/10-6-6
 pre-install:
 	-${MKDIR} ${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 440ed0d81055..13dd09652d2c 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -17,14 +17,10 @@ DISTFILES=	kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	X11 KAIST font(ksc5601.1987-0 encoding) collection
 
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_X_PREFIX=	yes
 
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
@@ -41,4 +37,4 @@ do-extract:
 post-install:
 	${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
index 0cd6459c99c9..256caa29c0c4 100644
--- a/korean/mizifont/Makefile
+++ b/korean/mizifont/Makefile
@@ -18,13 +18,9 @@ COMMENT=	Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding)
 
 EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
 
-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
 
 NO_WRKSUBDIR=	yes
 
@@ -57,4 +53,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index 57c607c50387..6323a2e31043 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -17,14 +17,10 @@ DISTNAME=	pinetree.precomposed-${PORTVERSION}-bdf
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding)
 
-USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
+BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
-.if ${XFREE86_VERSION} == 4
-BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
-RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
-.endif
+USE_X_PREFIX=	yes
 
 WRKSRC=		${WRKDIR}/pinetree.precomposed/bdf
 
@@ -46,4 +42,4 @@ do-install:
 	done; \
 	mkfontdir ${PREFIX}/lib/X11/fonts/local
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>