Index: head/devel/cgit/Makefile =================================================================== --- head/devel/cgit/Makefile (revision 474006) +++ head/devel/cgit/Makefile (revision 474007) @@ -1,69 +1,69 @@ # $FreeBSD$ 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 DISTFILES= cgit-${PORTVERSION}${EXTRACT_SUFX}:cgit \ git-${GIT_VERSION}${EXTRACT_SUFX}:git MAINTAINER= mt@markoturk.info COMMENT= Fast, lightweight web frontend for Git repositories LICENSE= GPLv2 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 SHEBANG_FILES= filters/email-gravatar.py \ filters/html-converters/md2html \ filters/html-converters/rst2html \ filters/syntax-highlighting.py CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_ARGS+= CGIT_SCRIPT_PATH=${WWWDIR} CGIT_CONFIG=${PREFIX}/etc/cgitrc \ prefix=${PREFIX} NO_GETTEXT=1 NO_LUA=1 NO_R_TO_GCC_LINKER=1 V=1 SUB_FILES= pkg-message PORTDOCS= ${PORTNAME}rc.5.txt OPTIONS_DEFINE= DOCS ASCIIDOC OPTIONS_DEFAULT= DOCS ASCIIDOC OPTIONS_SUB= yes ASCIIDOC_DESC= Use asciidoc to preprocess man page ASCIIDOC_BUILD_DEPENDS= a2x:textproc/asciidoc post-extract: @${RMDIR} ${WRKSRC}/git @${MV} ${WRKDIR}/git-${GIT_VERSION} ${WRKSRC}/git post-patch: @${REINPLACE_CMD} -e 's/^\(GIT_VER =\).*$$/\1 ${GIT_VERSION}/' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/' \ -e "s|\(ALL_CFLAGS =\)|\1 -I${OPENSSLINC}|g" \ -e "s|\(ALL_LDFLAGS =\)|\1 -L${OPENSSLLIB}|g" \ ${WRKSRC}/git/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}${WWWDIR}/cgit.cgi post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} post-install-ASCIIDOC-on: a2x --doctype manpage --format manpage ${WRKSRC}/cgitrc.5.txt ${INSTALL_MAN} ${WRKSRC}/cgitrc.5 ${STAGEDIR}${PREFIX}/man/man5 .include Index: head/devel/cgit/distinfo =================================================================== --- head/devel/cgit/distinfo (revision 474006) +++ head/devel/cgit/distinfo (revision 474007) @@ -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 Index: head/devel/cgit/files/patch-git-2.17 =================================================================== --- head/devel/cgit/files/patch-git-2.17 (nonexistent) +++ head/devel/cgit/files/patch-git-2.17 (revision 474007) @@ -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 + Property changes on: head/devel/cgit/files/patch-git-2.17 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property