diff options
| -rw-r--r-- | CHANGES | 15 | ||||
| -rw-r--r-- | Mk/Scripts/do-patch.sh | 11 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
3 files changed, 26 insertions, 4 deletions
@@ -10,6 +10,21 @@ in the release notes and/or placed into UPDATING. 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 diff --git a/Mk/Scripts/do-patch.sh b/Mk/Scripts/do-patch.sh index a44208545c3a..10095f56847d 100644 --- a/Mk/Scripts/do-patch.sh +++ b/Mk/Scripts/do-patch.sh @@ -107,9 +107,14 @@ fi 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 diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index b5b955e9979c..0ce7ed61b9a6 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -749,7 +749,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # ${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. |