Index: head/devel/cgit/Makefile =================================================================== --- head/devel/cgit/Makefile (revision 459719) +++ head/devel/cgit/Makefile (revision 459720) @@ -1,54 +1,60 @@ # $FreeBSD$ PORTNAME= cgit PORTVERSION= 1.1 -PORTREVISION= 14 +PORTREVISION= 15 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= adamw@FreeBSD.org COMMENT= Fast, lightweight web frontend for Git repositories LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -GIT_VERSION= 2.15.1 -USES= cpe gmake iconv shebangfix ssl tar:xz +TEST_DEPENDS= msgfmt:devel/gettext-tools + +GIT_VERSION= 2.16.1 +USES= cpe gmake iconv perl5 python:env shebangfix ssl tar:xz CPE_VENDOR= lars_hjemli -SHEBANG_FILES= filters/html-converters/rst2html +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 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} .include Index: head/devel/cgit/distinfo =================================================================== --- head/devel/cgit/distinfo (revision 459719) +++ head/devel/cgit/distinfo (revision 459720) @@ -1,5 +1,5 @@ -TIMESTAMP = 1512008253 +TIMESTAMP = 1516669198 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 SIZE (cgit-1.1.tar.xz) = 86268 -SHA256 (git-2.15.1.tar.xz) = 999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c -SIZE (git-2.15.1.tar.xz) = 4894768 +SHA256 (git-2.16.1.tar.xz) = cfad4337f2fdbfc1e2c8abce5e17e1dd4e1718a34ac2cbe3238fbe2426f2ea19 +SIZE (git-2.16.1.tar.xz) = 4961656 Index: head/devel/cgit/files/patch-git-2.16 =================================================================== --- head/devel/cgit/files/patch-git-2.16 (nonexistent) +++ head/devel/cgit/files/patch-git-2.16 (revision 459720) @@ -0,0 +1,115 @@ +From 1dd53e3a2ffec730ec27ebe15b3d63e0b417a544 Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Thu, 18 Jan 2018 09:19:31 +0100 +Subject: git: update to v2.16.0 + +Update to git version v2.16.0: + +* refs: convert resolve_ref_unsafe to struct object_id + (49e61479be913f67e66bb3fdf8de9475c41b58bd) +* diff: remove DIFF_OPT_SET macro + (23dcf77f48feb49c54bad09210f093a799816334) +* log: add option to choose which refs to decorate + (65516f586b69307f977cd67cc45513a296cabc25) +* diff: convert flags to be stored in bitfields + (02f2f56bc377c287c411947d0e1482aac888f8db) + +Signed-off-by: Christian Hesse +--- + Makefile | 2 +- + cgit.c | 2 +- + git | 2 +- + shared.c | 2 +- + ui-blame.c | 2 +- + ui-commit.c | 2 +- + ui-diff.c | 2 +- + ui-log.c | 7 +++---- + 8 files changed, 10 insertions(+), 11 deletions(-) + +diff --git a/cgit.c b/cgit.c +index 972a67e..a3702c2 100644 +--- cgit.c ++++ cgit.c +@@ -478,7 +478,7 @@ static char *guess_defbranch(void) + const char *ref, *refname; + struct object_id oid; + +- ref = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL); ++ ref = resolve_ref_unsafe("HEAD", 0, &oid, NULL); + if (!ref || !skip_prefix(ref, "refs/heads/", &refname)) + return "master"; + return xstrdup(refname); +diff --git a/shared.c b/shared.c +index df3f611..21ac8f4 100644 +--- shared.c ++++ shared.c +@@ -346,7 +346,7 @@ void cgit_diff_tree(const struct object_id *old_oid, + opt.output_format = DIFF_FORMAT_CALLBACK; + opt.detect_rename = 1; + opt.rename_limit = ctx.cfg.renamelimit; +- DIFF_OPT_SET(&opt, RECURSIVE); ++ opt.flags.recursive = 1; + if (ignorews) + DIFF_XDL_SET(&opt, IGNORE_WHITESPACE); + opt.format_callback = cgit_diff_tree_cb; +diff --git a/ui-commit.c b/ui-commit.c +index 586fea0..abf58f6 100644 +--- ui-commit.c ++++ ui-commit.c +@@ -41,7 +41,7 @@ void cgit_print_commit(char *hex, const char *prefix) + + format_display_notes(&oid, ¬es, PAGE_ENCODING, 0); + +- load_ref_decorations(DECORATE_FULL_REFS); ++ load_ref_decorations(NULL, DECORATE_FULL_REFS); + + cgit_print_layout_start(); + cgit_print_diff_ctrls(); +diff --git a/ui-diff.c b/ui-diff.c +index c7fb49b..a10ce8a 100644 +--- ui-diff.c ++++ ui-diff.c +@@ -444,7 +444,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, + + diff_setup(&diffopt); + diffopt.output_format = DIFF_FORMAT_PATCH; +- DIFF_OPT_SET(&diffopt, RECURSIVE); ++ diffopt.flags.recursive = 1; + diff_setup_done(&diffopt); + + ctx.page.mimetype = "text/plain"; +diff --git a/ui-log.c b/ui-log.c +index 2d2bb31..8e36fba 100644 +--- ui-log.c ++++ ui-log.c +@@ -119,8 +119,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) + struct commit_list *parents = commit->parents; + struct commit *parent; + int found = 0, saved_fmt; +- unsigned saved_flags = revs->diffopt.flags; +- ++ struct diff_flags saved_flags = revs->diffopt.flags; + + /* Always show if we're not in "follow" mode with a single file. */ + if (!ctx.qry.follow) +@@ -149,7 +148,7 @@ static int show_commit(struct commit *commit, struct rev_info *revs) + add_lines = 0; + rem_lines = 0; + +- DIFF_OPT_SET(&revs->diffopt, RECURSIVE); ++ revs->diffopt.flags.recursive = 1; + diff_tree_oid(&parent->tree->object.oid, + &commit->tree->object.oid, + "", &revs->diffopt); +@@ -434,7 +433,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern + rev.ignore_missing = 1; + rev.simplify_history = 1; + setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL); +- load_ref_decorations(DECORATE_FULL_REFS); ++ load_ref_decorations(NULL, DECORATE_FULL_REFS); + rev.show_decorations = 1; + rev.grep_filter.ignore_case = 1; + +-- +cgit v1.1-35-ge94e + Property changes on: head/devel/cgit/files/patch-git-2.16 ___________________________________________________________________ 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