Index: head/devel/git-cinnabar/Makefile =================================================================== --- head/devel/git-cinnabar/Makefile (revision 537901) +++ head/devel/git-cinnabar/Makefile (revision 537902) @@ -1,50 +1,51 @@ # $FreeBSD$ PORTNAME= git-cinnabar DISTVERSION= 0.5.5 +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 Index: head/devel/git-cinnabar/files/patch-git-2.27 =================================================================== --- head/devel/git-cinnabar/files/patch-git-2.27 (nonexistent) +++ head/devel/git-cinnabar/files/patch-git-2.27 (revision 537902) @@ -0,0 +1,57 @@ +https://github.com/glandium/git-cinnabar/commit/81c1269f2e7d + +--- helper/GIT-VERSION.mk.orig 2020-04-23 06:16:13 UTC ++++ helper/GIT-VERSION.mk +@@ -1,2 +1,2 @@ +-GIT_VERSION ?= v2.26.2 ++GIT_VERSION ?= v2.27.0 + WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1 +--- helper/cinnabar-fast-import.c.orig 2020-04-23 06:16:13 UTC ++++ helper/cinnabar-fast-import.c +@@ -9,7 +9,7 @@ static void start_packfile(); + #include "hg-bundle.h" + #include "hg-data.h" + #include "list.h" +-#include "sha1-array.h" ++#include "oid-array.h" + #include "strslice.h" + #include "tree-walk.h" + +@@ -131,6 +131,8 @@ static void init() + avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*)); + marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set)); + ++ hashmap_init(&object_table, object_entry_hashcmp, NULL, 0); ++ + global_argc = 1; + + rc_free = mem_pool_alloc(&fi_mem_pool, cmd_save * sizeof(*rc_free)); +@@ -266,7 +268,7 @@ static uintmax_t parse_mark_ref(const char *p, char ** + e->pack_id = MAX_PACK_ID; + e->idx.offset = 1; + } +- insert_mark(2, e); ++ insert_mark(marks, 2, e); + return 2; + } + +@@ -462,7 +464,7 @@ static void do_set(struct string_list *args) + + if (args->items[2].string[0] == ':') { + uintmax_t mark = parse_mark_ref_eol(args->items[2].string); +- struct object_entry *oe = find_mark(mark); ++ struct object_entry *oe = find_mark(marks, mark); + oidcpy(&git_id, &oe->idx.oid); + } else if (get_oid_hex(args->items[2].string, &git_id)) + die("Invalid sha1"); +--- helper/hg-connect.h.orig 2020-04-23 06:16:13 UTC ++++ helper/hg-connect.h +@@ -3,7 +3,7 @@ + + #include "cinnabar-util.h" + #include "run-command.h" +-#include "sha1-array.h" ++#include "oid-array.h" + #include "string-list.h" + + struct hg_connection { Property changes on: head/devel/git-cinnabar/files/patch-git-2.27 ___________________________________________________________________ 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