diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2014-04-11 17:29:07 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2014-04-11 17:29:07 +0000 |
| commit | c8e8214c025f2bd5b6ff883810a33ffd7834b35e (patch) | |
| tree | c1640b5a82258caddeb7edef5eccb4a96aba6387 /devel/subversion | |
| parent | 461d65ef5d2cf5e46d50d7d328b541cde22f86fc (diff) | |
| download | ports-c8e8214c025f2bd5b6ff883810a33ffd7834b35e.tar.gz ports-c8e8214c025f2bd5b6ff883810a33ffd7834b35e.zip | |
Notes
Diffstat (limited to 'devel/subversion')
| -rw-r--r-- | devel/subversion/Makefile.common | 2 | ||||
| -rw-r--r-- | devel/subversion/files/extra-patch-fbsd-template | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index 6babddd22082..7d41ed81956d 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -3,7 +3,7 @@ PORTNAME= subversion PORTVERSION= 1.8.8 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion18 diff --git a/devel/subversion/files/extra-patch-fbsd-template b/devel/subversion/files/extra-patch-fbsd-template index 0b953f5bd58a..fe896444ead4 100644 --- a/devel/subversion/files/extra-patch-fbsd-template +++ b/devel/subversion/files/extra-patch-fbsd-template @@ -10,7 +10,7 @@ -@@ -322,6 +325,68 @@ +@@ -322,6 +325,69 @@ } @@ -27,6 +27,7 @@ + "Approved by:", + "Obtained from:", + "MFC after:", ++ "MFH:", + "Relnotes:", + "Security:", + "Sponsored by:" @@ -79,7 +80,7 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -337,8 +402,34 @@ +@@ -337,8 +403,36 @@ /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); @@ -90,6 +91,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, "Sponsored by:\t" @@ -107,6 +109,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, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); @@ -115,7 +118,7 @@ *tmp_file = NULL; if (lmb->message) -@@ -350,6 +441,7 @@ +@@ -350,6 +444,7 @@ that follows it. */ truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, EDITOR_EOF_PREFIX); @@ -123,7 +126,7 @@ /* Make a string from a stringbuf, sharing the data allocation. */ log_msg_str->data = log_msg_buf->data; -@@ -470,6 +562,13 @@ +@@ -470,6 +565,13 @@ if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); |