# pkg-stage.sh |   10 +++-------
# 1 file changed, 3 insertions(+), 7 deletions(-)
# svn status
M       release/scripts/pkg-stage.sh

Index: release/scripts/pkg-stage.sh
===================================================================
--- release/scripts/pkg-stage.sh	(revision 271487)
+++ release/scripts/pkg-stage.sh	(working copy)
@@ -40,19 +40,15 @@ 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_ABI=$(pkg config ABI)
 export PKG_REPODIR="dvd/packages/${PKG_ABI}"
-export PKG_CACHEDIR="${PKG_REPODIR}/All"
 
-/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_REPODIR}