head	1.29;
access;
symbols
	pkgsrc-2026Q1:1.28.0.2
	pkgsrc-2026Q1-base:1.28
	pkgsrc-2025Q4:1.26.0.2
	pkgsrc-2025Q4-base:1.26
	pkgsrc-2025Q3:1.25.0.4
	pkgsrc-2025Q3-base:1.25
	pkgsrc-2025Q2:1.25.0.2
	pkgsrc-2025Q2-base:1.25
	pkgsrc-2025Q1:1.23.0.4
	pkgsrc-2025Q1-base:1.23
	pkgsrc-2024Q4:1.23.0.2
	pkgsrc-2024Q4-base:1.23
	pkgsrc-2024Q3:1.12.0.4
	pkgsrc-2024Q3-base:1.12
	pkgsrc-2024Q2:1.12.0.2
	pkgsrc-2024Q2-base:1.12
	pkgsrc-2024Q1:1.9.0.2
	pkgsrc-2024Q1-base:1.9
	pkgsrc-2023Q4:1.8.0.2
	pkgsrc-2023Q4-base:1.8
	pkgsrc-2023Q3:1.4.0.2
	pkgsrc-2023Q3-base:1.4
	pkgsrc-2023Q2:1.2.0.2
	pkgsrc-2023Q2-base:1.2;
locks; strict;
comment	@# @;


1.29
date	2026.05.14.16.40.40;	author ryoon;	state Exp;
branches;
next	1.28;
commitid	tKipFjQKzke3NNFG;

1.28
date	2026.02.06.10.04.28;	author wiz;	state Exp;
branches;
next	1.27;
commitid	MwQEYCXeWSFvIitG;

1.27
date	2026.01.07.08.46.30;	author wiz;	state Exp;
branches;
next	1.26;
commitid	1wQ3ICD8eebefrpG;

1.26
date	2025.10.05.19.25.50;	author js;	state Exp;
branches;
next	1.25;
commitid	U70EDQkwOmfbOpdG;

1.25
date	2025.04.19.07.57.41;	author wiz;	state Exp;
branches;
next	1.24;
commitid	8J0gu7BGAw8XqDRF;

1.24
date	2025.04.17.21.50.19;	author wiz;	state Exp;
branches;
next	1.23;
commitid	xcIXAVA292fk6sRF;

1.23
date	2024.12.16.00.41.41;	author riastradh;	state Exp;
branches;
next	1.22;
commitid	OtIZPEc1q5HO0FBF;

1.22
date	2024.12.16.00.41.19;	author riastradh;	state Exp;
branches;
next	1.21;
commitid	62S4oAmHaAfH0FBF;

1.21
date	2024.12.16.00.41.11;	author riastradh;	state Exp;
branches;
next	1.20;
commitid	9fQhtQw3qQKD0FBF;

1.20
date	2024.12.12.16.13.59;	author riastradh;	state Exp;
branches;
next	1.19;
commitid	dQ7YfDSRhPQCieBF;

1.19
date	2024.12.05.13.59.31;	author riastradh;	state Exp;
branches;
next	1.18;
commitid	lA2JZBR5b6UrMjAF;

1.18
date	2024.12.05.07.55.56;	author wiz;	state Exp;
branches;
next	1.17;
commitid	4Pw5QwwIz8VELhAF;

1.17
date	2024.12.05.02.31.30;	author riastradh;	state Exp;
branches;
next	1.16;
commitid	VXNryITEaNVoYfAF;

1.16
date	2024.12.05.01.19.26;	author riastradh;	state Exp;
branches;
next	1.15;
commitid	LpLargaTeQwGzfAF;

1.15
date	2024.11.14.22.19.20;	author wiz;	state Exp;
branches;
next	1.14;
commitid	JmuDYqwL4erbdFxF;

1.14
date	2024.11.01.12.52.05;	author wiz;	state Exp;
branches;
next	1.13;
commitid	QB4Wk02mZPuBuWvF;

1.13
date	2024.11.01.00.51.19;	author wiz;	state Exp;
branches;
next	1.12;
commitid	QT27BdVP362gvSvF;

1.12
date	2024.06.14.14.13.33;	author riastradh;	state Exp;
branches;
next	1.11;
commitid	ggK8iRqqBXh1sXdF;

