From owner-svn-ports-all@FreeBSD.ORG  Tue Jul 17 16:20:07 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 74A5F106566C;
	Tue, 17 Jul 2012 16:20:07 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A5C98FC19;
	Tue, 17 Jul 2012 16:20:07 +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 q6HGK7Mw070796;
	Tue, 17 Jul 2012 16:20:07 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q6HGK7h5070793;
	Tue, 17 Jul 2012 16:20:07 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201207171620.q6HGK7h5070793@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 17 Jul 2012 16:20:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r301014 - head/Mk
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jul 2012 16:20:07 -0000

Author: bapt
Date: Tue Jul 17 16:20:06 2012
New Revision: 301014
URL: http://svn.freebsd.org/changeset/ports/301014

Log:
  Fix config-conditional
  
  PR:		Gareth Hopkins <gabbawp@gmail.com> (via ports@)
  Tested by:	jgh

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Tue Jul 17 16:18:28 2012	(r301013)
+++ head/Mk/bsd.port.mk	Tue Jul 17 16:20:06 2012	(r301014)
@@ -6098,8 +6098,8 @@ config-recursive:
 
 .if !target(config-conditional)
 config-conditional: pre-config
-.if defined(_COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
-.  if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${_COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O}
+.if defined(COMPLETE_OPTIONS_LIST) && !defined(NO_DIALOG)
+.  if !defined(_FILE_COMPLETE_OPTIONS_LIST) || ${COMPLETE_OPTIONS_LIST:O} != ${_FILE_COMPLETE_OPTIONS_LIST:O}
 	@cd ${.CURDIR} && ${MAKE} config;
 .  endif
 .endif