MFreleng10 r259582 (reverse), MFstable10 r259491, r259492, r260781:upstream/10.0.0release/10.0.0

r259582 (reverted):
  Set PACKAGESITE to 'release/0' for the pkg-stage target to pull
  the release set of packages.  (Required to eliminate conflicts.)

r259491:
  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.

r259492:
  Add NOPKG to disable pkg-stage.

r260781:
  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.

  A change local to releng/10.0 sets the package fetch URL to
  'release/0'.

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

1 files changed, 4 insertions, 3 deletions

diff --git a/release/Makefile b/release/Makefile
index 83c3d1e8507b..4c42f3150882 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -15,6 +15,7 @@
 #            (by default, the directory above this one) 
 #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
 #  DOCDIR:   location of doc tree (default: /usr/doc)
+#  NOPKG:    if set, do not distribute third-party packages
 #  NOPORTS:  if set, do not distribute ports tree
 #  NOSRC:    if set, do not distribute source tree
 #  NODOC:    if set, do not generate release documentation
@@ -214,9 +215,9 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	touch ${.TARGET}
 
 pkg-stage:
-.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
-	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
-		${REVISION}
+.if !defined(NOPKG)
+	env REPOS_DIR=${.CURDIR}/pkg_repos/ \
+		sh ${.CURDIR}/scripts/pkg-stage.sh
 	mkdir -p ${.OBJDIR}/dvd/packages/repos/
 	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
 		${.OBJDIR}/dvd/packages/repos/