1.11
date	2024.05.29.16.32.02;	author adam;	state Exp;
branches;
next	1.10;
commitid	n8aFyEjEVZA0JUbF;

1.10
date	2024.05.16.06.14.45;	author wiz;	state Exp;
branches;
next	1.9;
commitid	kYKPUni8AkogJbaF;

1.9
date	2024.01.03.04.01.38;	author riastradh;	state Exp;
branches;
next	1.8;
commitid	GK2Z9Mcarm6WiXSE;

1.8
date	2023.11.08.13.18.44;	author wiz;	state Exp;
branches;
next	1.7;
commitid	PsuHTklAIsF4bOLE;

1.7
date	2023.10.24.22.08.44;	author wiz;	state Exp;
branches;
next	1.6;
commitid	MTsrqKm6aGrQAVJE;

1.6
date	2023.10.06.10.20.18;	author riastradh;	state Exp;
branches;
next	1.5;
commitid	lA6SXKyLZ3udgyHE;

1.5
date	2023.10.06.10.19.56;	author riastradh;	state Exp;
branches;
next	1.4;
commitid	YkE5zNI2Xyn5gyHE;

1.4
date	2023.09.26.07.38.58;	author wiz;	state Exp;
branches;
next	1.3;
commitid	dzJ7olNNrUYDGfGE;

1.3
date	2023.09.17.11.08.51;	author bsiegert;	state Exp;
branches;
next	1.2;
commitid	65LxF2GgVZ8l87FE;

1.2
date	2023.05.02.10.25.31;	author wiz;	state Exp;
branches;
next	1.1;
commitid	r8Ofamx0ccVQknnE;

1.1
date	2023.04.29.21.45.19;	author wiz;	state Exp;
branches;
next	;
commitid	v78llBuAnI35c3nE;


desc
@@


1.29
log
@*: Recursive revbump from security/nettle-4.0
@
text
@# $NetBSD: Makefile,v 1.28 2026/02/06 10:04:28 wiz Exp $

.include "Makefile.common"

PKGREVISION=	7
CATEGORIES=	devel

MAINTAINER=	pkgsrc-users@@NetBSD.org
COMMENT=	Remote helper to use mercurial repositories with git

DEPENDS+=	git-base-[0-9]*:../../devel/git-base

USE_TOOLS+=	gmake pkg-config

RUSTFLAGS+=	-C link-arg=${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.curl}/lib

CARGO_NO_DEFAULT_FEATURES=	yes
# version-check is on by default -- disable it for pkgsrc since pkgsrc
# manages version checks and updates, not the software itself, so no
# need for git-cinnabar to phone home every time you run it.
#CARGO_FEATURES+=		version-check

# This has to come before -I/usr/include/krb5 (which comes in on NetBSD
# via curl with gssapi enabled) because both git-core and krb5 have a
# file called `hex.h' which git-core uses internally.
CPPFLAGS+=	-I${WRKSRC}/git-core

INSTALLATION_DIRS+=	libexec/git-core share/doc/git-cinnabar

