From owner-svn-ports-head@FreeBSD.ORG Mon Feb 24 15:40:30 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF164CDD; Mon, 24 Feb 2014 15:40:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BE8741502; Mon, 24 Feb 2014 15:40:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1OFeU7v085357; Mon, 24 Feb 2014 15:40:30 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1OFeUPA085356; Mon, 24 Feb 2014 15:40:30 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402241540.s1OFeUPA085356@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 24 Feb 2014 15:40:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345870 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2014 15:40:31 -0000 Author: mat Date: Mon Feb 24 15:40:30 2014 New Revision: 345870 URL: http://svnweb.freebsd.org/changeset/ports/345870 QAT: https://qat.redports.org/buildarchive/r345870/ Log: Really tell our users that using WITH_/WITHOUT_ to set/unset options is deprecated. Sponsored by: Absolight Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Feb 24 15:31:14 2014 (r345869) +++ head/Mk/bsd.options.mk Mon Feb 24 15:40:30 2014 (r345870) @@ -259,13 +259,39 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} ### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile .for opt in ${ALL_OPTIONS} .if defined(WITH_${opt}) +OPTIONS_WARNINGS+= "WITH_${opt}" +OPTIONS_WARNINGS_SET+= ${opt} PORT_OPTIONS+= ${opt} .endif .if defined(WITHOUT_${opt}) +OPTIONS_WARNINGS+= "WITHOUT_${opt}" +OPTIONS_WARNINGS_UNSET+= ${opt} PORT_OPTIONS:= ${PORT_OPTIONS:N${opt}} .endif .endfor +.if defined(OPTIONS_WARNINGS) +WARNING+= "You are using the following deprecated options: ${OPTIONS_WARNINGS}" +WARNING+= "If you added them on the command line, you should replace them by" +WARNING+= "WITH=\"${OPTIONS_WARNINGS_SET}\" WITHOUT=\"${OPTIONS_WARNINGS_UNSET}\"" +WARNING+= "" +WARNING+= "If they are global options set in your make.conf, you should replace them with:" +.if defined(OPTIONS_WARNINGS_SET) +WARNING+= "OPTIONS_SET=${OPTIONS_WARNINGS_SET}" +.endif +.if defined(OPTIONS_WARNINGS_UNSET) +WARNING+= "OPTIONS_UNSET=${OPTIONS_WARNINGS_UNSET}" +.endif +WARNING+= "" +WARNING+= "If they are local to this port, you should use:" +.if defined(OPTIONS_WARNINGS_SET) +WARNING+= "${OPTIONS_NAME}_SET=${OPTIONS_WARNINGS_SET}" +.endif +.if defined(OPTIONS_WARNINGS_UNSET) +WARNING+= "${OPTIONS_NAME}_UNSET=${OPTIONS_WARNINGS_UNSET}" +.endif +.endif + ## 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})