From owner-svn-ports-all@freebsd.org Fri Jul 6 11:53:08 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EE15C10426B2; Fri, 6 Jul 2018 11:53:07 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A4A787C0A2; Fri, 6 Jul 2018 11:53:07 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85D683F9; Fri, 6 Jul 2018 11:53:07 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w66Br7ZS038459; Fri, 6 Jul 2018 11:53:07 GMT (envelope-from miwi@FreeBSD.org) Received: (from miwi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w66Br6QS038456; Fri, 6 Jul 2018 11:53:06 GMT (envelope-from miwi@FreeBSD.org) Message-Id: <201807061153.w66Br6QS038456@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: miwi set sender to miwi@FreeBSD.org using -f From: Martin Wilke Date: Fri, 6 Jul 2018 11:53:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r474007 - in head/devel/cgit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: miwi X-SVN-Commit-Paths: in head/devel/cgit: . files X-SVN-Commit-Revision: 474007 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 06 Jul 2018 11:53:08 -0000 Author: miwi Date: Fri Jul 6 11:53:06 2018 New Revision: 474007 URL: https://svnweb.freebsd.org/changeset/ports/474007 Log: - Update included git to 2.17.1 PR: 227536 Added: head/devel/cgit/files/patch-git-2.17 (contents, props changed) Modified: head/devel/cgit/Makefile head/devel/cgit/distinfo Modified: head/devel/cgit/Makefile ============================================================================== --- head/devel/cgit/Makefile Fri Jul 6 11:27:17 2018 (r474006) +++ head/devel/cgit/Makefile Fri Jul 6 11:53:06 2018 (r474007) @@ -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 Modified: head/devel/cgit/distinfo ============================================================================== --- head/devel/cgit/distinfo Fri Jul 6 11:27:17 2018 (r474006) +++ head/devel/cgit/distinfo Fri Jul 6 11:53:06 2018 (r474007) @@ -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 Added: head/devel/cgit/files/patch-git-2.17 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cgit/files/patch-git-2.17 Fri Jul 6 11:53:06 2018 (r474007) @@ -0,0 +1,62 @@ +From 3e7e7a886006376ba68e959addaea1eabbb37482 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +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 +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 +