Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 424132)
+++ head/devel/git-cinnabar/Makefile	(revision 424133)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.4.0b3-6
 DISTVERSIONSUFFIX=	-g75f38ed
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Git remote helper to interact with Mercurial repositories
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${NONEXISTENT}:devel/git:configure
 RUN_DEPENDS=	git:devel/git \
 		hg:devel/mercurial
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:2.7,run shebangfix
 SHEBANG_LANG=	python2.7
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 .ifnmake describe
+WRKSRC_git!=	${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git
 MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${PORTSDIR}/devel/git
 MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${PORTSDIR}/devel/git
 .endif
 MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 post-configure:
-	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
-		${TAR} xof - -C${WRKSRC}/git-core
+	@(cd ${WRKSRC_git} && ${COPYTREE_SHARE} . ${WRKSRC}/git-core)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${WRKSRC}/git-remote-hg \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/git-core/${PORTNAME}-helper \
 		${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTNAME:S/git-//}" \
 		${STAGEDIR}${DATADIR}/pythonlib)
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \
 		"${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>