From owner-svn-ports-all@freebsd.org Mon Apr 17 20:24:47 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BFB25D42F52; Mon, 17 Apr 2017 20:24:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B25B17A3; Mon, 17 Apr 2017 20:24:47 +0000 (UTC) (envelope-from kwm@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v3HKOk0Y094458; Mon, 17 Apr 2017 20:24:46 GMT (envelope-from kwm@FreeBSD.org) Received: (from kwm@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v3HKOkYd094457; Mon, 17 Apr 2017 20:24:46 GMT (envelope-from kwm@FreeBSD.org) Message-Id: <201704172024.v3HKOkYd094457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kwm set sender to kwm@FreeBSD.org using -f From: Koop Mast Date: Mon, 17 Apr 2017 20:24:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438752 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Apr 2017 20:24:47 -0000 Author: kwm Date: Mon Apr 17 20:24:46 2017 New Revision: 438752 URL: https://svnweb.freebsd.org/changeset/ports/438752 Log: * Fix MESON_TRUE/MESON_FALSE comment, to mention the actualy meson argument. * Rework option hanlding to be more clear and to avoid double negative. Submitted by: antoine@ Approved by: antoine@ Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Apr 17 20:20:22 2017 (r438751) +++ head/Mk/bsd.options.mk Mon Apr 17 20:24:46 2017 (r438752) @@ -118,11 +118,11 @@ # content to MESON_ARGS. # # ${opt}_MESON_TRUE Will add to MESON_ARGS: -# Option enabled --${content} true -# Option disabled --${content} false +# Option enabled -D${content}=true +# Option disabled -D${content}=false # ${opt}_MESON_FALSE Will add to MESON_ARGS: -# Option enabled --${content} false -# Option disabled --${content} true +# Option enabled -D${content}=false +# Option disabled -D${content}=true # # ${opt}_IMPLIES When opt is enabled, options named in IMPLIES will # get enabled too. @@ -536,8 +536,8 @@ CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/ . if defined(${opt}_MESON_TRUE) MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=true/} . endif -. if defined(${opt}_MESON_TRUE_OFF) -MESON_ARGS+= ${${opt}_MESON_TRUE_OFF:C/.*/-D&=false/} +. if defined(${opt}_MESON_FALSE) +MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} . endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_ON) @@ -589,11 +589,11 @@ CMAKE_ARGS+= ${${opt}_CMAKE_BOOL:C/.*/- . if defined(${opt}_CMAKE_BOOL_OFF) CMAKE_ARGS+= ${${opt}_CMAKE_BOOL_OFF:C/.*/-D&:BOOL=true/} . endif -. if defined(${opt}_MESON_FALSE) -MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=false/} +. if defined(${opt}_MESON_TRUE) +MESON_ARGS+= ${${opt}_MESON_TRUE:C/.*/-D&=false/} . endif -. if defined(${opt}_MESON_FALSE_OFF) -MESON_ARGS+= ${${opt}_MESON_FALSE_OFF:C/.*/-D&=true/} +. if defined(${opt}_MESON_FALSE) +MESON_ARGS+= ${${opt}_MESON_FALSE:C/.*/-D&=true/} . endif . for configure in CONFIGURE CMAKE MESON QMAKE . if defined(${opt}_${configure}_OFF)