Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 6 Jul 2018 11:53:06 +0000 (UTC)
From:      Martin Wilke <miwi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r474007 - in head/devel/cgit: . files
Message-ID:  <201807061153.w66Br6QS038456@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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 <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
+

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807061153.w66Br6QS038456>