From owner-svn-ports-all@FreeBSD.ORG Tue Oct 1 16:27:53 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 586FA5C3; Tue, 1 Oct 2013 16:27:53 +0000 (UTC) (envelope-from sunpoet@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 2B7DA279D; Tue, 1 Oct 2013 16:27:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r91GRrd3057847; Tue, 1 Oct 2013 16:27:53 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r91GRrv7057846; Tue, 1 Oct 2013 16:27:53 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201310011627.r91GRrv7057846@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Tue, 1 Oct 2013 16:27:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328963 - 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: Tue, 01 Oct 2013 16:27:53 -0000 Author: sunpoet Date: Tue Oct 1 16:27:52 2013 New Revision: 328963 URL: http://svnweb.freebsd.org/changeset/ports/328963 Log: - Add more OPTIONS helpers: MAKE_ARGS, PLIST_FILES, PLIST_DIRS and PLIST_DIRSTRY - Fix typo PR: ports/182514 Submitted by: sunpoet (myself) Approved by: bdrewery (portmgr) Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Tue Oct 1 16:13:56 2013 (r328962) +++ head/Mk/bsd.options.mk Tue Oct 1 16:27:52 2013 (r328963) @@ -70,7 +70,7 @@ # WITHOUT - Unset options from the command line # # -# The following knobs are there to simplfy the handling of OPTIONS in simple +# The following knobs are there to simplify the handling of OPTIONS in simple # cases : # # OPTIONS_SUB When defined it will add to PLIST_SUB: @@ -93,9 +93,9 @@ # ${opt}_CMAKE_OFF When option is disabled, it will add its content to # the CMAKE_ARGS. # -# For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ENV USES -# DISTFILES, defining ${opt}_${variable} will add it to the actual variable -# when the option is enabled. +# For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV +# USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY, defining +# ${opt}_${variable} will add it to the actual variable when the option is enabled. # # For each of the depends target PKG EXTRACT PATCH FETCH BUILD LIB RUN, # defining ${opt}_${deptype}_DEPENDS will add it to the actual dependency when @@ -392,7 +392,8 @@ 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_ENV USES DISTFILES +. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV \ + USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY . if defined(${opt}_${flags}) ${flags}+= ${${opt}_${flags}} . endif