From owner-svn-src-user@FreeBSD.ORG  Thu Apr 28 05:48:33 2011
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 58580106564A;
	Thu, 28 Apr 2011 05:48:33 +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 490518FC0A;
	Thu, 28 Apr 2011 05:48:33 +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 p3S5mXxh007575;
	Thu, 28 Apr 2011 05:48:33 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3S5mXkT007573;
	Thu, 28 Apr 2011 05:48:33 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201104280548.p3S5mXkT007573@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 28 Apr 2011 05:48:33 +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: r221148 - 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, 28 Apr 2011 05:48:33 -0000

Author: dougb
Date: Thu Apr 28 05:48:32 2011
New Revision: 221148
URL: http://svn.freebsd.org/changeset/base/221148

Log:
  In the event that an invalid combination of configuration options causes
  a port to be BROKEN, etc. it is useful to run --force-config and try again

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Thu Apr 28 03:33:12 2011	(r221147)
+++ user/dougb/portmaster/portmaster	Thu Apr 28 05:48:32 2011	(r221148)
@@ -3116,9 +3116,17 @@ echo "===>>> Port directory: $pd/$portdi
 if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then
 	if [ -z "$PM_INDEX_ONLY" ]; then
 		if ! check_state; then
-			echo "	===>>> If you are sure you can build it, remove the"
-			echo "	       $state line in the Makefile and try again."
-			safe_exit 1
+			check_state_fail=check_state_fail
+			if [ -n "$PM_FORCE_CONFIG" ]; then
+				sleep 4
+				make_config
+				check_state && unset check_state_fail
+			fi
+			if [ -n "$check_state_fail" ]; then
+				echo "	===>>> If you are sure you can build it, remove the"
+				echo "	       $state line in the Makefile and try again."
+				safe_exit 1
+			fi
 		fi
 	fi