git: aa133a965a39 - main - UPDATING: clarify mesa-libs and nvidia-driver conflicts

[Kevin Bowling]

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa133a965a39087ca7b20d94de47342477bbbabe

commit aa133a965a39087ca7b20d94de47342477bbbabe
Author:     Kevin Bowling <kbowling at FreeBSD.org>
AuthorDate: 2021-06-22 20:11:46 +0000
Commit:     Kevin Bowling <kbowling at FreeBSD.org>
CommitDate: 2021-06-22 20:13:01 +0000

    UPDATING: clarify mesa-libs and nvidia-driver conflicts
    
    PR:             246767
    Reported by:    jbeich
---
 UPDATING | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/UPDATING b/UPDATING
index 37d850e39cef..f5ae3316e411 100644
--- a/UPDATING
+++ b/UPDATING
@@ -34,19 +34,21 @@ you update your ports collection, before attempting any port upgrades.
   both at the same time on the same port.
 
 20210617:
-  AFFECTS: users of graphics/mesa-libs
+  AFFECTS: users of graphics/mesa-libs and x11/nvidia-driver
   AUTHOR: kbowling at FreeBSD.org
 
   Some libraries from mesa-libs are now provided by libglvnd while
-  others were renamed. When building outside poudriere make sure to
-  remove mesa-libs first in order to avoid conflict with libglvnd.
+  others were renamed. nvidia-driver already used libglvnd but bundled
+  a copy which is now provided as a separate package. When building
+  outside poudriere make sure to remove mesa-libs and nvidia-driver
+  first in order to avoid conflict with libglvnd.
 
   For portmaster users:
-  # pkg delete -f mesa-libs
+  # pkg delete -f mesa-libs nvidia-driver
   # portmaster -a
 
   For portupgrade users:
-  # pkg delete -f mesa-libs
+  # pkg delete -f mesa-libs nvidia-driver
   # portupgrade -a
 
 20210523: