MFC r260772:

  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

Sponsored by:	The FreeBSD Foundation

1 files changed, 0 insertions, 36 deletions

diff --git a/release/amd64/pkg-stage.conf b/release/amd64/pkg-stage.conf
deleted file mode 100755
index 4ea7dc4..0000000
--- a/release/amd64/pkg-stage.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:64"
-export ASSUME_ALWAYS_YES=1
-export __PKG_CONF="/etc/pkg/FreeBSD.conf"
-export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest"
-export MIRROR_TYPE="SRV"
-export REPO_AUTOUPDATE="NO"
-export PKG_DBDIR="/tmp/pkg"
-export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
-export PERMISSIVE="YES"
-export PKGCMD="/usr/sbin/pkg -d -C ${__PKG_CONF}"
-
-DVD_PACKAGES="archivers/unzip
-devel/subversion
-devel/subversion-static
-emulators/linux_base-f10
-misc/freebsd-doc-all
-net/mpd5
-net/rsync
-ports-mgmt/pkg
-ports-mgmt/portaudit
-ports-mgmt/portmaster
-shells/bash
-shells/zsh
-security/sudo
-sysutils/screen
-www/firefox
-www/links
-x11-drivers/xf86-video-vmware
-x11/gnome2
-x11/kde4
-x11/xorg"