diff options
| author | Johannes Jost Meixner <xmj@FreeBSD.org> | 2014-09-11 11:20:02 +0000 |
|---|---|---|
| committer | Johannes Jost Meixner <xmj@FreeBSD.org> | 2014-09-11 11:20:02 +0000 |
| commit | 3e75161cf5f782bda06b01110223a906f5c7338a (patch) | |
| tree | 1e1bd1840668cc7ea9b943d0dae217be2b835219 /devel/subversion | |
| parent | 290c0c4a2e3b393f024521ba27b1224ca809e375 (diff) | |
| download | ports-3e75161cf5f782bda06b01110223a906f5c7338a.tar.gz ports-3e75161cf5f782bda06b01110223a906f5c7338a.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 | 27 |
2 files changed, 16 insertions, 13 deletions
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common index bab9b6aa54a3..112e5878217a 100644 --- a/devel/subversion/Makefile.common +++ b/devel/subversion/Makefile.common @@ -3,7 +3,7 @@ PORTNAME?= subversion PORTVERSION= 1.8.10 -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 b9605ce52324..0c29d6584985 100644 --- a/devel/subversion/files/extra-patch-fbsd-template +++ b/devel/subversion/files/extra-patch-fbsd-template @@ -10,7 +10,7 @@ -@@ -322,6 +325,69 @@ +@@ -322,6 +325,70 @@ } @@ -22,6 +22,7 @@ + +static const char *prefixes[] = { + "PR:", ++ "Differential Revision:", + "Submitted by:", + "Reviewed by:", + "Approved by:", @@ -80,12 +81,13 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -337,8 +403,36 @@ +@@ -337,8 +403,38 @@ /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Submitted 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); @@ -103,16 +105,17 @@ - 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, "> Submitted by: If someone else sent in the change." 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); -+ 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); ++ svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "> Differential Revision: If a Phabric differential is affected by the change." 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, "> 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); ++ 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); + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); |