Add instructions for the X.Org update to UPDATING, and make the ones in CHANGES

specific for porters.

Requested by:	marcus
This commit is contained in:
Eric Anholt 2004-07-23 22:09:30 +00:00
parent 56bc4566bf
commit 22e94c25e6
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=114527
2 changed files with 21 additions and 17 deletions

22
CHANGES
View File

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

View File

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