From owner-svn-ports-all@FreeBSD.ORG Thu Aug 21 18:06:59 2014 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 ESMTPS id 55DAA3CB; Thu, 21 Aug 2014 18:06:59 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40BDC34A6; Thu, 21 Aug 2014 18:06:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7LI6x86001706; Thu, 21 Aug 2014 18:06:59 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7LI6wlO001701; Thu, 21 Aug 2014 18:06:58 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201408211806.s7LI6wlO001701@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 21 Aug 2014 18:06:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365573 - in head: Mk x11-themes/slim-themes 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.18-1 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: Thu, 21 Aug 2014 18:06:59 -0000 Author: antoine Date: Thu Aug 21 18:06:58 2014 New Revision: 365573 URL: http://svnweb.freebsd.org/changeset/ports/365573 QAT: https://qat.redports.org/buildarchive/r365573/ Log: Add an option helper for PLIST_SUB Rename a few variables to avoid confusion with this new helper Requested by: koobs Reviewed by: mat With hat: portmgr Differential revision: https://reviews.freebsd.org/D665 Modified: head/Mk/bsd.apache.mk head/Mk/bsd.options.mk head/x11-themes/slim-themes/Makefile Modified: head/Mk/bsd.apache.mk ============================================================================== --- head/Mk/bsd.apache.mk Thu Aug 21 17:24:39 2014 (r365572) +++ head/Mk/bsd.apache.mk Thu Aug 21 18:06:58 2014 (r365573) @@ -143,7 +143,7 @@ IGNORE= lowercase WITH_STATIC_MODULES=" # Setting "@comment " as default. .for module in ${AVAILABLE_MODULES:O} -${module}_PLIST_SUB= "@comment " +${module}PLIST_SUB= "@comment " _DISABLE_MODULES+= --disable-${module:tl} .endfor @@ -244,11 +244,11 @@ SHARED_MODULES= ${APACHE_MODULES} .endif .for module in ${SHARED_MODULES} -${module}_PLIST_SUB= "" +${module}PLIST_SUB= "" .endfor .for module in ${AVAILABLE_MODULES:O:u} -PLIST_SUB+= MOD_${module}=${${module}_PLIST_SUB} +PLIST_SUB+= MOD_${module}=${${module}PLIST_SUB} .endfor # pkg-plist workaround STATIC support Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Thu Aug 21 17:24:39 2014 (r365572) +++ head/Mk/bsd.options.mk Thu Aug 21 18:06:58 2014 (r365573) @@ -104,7 +104,7 @@ # 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 INFO USES, defining ${opt}_${variable} will +# 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. @@ -130,7 +130,7 @@ _OPTIONS_FLAGS= ALL_TARGET CATEGORIES CF 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 \ - USES INFO + PLIST_SUB USES INFO _OPTIONS_DEPENDS= PKG FETCH EXTRACT PATCH BUILD LIB RUN # Set the default values for the global options, as defined by portmgr Modified: head/x11-themes/slim-themes/Makefile ============================================================================== --- head/x11-themes/slim-themes/Makefile Thu Aug 21 17:24:39 2014 (r365572) +++ head/x11-themes/slim-themes/Makefile Thu Aug 21 18:06:58 2014 (r365573) @@ -84,11 +84,11 @@ PORT_OPTIONS+= ${n} NEWDISTFILES:= ${DISTFILES} ${${n}_DIST} DISTFILES:= ${NEWDISTFILES} SEEN_THEMES= yes -NEW_PLIST_SUB:= ${PLIST_SUB} ${n}="" -PLIST_SUB:= ${NEW_PLIST_SUB} +NEWPLIST_SUB:= ${PLIST_SUB} ${n}="" +PLIST_SUB:= ${NEWPLIST_SUB} .else -NEW_PLIST_SUB:= ${PLIST_SUB} ${n}="@comment " -PLIST_SUB:= ${NEW_PLIST_SUB} +NEWPLIST_SUB:= ${PLIST_SUB} ${n}="@comment " +PLIST_SUB:= ${NEWPLIST_SUB} .endif # ${PORT_OPTIONS:MALL_THEMES} || ${PORT_OPTIONS:M${n}} .endfor # n in ${THEMELIST}