From owner-svn-ports-head@FreeBSD.ORG  Thu Jun 13 12:41:04 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 63222312;
 Thu, 13 Jun 2013 12:41:04 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 55CA51ACB;
 Thu, 13 Jun 2013 12:41:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DCf40l050856;
 Thu, 13 Jun 2013 12:41:04 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DCf42s050855;
 Thu, 13 Jun 2013 12:41:04 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201306131241.r5DCf42s050855@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 13 Jun 2013 12:41:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320795 - 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-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Jun 2013 12:41:04 -0000

Author: bapt
Date: Thu Jun 13 12:41:03 2013
New Revision: 320795
URL: http://svnweb.freebsd.org/changeset/ports/320795

Log:
  Fix patching
  
  Reported by:	kwm

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Jun 13 12:26:59 2013	(r320794)
+++ head/Mk/bsd.port.mk	Thu Jun 13 12:41:03 2013	(r320795)
@@ -3593,25 +3593,27 @@ do-patch:
 	@${ECHO_MSG} "===>  Applying distribution patches for ${PKGNAME}"
 .for i in ${_PATCHFILES}
 .  if defined(PATCH_DEBUG_TMP) && ${PATCH_DEBUG_TMP} == yes
-	@${ECHO_MSG} "===>   Applying distribution patch $$i"
+	@${ECHO_MSG} "===>   Applying distribution patch $i"
 .  endif
-	@case $i in \
+	@(cd ${_DISTDIR}; \
+	case $i in \
 		*.Z|*.gz) ${GZCAT} $i ;; \
 		*.bz2) ${BZCAT} $i ;; \
 		*.xz) ${XZCAT} $i ;; \
 		*) ${CAT} $i ;; \
-	esac | ${PATCH} ${PATCH_DIST_ARGS}
+	esac | ${PATCH} ${PATCH_DIST_ARGS} )
 .  endfor
 .endif
 .if defined(EXTRA_PATCHES)
 .  for i in ${EXTRA_PATCHES}
-	@${ECHO_MSG} "===>  Applying extra patch $i" ; \
+	@${ECHO_MSG} "===>  Applying extra patch $i"
+	@(cd ${_DISTDIR}; \
 	case $i in \
 		*.Z|*.gz) ${GZCAT} $i ;; \
 		*.bz2) ${BZCAT} $i ;; \
 		*.xz) ${XZCAT} $i ;; \
 		*) ${CAT} $i ;; \
-	esac | ${PATCH} ${PATCH_DIST_ARGS}
+	esac | ${PATCH} ${PATCH_DIST_ARGS} )
 .  endfor
 .endif
 	@set -e ;\