CHECK_WRKREF_SKIP+=	libexec/git-core/*

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/target/release/git-cinnabar ${DESTDIR}${PREFIX}/libexec/git-core
	cd ${DESTDIR}${PREFIX}/libexec/git-core && ${LN} git-cinnabar git-remote-hg
	${INSTALL_DATA} ${WRKSRC}/README.md ${DESTDIR}${PREFIX}/share/doc/git-cinnabar

CARGO_TEST_ARGS=	test ${DEFAULT_CARGO_ARGS}

do-test: do-test-cargo
do-test-cargo: .PHONY
	@@${STEP_MSG} Running cargo test
	${RUN} cd ${CARGO_WRKSRC} && \
	${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo ${CARGO_TEST_ARGS}

TEST_DEPENDS+=		${PYPKGPREFIX}-cram>=0:../../devel/py-cram
TEST_DEPENDS+=		${PYPKGPREFIX}-mercurial>=0:../../devel/py-mercurial

# this.cannot.possibly.exist.invalid-tld appears in some tests that
# check for exact error messages, so let that bypass the fake proxy.
do-test: do-test-cram
do-test-cram: .PHONY
	@@${STEP_MSG} Running cram tests
	${RUN} cd ${CARGO_WRKSRC} && \
	${LN} -sf git-cinnabar target/release/git-remote-hg && \
	${SETENV} ${MAKE_ENV} \
	    GIT_EXEC_PATH=${CARGO_WRKSRC}/target/release:"`git --exec-path`" \
	    no_proxy=localhost,this.cannot.possibly.exist.invalid-tld \
	    ${PREFIX}/bin/cram-${PYVERSSUFFIX} ${PKG_VERBOSE:D--verbose} tests

.include "cargo-depends.mk"

.include "../../archivers/zstd/buildlink3.mk"
.include "../../lang/python/application.mk"
.include "../../lang/rust/cargo.mk"
.include "../../www/curl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
@


1.28
log
@*: recursive bump for nettle 4.0 shlib major bump
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.27 2026/01/07 08:46:30 wiz Exp $
d5 1
a5 1
PKGREVISION=	6
@


1.27
log
@*: recursive bump for icu 78.1
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.26 2025/10/05 19:25:50 js Exp $
d5 1
a5 1
PKGREVISION=	5
@


1.26
log
@*: rev bump for curl
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.25 2025/04/19 07:57:41 wiz Exp $
d5 1
a5 1
PKGREVISION=	4
@


1.25
log
@*: recursive bump for default Kerberos implementation switch
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.24 2025/04/17 21:50:19 wiz Exp $
d5 1
a5 1
PKGREVISION=	3
@


1.24
log
@*: recursive bump for icu 77 and libxml2 2.14
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.23 2024/12/16 00:41:41 riastradh Exp $
d5 1
a5 1
PKGREVISION=	2
@


1.23
log
@devel/git-cinnabar: Add patches to fix spurious git push success.

PKGREVISION++

(No change to devel/py-hg-cinnabarclone PKGREVISION even though the
patch also applies to it, because the patch doesn't change any of the
content of the py-hg-cinnabarclone package, which consists mainly of
one .py file in git-cinnabar.  The patch is applied merely for the
convenience of sharing distinfo between the two packages.)

Derived from the current state of:

https://github.com/glandium/git-cinnabar/pull/342
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.22 2024/12/16 00:41:19 riastradh Exp $
d5 1
a5 1
PKGREVISION=	1
@


1.22
log
@devel/git-cinnabar: Don't run cargo tests twice on `bmake test'.

Forgot to remove this recipe back when I added the cram tests.

No functional change intended outside `bmake test', so no revbump.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.21 2024/12/16 00:41:11 riastradh Exp $
d5 1
@


1.21
log
@devel/git-cinnabar: Nix outdated comment.

GIT_SUBMODULES was moved to Makefile.common after all.

No functional change intended.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.20 2024/12/12 16:13:59 riastradh Exp $
a37 4
do-test:
	${RUN} cd ${CARGO_WRKSRC} && \
	${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo ${CARGO_TEST_ARGS}

@


1.20
log
@devel/git-cinnabar: Move GITHUB_SUBMODULES to Makefile.common.

This makes no difference for devel/git-cinnabar, and unbreaks
devel/py-hg-cinnabarclone by making the new patch under git-core/
apply.  This patch isn't needed for py-hg-cinnabarclone but it'll be
easier to maintain, I think, if we have all the git-cinnabar in one
place.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.19 2024/12/05 13:59:31 riastradh Exp $
a2 1
# does not contain the git submodules, please update GITHUB_SUBMODULES below
@


1.19
log
@devel/git-cinnabar: Make tests work before installation.

And make sure we override any previously installed git-cinnabar (and
git-remote-hg) executables in libexec/git-core (`git exec path').

Creating a symlink under ${WRKSRC}/target/release is a little hokey,
but it'll do.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.18 2024/12/05 07:55:56 wiz Exp $
a12 2
GITHUB_SUBMODULES=	git-for-windows git v2.46.2.windows.1 git-core

@


1.18
log
@git-cinnabar: add missing test dependency, fix binary name in target
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.17 2024/12/05 02:31:30 riastradh Exp $
d60 3
a62 1
	${SETENV} ${MAKE_ENV} PATH=${CARGO_WRKSRC}/target/release:${PATH:Q} \
@


1.17
log
@git-cinnabar: Run the cram tests too.

No revbump because this only affects bmake test -- no change to the
built package.

All the tests should pass on NetBSD 9 now (probably 10 too).  Issues
filed upstream for the patches needed to make this work.

Tidy Makefile style a little while here.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.16 2024/12/05 01:19:26 riastradh Exp $
d52 1
d62 1
a62 1
	    ${PREFIX}/bin/cram ${PKG_VERBOSE:D--verbose} tests
@


1.16
log
@devel/git-cinnabar, devel/py-hg-cinnabarclone: update to 0.7.0beta2

While here: Disable `version-check' feature so git-cinnabar doesn't
phone home every time you run it.

Upstream release notes:

0.7.0-beta.2 Pre-release

What's new since 0.7.0-beta.1?

 * Based on git 2.46.2.
 * Avoid showing an update notification for the current beta version when it is the latest release.
 * Fixed git push --dry-run to not report spurious errors.
 * Allow git push --dry-run to create metadata for the changesets the push would create.
 * Various changes to download.py and git cinnabar self-update.

0.7.0-beta.1 Pre-release

/!\ As of version 0.7, some corner cases in Mercurial repositories will generate different git commits than with prior versions of git-cinnabar. This means a fresh clone might have different git SHA-1s than existing clones, but this doesn't impact the use of existing clones with newer versions of git-cinnabar.

Most repositories should remain non-affected by the change.

You can set the cinnabar.compat git configuration to 0.6 to keep the previous behavior.

What's new since 0.6.3?

 * Based on git 2.46.0.
 * Fixed git cinnabar fsck to avoid misreporting weird old Mercurial file history as metadata corruption.
 * Fixed the creation of empty trees for manifests.
 * Fixed access to ssh remotes with absolute paths.
 * Fixed cinnabarclone extension with Mercurial >= 6.6.
 * Fixed handling cinnabar.refs=heads,tips (backwards incompatible change).
 * Various optimizations making clones and pulls faster.
 * Made negotiation with repo with large number of heads faster for pull and push.
 * git cinnabar fetch and git cinnabar reclone now handle everything internally instead of delegating to git fetch and git remote, respectively.
 * git cinnabar reclone doesn't lose metadata history when a cinnabarclone is used.
 * A clone with cinnabarclone now only records one metadata update instead of two when there are updates after the cinnabarclone.
 * git cinnabar reclone now only records one metadata update even when pulling from several remotes at the same time.
 * git cinnabar reclone will try to restore as many of the heads it knew about, fetching from skipDefaultUpdate remotes if necessary.
 * git cinnabar reclone --rebase allows to automatically rebase local branches and detached heads when git commits change after the reclone (e.g. when switching between a plain clone to a grafted clone, or when there was a bug in the original conversion)
 * cinnabar.check=no-bundle2 now pretends the Mercurial server doesn't support bundle2.
 * Updated crate dependencies.
 * Many refactors, including the conversion of many functions from C to Rust.
 * Experimental support for tweaking the similarity level when detecting copies and renames during a push.
 * Experimental support for pushing named branches and tags.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2024/06/14 14:13:33 riastradh Exp $
d45 18
d65 2
a68 1
.include "../../archivers/zstd/buildlink3.mk"
@


1.15
log
@*: recursive bump for icu 76 shlib major version bump
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.14 2024/11/01 12:52:05 wiz Exp $
a5 1
PKGREVISION=	5
d13 1
a13 1
GITHUB_SUBMODULES=	git-for-windows git v2.41.0.windows.1 git-core
d19 6
@


1.14
log
@*: revbump for icu downgrade
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.13 2024/11/01 00:51:19 wiz Exp $
d6 1
a6 1
PKGREVISION=	4
@


1.13
log
@*: recursive bump for icu 76.1 shlib bump
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.12 2024/06/14 14:13:33 riastradh Exp $
d6 1
a6 1
PKGREVISION=	3
@


1.12
log
@devel/py-hg-cinnabarclone: Import hg extension from git-cinnabar.

This simple server-side hg extension can advertise bundles to speed
up `git clone' with git-cinnabar.

Single Python file distributed as part of git-cinnabar -- need not
pull in all of git-cinnabar (and Rust) on the server to run.

Not 100% sure if this use of PY_COMPILE_ALL/PY_COMPILE_O_ALL is
appropriate -- review and/or tweaks welcome.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.11 2024/05/29 16:32:02 adam Exp $
d6 1
a6 1
PKGREVISION=	2
@


1.11
log
@revbump after icu and protobuf updates
@
text
@d1 4
a4 1
# $NetBSD: Makefile,v 1.10 2024/05/16 06:14:45 wiz Exp $
a5 1
DISTNAME=	git-cinnabar-0.6.3
a7 3
MASTER_SITES=	${MASTER_SITE_GITHUB:=glandium/}
# does not contain the git submodules, please update GITHUB_SUBMODULES below
GITHUB_TAG=	${PKGVERSION_NOREV}
a9 1
HOMEPAGE=	https://github.com/glandium/git-cinnabar/
a10 1
LICENSE=	mpl-2.0 AND gnu-gpl-v2
@


1.10
log
@*: recursive bump for gnutls p11-kit option

(existing installations need the bl3.mk included, but it's now only
optionally included)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.9 2024/01/03 04:01:38 riastradh Exp $
d4 1
a4 1
PKGREVISION=	1
@


1.9
log
@devel/git-cinnabar: update to 0.6.3; implement test target

- Fixed handling of null manifests.
- Added support for httppostargs.
- Worked around bug in curl >= 8.3, <= 8.5 with libressl (like on e.g. macOS Sonoma)
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.8 2023/11/08 13:18:44 wiz Exp $
d4 1
@


1.8
log
@*: recursive bump for icu 74.1
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.7 2023/10/24 22:08:44 wiz Exp $
d3 1
a3 2
DISTNAME=	git-cinnabar-0.6.2
PKGREVISION=	3
d36 6
@


1.7
log
@*: bump for openssl 3
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.6 2023/10/06 10:20:18 riastradh Exp $
d4 1
a4 1
PKGREVISION=	2
@


1.6
log
@git-cinnabar: Backport upstream patch to 0.6.2.

Fixes clone of xsrc.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.5 2023/10/06 10:19:56 riastradh Exp $
d4 1
a4 1
PKGREVISION=	1
@


1.5
log
@git-cinnabar: Update to 0.6.2.

What's new since 0.6.1?

    Better handle some HTTP errors.
    Switch to schannel curl backend on Windows. We were using rustls, but it seems to be causing some problems.
    Based on git 2.41.0.
    Updated crate dependencies.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.4 2023/09/26 07:38:58 wiz Exp $
d4 1
@


1.4
log
@git-cinnabar: downgrade to 0.6.1

0.6.2 doesn't build on NetBSD, and the branch is coming soon - we
can re-update afterwards.
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.2 2023/05/02 10:25:31 wiz Exp $
d3 1
a3 1
DISTNAME=	git-cinnabar-0.6.1
d16 1
a16 1
GITHUB_SUBMODULES=	git-for-windows git v2.40.0.windows.1 git-core
d22 5
@


1.3
log
@git-cinnabar: update to 0.6.2


- Better handle some HTTP errors.
- Switch to schannel curl backend on Windows. We were using rustls, but it
  seems to be causing some problems.
- Based on git 2.41.0.
- Updated crate dependencies.
@
text
@d3 1
a3 1
DISTNAME=	git-cinnabar-0.6.2
d16 1
a16 1
GITHUB_SUBMODULES=	git-for-windows git v2.41.0.windows.1 git-core
@


1.2
log
@git-cinnabar: add comment to update submodule checkout when updating
@
text
@d1 1
a1 1
# $NetBSD: Makefile,v 1.1 2023/04/29 21:45:19 wiz Exp $
d3 1
a3 1
DISTNAME=	git-cinnabar-0.6.1
d16 1
a16 1
GITHUB_SUBMODULES=	git-for-windows git v2.40.0.windows.1 git-core
@


1.1
log
@devel/git-cinnabar: import git-cinnabar-0.6.1

git-cinnabar is a git remote helper to interact with mercurial
repositories. Contrary to other such helpers, it doesn't use a
local mercurial clone under the hood.

The main focus at the moment is to make it work with mozilla-central
and related mercurial repositories and support Mozilla workflows
(try server, etc.).
@
text
@d1 1
a1 1
# $NetBSD$
d6 1
@