From owner-freebsd-ports@FreeBSD.ORG  Thu Sep 18 08:51:15 2008
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 809881065673
	for <ports@freebsd.org>; Thu, 18 Sep 2008 08:51:15 +0000 (UTC)
	(envelope-from ale@FreeBSD.org)
Received: from andxor.it (relay.andxor.it [195.223.2.3])
	by mx1.freebsd.org (Postfix) with SMTP id AF73D8FC1A
	for <ports@freebsd.org>; Thu, 18 Sep 2008 08:51:13 +0000 (UTC)
	(envelope-from ale@FreeBSD.org)
Received: (qmail 35869 invoked from network); 18 Sep 2008 08:51:12 -0000
Received: from unknown (HELO ale.andxor.it) (192.168.2.5)
	by andxor.it with SMTP; 18 Sep 2008 08:51:12 -0000
Message-ID: <48D2167F.3040203@FreeBSD.org>
Date: Thu, 18 Sep 2008 10:51:11 +0200
From: Alex Dupre <ale@FreeBSD.org>
User-Agent: Thunderbird 2.0.0.16 (X11/20080906)
MIME-Version: 1.0
To: John Baldwin <jhb@freebsd.org>
References: <200809151036.19674.jhb@freebsd.org>
	<48D03248.1040109@FreeBSD.org> <48D0A683.9020802@FreeBSD.org>
	<200809171303.05759.jhb@freebsd.org>
In-Reply-To: <200809171303.05759.jhb@freebsd.org>
Content-Type: multipart/mixed; boundary="------------050206000609000202030101"
Cc: ports@freebsd.org, Doug Barton <dougb@freebsd.org>
Subject: Re: OPTIONS handling doesn't seem to work fully in dependencies
	anymore
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Sep 2008 08:51:15 -0000

This is a multi-part message in MIME format.
--------------050206000609000202030101
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

John Baldwin ha scritto:
> It used to work.

I was thinking the same thing, but actually it never worked in that way.

> I was just guessing about how it might not be working now 
> based on reading the existing logic.  I have not delved into the history to 
> see what has changed.

The attached patch should solve this erratic behavior.

-- 
Alex Dupre

--------------050206000609000202030101
Content-Type: text/plain;
 name="bsd.port.mk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="bsd.port.mk.diff"

--- bsd.port.mk.orig	2008-09-18 10:31:14.000000000 +0200
+++ bsd.port.mk	2008-09-18 10:46:02.000000000 +0200
@@ -3234,7 +3234,7 @@
 # target or not.
 #
 ################################################################
-.if (!defined(OPTIONS) || defined(CONFIG_DONE) || \
+.if (!defined(OPTIONS) || defined(CONFIG_DONE_${UNIQUENAME:U}) || \
 	defined(PACKAGE_BUILDING) || defined(BATCH))
 _OPTIONS_OK=yes
 .endif
@@ -4169,7 +4169,7 @@
 ${target}: ${${target:U}_COOKIE}
 .elif !target(${target})
 ${target}: config-conditional
-	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
+	@cd ${.CURDIR} && ${MAKE} CONFIG_DONE_${UNIQUENAME:U}=1 ${__softMAKEFLAGS} ${${target:U}_COOKIE}
 .elif target(${target}) && defined(IGNORE)
 .endif
 

--------------050206000609000202030101--