svn commit: r459915 - in head: . Mk Mk/Scripts

[Mathieu Arnold]

Author: mat
Date: Thu Jan 25 09:12:21 2018
New Revision: 459915
URL: https://svnweb.freebsd.org/changeset/ports/459915

Log:
  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
  
  Approved by:	bdrewery
  Sponsored by:	Absolight
  Differential Revision:	https://reviews.freebsd.org/D10855

Modified:
  head/CHANGES
  head/Mk/Scripts/do-patch.sh   (contents, props changed)
  head/Mk/bsd.port.mk   (contents, props changed)

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Jan 25 09:04:31 2018	(r459914)
+++ head/CHANGES	Thu Jan 25 09:12:21 2018	(r459915)
@@ -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 at 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 at FreeBSD.org
 

Modified: head/Mk/Scripts/do-patch.sh
==============================================================================
--- head/Mk/Scripts/do-patch.sh	Thu Jan 25 09:04:31 2018	(r459914)
+++ head/Mk/Scripts/do-patch.sh	Thu Jan 25 09:12:21 2018	(r459915)
@@ -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
 

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Jan 25 09:04:31 2018	(r459914)
+++ head/Mk/bsd.port.mk	Thu Jan 25 09:12:21 2018	(r459915)
@@ -749,7 +749,9 @@ FreeBSD_MAINTAINER=	portmgr at 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.