diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile index cf507b4e456e..3ebdfe719d3d 100644 --- a/devel/git-cinnabar/Makefile +++ b/devel/git-cinnabar/Makefile @@ -1,48 +1,47 @@ PORTNAME= git-cinnabar -DISTVERSION= 0.5.10 -PORTREVISION= 4 +DISTVERSION= 0.5.11 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Git remote helper to interact with Mercurial repositories WWW= https://github.com/glandium/git-cinnabar LICENSE= GPLv2 BUILD_DEPENDS= ${NONEXISTENT}:devel/git:configure RUN_DEPENDS= git:devel/git USE_GITHUB= yes GH_ACCOUNT= glandium USES= gmake python:3.6+,run shebangfix TARGET_ORDER_OVERRIDE= 510:fix-shebang # after do-patch SHEBANG_FILES= ${PORTNAME} git-remote-hg ALL_TARGET= ${PORTNAME}-helper MAKE_ENV= ${:!${MAKE} -V MAKE_ENV -C ${.CURDIR:H}/git!} MAKE_ARGS= SUBMODULE_STATUS=dummy ${:!${MAKE} -V MAKE_ARGS -C ${.CURDIR:H}/git!} CFLAGS+= -ffunction-sections -fdata-sections LDFLAGS+= -Wl,--gc-sections .export CPPFLAGS CFLAGS CXXFLAGS LDFLAGS # :configure 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 diff --git a/devel/git-cinnabar/distinfo b/devel/git-cinnabar/distinfo index 6a99e6a5d278..56f6ba63e053 100644 --- a/devel/git-cinnabar/distinfo +++ b/devel/git-cinnabar/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659215085 -SHA256 (glandium-git-cinnabar-0.5.10_GH0.tar.gz) = 20792358201417fa64cb3b1b9ccd6753909f081b0bf11cb9908f55a3607627e1 -SIZE (glandium-git-cinnabar-0.5.10_GH0.tar.gz) = 183884 +TIMESTAMP = 1667018365 +SHA256 (glandium-git-cinnabar-0.5.11_GH0.tar.gz) = 20f94f6a9b05fff2684e8c5619a1a5703e7d472fd2d0e87b020b20b4190a6338 +SIZE (glandium-git-cinnabar-0.5.11_GH0.tar.gz) = 184004 diff --git a/devel/git-cinnabar/files/patch-git-2.37.3 b/devel/git-cinnabar/files/patch-git-2.37.3 deleted file mode 100644 index de470213ddd8..000000000000 --- a/devel/git-cinnabar/files/patch-git-2.37.3 +++ /dev/null @@ -1,19 +0,0 @@ -https://github.com/glandium/git-cinnabar/commit/02449dbf25b1 - ---- helper/tree-walk.c.patch.orig 2022-07-30 21:04:45 UTC -+++ helper/tree-walk.c.patch -@@ -1,12 +1,12 @@ diff --git a/tree-walk.c b/tree-walk.c - diff --git a/tree-walk.c b/tree-walk.c --index 3a94959d64..70558d2964 100644 -+index 74f4d710e8..f46ac155eb 100644 - --- a/tree-walk.c - +++ b/tree-walk.c - @@ -47,7 +47,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l - - /* Initialize the descriptor entry */ - desc->entry.path = path; --- desc->entry.mode = canon_mode(mode); -+- desc->entry.mode = (desc->flags & TREE_DESC_RAW_MODES) ? mode : canon_mode(mode); - + desc->entry.mode = mode; - desc->entry.pathlen = len - 1; - oidread(&desc->entry.oid, (const unsigned char *)path + len);