diff options
Diffstat (limited to 'devel/subversion16')
| -rw-r--r-- | devel/subversion16/Makefile.common | 2 | ||||
| -rw-r--r-- | devel/subversion16/files/extra-patch-fbsd-template | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index d88144bdbeac..3fe351617bf5 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync. -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES+= devel PKGNAMESUFFIX= 16 MASTER_SITES= http://subversion.tigris.org/downloads/ diff --git a/devel/subversion16/files/extra-patch-fbsd-template b/devel/subversion16/files/extra-patch-fbsd-template index 331f009870bf..e55956a01d67 100644 --- a/devel/subversion16/files/extra-patch-fbsd-template +++ b/devel/subversion16/files/extra-patch-fbsd-template @@ -1,6 +1,6 @@ ---- subversion/svn/util.c.orig 2014-03-20 14:21:37.701997671 -0400 -+++ subversion/svn/util.c 2014-03-20 14:21:56.023996839 -0400 -@@ -664,6 +664,68 @@ +--- ./subversion/svn/util.c.orig 2011-05-06 16:43:48.000000000 +0200 ++++ ./subversion/svn/util.c 2014-04-11 19:08:35.000000000 +0200 +@@ -664,6 +664,69 @@ } @@ -18,6 +18,7 @@ + "Approved by:", + "Obtained from:", + "MFC after:", ++ "MFH:", + "Relnotes:", + "Security:", +}; @@ -69,7 +70,7 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -679,8 +741,28 @@ +@@ -679,8 +742,30 @@ /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); @@ -80,6 +81,7 @@ + svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "MFH:\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, EDITOR_EOF_PREFIX); @@ -92,6 +94,7 @@ + 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); + 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, "> 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, "> Empty fields above will be automatically removed." APR_EOL_STR); @@ -99,7 +102,7 @@ *tmp_file = NULL; if (lmb->message) -@@ -692,6 +774,7 @@ +@@ -692,6 +777,7 @@ that follows it. */ truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, EDITOR_EOF_PREFIX); @@ -107,7 +110,7 @@ /* Make a string from a stringbuf, sharing the data allocation. */ log_msg_str->data = log_msg_buf->data; -@@ -811,6 +894,13 @@ +@@ -811,6 +897,13 @@ if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); |