Date: Mon, 3 Mar 2014 12:45:52 -0500 (EST) From: Adam Weinberger <adamw@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/187226: [patch] add CONFLICTS to the OPTIONS helpers, and sort the helpers Message-ID: <20140303174553.0006211F9E3@apnoea.adamw.org> Resent-Message-ID: <201403031750.s23Ho1Zu035818@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187226
>Category: ports
>Synopsis: [patch] add CONFLICTS to the OPTIONS helpers, and sort the helpers
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 03 17:50:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Adam Weinberger
>Release: FreeBSD 10.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD apnoea.adamw.org 10.0-STABLE FreeBSD 10.0-STABLE #0: Fri Feb 28 10:32:45 EST 2014 root@apnoea.adamw.org:/usr/obj/usr/src/sys/PEEP i386
>Description:
CONFLICTS may arise by enabling certain options, so it'd be nice to have it as
an OPTIONS helper.
Also, the list of helpers would be much easier to follow if they were sorted. It
makes it easier to ask "Does this thing have an OPTION helper?"
The attached patch adds CONFLICTS to the list of helpers, and it sorts the list
alphabetically in the description and in the actual code.
>How-To-Repeat:
>Fix:
--- options-conflicts.patch begins here ---
Index: bsd.options.mk
===================================================================
--- bsd.options.mk (revision 346938)
+++ bsd.options.mk (working copy)
@@ -103,14 +103,15 @@
# If you need more than one option, you can do
# FOO=bar,baz and you'll get USE_FOO=bar baz
#
-# For each of 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, 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:
+# ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS CPPFLAGS CXXFLAGS
+# DISTFILES EXTRA_PATCHES INSTALL_TARGET LDFLAGS MAKE_ARGS MAKE_ENV PATCH_SITES
+# PATCHFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY 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 EXTRACT PATCH FETCH BUILD LIB RUN,
+# For each of the depends target BUILD EXTRACT FETCH LIB PATCH PKG RUN,
# defining ${opt}_${deptype}_DEPENDS will add its content to the actual
# dependency when the option is enabled. Defining
# ${opt}_${deptype}_DEPENDS_OFF will add its content to the actual dependency
@@ -421,9 +422,10 @@
${configure}_ARGS+= ${${opt}_${configure}_ON}
. endif
. endfor
-. 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 ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
+ CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES INSTALL_TARGET LDFLAGS \
+ MAKE_ARGS MAKE_ENV PATCH_SITES PATCHFILES PLIST_FILES PLIST_DIRS \
+ PLIST_DIRSTRY USES
. if defined(${opt}_${flags})
${flags}+= ${${opt}_${flags}}
. endif
@@ -449,9 +451,10 @@
${configure}_ARGS+= ${${opt}_${configure}_OFF}
. endif
. endfor
-. 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 ALL_TARGET CATEGORIES CFLAGS CONFIGURE_ENV CONFLICTS \
+ CPPFLAGS CXXFLAGS DISTFILES EXTRA_PATCHES INSTALL_TARGET LDFLAGS \
+ MAKE_ARGS MAKE_ENV PATCH_SITES PATCHFILES PLIST_FILES PLIST_DIRS \
+ PLIST_DIRSTRY USES
. if defined(${opt}_${flags}_OFF)
${flags}+= ${${opt}_${flags}_OFF}
. endif
--- options-conflicts.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140303174553.0006211F9E3>