Index: head/devel/git-cinnabar/Makefile =================================================================== --- head/devel/git-cinnabar/Makefile (revision 487450) +++ head/devel/git-cinnabar/Makefile (revision 487451) @@ -1,52 +1,52 @@ # $FreeBSD$ PORTNAME= git-cinnabar DISTVERSION= 0.5.0-31 DISTVERSIONSUFFIX= -gcb81a59 -PORTREVISION= 2 +PORTREVISION= 3 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-helper_cinnabar-helper.c =================================================================== --- head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c (nonexistent) +++ head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c (revision 487451) @@ -0,0 +1,13 @@ +https://github.com/glandium/git-cinnabar/commit/cf440d651b37 + +--- helper/cinnabar-helper.c.orig 2018-09-29 22:45:54 UTC ++++ helper/cinnabar-helper.c +@@ -1461,7 +1461,7 @@ static void upgrade_files(const struct old_manifest_tr + goto corrupted; + } + display_progress(track->progress, +- hashmap_get_size(&track->set.map.map)); ++ kh_size(&track->set.set)); + } + + free_tree_buffer(state.tree_git); Property changes on: head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c ___________________________________________________________________ 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