svn commit: r411398 - in head/devel/subversion18: . files

[Lev A. Serebryakov]

Author: lev
Date: Sat Mar 19 14:07:39 2016
New Revision: 411398
URL: https://svnweb.freebsd.org/changeset/ports/411398

Log:
   (1) Remove GNATS reference from commit template
   (2) Add "Reported by:" field to commit remplate
  
  PR:		205692, 195252

Modified:
  head/devel/subversion18/Makefile
  head/devel/subversion18/files/extra-patch-fbsd-template

Modified: head/devel/subversion18/Makefile
==============================================================================
--- head/devel/subversion18/Makefile	Sat Mar 19 14:06:09 2016	(r411397)
+++ head/devel/subversion18/Makefile	Sat Mar 19 14:07:39 2016	(r411398)
@@ -1,7 +1,7 @@
 # Created by: rooneg at electricjellyfish.net
 # $FreeBSD$
 
-PORTREVISION=	3
+PORTREVISION=	4
 
 MAINTAINER=	lev at FreeBSD.org
 COMMENT=	Version control system

Modified: head/devel/subversion18/files/extra-patch-fbsd-template
==============================================================================
--- head/devel/subversion18/files/extra-patch-fbsd-template	Sat Mar 19 14:06:09 2016	(r411397)
+++ head/devel/subversion18/files/extra-patch-fbsd-template	Sat Mar 19 14:07:39 2016	(r411398)
@@ -1,6 +1,6 @@
---- subversion/svn/util.c.orig	2013-07-10 06:00:05.000000000 +0200
-+++ subversion/svn/util.c	2015-07-30 13:00:04.642537000 +0200
-@@ -66,6 +69,9 @@
+--- subversion/svn/util.c.orig	2013-07-10 08:00:05.000000000 +0400
++++ subversion/svn/util.c	2016-03-19 17:03:56.502867255 +0300
+@@ -66,6 +66,9 @@
  #include "private/svn_client_private.h"
  #include "private/svn_cmdline_private.h"
  #include "private/svn_string_private.h"
@@ -10,7 +10,7 @@
  
  

  
-@@ -322,6 +328,70 @@ truncate_buffer_at_prefix(apr_size_t *ne
+@@ -322,6 +325,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 *
-@@ -334,11 +404,54 @@ svn_cl__get_log_message(const char **log
+@@ -334,11 +402,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)
-@@ -350,6 +463,7 @@ svn_cl__get_log_message(const char **log
+@@ -350,6 +463,7 @@
           that follows it.  */
        truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
                                  EDITOR_EOF_PREFIX);
@@ -145,7 +148,7 @@
  
        /* Make a string from a stringbuf, sharing the data allocation. */
        log_msg_str->data = log_msg_buf->data;
-@@ -470,6 +584,13 @@ svn_cl__get_log_message(const char **log
+@@ -470,6 +584,13 @@
        if (message)
          truncate_buffer_at_prefix(&message->len, message->data,
                                    EDITOR_EOF_PREFIX);