Page MenuHomeFreeBSD
Files F136109502

D12483.id35666.diff
No OneTemporary
Actions

D12483.id35666.diff
View Options

Index: CHANGES
===================================================================
--- CHANGES
+++ CHANGES
@@ -10,6 +10,18 @@
All ports committers are allowed to commit to this file.
+20171114:
+AUTHOR: mat@FreeBSD.org
+
+ To help with flavored ports, helpers are available. In these, replace <*>
+ with the flavor name.
+
+ *_PKGNAMEPREFIX *_PKGNAMESUFFIX *_PLIST *_DESCR will overwrite the variable.
+
+ *_CONFLICTS *_CONFLICTS_BUILD *_CONFLICTS_INSTALL *_PKG_DEPENDS
+ *_EXTRACT_DEPENDS *_PATCH_DEPENDS *_FETCH_DEPENDS *_BUILD_DEPENDS
+ *_LIB_DEPENDS *_RUN_DEPENDS *_TEST_DEPENDS will append to the variable.
+
20171113:
AUTHOR: mat@FreeBSD.org
Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1084,6 +1084,31 @@
# Do not leak flavors to childs make
.MAKEOVERRIDES:= ${MAKEOVERRIDES:NFLAVOR=*}
+.if !empty(FLAVOR) && !defined(_DID_FLAVORS_HELPERS)
+_DID_FLAVORS_HELPERS= yes
+# These overwrite the current value
+.for v in PKGNAMEPREFIX PKGNAMESUFFIX PLIST DESCR
+.if defined(${FLAVOR}_${v})
+${v}= ${${FLAVOR}_${v}}
+.endif
+.endfor
+
+# These append to the current value
+.for v in CONFLICTS CONFLICTS_BUILD CONFLICTS_INSTALL \
+ PKG_DEPENDS EXTRACT_DEPENDS PATCH_DEPENDS FETCH_DEPENDS BUILD_DEPENDS \
+ LIB_DEPENDS RUN_DEPENDS TEST_DEPENDS
+.if defined(${FLAVOR}_${v})
+${v}+= ${${FLAVOR}_${v}}
+.endif
+.endfor
+
+.for v in BROKEN IGNORE
+.if defined(${FLAVOR}_${v})
+${v}= flavor "${FLAVOR}" ${${FLAVOR}_${v}}
+.endif
+.endfor
+.endif # defined(${FLAVOR})
+
.if defined(CROSS_TOOLCHAIN)
.if !defined(CROSS_SYSROOT)
IGNORE= CROSS_SYSROOT should be defined

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 16, 9:02 PM (4 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25388961
Default Alt Text
D12483.id35666.diff (1 KB)

Event Timeline