From owner-svn-src-user@FreeBSD.ORG  Sat Dec 19 19:01:36 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 2C36910656A9;
	Sat, 19 Dec 2009 19:01:36 +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 006B78FC1E;
	Sat, 19 Dec 2009 19:01:25 +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 nBJJ1Oek040988;
	Sat, 19 Dec 2009 19:01:24 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBJJ1OV0040986;
	Sat, 19 Dec 2009 19:01:24 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912191901.nBJJ1OV0040986@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sat, 19 Dec 2009 19:01:24 +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: r200733 - 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: Sat, 19 Dec 2009 19:01:36 -0000

Author: dougb
Date: Sat Dec 19 19:01:24 2009
New Revision: 200733
URL: http://svn.freebsd.org/changeset/base/200733

Log:
  pkg_add on FreeBSD 6.3 does not have long options,[1]
  so use the short ones instead and add a comment about what they do.
  
  Submitted by:	Miroslav Lachman <000.fbsd@quip.cz>[1]

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Sat Dec 19 18:42:12 2009	(r200732)
+++ user/dougb/portmaster/portmaster	Sat Dec 19 19:01:24 2009	(r200733)
@@ -2781,7 +2781,8 @@ else
 	[ -n "$local_package" ] && ppd=${local_package%/Latest*}/All
 
 	echo "===>>> Installing package"
-	pkg_add --no-deps --force ${ppd}/${latest_pv}.tbz ||
+	# -i == --no-deps, -f == --force
+	pkg_add -i -f ${ppd}/${latest_pv}.tbz ||
 		install_failed ${latest_pv}.tbz
 fi
 echo ''