From owner-svn-src-projects@FreeBSD.ORG  Mon Jul 18 13:50:00 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CDF9106566B;
	Mon, 18 Jul 2011 13:50:00 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2CD3F8FC24;
	Mon, 18 Jul 2011 13:50:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6IDo0p9025502;
	Mon, 18 Jul 2011 13:50:00 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6IDo0eX025500;
	Mon, 18 Jul 2011 13:50:00 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201107181350.p6IDo0eX025500@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Mon, 18 Jul 2011 13:50:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224183 - projects/portbuild/scripts
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Jul 2011 13:50:00 -0000

Author: flz
Date: Mon Jul 18 13:49:59 2011
New Revision: 224183
URL: http://svn.freebsd.org/changeset/base/224183

Log:
  portbuild: various pkgng related fixes.

Modified:
  projects/portbuild/scripts/buildscript

Modified: projects/portbuild/scripts/buildscript
==============================================================================
--- projects/portbuild/scripts/buildscript	Mon Jul 18 12:59:31 2011	(r224182)
+++ projects/portbuild/scripts/buildscript	Mon Jul 18 13:49:59 2011	(r224183)
@@ -56,14 +56,14 @@ add_pkg() {
         pkg_cmd_info="pkg_info -qe"
         pkg_cmd_add="pkg_add"
       else
-        pkg_cmd_info="pkg info -qeO"
+        pkg_cmd_info="pkg info -e"
         pkg_cmd_add="pkg add"
       fi
-      eval $pkg_cmd_info $base >/dev/null 2>&1
+      eval $pkg_cmd_info $base
       if [ $? -eq 0 ]; then
         echo "skipping $base, already added"
       else
-        eval $pkg_cmd_add $i >/dev/null 2>&1
+        eval $pkg_cmd_add $i
         if [ $? -ne 0 ]; then
           echo "error in dependency $i, exiting"
           cleanup 0
@@ -92,7 +92,7 @@ del_pkg() {
           pkg_cmd_check="cd /var/db/pkg && test -d"
         else
           dependents=$(pkg info -qOr $base)
-          pkg_cmd_check="pkg info -qO"
+          pkg_cmd_check="pkg info -qe"
         fi
         if [ -n "$dependents" ]; then
           recursion=1
@@ -120,11 +120,11 @@ del_pkg() {
         for j in ${delpkg}; do
           echo "Deleting ${j}"
           if [ $use_pkgng = "no" ]; then
-            pkg_delete -f ${j}
+            pkg_cmd_delete="pkg_delete -f"
           else
-            jorig=$(pkg info -qOo ${j})
-            pkg delete -f ${jorig}
+            pkg_cmd_delete="pkg delete -f"
           fi
+          eval $pkg_cmd_delete $j
           if [ $? -ne 0 ]; then
             echo "--> error in pkg_delete, exiting"
             cleanup 0