From owner-svn-src-user@FreeBSD.ORG  Thu Dec 31 03:25:20 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 199B11065692;
	Thu, 31 Dec 2009 03:25:20 +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 E64C28FC12;
	Thu, 31 Dec 2009 03:25:27 +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 nBV3PRRe084587;
	Thu, 31 Dec 2009 03:25:27 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBV3PRPV084586;
	Thu, 31 Dec 2009 03:25:27 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <200912310325.nBV3PRPV084586@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 31 Dec 2009 03:25:27 +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: r201322 - 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 03:25:20 -0000

Author: dougb
Date: Thu Dec 31 03:25:27 2009
New Revision: 201322
URL: http://svn.freebsd.org/changeset/base/201322

Log:
  The options needed for pkg_add were not introduced until version
  6.4, so check for that if the appropriate options are enabled.

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Dec 31 01:38:12 2009	(r201321)
+++ user/dougb/portmaster/portmaster	Thu Dec 31 03:25:27 2009	(r201322)
@@ -462,6 +462,10 @@ if [ "$$" -eq "$PM_PARENT_PID" ]; then		
 		PM_BUILD_ONLY_LIST=pm_bol
 		export PM_BUILD_ONLY_LIST
 	fi
+	if [ -n "$PM_PACKAGES" -o -n "$PM_PACKAGES_BUILD" ]; then
+		[ `/sbin/sysctl -n kern.osreldate 2>/dev/null` -lt 600400 ] &&
+		fail Package installation support requires FreeBSD 6.4 or newer
+	fi
 fi
 
 set -- $newopts