Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 523020)
+++ head/devel/git-cinnabar/Makefile	(revision 523021)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.2
-PORTREVISION=	4
+PORTREVISION=	5
 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
 ALL_TARGET=	${PORTNAME}-helper
 .ifnmake describe
 MAKE_ENV!=	${MAKE} -V MAKE_ENV -C ${.CURDIR}/../git
 MAKE_ARGS!=	${MAKE} -V MAKE_ARGS -C ${.CURDIR}/../git
 .endif
 MAKE_ENV+=	PYTHON_PATH="${PYTHON_CMD}"
 MAKE_ARGS+=	SUBMODULE_STATUS=dummy
 DATADIR=	${PREFIX}/libexec/git-core
 PORTDATA=	*
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-configure:
 	@${TAR} cf - -C$$(${MAKE} -V WRKSRC -C ${PORTSDIR}/devel/git) . | \
 		${TAR} xof - -C${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>
Index: head/devel/git-cinnabar/files/patch-git-2.25
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.25	(nonexistent)
+++ head/devel/git-cinnabar/files/patch-git-2.25	(revision 523021)
@@ -0,0 +1,67 @@
+https://github.com/glandium/git-cinnabar/commit/ea76c73d222e
+
+--- helper/cinnabar-fast-import.c.orig	2019-07-01 04:57:48 UTC
++++ helper/cinnabar-fast-import.c
+@@ -588,7 +588,7 @@ static void store_file(struct rev_chunk *chunk)
+ 	while (rev_diff_iter_next(&diff)) {
+ 		if (diff.start > last_file.file.len || diff.start < last_end)
+ 			die("Malformed file chunk for %s",
+-			    sha1_to_hex(chunk->node->hash));
++			    hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1]));
+ 		strbuf_add(&data, last_file.file.buf + last_end,
+ 		           diff.start - last_end);
+ 		strbuf_addbuf(&data, &diff.data);
+@@ -598,7 +598,7 @@ static void store_file(struct rev_chunk *chunk)
+ 
+ 	if (last_file.file.len < last_end)
+ 		die("Malformed file chunk for %s",
+-		    sha1_to_hex(chunk->node->hash));
++		    hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1]));
+ 
+ 	strbuf_add(&data, last_file.file.buf + last_end,
+ 		   last_file.file.len - last_end);
+@@ -702,8 +702,8 @@ static void store_manifest(struct rev_chunk *chunk)
+ 		note = get_note_hg(&hg2git, chunk->delta_node);
+ 		if (!note)
+ 			die("Cannot find delta node %s for %s",
+-			    sha1_to_hex(chunk->delta_node->hash),
+-			    sha1_to_hex(chunk->node->hash));
++			    hash_to_hex_algop(chunk->delta_node->hash, &hash_algos[GIT_HASH_SHA1]),
++			    hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1]));
+ 
+ 		// TODO: this could be smarter, avoiding to throw everything
+ 		// away. But this is what the equivalent fast-import commands
+@@ -826,7 +826,7 @@ static void store_manifest(struct rev_chunk *chunk)
+ 	strbuf_addstr(&data, "author  <cinnabar@git> 0 +0000\n"
+ 	                     "committer  <cinnabar@git> 0 +0000\n"
+ 	                     "\n");
+-	strbuf_addstr(&data, sha1_to_hex(last_manifest_oid.hash));
++	strbuf_addstr(&data, hash_to_hex_algop(last_manifest_oid.hash, &hash_algos[GIT_HASH_SHA1]));
+ 	store_object(OBJ_COMMIT, &data, NULL, &last_manifest->oid, 0);
+ 	strbuf_release(&data);
+ 	ensure_notes(&hg2git);
+@@ -834,11 +834,11 @@ static void store_manifest(struct rev_chunk *chunk)
+ 	add_head(&manifest_heads, &last_manifest->oid);
+ 	if ((cinnabar_check & CHECK_MANIFESTS) &&
+ 	    !check_manifest(&last_manifest->oid, NULL))
+-		die("sha1 mismatch for node %s", sha1_to_hex(chunk->node->hash));
++		die("sha1 mismatch for node %s", hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1]));
+ 	return;
+ 
+ malformed:
+-	die("Malformed manifest chunk for %s", sha1_to_hex(chunk->node->hash));
++	die("Malformed manifest chunk for %s", hash_to_hex_algop(chunk->node->hash, &hash_algos[GIT_HASH_SHA1]));
+ }
+ 
+ static void for_each_changegroup_chunk(FILE *in, int version,
+--- helper/hg-connect.c.orig	2019-07-01 04:57:48 UTC
++++ helper/hg-connect.c
+@@ -263,7 +263,7 @@ void hg_unbundle(struct hg_connection *conn, struct st
+ 			/* XXX: should use hg_object_id-specific function */
+ 			oid_array_for_each_unique(heads, unbundlehash, &ctx);
+ 			git_SHA1_Final(sha1, &ctx);
+-			sha1_to_hex_r(&heads_str[13], sha1);
++			hash_to_hex_algop_r(&heads_str[13], sha1, &hash_algos[GIT_HASH_SHA1]);
+ 		} else
+ 			heads_str = join_oid_array_hex(heads, ' ');
+ 	} else

Property changes on: head/devel/git-cinnabar/files/patch-git-2.25
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property