mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-07 00:50:50 +00:00
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
This commit is contained in:
parent
45bce6fa30
commit
d31ed58b9f
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue