Index: stable/10/release/scripts/pkg-stage.sh
===================================================================
--- stable/10/release/scripts/pkg-stage.sh	(revision 271607)
+++ stable/10/release/scripts/pkg-stage.sh	(revision 271608)
@@ -1,59 +1,56 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 set -e
 
 export ASSUME_ALWAYS_YES="YES"
 export PKG_DBDIR="/tmp/pkg"
 export PERMISSIVE="YES"
 export REPO_AUTOUPDATE="NO"
 export PKGCMD="/usr/sbin/pkg -d"
 
 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/portmaster
 shells/bash
 shells/zsh
 security/sudo
 sysutils/screen
 www/firefox
 www/links
 x11-drivers/xf86-video-vmware
 x11/gnome2
 x11/kde4
 x11/xorg"
 
 # If NOPORTS is set for the release, do not attempt to build pkg(8).
 if [ ! -f /usr/ports/Makefile ]; then
 	exit 0
 fi
 
 if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
-PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
-PKG_ABI="${PKG_ABI%\";}"
-PKG_ABI="${PKG_ABI#\"}"
-export PKG_ABI
-export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PKG_ABI=$(pkg config ABI)
+export PKG_REPODIR="dvd/packages/${PKG_ABI}"
 
-/bin/mkdir -p ${PKG_CACHEDIR}
+/bin/mkdir -p ${PKG_REPODIR}
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f
-${PKGCMD} fetch -d ${DVD_PACKAGES}
+${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
-${PKGCMD} repo ${PKG_CACHEDIR}
+${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.
 exit 0
Index: stable/10
===================================================================
--- stable/10	(revision 271607)
+++ stable/10	(revision 271608)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r271480,271483,271491