From owner-svn-src-user@FreeBSD.ORG  Thu Dec 31 04:16:13 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DFA31106568B;
	Thu, 31 Dec 2009 04:16:13 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D48A18FC13;
	Thu, 31 Dec 2009 04:16:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nBV4GDOQ085591;
	Thu, 31 Dec 2009 04:16:13 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBV4GDRC085589;
	Thu, 31 Dec 2009 04:16:13 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912310416.nBV4GDRC085589@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 31 Dec 2009 04:16:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201324 - user/dougb/portmaster
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Dec 2009 04:16:14 -0000

Author: dougb
Date: Thu Dec 31 04:16:13 2009
New Revision: 201324
URL: http://svn.freebsd.org/changeset/base/201324

Log:
  Restore command line flags for pkg_add as they are in the ports
  version (long options) ala 2.16. The problem with FreeBSD older
  than 6.4 is not the option format, it's the existince of the
  option itself (or lack thereof).

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Dec 31 04:07:13 2009	(r201323)
+++ user/dougb/portmaster/portmaster	Thu Dec 31 04:16:13 2009	(r201324)
@@ -2874,8 +2874,7 @@ else
 	[ -n "$local_package" ] && ppd=${local_package%/Latest*}/All
 
 	echo "===>>> Installing package"
-	# -i == --no-deps, -f == --force
-	pkg_add -i -f ${ppd}/${latest_pv}.tbz ||
+	pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz ||
 		install_failed ${latest_pv}.tbz
 fi
 echo ''