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

11 files changed, 47 insertions, 8 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index a37a0d8e31f..db5bf191b51 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -27,4 +27,8 @@ XINCLUDE_DIRS=		lib/xtrans programs/Xserver
 XINSTALL_MAN_DIRS=	programs/xfs
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
-.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-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index 87762aafaa3..a905d0466c6 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -38,4 +38,8 @@ post-extract:
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
-.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-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 0f26957091b..30ca5a0c4aa 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -40,4 +40,8 @@ do-install:
 	$(INSTALL_PROGRAM) ${WRKSRC}/programs/Xserver/Xprt ${PREFIX}/bin/Xprt
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
-.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-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index d0596e72064..00a143795cf 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -122,6 +122,10 @@ NOT_FOR_ARCHS=		ia64
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} != xfree86-4
+IGNORE= is part of XFree86-4
+.endif
+
 .if ${ARCH} == i386 || ${ARCH} == alpha
 RUN_DEPENDS+=		${X11BASE}/lib/modules/dri/r200_dri.so:${PORTSDIR}/graphics/dri
 BuildXF86DRI=		YES
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index dfceceda569..86d887ac8b9 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -42,4 +42,8 @@ post-extract:
 		${WRKSRC}/lib/Xdmcp/Wraphelp.c
 
 .include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc"
-.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-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index c31957d694c..63e87c962b0 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -17,7 +17,6 @@ COMMENT=	Libraries to support 3dfx Voodoo3/4/5/Banshee with the DRI
 
 USE_BZIP2=		yes
 USE_X_PREFIX=		yes
-XFREE86_VERSION=	4
 INSTALLS_SHLIB=		yes
 USE_INC_LIBTOOL_VER=	13
 USE_AUTOMAKE_VER=	14
diff --git a/x11-servers/xorg-fontserver/Makefile b/x11-servers/xorg-fontserver/Makefile
index 3ab1c8bd9a1..35e0b789d89 100644
--- a/x11-servers/xorg-fontserver/Makefile
+++ b/x11-servers/xorg-fontserver/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-servers/xorg-printserver/Makefile b/x11-servers/xorg-printserver/Makefile
index 051b1ace08a..80f6cc07dc3 100644
--- a/x11-servers/xorg-printserver/Makefile
+++ b/x11-servers/xorg-printserver/Makefile
@@ -26,4 +26,8 @@ XINCLUDE_DIRS=	lib/xtrans
 XMAN_DIRS=	programs/Xserver
 
 .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-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index f1686cdfef6..a9d5eea89a9 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -63,6 +63,10 @@ NOT_FOR_ARCHS=	ia64
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index f1686cdfef6..a9d5eea89a9 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -63,6 +63,10 @@ NOT_FOR_ARCHS=	ia64
 .include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
 
+.if ${X_WINDOW_SYSTEM:L} != xorg
+IGNORE= is part of X.Org
+.endif
+
 .if ${ARCH} == ia64
 PLIST_SUB+=	IA64_NA="@comment "
 .else
diff --git a/x11-servers/xorg-vfbserver/Makefile b/x11-servers/xorg-vfbserver/Makefile
index c384d2d8ffc..5d0faad289a 100644
--- a/x11-servers/xorg-vfbserver/Makefile
+++ b/x11-servers/xorg-vfbserver/Makefile
@@ -28,4 +28,8 @@ XMAN_DIRS=	programs/Xserver
 MAN1=		Xvfb.1
 
 .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>