Date: Mon, 16 Jan 2017 16:47:05 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431681 - in head: . Mk Mk/Scripts Message-ID: <201701161647.v0GGl5Zf046086@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jan 16 16:47:05 2017 New Revision: 431681 URL: https://svnweb.freebsd.org/changeset/ports/431681 Log: Implement EXTRA_PATCH_TREE. PR: 215726 Reported by: julian 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 Mon Jan 16 16:47:00 2017 (r431680) +++ head/CHANGES Mon Jan 16 16:47:05 2017 (r431681) @@ -13,6 +13,18 @@ All ports committers are allowed to comm 20160116: AUTHOR: mat@FreeBSD.org + A new EXTRA_PATCH_TREE has been added. Points to a directory hierarchy with + the same layout as the ports tree, where local patches can be found. This + allows a third party to keep their patches in some other source control + system if needed. + + For example, if you have EXTRA_PATCH_TREE=/patches, when building + lang/perl5.24, any file named patch-* in /patches/lang/perl5.24/ will be used + to patch the Perl distribution. + +20160116: +AUTHOR: mat@FreeBSD.org + During extraction of the do-patch target into a separate script, the "-d PATCH_WRKSRC" had to be removed from the PATCH_ARGS and PATCH_DIST_ARGS variables. If using these variables directly, you will need to adapt the Modified: head/Mk/Scripts/do-patch.sh ============================================================================== --- head/Mk/Scripts/do-patch.sh Mon Jan 16 16:47:00 2017 (r431680) +++ head/Mk/Scripts/do-patch.sh Mon Jan 16 16:47:05 2017 (r431681) @@ -115,3 +115,7 @@ fi patch_from_directory "${dp_PATCHDIR}" "${dp_OPSYS}" +if [ -n "${dp_EXTRA_PATCH_TREE}" ]; then + patch_from_directory "${dp_EXTRA_PATCH_TREE}/${dp_PKGORIGIN}" "local" +fi + Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Jan 16 16:47:00 2017 (r431680) +++ head/Mk/bsd.port.mk Mon Jan 16 16:47:05 2017 (r431681) @@ -749,6 +749,11 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # The patches specified by this variable will be # applied after the normal distribution patches but # before those in ${PATCHDIR}. +# 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. +# This allows a third party to keep their patches in +# some other source control system if needed. # PATCH_WRKSRC - Directory to apply patches in. # Default: ${WRKSRC} #
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701161647.v0GGl5Zf046086>