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, although it currently does require
mercurial to be installed for some of its libraries.
===> The following configuration options are available for git-cinnabar-0.7.5_2:
DOCS=on: Build and/or install documentation
===> Use 'make config' to modify these settings
*/*: remove STRIP_CMD calls in rust based ports
This is not needed after bc4fedc1fec0d359365c04d43be9e32bf101a50e
PR: 246993
Differential Revision: https://reviews.freebsd.org/D46503
devel/git-cinnabar: drop unused dependencies
Error: /usr/local/libexec/git-core/git-cinnabar-helper is linked to
/usr/local/lib/libintl.so.8 from devel/gettext-runtime but it is not declared as
a dependency
Warning: you need USES+=gettext-runtime
Error: /usr/local/libexec/git-core/git-cinnabar-helper is linked to
/usr/local/lib/libpcre2-8.so.0 from devel/pcre2 but it is not declared as a
dependency
Warning: you need LIB_DEPENDS+=libpcre2-8.so:devel/pcre2
devel/git-cinnabar: unbreak with git/CURL=off (track direct dependency)
In file included from helper/hg-bundle.c:3:
./http.h:6:10: fatal error: 'curl/curl.h' file not found
#include <curl/curl.h>
^~~~~~~~~~~~~
Error: /usr/local/libexec/git-core/git-cinnabar-helper is linked to
/usr/local/lib/libcurl.so.4 from ftp/curl but it is not declared as
a dependency
Warning: you need LIB_DEPENDS+=libcurl.so:ftp/curl
Regressed by: https://github.com/glandium/git-cinnabar/commit/fb3292fa908a
See also: https://github.com/glandium/git-cinnabar/commit/76edb8c76bbb
devel/git-cinnabar: unbreak after d3a5eb641d28
patch -p1 -F0 -o helper/object-file.patched.c git-core/object-file.c <
helper/object-file.c.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/object-file.c b/object-file.c
|index 8be57f48de..52315414f3 100644
|--- a/object-file.c
|+++ b/object-file.c
--------------------------
Patching file git-core/object-file.c using Plan A...
Hunk #1 failed at 34.
1 out of 1 hunks failed--saving rejects to helper/object-file.patched.c.rej
done
gmake[2]: *** [helper/helper.mk:104: helper/object-file.patched.c] Error 1
PR: 270222
Remove WWW entries moved into port Makefiles
Commit b7f05445c00f has added WWW entries to port Makefiles based on
WWW: lines in pkg-descr files.
This commit removes the WWW: lines of moved-over URLs from these
pkg-descr files.
Approved by: portmgr (tcberner)
Add WWW entries to port Makefiles
It has been common practice to have one or more URLs at the end of the
ports' pkg-descr files, one per line and prefixed with "WWW:". These
URLs should point at a project website or other relevant resources.
Access to these URLs required processing of the pkg-descr files, and
they have often become stale over time. If more than one such URL was
present in a pkg-descr file, only the first one was tarnsfered into
the port INDEX, but for many ports only the last line did contain the
port specific URL to further information.
There have been several proposals to make a project URL available as
a macro in the ports' Makefiles, over time.
(Only the first 15 lines of the commit message are shown above )
devel/git-cinnabar: unbreak after 7a2cc88e5838
helper/hg-connect-stdio.c:218:22: error: no member named 'env_array' in 'struct
child_process'
strvec_pushv(&proc->env_array, (const char **)local_repo_env);
~~~~ ^
devel/git-cinnabar: unbreak after c472db1cb7c6
patch -p1 -F0 -o helper/fast-import.patched.c git-core/builtin/fast-import.c <
helper/fast-import.c.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/builtin/fast-import.c b/builtin/fast-import.c
|index 20406f6775..7ff0911c2c 100644
|--- a/builtin/fast-import.c
|+++ b/builtin/fast-import.c
--------------------------
Patching file git-core/builtin/fast-import.c using Plan A...
Hunk #1 failed at 19.
Hunk #2 succeeded at 747 (offset 9 lines).
Hunk #3 succeeded at 848 (offset 9 lines).
Hunk #4 failed at 867.
Hunk #5 succeeded at 967 (offset 9 lines).
Hunk #6 succeeded at 1653 (offset 9 lines).
Hunk #7 succeeded at 2222 (offset 9 lines).
Hunk #8 succeeded at 2288 (offset 9 lines).
2 out of 8 hunks failed--saving rejects to helper/fast-import.patched.c.rej
done
devel/git-cinnabar: unbreak after 575abbd62626
helper/cinnabar-util.c:230:16: error: no member named 'argv' in 'struct
child_process'; did you mean 'args'?
context->proc.argv = argv;
^~~~
helper/hg-connect-stdio.c:218:8: error: no member named 'env' in 'struct
child_process'
proc->env = local_repo_env;
~~~~ ^
devel/git-cinnabar: unbreak after 317ce5d4d408
helper/cinnabar-fast-import.c:525:5: error: redefinition of 'write_object_file'
int write_object_file(const void *buf, unsigned long len, const char *type,
^
./object-store.h:229:19: note: previous definition is here
static inline int write_object_file(const void *buf, unsigned long len,
^
devel/git-cinnabar: unbreak after 65831666797c
patch -p1 -F0 -o helper/csum-file.patched.c git-core/csum-file.c <
helper/csum-file.c.patch
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/csum-file.c b/csum-file.c
|index 7510950fa3..19d02e3a63 100644
|--- a/csum-file.c
|+++ b/csum-file.c
--------------------------
Patching file git-core/csum-file.c using Plan A...
Hunk #1 failed at 86.
1 out of 1 hunks failed--saving rejects to helper/csum-file.patched.c.rej
done
gmake[2]: *** [helper/helper.mk:99: helper/csum-file.patched.c] Error 1
devel/mercurial: update to 5.9.1.
Bump PORTREVISIONs for dependant ports.
While I'm here update devel/tortoisehg to 5.9.1. (*)
Approved by: arrowd (*)
PR: ports/258352
devel/git-cinnabar: unbreak with python310
$ git clone hg::https://hg.mozilla.org/projects/nss
Cloning into 'nss'...
Traceback (most recent call last):
File "/usr/local/libexec/git-core/git-remote-hg", line 9, in <module>
from cinnabar.githg import GitHgStore
File "g/usr/local/libexec/git-core/pythonlib/cinnabar/githg.py", line 17, in
<module>
from collections import (
ImportError: cannot import name 'Sequence' from 'collections'
(/usr/local/lib/python3.10/collections/__init__.py)
devel/git-cinnabar: unbreak after 754ca6f4c9c3
Patching file git-core/csum-file.c using Plan A...
Hunk #1 failed at 86.
1 out of 1 hunks failed--saving rejects to helper/csum-file.patched.c.rej
done
gmake[2]: *** [helper/helper.mk:99: helper/csum-file.patched.c] Error 1
devel/git-cinnabar: unbreak after r568648
Patching file helper/sha1-file.c.patch using Plan A...
No such line 1867 in input file, ignoring
Hunk #1 failed at 1868.
Reported by: pkg-fallout
devel/git-cinnabar: unbreak after r554143
gmake[2]: *** No rule to make target 'fast-import.c', needed by
'helper/fast-import.patched.c'. Stop.
Obtained from: upstream
devel/mercurial: Update to 5.5 and flavorize. Adjust dependency lines and bump
PORTREVISION's for ports that depend on mercurial.
PR: 242463
Submitted by: Peter Wullinger <freebsd@dhke.de> (original patch)
devel/git-cinnabar: simplify MAKE_ENV and MAKE_ARGS
- PYTHON_PATH is no longer used by git-cinnabar itself
- Convert != to ${:!...!}
- Convert /.. to :H
Note, foreign variables can be factored out (dubious benefit):
# Import devel/git variables (append if :group is missing)
.for v in MAKE_ENV MAKE_ARGS WRKSRC:git
${v:S/:/_/}+= ${:!${SETENV} -u FLAVOR ${MAKE} -V ${v:C/:.*//} -C
${PORTSDIR}/devel/git!}
.endfor
devel/git-cinnabar: unbreak after r537899
helper/cinnabar-fast-import.c:12:10: fatal error:
'sha1-array.h' file not found
#include "sha1-array.h"
^~~~~~~~~~~~~~
In file included from helper/hg-connect-stdio.c:3:
In file included from helper/hg-connect-internal.h:4:
helper/hg-connect.h:6:10: fatal error: 'sha1-array.h' file not
found
#include "sha1-array.h"
^~~~~~~~~~~~~~
Obtained from: upstream
