Merge branch 'master' of github.com:pcbsd/pcbsd

src-sh/pbi-manager10/pbi-manager

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2011 iXsystems (Kris Moore)
+# Copyright 2013 iXsystems (Kris Moore)
 # All rights reserved
 #
 # Redistribution and use in source and binary forms, with or without
@@ -7079,16 +7079,22 @@ chroot_extract() {
 	PBI_WRAPPERFILE="${PBI_SHARE_DIR}/.pbiwrapper-$ARCH"
 	cp ${PBI_WRAPPERFILE} ${PBI_CHROOTDIR}/.pbiwrapper-$ARCH
 
+	# If we are doing a PKGNG build, lets set it up
 	if [ "$PBI_PKGNGBUILD" = "YES" ] ; then
 		mkdir -p ${PBI_CHROOTDIR}/usr/local/etc 2>/dev/null
 	   	cp /usr/local/etc/pkg.conf ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf
+		# Make sure we change pkgng ARCH to what we are building
+	        sed -i '' "s|amd64|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf 	
+	        sed -i '' "s|i386|$ARCH|g" ${PBI_CHROOTDIR}/usr/local/etc/pkg.conf 	
+		# Now make sure to copy over the pubkey
 	   	local pubKey=`cat /usr/local/etc/pkg.conf | grep "^PUBKEY:" | awk '{print $2}'`
 	   	if [ -n "$pubKey" ] ; then
 			if [ ! -d "${PBI_CHROOTDIR}/`dirname $pubKey`" ] ; then
 				mkdir "${PBI_CHROOTDIR}/`dirname $pubKey`"
 			fi
 	     		cp $pubKey ${PBI_CHROOTDIR}/$pubKey
 	   	fi
+
 	fi
 
 	# If we have a custom PBI_MAKECONF include it