Page MenuHomeFreeBSD
Files F142600401

D10855.diff
No OneTemporary
Actions

D10855.diff
View Options

Index: head/CHANGES
===================================================================
--- head/CHANGES
+++ head/CHANGES
@@ -10,6 +10,21 @@
All ports committers are allowed to commit to this file.
+20180125:
+AUTHOR: mat@FreeBSD.org
+
+ Add support to passing directories to EXTRA_PATCHES.
+
+ Instead of:
+
+ EXTRA_PATCHES= ${PATCHDIR}/feat-foo-patch-file.c \
+ ${PATCHDIR}/feat-foo-patch-file.h \
+ ${PATCHDIR}/feat-foo-patch-file2.c
+
+ Move those files to ${PATCHDIR}/feat-foo/, name them patch-*, and set:
+
+ EXTRA_PATCHES= ${PATCHDIR}/feat-foo
+
20180116:
AUTHOR: mat@FreeBSD.org
Index: head/Mk/Scripts/do-patch.sh
===================================================================
--- head/Mk/Scripts/do-patch.sh
+++ head/Mk/Scripts/do-patch.sh
@@ -107,9 +107,14 @@
if [ -n "${dp_EXTRA_PATCHES}" ]; then
for i in ${dp_EXTRA_PATCHES}; do
- apply_one_patch "${i}" \
- "Applying extra patch" \
- ${dp_PATCH_ARGS}
+ if [ -d "${i}" ]; then
+ patch_from_directory "${i}" \
+ "extra patch"
+ else
+ apply_one_patch "${i}" \
+ "Applying extra patch" \
+ ${dp_PATCH_ARGS}
+ fi
done
fi
Index: head/Mk/bsd.port.mk
===================================================================
--- head/Mk/bsd.port.mk
+++ head/Mk/bsd.port.mk
@@ -749,7 +749,9 @@
# ${WRKDIR}, then point EXTRA_PATCHES to them.
# The patches specified by this variable will be
# applied after the normal distribution patches but
-# before those in ${PATCHDIR}.
+# before those in ${PATCHDIR}. This can also contain
+# directories, all the files named patch-* in those directories
+# will be applied.
# EXTRA_PATCH_TREE - where to find extra 'out-of-tree' patches
# Points to a directory hierarchy with the same layout
# as the ports tree, where local patches can be found.

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 22, 10:09 AM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27840965
Default Alt Text
D10855.diff (1 KB)

Event Timeline