From owner-svn-ports-all@FreeBSD.ORG  Mon Apr 28 15:47:50 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EF72C11E;
 Mon, 28 Apr 2014 15:47:50 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC18B1D32;
 Mon, 28 Apr 2014 15:47:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3SFlo2t007008;
 Mon, 28 Apr 2014 15:47:50 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3SFlohI007007;
 Mon, 28 Apr 2014 15:47:50 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201404281547.s3SFlohI007007@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 28 Apr 2014 15:47:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352514 - head/Mk
X-SVN-Group: ports-head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Apr 2014 15:47:51 -0000

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 ;\