From owner-svn-ports-all@FreeBSD.ORG Wed Oct 30 16:54:10 2013 Return-Path: Delivered-To: svn-ports-all@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 ESMTP id 00A69870; Wed, 30 Oct 2013 16:54:09 +0000 (UTC) (envelope-from ak@FreeBSD.org) 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 C71FA210E; Wed, 30 Oct 2013 16:54:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9UGs9YO060889; Wed, 30 Oct 2013 16:54:09 GMT (envelope-from ak@svn.freebsd.org) Received: (from ak@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9UGs9lM060888; Wed, 30 Oct 2013 16:54:09 GMT (envelope-from ak@svn.freebsd.org) Message-Id: <201310301654.r9UGs9lM060888@svn.freebsd.org> From: Alex Kozlov Date: Wed, 30 Oct 2013 16:54:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r332153 - 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.14 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: Wed, 30 Oct 2013 16:54:10 -0000 Author: ak Date: Wed Oct 30 16:54:09 2013 New Revision: 332153 URL: http://svnweb.freebsd.org/changeset/ports/332153 Log: - Remove gratuitous whitespaces - Use sinclude when possible - Rewrap overly long list Approved by: portmgr (bapt) Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Wed Oct 30 16:50:31 2013 (r332152) +++ head/Mk/bsd.options.mk Wed Oct 30 16:54:09 2013 (r332153) @@ -53,7 +53,7 @@ # "make config". # # OPTIONS_SET - List of options to enable for all ports. -# OPTIONS_UNSET - List of options to disable for all ports. +# OPTIONS_UNSET - List of options to disable for all ports. # ${OPTIONS_NAME}_SET - List of options to enable for a specific port. # ${OPTIONS_NAME}_UNSET - List of options to disable for a specific port. # @@ -87,7 +87,7 @@ # ${opt}_CONFIGURE_WITH Will add to CONFIGURE_ARGS: # Option enabled --with-${content} # Option disabled --without-${content} -# +# # ${opt}_CMAKE_ON When option is enabled, it will add its content to # the CMAKE_ARGS. # ${opt}_CMAKE_OFF When option is disabled, it will add its content to @@ -236,18 +236,14 @@ NEW_OPTIONS:= ${NEW_OPTIONS:N${opt}} . if exists(${OPTIONSFILE}) && !make(rmconfig) . include "${OPTIONSFILE}" . endif -. if exists(${OPTIONSFILE}.local) -. include "${OPTIONSFILE}.local" -. endif +. sinclude "${OPTIONSFILE}.local" # XXX to remove once UNIQUENAME is removed ## options files (from dialog) . if exists(${OPTIONS_FILE}) && !make(rmconfig) . include "${OPTIONS_FILE}" . endif -. if exists(${OPTIONS_FILE}.local) -. include "${OPTIONS_FILE}.local" -. endif +. sinclude "${OPTIONS_FILE}.local" ### convert WITH and WITHOUT found in make.conf or reloaded from old optionsfile .for opt in ${ALL_OPTIONS} @@ -406,9 +402,9 @@ CONFIGURE_ARGS+= ${${opt}_CONFIGURE_ON} . if defined(${opt}_CMAKE_ON) CMAKE_ARGS+= ${${opt}_CMAKE_ON} . endif -. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV \ - ALL_TARGET INSTALL_TARGET USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY \ - EXTRA_PATCHES PATCHFILES PATCH_SITES CATEGORIES +. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS \ + MAKE_ENV ALL_TARGET INSTALL_TARGET USES DISTFILES PLIST_FILES \ + PLIST_DIRS PLIST_DIRSTRY EXTRA_PATCHES PATCHFILES PATCH_SITES CATEGORIES . if defined(${opt}_${flags}) ${flags}+= ${${opt}_${flags}} . endif @@ -438,5 +434,4 @@ CMAKE_ARGS+= ${${opt}_CMAKE_OFF} . endif .endfor - .endif