Date: Thu, 13 Jun 2013 12:41:04 +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: r320795 - head/Mk Message-ID: <201306131241.r5DCf42s050855@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 ;\
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306131241.r5DCf42s050855>