MFC r338754:
Update the pkg-stage.sh script used to populate packages on the
dvd1.iso installation medium from including KDE4 to KDE5, as the
KDE4-based ports have been marked as deprecated in the Ports
Collection.

Sponsored by: The FreeBSD Foundation

MFC r318646:
Allow PORTSDIR to be overridden in the pkg-stage target.

PR: 218393
Sponsored by: The FreeBSD Foundation

MFC r317376: Add sysutils/tmux to the DVD package set

The zsh + tmux combination is commonly wanted.

Sponsored by: The FreeBSD Foundation

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Replace linux-f10 packages with updated linux-c6.

PR: 208280
Submitted by: Johannes Meixner
Sponsored by: The FreeBSD Foundation

Switch to x11/gnome3 now that x11/gnome2 no
longer exists in the ports tree.

MFC after: 3 days
X-MFC-With: r276820, r276822, r276827
Sponsored by: The FreeBSD Foundation

Ensure the ports directories exist for the list of
packages intended to be included on the DVD, and
remove any nonexistent ports from the final list.

Print the list of missing paths, and ensure that
DVD_PACKAGES is non-zero length (which should never
happen).

MFC after: 3 days
X-MFC-With: r276820, r276822
Sponsored by: The FreeBSD Foundation

Ensure /var/run/ld-elf.so.hints exists before building
pkg(8).

MFC after: 3 days
X-MFC-With: r276820
Sponsored by: The FreeBSD Foundation

Print informational output when NOPORTS is set,
which would otherwise cause pkg-stage.sh to
silently exit.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Properly change directories before creating the
PKG_ALTABI -> PKG_ABI symlink.

MFC after: 3 days
X-MFC-With: r276765
Sponsored by: The FreeBSD Foundation

Update pkg-stage.sh to be compatible with pkg-1.4.x.

In 1.3.x and earlier, ABI format is, for example,
freebsd:11:x86:64.

In 1.4.x, ABI format is FreeBSD:11:amd64, and a new
configuration entry, ALTABI, is: freebsd:11:x86:64.

Export PKG_ABI and PKG_ALTABI accordingly, and if
PKG_ALTABI is set, create a symlink within the dvd
PKG_CACHEDIR so both new and old ABI directories
exist.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

When populating the dvd/packages/ directory, create
a symlink to All/pkg-*.txz in the Latest/ directory.

This allows 'pkg bootstrap' to work out-of-box if
the REPOS_DIR environment is properly set.

Tested on: stable/10@r271848
MFC after: 3 days
X-MFC-10.1: yes
Sponsored by: The FreeBSD Foundation

Simplify dvd package population with pkg-1.3.

Submitted by: bdrewery
MFC after: 3 days
X-MFC-With: r271480, r271483
Sponsored by: The FreeBSD Foundation

Fix duplicate PKG_ABI in the PKG_CACHEDIR path.

MFC after: 3 days
X-MFC-With: r271480
Sponsored by: The FreeBSD Foundation

Set PKG_CACHEDIR to an 'All/' directory one level lower
to fix 'pkg repo' generating repository metadata for the
on-disc packages.

MFC after: 3 days
X-MFC-to-10.1: yes
Sponsored by: The FreeBSD Foundation

Add forward-compatibility glue with pkg-1.3:
- Use ASSUME_ALWAYS_YES=YES instead of ASSUME_ALWAYS_YES=1
since pkg-1.3 expects "yes" or "true" values.
- Before exporting PKG_ABI, strip extra characters from what
is parsed from 'pkg -vv'. This causes problems further down
when creating the packages directory for inclusion on the
dvd1.iso. Previously PKG_ABI would be 'freebsd:9:x86:64',
but now is '"freebsd:9:x86:64";' in pkg-1.3

Tested on: stable/9@r265858 with ports-mgmt/pkg-devel
MFC After: 3 days
Sponsored by: The FreeBSD Foundation

Update the pkg-stage target to be more compatible with pkg-1.2:

- Add a release-dvd.conf pkg(8) configuration file to override
the default FreeBSD.conf configuration.
- Remove architecture-specific pkg-stage.conf files, consolidate,
and move their contents to scripts/pkg-stage.sh.
- Use 'pkg -vv' to determine the ABI, which is used as the
cache directory.

Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.

Tested against: head@r260522, stable/10@r260522

MFC after: 3 days
X-Insta-MFC: possibly
Sponsored by: The FreeBSD Foundation

Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.

MFC after: 3 days
Sponsored by: The FreeBSD Foundation

Provide reproducibility between builds by building pkg(8) from ports,
instead of using pkg-bootstrap.

This should resolve a problem that was discovered during 10.0-BETA4
freebsd-update(8) builds,

Reported by: secteam (delphij)
MFC after: 3 days
X-MFC-to-10: possibly immediately, pending freebsd-update(8) builds
Sponsored by: The FreeBSD Foundation

Add a script and configuration files to fetch pre-built packages
from pkg.FreeBSD.org for inclusion on release medium (dvd1.iso).

The script sources ${.CURDIR}/${TARGET}/pkg-stage.conf, which sets
several environment variables, such as the pkg(8) ABI, PACKAGESITE,
PKG_DBDIR, and PKG_CACHEDIR. PKG_CACHEDIR is set to the directory
on the release medium used by bsdconfig(8) (/packages/${ABI}). ABI
is determined by output of 'make -C /usr/src/release -V REVISION'.
See pkg.conf(5) for descripton on other variables set here.

The list of packages to include are set within the configuration
file.

The script and configuration files are intended to be run by the
'make dvd' target within the release directory, and assume the
release is built within a chroot environment (such as by using
release.sh).

Relevant updates to release/Makefile will follow.

Sponsored by: The FreeBSD Foundation