Backport pkg cleanup to 9.2

src-sh/xtrafiles/local/share/pcbsd/bin/pkg

@@ -38,33 +38,8 @@ intercept_pkg_dl()
    fullopts="$@"
    op="$1"
 
-   # Make sure we insert some flags we need
-   while [ $# -gt 0 ]; do
-     if [ $count -gt 0 ] ; then
-        # If we are already using -n, we can skip downloading anything
-	if [ "$1" = "-n" ] ; then
-           pkg $fullopts
-           exit $?
-	fi
-        flags="$flags $1"
-     else
-        flags="-U -n"
-     fi
-     count=`expr $count + 1`
-     shift
-   done
-
-   # Lets pre-download all packages
-   download_cache_packages "pkg $op $flags"
-
-   # Lets check for any conflicts doing this install
-   check_pkg_conflicts "${op} -FUy $flags"
-   if [ $? -ne 0 ] ; then
-  	exit 1
-   fi
-
    # Time to run pkgng and let it do its thing
-   pkg $fullopts 
+   pkg-static $fullopts
    result=$?
 
    # Nobody likes a litter bug