Index: head/devel/git-cinnabar/Makefile
===================================================================
--- head/devel/git-cinnabar/Makefile	(revision 528967)
+++ head/devel/git-cinnabar/Makefile	(revision 528968)
@@ -1,50 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	git-cinnabar
 DISTVERSION=	0.5.4
+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 \
 		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.2
===================================================================
--- head/devel/git-cinnabar/files/patch-git-2.25.2	(nonexistent)
+++ head/devel/git-cinnabar/files/patch-git-2.25.2	(revision 528968)
@@ -0,0 +1,30 @@
+--- helper/notes.c.patch.orig	2020-02-05 23:41:37 UTC
++++ helper/notes.c.patch
+@@ -14,10 +14,10 @@ index 75c028b300..24089afa8a 100644
+  			if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
+  					 hashsz - prefix_len))
+  				goto handle_non_note; /* entry.path is not a SHA1 */
+-@@ -722,6 +719,7 @@ static int write_each_note_helper(struct tree_write_stack *tws,
+- struct write_each_note_data {
++@@ -720,6 +720,7 @@ struct write_each_note_data {
+  	struct tree_write_stack *root;
+- 	struct non_note *next_non_note;
++ 	struct non_note **nn_list;
++ 	struct non_note *nn_prev;
+ +	unsigned int note_mode;
+  };
+  
+@@ -41,10 +41,10 @@ index 75c028b300..24089afa8a 100644
+  {
+  	struct tree_write_stack root;
+  	struct write_each_note_data cb_data;
+-@@ -1143,6 +1142,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
+- 	root.path[0] = root.path[1] = '\0';
++@@ -1178,6 +1179,7 @@ int write_notes_tree_mode(struct notes_tree *t, struct
+  	cb_data.root = &root;
+- 	cb_data.next_non_note = t->first_non_note;
++ 	cb_data.nn_list = &(t->first_non_note);
++ 	cb_data.nn_prev = NULL;
+ +	cb_data.note_mode = mode;
+  
+  	/* Write tree objects representing current notes tree */

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