From owner-svn-ports-head@FreeBSD.ORG Mon Jun 1 09:38:55 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5ECA31B1; Mon, 1 Jun 2015 09:38:55 +0000 (UTC) (envelope-from mat@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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 330281BE4; Mon, 1 Jun 2015 09:38:55 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t519ctQH063127; Mon, 1 Jun 2015 09:38:55 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t519ctNd063126; Mon, 1 Jun 2015 09:38:55 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201506010938.t519ctNd063126@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 1 Jun 2015 09:38:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r388209 - 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.20 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, 01 Jun 2015 09:38:55 -0000 Author: mat Date: Mon Jun 1 09:38:54 2015 New Revision: 388209 URL: https://svnweb.freebsd.org/changeset/ports/388209 Log: Add SUB_LIST and SUB_FILES to the helper flags. (and sort the flags) With hat: portmgr Sponsored by: Absolight Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Mon Jun 1 09:20:35 2015 (r388208) +++ head/Mk/bsd.options.mk Mon Jun 1 09:38:54 2015 (r388209) @@ -105,12 +105,12 @@ # # For each of: # ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CONFLICTS_BUILD -# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES +# CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES INFO # INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV PATCHFILES PATCH_SITES -# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES PLIST_SUB INFO USES, defining ${opt}_${variable} will -# add its content to the actual variable when the option is enabled. Defining -# ${opt}_${variable}_OFF will add its content to the actual variable when the -# option is disabled. +# PLIST_DIRS PLIST_DIRSTRY PLIST_FILES PLIST_SUB SUB_FILES SUB_LIST USES, +# defining ${opt}_${variable} will add its content to the actual variable when +# the option is enabled. Defining ${opt}_${variable}_OFF will add its content +# to the actual variable when the option is disabled. # # For each of the depends target PKG FETCH EXTRACT PATCH BUILD LIB RUN, # defining ${opt}_${deptype}_DEPENDS will add its content to the actual @@ -129,11 +129,11 @@ OPTIONS_NAME?= ${PKGORIGIN:S/\//_/} OPTIONSFILE?= ${PORT_DBDIR}/${UNIQUENAME}/options OPTIONS_FILE?= ${PORT_DBDIR}/${OPTIONS_NAME}/options -_OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ +_OPTIONS_FLAGS= ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \ CONFLICTS_BUILD CONFLICTS_INSTALL CPPFLAGS CXXFLAGS DISTFILES \ - EXTRA_PATCHES INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS MAKE_ENV \ - PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY PLIST_FILES \ - PLIST_SUB USES INFO + EXTRA_PATCHES INFO INSTALL_TARGET LDFLAGS LIBS MAKE_ARGS \ + MAKE_ENV PATCHFILES PATCH_SITES PLIST_DIRS PLIST_DIRSTRY \ + PLIST_FILES PLIST_SUB SUB_FILES SUB_LIST USES _OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN # Set the default values for the global options, as defined by portmgr