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

1 files changed, 20 insertions, 0 deletions

diff --git a/CHANGES b/CHANGES
index 224f315beb76..f724e62b655f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,26 @@ in the release notes.
 
 All ports committers are allowed to commit to this file.
 
+20040721:
+AUTHOR: anholt@FreeBSD.org
+  The XFREE86_VERSION variable is deprecated and replaced by the X_WINDOW_SYSTEM
+  switch. X_WINDOW_SYSTEM may be set to any of xorg, xfree86-4, and xfree86-3.
+  Ports which depended on ports from a specific X distribution have been updated
+  to use the new X_*_PORT defines from bsd.port.mk.  XFREE86_VERSION will
+  continue to work and map to X_WINDOW_SYSTEM for a short time.
+
+  X.Org has been made the default X distribution for FreeBSD 502123
+  (current -CURRENT) and later.  This requires that all existing XFree86 ports
+  be deleted and replaced by X.Org for dependencies to work, unless you set
+  X_WINDOW_SYSTEM to xfree86-4.  To make the switch to x.org, do:
+
+  pkg_delete -f /var/db/pkg/imake-4* /var/db/pkg/XFree86-*
+  cd /usr/ports/x11/xorg && make install
+  pkgdb -F
+
+  Users of -STABLE or older -CURRENT can switch to X.Org as well by setting
+  X_WINDOW_SYSTEM=xorg in make.conf and following the same process.
+
 20040719:
 AUTHOR: ale@FreeBSD.org
   There has been a big update to PHP ports and bsd.php.mk to add more