Index: head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c =================================================================== --- head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c (revision 488630) +++ head/devel/git-cinnabar/files/patch-helper_cinnabar-helper.c (nonexistent) @@ -1,13 +0,0 @@ -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 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/devel/git-cinnabar/Makefile =================================================================== --- head/devel/git-cinnabar/Makefile (revision 488630) +++ head/devel/git-cinnabar/Makefile (revision 488631) @@ -1,52 +1,51 @@ # $FreeBSD$ PORTNAME= git-cinnabar -DISTVERSION= 0.5.0-31 -DISTVERSIONSUFFIX= -gcb81a59 -PORTREVISION= 4 +DISTVERSION= 0.5.0-36 +DISTVERSIONSUFFIX= -g0236515 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/distinfo =================================================================== --- head/devel/git-cinnabar/distinfo (revision 488630) +++ head/devel/git-cinnabar/distinfo (revision 488631) @@ -1,3 +1,3 @@ -TIMESTAMP = 1538261154 -SHA256 (glandium-git-cinnabar-0.5.0-31-gcb81a59_GH0.tar.gz) = ab01b1da5021deab44b87754634550f152675295de740d33e9e0e48cabeed84c -SIZE (glandium-git-cinnabar-0.5.0-31-gcb81a59_GH0.tar.gz) = 143428 +TIMESTAMP = 1545865303 +SHA256 (glandium-git-cinnabar-0.5.0-36-g0236515_GH0.tar.gz) = b71eca252fdbbffc1890764b297dc38d0765b2fa3901a7c7e0ad16f680e89a7a +SIZE (glandium-git-cinnabar-0.5.0-36-g0236515_GH0.tar.gz) = 143433