Date: Mon, 28 Apr 2014 15:47:50 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352514 - head/Mk Message-ID: <201404281547.s3SFlohI007007@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Apr 28 15:47:50 2014 New Revision: 352514 URL: http://svnweb.freebsd.org/changeset/ports/352514 QAT: https://qat.redports.org/buildarchive/r352514/ Log: Allow to append -p[0-9] to EXTRA_PATCHES to specify the patch(1) stripping level Modified: head/Mk/bsd.port.mk Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Apr 28 15:47:00 2014 (r352513) +++ head/Mk/bsd.port.mk Mon Apr 28 15:47:50 2014 (r352514) @@ -3562,13 +3562,17 @@ do-patch: .if defined(EXTRA_PATCHES) @set -e ; \ for i in ${EXTRA_PATCHES}; do \ - ${ECHO_MSG} "===> Applying extra patch $$i" ; \ case $$i in \ - *.Z|*.gz) ${GZCAT} $$i ;; \ - *.bz2) ${BZCAT} $$i ;; \ - *.xz) ${XZCAT} $$i ;; \ - *) ${CAT} $$i ;; \ - esac | ${PATCH} ${PATCH_ARGS} ; \ + *:-p[0-9]) patch_file=$${i%:*} ; patch_strip=$${i##*:} ;; \ + *) patch_file=$$i ;; \ + esac ; \ + ${ECHO_MSG} "===> Applying extra patch $$patch_file" ; \ + case $$patfh_file in \ + *.Z|*.gz) ${GZCAT} $$patch_file ;; \ + *.bz2) ${BZCAT} $$patch_file ;; \ + *.xz) ${XZCAT} $$patch_file ;; \ + *) ${CAT} $$patch_file ;; \ + esac | ${PATCH} ${PATCH_ARGS} $$patch_strip ; \ done .endif @set -e ;\
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404281547.s3SFlohI007007>