aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES22
-rw-r--r--UPDATING16
2 files changed, 21 insertions, 17 deletions
diff --git a/CHANGES b/CHANGES
index f724e62b655f..39b920254d38 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,23 +12,11 @@ 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.
+ The XFREE86_VERSION variable is replaced by the X_WINDOW_SYSTEM variable.
+ XFREE86_VERSION may no longer be used by ports Makefiles. X_WINDOW_SYSTEM may
+ currently be set to xorg, xfree86-4, and xfree86-3 (please use :L in checking
+ it). Several X_*_PORT variables are provided by bsd.port.mk which map to the
+ appropriate port for the X_WINDOW_SYSTEM chosen.
20040719:
AUTHOR: ale@FreeBSD.org
diff --git a/UPDATING b/UPDATING
index 3af349a49ccf..7613978034ff 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,22 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20040721:
+ AFFECTS: users of FreeBSD-current, users of xorg
+ AUTHOR: anholt@FreeBSD.org
+
+ The XFREE86_VERSION variable is deprecated and has been replaced by the
+ X_WINDOW_SYSTEM variable. X_WINDOW_SYSTEM may be set to xorg, xfree86-4, or
+ xfree86-3. X_WINDOW_SYSTEM defaults to xorg on FreeBSD-current. If you are
+ switching to xorg, you should follow this set of commands to cleanly upgrade:
+
+ 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 by setting
+ X_WINDOW_SYSTEM=xorg in make.conf and following the same process.
+
20040719:
AFFECTS: users of PHP
AUTHOR: ale@FreeBSD.org