From owner-svn-ports-all@freebsd.org Wed Mar 22 01:39:06 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5D010D17579; Wed, 22 Mar 2017 01:39:06 +0000 (UTC) (envelope-from adamw@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 mx1.freebsd.org (Postfix) with ESMTPS id 37933197F; Wed, 22 Mar 2017 01:39:06 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2M1d5oc033215; Wed, 22 Mar 2017 01:39:05 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2M1d5Yg033212; Wed, 22 Mar 2017 01:39:05 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201703220139.v2M1d5Yg033212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Wed, 22 Mar 2017 01:39:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436672 - in head/devel/cgit: . files X-SVN-Group: ports-head 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.23 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: Wed, 22 Mar 2017 01:39:06 -0000 Author: adamw Date: Wed Mar 22 01:39:04 2017 New Revision: 436672 URL: https://svnweb.freebsd.org/changeset/ports/436672 Log: Update included git to 2.12.1 and bump PORTREVISION. Added: head/devel/cgit/files/patch-git-2.12.0 (contents, props changed) Modified: head/devel/cgit/Makefile head/devel/cgit/distinfo Modified: head/devel/cgit/Makefile ============================================================================== --- head/devel/cgit/Makefile Wed Mar 22 01:24:38 2017 (r436671) +++ head/devel/cgit/Makefile Wed Mar 22 01:39:04 2017 (r436672) @@ -2,7 +2,7 @@ PORTNAME= cgit PORTVERSION= 1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel www MASTER_SITES= http://git.zx2c4.com/cgit/snapshot/:cgit \ https://www.kernel.org/pub/software/scm/git/:git @@ -15,7 +15,7 @@ COMMENT= Fast, lightweight web frontend LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -GIT_VERSION= 2.11.1 +GIT_VERSION= 2.12.1 USES= cpe gmake iconv shebangfix ssl tar:xz CPE_VENDOR= lars_hjemli SHEBANG_FILES= filters/html-converters/rst2html @@ -36,6 +36,9 @@ post-extract: @${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" \ Modified: head/devel/cgit/distinfo ============================================================================== --- head/devel/cgit/distinfo Wed Mar 22 01:24:38 2017 (r436671) +++ head/devel/cgit/distinfo Wed Mar 22 01:39:04 2017 (r436672) @@ -1,5 +1,5 @@ -TIMESTAMP = 1486685455 +TIMESTAMP = 1490145983 SHA256 (cgit-1.1.tar.xz) = 0889af29be15fc981481caa09579f982b9740fe9fd2860ab87dff286f4635890 SIZE (cgit-1.1.tar.xz) = 86268 -SHA256 (git-2.11.1.tar.xz) = c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 -SIZE (git-2.11.1.tar.xz) = 4208132 +SHA256 (git-2.12.1.tar.xz) = db11674364b764e101966d829a2e271c9b9d2a8bd4d8ecb4221a1dcdc9a3ada2 +SIZE (git-2.12.1.tar.xz) = 4271828 Added: head/devel/cgit/files/patch-git-2.12.0 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cgit/files/patch-git-2.12.0 Wed Mar 22 01:39:04 2017 (r436672) @@ -0,0 +1,147 @@ +From 5c80837ea913179a6a983076c4adbab42e6a31dc Mon Sep 17 00:00:00 2001 +From: Christian Hesse +Date: Wed, 1 Mar 2017 11:37:59 +0100 +Subject: git: update to v2.12.0 + +Update to git version v2.12.0: With commit 8aee769f (pathspec: copy and free +owned memory) member 'match' of 'struct pathspec_item' is no longer +'const char*' but just 'char*'. +--- + cgit.h | 4 ++-- + shared.c | 4 ++-- + ui-blob.c | 2 +- + ui-blob.h | 2 +- + ui-commit.c | 2 +- + ui-commit.h | 2 +- + ui-diff.c | 4 ++-- + ui-diff.h | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/cgit.h b/cgit.h +index fbc6c6a..3eb04de 100644 +--- cgit.h ++++ cgit.h +@@ -355,10 +355,10 @@ extern int cgit_diff_files(const struct object_id *old_oid, + + extern void cgit_diff_tree(const struct object_id *old_oid, + const struct object_id *new_oid, +- filepair_fn fn, const char *prefix, int ignorews); ++ filepair_fn fn, char *prefix, int ignorews); + + extern void cgit_diff_commit(struct commit *commit, filepair_fn fn, +- const char *prefix); ++ char *prefix); + + __attribute__((format (printf,1,2))) + extern char *fmt(const char *format,...); +diff --git a/shared.c b/shared.c +index c63f1e3..4602123 100644 +--- shared.c ++++ shared.c +@@ -336,7 +336,7 @@ int cgit_diff_files(const struct object_id *old_oid, + + void cgit_diff_tree(const struct object_id *old_oid, + const struct object_id *new_oid, +- filepair_fn fn, const char *prefix, int ignorews) ++ filepair_fn fn, char *prefix, int ignorews) + { + struct diff_options opt; + struct pathspec_item item; +@@ -367,7 +367,7 @@ void cgit_diff_tree(const struct object_id *old_oid, + diff_flush(&opt); + } + +-void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix) ++void cgit_diff_commit(struct commit *commit, filepair_fn fn, char *prefix) + { + const struct object_id *old_oid = NULL; + +diff --git a/ui-blob.c b/ui-blob.c +index 5f30de7..c759520 100644 +--- ui-blob.c ++++ ui-blob.c +@@ -33,7 +33,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base, + return 0; + } + +-int cgit_ref_path_exists(const char *path, const char *ref, int file_only) ++int cgit_ref_path_exists(char *path, const char *ref, int file_only) + { + struct object_id oid; + unsigned long size; +diff --git a/ui-blob.h b/ui-blob.h +index 16847b2..d4be56a 100644 +--- ui-blob.h ++++ ui-blob.h +@@ -1,7 +1,7 @@ + #ifndef UI_BLOB_H + #define UI_BLOB_H + +-extern int cgit_ref_path_exists(const char *path, const char *ref, int file_only); ++extern int cgit_ref_path_exists(char *path, const char *ref, int file_only); + extern int cgit_print_file(char *path, const char *head, int file_only); + extern void cgit_print_blob(const char *hex, char *path, const char *head, int file_only); + +diff --git a/ui-commit.c b/ui-commit.c +index db69d54..47b9025 100644 +--- ui-commit.c ++++ ui-commit.c +@@ -13,7 +13,7 @@ + #include "ui-diff.h" + #include "ui-log.h" + +-void cgit_print_commit(char *hex, const char *prefix) ++void cgit_print_commit(char *hex, char *prefix) + { + struct commit *commit, *parent; + struct commitinfo *info, *parent_info; +diff --git a/ui-commit.h b/ui-commit.h +index 8198b4b..3d19eeb 100644 +--- ui-commit.h ++++ ui-commit.h +@@ -1,6 +1,6 @@ + #ifndef UI_COMMIT_H + #define UI_COMMIT_H + +-extern void cgit_print_commit(char *hex, const char *prefix); ++extern void cgit_print_commit(char *hex, char *prefix); + + #endif /* UI_COMMIT_H */ +diff --git a/ui-diff.c b/ui-diff.c +index 173d351..e8e9897 100644 +--- ui-diff.c ++++ ui-diff.c +@@ -189,7 +189,7 @@ static void inspect_filepair(struct diff_filepair *pair) + + static void cgit_print_diffstat(const struct object_id *old_oid, + const struct object_id *new_oid, +- const char *prefix) ++ char *prefix) + { + int i; + +@@ -382,7 +382,7 @@ void cgit_print_diff_ctrls(void) + } + + void cgit_print_diff(const char *new_rev, const char *old_rev, +- const char *prefix, int show_ctrls, int raw) ++ char *prefix, int show_ctrls, int raw) + { + struct commit *commit, *commit2; + const unsigned char *old_tree_sha1, *new_tree_sha1; +diff --git a/ui-diff.h b/ui-diff.h +index 39264a1..4d5a83c 100644 +--- ui-diff.h ++++ ui-diff.h +@@ -4,7 +4,7 @@ + extern void cgit_print_diff_ctrls(void); + + extern void cgit_print_diff(const char *new_hex, const char *old_hex, +- const char *prefix, int show_ctrls, int raw); ++ char *prefix, int show_ctrls, int raw); + + extern struct diff_filespec *cgit_get_current_old_file(void); + extern struct diff_filespec *cgit_get_current_new_file(void); +-- +cgit v1.1-7-g6221 +