diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2018-07-06 11:53:06 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2018-07-06 11:53:06 +0000 |
| commit | 79b917663a325063a5b0ff72255860beebd07647 (patch) | |
| tree | 66bc3ef01ad4c76eb45affac17b00fe907bcc05a /devel/cgit | |
| parent | 2b2a52549f40bc4a091659f77bc12cb9c53390ad (diff) | |
| download | ports-79b917663a325063a5b0ff72255860beebd07647.tar.gz ports-79b917663a325063a5b0ff72255860beebd07647.zip | |
- Update included git to 2.17.1
PR: 227536
Notes
Notes:
svn path=/head/; revision=474007
Diffstat (limited to 'devel/cgit')
| -rw-r--r-- | devel/cgit/Makefile | 4 | ||||
| -rw-r--r-- | devel/cgit/distinfo | 6 | ||||
| -rw-r--r-- | devel/cgit/files/patch-git-2.17 | 62 |
3 files changed, 67 insertions, 5 deletions
diff --git a/devel/cgit/Makefile b/devel/cgit/Makefile index 220a780f0f4c..c5f0190deba0 100644 --- a/devel/cgit/Makefile +++ b/devel/cgit/Makefile @@ -2,7 +2,7 @@ PORTNAME= cgit PORTVERSION= 1.1 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= devel www MASTER_SITES= http://git.zx2c4.com/cgit/snapshot/:cgit \ https://www.kernel.org/pub/software/scm/git/:git @@ -17,7 +17,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING TEST_DEPENDS= msgfmt:devel/gettext-tools -GIT_VERSION= 2.16.3 +GIT_VERSION= 2.17.1 USES= cpe gmake iconv perl5 python:env shebangfix ssl tar:xz CPE_VENDOR= lars_hjemli USE_PERL5= test diff --git a/devel/cgit/distinfo b/devel/cgit/distinfo index 1b29d0e3404d..3f05233a8b8b 100644 --- a/devel/cgit/distinfo +++ b/devel/cgit/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1521825342 +TIMESTAMP = 1527631983 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 SIZE (cgit-1.1.tar.xz) = 86268 -SHA256 (git-2.16.3.tar.xz) = d65d99e9e5b081c1f14ea018973806e942a2eb7d0da2ebc01bd2525adee62d48 -SIZE (git-2.16.3.tar.xz) = 4966248 +SHA256 (git-2.17.1.tar.xz) = 79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e +SIZE (git-2.17.1.tar.xz) = 5015484 diff --git a/devel/cgit/files/patch-git-2.17 b/devel/cgit/files/patch-git-2.17 new file mode 100644 index 000000000000..2f7b616a0f8c --- /dev/null +++ b/devel/cgit/files/patch-git-2.17 @@ -0,0 +1,62 @@ +From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Mon, 2 Apr 2018 23:09:01 +0200 +Subject: [PATCH] git: update to v2.17.0 + +Update to git version v2.17.0. Required changes: + +* The function 'typename' has been renamed to 'type_name' + (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb) +--- + Makefile | 2 +- + git | 2 +- + ui-shared.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git ui-shared.c ui-shared.c +index 9d8f66b..ce806f6 100644 +--- ui-shared.c ++++ ui-shared.c +@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj) + page = "tag"; + else + page = "blob"; +- name = fmt("%s %s...", typename(obj->type), shortrev); ++ name = fmt("%s %s...", type_name(obj->type), shortrev); + reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); + } + +-- +2.17.0 + +From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <mail@eworm.de> +Date: Mon, 2 Apr 2018 23:09:01 +0200 +Subject: [PATCH] git: update to v2.17.0 + +Update to git version v2.17.0. Required changes: + +* The function 'typename' has been renamed to 'type_name' + (upstream commit debca9d2fe784193dc2d9f98b5edac605ddfefbb) +--- + Makefile | 2 +- + git | 2 +- + ui-shared.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git ui-shared.c ui-shared.c +index 9d8f66b..ce806f6 100644 +--- ui-shared.c ++++ ui-shared.c +@@ -545,7 +545,7 @@ void cgit_object_link(struct object *obj) + page = "tag"; + else + page = "blob"; +- name = fmt("%s %s...", typename(obj->type), shortrev); ++ name = fmt("%s %s...", type_name(obj->type), shortrev); + reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL); + } + +-- +2.17.0 + |