Date: Fri, 4 Oct 2013 15:22:19 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/182626: [PATCH] Mk/bsd.options.mk: add more helpers and remove duplicate EXTRA_PATCHES comment Message-ID: <20131004072220.0088F3269@sunpoet.net> Resent-Message-ID: <201310040730.r947U0VI064947@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 182626
>Category: ports
>Synopsis: [PATCH] Mk/bsd.options.mk: add more helpers and remove duplicate EXTRA_PATCHES comment
>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: Fri Oct 04 07:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 9.2-PRERELEASE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.2-PRERELEASE FreeBSD 9.2-PRERELEASE #0 r255451: Wed Sep 11 02:56:55 CST 2013 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64
>Description:
- Add more helpers: ALL_TARGET, INSTALL_TARGET and CATEGORIES
- Remove duplicate EXTRA_PATCHES comment
- Minor comment rewording: change "add it to" to "add its content to"
just like how we describe ${opt}_CMAKE_*
>How-To-Repeat:
>Fix:
--- bsd.options.mk.patch begins ---
Index: Mk/bsd.options.mk
===================================================================
--- Mk/bsd.options.mk (revision 329267)
+++ Mk/bsd.options.mk (working copy)
@@ -93,17 +93,14 @@
# ${opt}_CMAKE_OFF When option is disabled, it will add its content to
# the CMAKE_ARGS.
#
-# ${opt}_EXTRA_PATCHES When option is enabled, it will add its content to
-# EXTRA_PATCHES
-#
# For each of CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV
-# USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY EXTRA_PATCHES
-# PATCHFILES PATCH_SITES, defining
-# ${opt}_${variable} will add it to the actual variable when the option is enabled.
+# 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.
#
# 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
-# the option is enabled.
+# defining ${opt}_${deptype}_DEPENDS will add its content to the actual
+# dependency when the option is enabled.
##
# Set all the options available for the ports, beginning with the
@@ -397,8 +394,8 @@
CMAKE_ARGS+= ${${opt}_CMAKE_ON}
. endif
. for flags in CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CONFIGURE_ENV MAKE_ARGS MAKE_ENV \
- USES DISTFILES PLIST_FILES PLIST_DIRS PLIST_DIRSTRY \
- EXTRA_PATCHES PATCHFILES PATCH_SITES
+ 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
--- bsd.options.mk.patch ends ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131004072220.0088F3269>