git: d31ed58b9f93 - main - Modernize DVD package set in preparation for 14.1

The branch main has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=d31ed58b9f9360cecd9acfbd12999190edca6e56

commit d31ed58b9f9360cecd9acfbd12999190edca6e56
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-05-20 17:42:49 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-05-24 00:01:59 +0000

    Modernize DVD package set in preparation for 14.1
    
    Remove archivers/unzip (now in base) and emulators/linux_base-c7 (old
    and unlikely to be useful without other linux packages being installed),
    ports-mgmt/portmaster (now largely obsolete and discouraged in favour
    of using pkg and binary packages) and x11-drivers/xf86-video-vmware
    (questionably useful).
    
    Replace devel/git with devel/git@lite (sufficient for most purposes),
    and adjust the "ensure the ports exist to sanitize the list" code to
    ignore the @lite part when checking that /usr/ports/devel/git exists.
    
    Add sysutils/seatd and x11-wm/sway for wayland support.
    
    MFC after:      1 minute
    Differential Revision:  https://reviews.freebsd.org/D45278
---
 release/scripts/pkg-stage.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 551876eca8c6..5742f84b0258 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -12,9 +12,7 @@ export ROOTDIR="$PWD/dvd"
 export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}"
 export PORTSDIR="${PORTSDIR:-/usr/ports}"
 
-_DVD_PACKAGES="archivers/unzip
-devel/git
-emulators/linux_base-c7
+_DVD_PACKAGES="devel/git@lite
 graphics/drm-kmod
 graphics/drm-510-kmod
 graphics/drm-515-kmod
@@ -22,19 +20,19 @@ misc/freebsd-doc-all
 net/mpd5
 net/rsync
 ports-mgmt/pkg
-ports-mgmt/portmaster
 shells/bash
 shells/zsh
 security/sudo
 sysutils/screen
+sysutils/seatd
 sysutils/tmux
 www/firefox
 www/links
-x11-drivers/xf86-video-vmware
 x11/gnome
 x11/kde5
 x11/sddm
-x11/xorg"
+x11/xorg
+x11-wm/sway"
 
 # If NOPORTS is set for the release, do not attempt to build pkg(8).
 if [ ! -f ${PORTSDIR}/Makefile ]; then
@@ -61,10 +59,10 @@ fi
 # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
 # final list.
 for _P in ${_DVD_PACKAGES}; do
-	if [ -d "${PORTSDIR}/${_P}" ]; then
+	if [ -d "${PORTSDIR}/${_P%%@*}" ]; then
 		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
 	else
-		echo "*** Skipping nonexistent port: ${_P}"
+		echo "*** Skipping nonexistent port: ${_P%%@*}"
 	fi
 done