Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 559757)
+++ head/devel/git-cinnabar/Makefile	(revision 559758)
@@ -1,48 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.6
+PORTREVISION=	1
 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
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	glandium
 
 USES=		gmake python:3.6+,run shebangfix
 TARGET_ORDER_OVERRIDE=	510:fix-shebang # after do-patch
 SHEBANG_FILES=	${PORTNAME} git-remote-hg
 ALL_TARGET=	${PORTNAME}-helper
 MAKE_ENV=	${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!}
 MAKE_ARGS=	SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!}
 CFLAGS+=	-ffunction-sections -fdata-sections
 LDFLAGS+=	-Wl,--gc-sections
 .export		CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure
 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.30
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.30	(nonexistent)
+++ head/devel/git-cinnabar/files/patch-git-2.30	(revision 559758)
@@ -0,0 +1,49 @@
+https://github.com/glandium/git-cinnabar/commit/2db9fad6a3df
+
+--- helper/GIT-VERSION.mk.orig	2020-11-12 02:19:34 UTC
++++ helper/GIT-VERSION.mk
+@@ -1,2 +1,2 @@
+-GIT_VERSION ?= v2.29.2
++GIT_VERSION ?= v2.30.0
+ WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1
+--- helper/cinnabar-fast-import.c.orig	2020-11-12 02:19:34 UTC
++++ helper/cinnabar-fast-import.c
+@@ -264,7 +264,7 @@ static uintmax_t parse_mark_ref(const char *p, char **
+ 		e->pack_id = MAX_PACK_ID;
+ 		e->idx.offset = 1;
+ 	}
+-	insert_mark(marks, 2, e);
++	insert_mark(&marks, 2, e);
+ 	return 2;
+ }
+ 
+--- helper/cinnabar-helper.c.orig	2020-11-12 02:19:34 UTC
++++ helper/cinnabar-helper.c
+@@ -1978,8 +1978,8 @@ static void do_upgrade(struct string_list *args)
+ 				free_tree_buffer(get_commit_tree(manifest_commit));
+ 			}
+ 		}
+-		hashmap_free_entries(&track.commit_cache, struct oid_map_entry, ent);
+-		hashmap_free_entries(&track.tree_cache, struct oid_map_entry, ent);
++		hashmap_clear_and_free(&track.commit_cache, struct oid_map_entry, ent);
++		hashmap_clear_and_free(&track.tree_cache, struct oid_map_entry, ent);
+ 		oidset_clear(&track.manifests);
+ 		stop_progress(&track.progress);
+ 	}
+@@ -2371,7 +2371,7 @@ static void do_reload(struct string_list *args)
+ 
+ 	oidset_clear(&hg2git_seen);
+ 
+-	hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent);
++	hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent);
+ 	hashmap_init(&git_tree_cache, oid_map_entry_cmp, NULL, 0);
+ 
+ 	oid_array_clear(&manifest_heads);
+@@ -2574,6 +2574,6 @@ int main(int argc, const char *argv[])
+ 		free_notes(&files_meta);
+ 
+ 	oidset_clear(&hg2git_seen);
+-	hashmap_free_entries(&git_tree_cache, struct oid_map_entry, ent);
++	hashmap_clear_and_free(&git_tree_cache, struct oid_map_entry, ent);
+ 	return 0;
+ }

Property changes on: head/devel/git-cinnabar/files/patch-git-2.30
___________________________________________________________________
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