From owner-svn-src-user@FreeBSD.ORG  Wed Jun  1 01:35:10 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 2208D1065690;
	Wed,  1 Jun 2011 01:35:10 +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 124DE8FC12;
	Wed,  1 Jun 2011 01:35:10 +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 p511Z9r5048332;
	Wed, 1 Jun 2011 01:35:09 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p511Z99Y048330;
	Wed, 1 Jun 2011 01:35:09 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201106010135.p511Z99Y048330@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Wed, 1 Jun 2011 01:35:09 +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: r222553 - 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: Wed, 01 Jun 2011 01:35:10 -0000

Author: dougb
Date: Wed Jun  1 01:35:09 2011
New Revision: 222553
URL: http://svn.freebsd.org/changeset/base/222553

Log:
  The mere presence of IS_INTERACTIVE in the Makefile is not enough, the
  condition needs to be verified in case it is conditional
  
  PR:		ports/157481
  Submitted by:	Carl <k0802647@telus.net>

Modified:
  user/dougb/portmaster/portmaster

Modified: user/dougb/portmaster/portmaster
==============================================================================
--- user/dougb/portmaster/portmaster	Wed Jun  1 01:32:58 2011	(r222552)
+++ user/dougb/portmaster/portmaster	Wed Jun  1 01:35:09 2011	(r222553)
@@ -3193,7 +3193,8 @@ if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUIL
 	fi
 
 	if [ -z "$FETCH_ONLY" -a ! "$PM_PACKAGES" = only ]; then
-		TESTINT=`grep -l ^IS_INTERACTIVE Makefile`
+		TESTINT=`grep -l ^IS_INTERACTIVE Makefile` &&
+		    TESTINT=`pm_make_b -V IS_INTERACTIVE`
 	else
 		[ -n "$ALL_FETCH" ] && safe_exit
 	fi