git: 522a48dadc5e - main - MOVED: fix the xorg entries and deduplicate

The branch main has been updated by bapt:

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

commit 522a48dadc5efba552a15e7965e02d25538df63c
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-08-02 09:54:33 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2022-08-02 09:55:03 +0000

    MOVED: fix the xorg entries and deduplicate
---
 MOVED | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/MOVED b/MOVED
index 5537eb169726..079d5b6b052c 100644
--- a/MOVED
+++ b/MOVED
@@ -17528,8 +17528,7 @@ deskutils/gnome-documents||2022-08-01|Has expired: Archived upstream
 deskutils/gnome-search-tool||2022-08-01|Has expired: Did not survive gnome3
 security/nextcloud-twofactor_u2f|security/nextcloud-twofactor_webauthn|2022-08-01|Has expired: Upstream deprecated this port in favor of twofactor_webauthn. Check https://github.com/nextcloud/twofactor_webauthn#migration-from-two-factor-u2f for migration instructions
 editors/codelite||2022-08-01|Has expired: Has been broken for over a year.
-x11-servers/xephyr|x11-servers/xorg@xephyr|2022-08-02|Merged into flavorized version
-x11-servers/xorg-nestserver|x11-servers/xorg@xnest|2022-08-02|Merged into the flavorized version
-x11-servers/xorg-nestserver|x11-servers/xorg@xnest|2022-08-02|Merged into the flavorized version
-x11-servers/xorg-vfbserver|x11-servers/xorg@xvfb|2022-08-02|Merged into the flavorized version
+x11-servers/xephyr|x11-servers/xorg-server@xephyr|2022-08-02|Merged into flavorized version
+x11-servers/xorg-nestserver|x11-servers/xorg-server@xnest|2022-08-02|Merged into the flavorized version
+x11-servers/xorg-vfbserver|x11-servers/xorg-server@xvfb|2022-08-02|Merged into the flavorized version
 x11-servers/xorg-dmx||2022-08-02|Discontinued upstream