Date: Sat, 19 Mar 2016 14:06:10 +0000 (UTC) From: "Lev A. Serebryakov" <lev@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411397 - in head/devel/subversion: . files Message-ID: <201603191406.u2JE6AnG096572@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lev Date: Sat Mar 19 14:06:09 2016 New Revision: 411397 URL: https://svnweb.freebsd.org/changeset/ports/411397 Log: (1) Fix pkg-plist for BDB backend (2) Remove GNATS references from commit template (3) Add "Reported by:" field to commit template PR: 205182, 205692, 195252 Modified: head/devel/subversion/Makefile head/devel/subversion/files/extra-patch-fbsd-template head/devel/subversion/pkg-plist Modified: head/devel/subversion/Makefile ============================================================================== --- head/devel/subversion/Makefile Sat Mar 19 13:35:24 2016 (r411396) +++ head/devel/subversion/Makefile Sat Mar 19 14:06:09 2016 (r411397) @@ -1,7 +1,7 @@ # Created by: rooneg@electricjellyfish.net # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 MAINTAINER= lev@FreeBSD.org COMMENT= Version control system Modified: head/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- head/devel/subversion/files/extra-patch-fbsd-template Sat Mar 19 13:35:24 2016 (r411396) +++ head/devel/subversion/files/extra-patch-fbsd-template Sat Mar 19 14:06:09 2016 (r411397) @@ -1,5 +1,5 @@ --- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 -+++ subversion/svn/util.c 2015-10-15 01:23:05.532340287 +0300 ++++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 @@ -66,6 +66,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" @@ -10,7 +10,7 @@ -@@ -331,6 +334,70 @@ +@@ -331,6 +334,71 @@ } @@ -23,6 +23,7 @@ +static const char *prefixes[] = { + "PR:", + "Submitted by:", ++ "Reported by:", + "Reviewed by:", + "Approved by:", + "Obtained from:", @@ -81,7 +82,7 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -343,11 +410,54 @@ +@@ -343,11 +411,56 @@ svn_stringbuf_t *default_msg = NULL; struct log_msg_baton *lmb = baton; svn_stringbuf_t *message = NULL; @@ -95,6 +96,7 @@ + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); @@ -121,8 +123,9 @@ - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --|" APR_EOL_STR); -+ svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "> PR: If and which Problem Report is related." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "> Reported by: If someone else reported the issue." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR); @@ -137,7 +140,7 @@ *tmp_file = NULL; if (lmb->message) -@@ -362,6 +472,7 @@ +@@ -362,6 +475,7 @@ /* Strip off the EOF marker text and the junk that follows it. */ truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data, EDITOR_EOF_PREFIX); @@ -145,7 +148,7 @@ *log_msg = log_msg_str->data; return SVN_NO_ERROR; -@@ -472,6 +583,13 @@ +@@ -472,6 +586,13 @@ if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); Modified: head/devel/subversion/pkg-plist ============================================================================== --- head/devel/subversion/pkg-plist Sat Mar 19 13:35:24 2016 (r411396) +++ head/devel/subversion/pkg-plist Sat Mar 19 14:06:09 2016 (r411397) @@ -151,6 +151,7 @@ libdata/pkgconfig/libsvn_client.pc libdata/pkgconfig/libsvn_delta.pc libdata/pkgconfig/libsvn_diff.pc libdata/pkgconfig/libsvn_fs.pc +%%BDB%%libdata/pkgconfig/libsvn_fs_base-1.pc libdata/pkgconfig/libsvn_fs_fs.pc libdata/pkgconfig/libsvn_fs_util.pc libdata/pkgconfig/libsvn_fs_x.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603191406.u2JE6AnG096572>