From owner-freebsd-ports@FreeBSD.ORG  Wed Jul 25 21:24:31 2012
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2EE98106564A;
	Wed, 25 Jul 2012 21:24:30 +0000 (UTC)
	(envelope-from ohauer@FreeBSD.org)
Received: from p578be941.dip0.t-ipconnect.de (p578be941.dip0.t-ipconnect.de
	[87.139.233.65])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E6198FC0A;
	Wed, 25 Jul 2012 21:24:30 +0000 (UTC)
Received: from [192.168.0.100] (cde1100.uni.vrs [192.168.0.100])
	(Authenticated sender: ohauer)
	by p578be941.dip0.t-ipconnect.de (Postfix) with ESMTPSA id 2D23D20893; 
	Wed, 25 Jul 2012 23:24:26 +0200 (CEST)
Message-ID: <5010640B.6070107@FreeBSD.org>
Date: Wed, 25 Jul 2012 23:24:27 +0200
From: Olli Hauer <ohauer@FreeBSD.org>
User-Agent: Mozilla/5.0 (Windows NT 5.1;
	rv:14.0) Gecko/20120713 Thunderbird/14.0
MIME-Version: 1.0
To: freebsd-ports <freebsd-ports@FreeBSD.org>
References: <20120725155932.GA13771@ithaqua.etoilebsd.net>
	<201207251709.q6PH9mpJ086314@lurza.secnetix.de>
	<CACdU+f_RW6eWdW9sZsTDfx7bz7L54u5C6qj-e9cBy714WM6KQA@mail.gmail.com>
In-Reply-To: <CACdU+f_RW6eWdW9sZsTDfx7bz7L54u5C6qj-e9cBy714WM6KQA@mail.gmail.com>
X-Enigmail-Version: 1.4.3
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: bapt@freebsd.org, Scot Hetzel <swhetzel@gmail.com>,
	Oliver Fromme <olli@lurza.secnetix.de>
Subject: Re: Question about new options framework (regression?)
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: FreeBSD Ports <ports@FreeBSD.org>
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: Wed, 25 Jul 2012 21:24:31 -0000

On 2012-07-25 20:18, Scot Hetzel wrote:
> On Wed, Jul 25, 2012 at 12:09 PM, Oliver Fromme <olli@lurza.secnetix.de> wrote:

The following diff will restore the old behavior so make.conf and command params have priority.
(Place the make.conf part after the OPTIONS_FILE_SET part)

Until now I cannot see why the OPTIONS file should always win.


Index: bsd.options.mk
===================================================================
--- bsd.options.mk      (revision 301530)
+++ bsd.options.mk      (working copy)
@@ -173,17 +173,6 @@
 .  include "${OPTIONSFILE}.local"
 .  endif

-### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
-.for opt in ${ALL_OPTIONS}
-.if defined(WITH_${opt})
-PORT_OPTIONS+= ${opt}
-PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
-.endif
-.if defined(WITHOUT_${opt})
-PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
-.endif
-.endfor
-
 ## Finish by using the options set by the port config dialog, if any
 .  for opt in ${OPTIONS_FILE_SET}
 .    if !empty(COMPLETE_OPTIONS_LIST:M${opt})
@@ -199,6 +188,17 @@

 .endif

+### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile
+.for opt in ${ALL_OPTIONS}
+.if defined(WITH_${opt})
+PORT_OPTIONS+= ${opt}
+PORT_OPTIONS:= ${PORT_OPTIONS:O:u}
+.endif
+.if defined(WITHOUT_${opt})
+PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}}
+.endif
+.endfor
+
 ## Now some compatibility
 .if empty(PORT_OPTIONS:MDOCS)
 NOPORTDOCS=    yes