Index: head/devel/git-cinnabar/Makefile =================================================================== --- head/devel/git-cinnabar/Makefile (revision 531624) +++ head/devel/git-cinnabar/Makefile (revision 531625) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= git-cinnabar DISTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 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 Index: head/devel/git-cinnabar/files/patch-git-2.26 =================================================================== --- head/devel/git-cinnabar/files/patch-git-2.26 (nonexistent) +++ head/devel/git-cinnabar/files/patch-git-2.26 (revision 531625) @@ -0,0 +1,29 @@ +https://github.com/glandium/git-cinnabar/commit/716a09de6de7 + +--- helper/cinnabar-helper.c.orig 2020-02-05 23:41:37 UTC ++++ helper/cinnabar-helper.c +@@ -192,7 +192,7 @@ static void send_object(const struct object_id *oid) + unsigned long sz; + struct git_istream *st; + +- st = open_istream(oid, &type, &sz, NULL); ++ st = open_istream(the_repository, oid, &type, &sz, NULL); + + if (!st) + die("open_istream failed for %s", oid_to_hex(oid)); +@@ -2270,6 +2270,7 @@ static void reset_replace_map() + { + oidmap_free(the_repository->objects->replace_map, 1); + FREE_AND_NULL(the_repository->objects->replace_map); ++ the_repository->objects->replace_map_initialized = 0; + } + + static void init_metadata() +@@ -2304,6 +2305,7 @@ static void init_metadata() + the_repository->objects->replace_map = + xmalloc(sizeof(*the_repository->objects->replace_map)); + oidmap_init(the_repository->objects->replace_map, 0); ++ the_repository->objects->replace_map_initialized = 1; + + tree = get_commit_tree(c); + parse_tree(tree); Property changes on: head/devel/git-cinnabar/files/patch-git-2.26 ___________________________________________________________________ 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