From owner-svn-ports-all@freebsd.org Thu Jan 25 09:12:22 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 00F8CECB61D; Thu, 25 Jan 2018 09:12:22 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6FA1731E0; Thu, 25 Jan 2018 09:12:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 889502976; Thu, 25 Jan 2018 09:12:21 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0P9CLuE024783; Thu, 25 Jan 2018 09:12:21 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0P9CL9E024780; Thu, 25 Jan 2018 09:12:21 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201801250912.w0P9CL9E024780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 25 Jan 2018 09:12:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459915 - in head: . Mk Mk/Scripts X-SVN-Group: ports-head X-SVN-Commit-Author: mat X-SVN-Commit-Paths: in head: . Mk Mk/Scripts X-SVN-Commit-Revision: 459915 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2018 09:12:22 -0000 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@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 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@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.