Index: files/extra-patch-fbsd-template
===================================================================
--- files/extra-patch-fbsd-template	(revision 446612)
+++ files/extra-patch-fbsd-template	(working copy)
@@ -1,5 +1,5 @@
---- subversion/svn/util.c.orig	2015-02-28 13:37:27.000000000 +0300
-+++ subversion/svn/util.c	2016-03-19 16:53:13.016472654 +0300
+--- subversion/svn/util.c.orig	2015-02-28 11:37:27.000000000 +0100
++++ subversion/svn/util.c	2017-07-25 20:35:45.765006000 +0200
 @@ -66,6 +66,9 @@
  #include "private/svn_client_private.h"
  #include "private/svn_cmdline_private.h"
@@ -10,7 +10,7 @@
  
  
  
-@@ -331,6 +334,71 @@
+@@ -331,6 +334,72 @@
  }
  
  
@@ -29,6 +29,7 @@
 +  "Obtained from:",
 +  "MFC after:",
 +  "MFH:",
++  "MFH-Reqs:",
 +  "Relnotes:",
 +  "Security:",
 +  "Sponsored by:",
@@ -82,15 +83,15 @@
  #define EDITOR_EOF_PREFIX  _("--This line, and those below, will be ignored--")
  
  svn_error_t *
-@@ -343,11 +411,56 @@
+@@ -343,11 +412,58 @@
    svn_stringbuf_t *default_msg = NULL;
    struct log_msg_baton *lmb = baton;
    svn_stringbuf_t *message = NULL;
 +  svn_config_t *cfg;
 +  const char *mfc_after, *sponsored_by;
+ 
++  cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL;
 +
-+  cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL;
- 
    /* Set default message.  */
    default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
 +  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
@@ -106,6 +107,7 @@
 +	  svn_stringbuf_appendcstr(default_msg, mfc_after);
 +  svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "MFH:\t\t" APR_EOL_STR);
++  svn_stringbuf_appendcstr(default_msg, "MFH-Reqs:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Relnotes:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t");
@@ -131,6 +133,7 @@
 +  svn_stringbuf_appendcstr(default_msg, "> Obtained from:            If the change is from a third party." APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "> MFC after:                N [day[s]|week[s]|month[s]].  Request a reminder email." APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "> MFH:                      Ports tree branch name.  Request approval for merge." APR_EOL_STR);
++  svn_stringbuf_appendcstr(default_msg, "> MFH-Reqs:                 Required revisions needed to apply the MFH request.  " APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "> Relnotes:                 Set to 'yes' for mention in release notes." APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "> Security:                 Vulnerability reference (one per line) or description." APR_EOL_STR);
 +  svn_stringbuf_appendcstr(default_msg, "> Sponsored by:             If the change was sponsored by an organization." APR_EOL_STR);
@@ -140,7 +143,7 @@
  
    *tmp_file = NULL;
    if (lmb->message)
-@@ -362,6 +475,7 @@
+@@ -362,6 +478,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);
@@ -148,7 +151,7 @@
  
        *log_msg = log_msg_str->data;
        return SVN_NO_ERROR;
-@@ -472,6 +586,13 @@
+@@ -472,6 +589,13 @@
        if (message)
          truncate_buffer_at_prefix(&message->len, message->data,
                                    EDITOR_EOF_PREFIX);