svn commit: r348715 - in head/devel: subversion subversion/files subversion16 subversion16/files subversion17 subversion17/files
Glen Barber
gjb at FreeBSD.org
Thu Mar 20 18:42:24 UTC 2014
Author: gjb
Date: Thu Mar 20 18:42:22 2014
New Revision: 348715
URL: http://svnweb.freebsd.org/changeset/ports/348715
QAT: https://qat.redports.org/buildarchive/r348715/
Log:
- Update commit template to include 'Relnotes:' tag, to
help re@ track release notes candidates.
- Bump PORTREVISION.
Discussed with: re
Reviewed by: bdrewery
Sponsored by: The FreeBSD Foundation
Modified:
head/devel/subversion/Makefile.common
head/devel/subversion/files/extra-patch-fbsd-template
head/devel/subversion16/Makefile.common
head/devel/subversion16/files/extra-patch-fbsd-template
head/devel/subversion17/Makefile.common
head/devel/subversion17/files/extra-patch-fbsd-template
Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion/Makefile.common Thu Mar 20 18:42:22 2014 (r348715)
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.8.8
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion18
Modified: head/devel/subversion/files/extra-patch-fbsd-template
==============================================================================
--- head/devel/subversion/files/extra-patch-fbsd-template Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion/files/extra-patch-fbsd-template Thu Mar 20 18:42:22 2014 (r348715)
@@ -1,8 +1,8 @@
---- subversion/svn/util.c.orig 2011-10-20 07:01:47.000000000 -0700
-+++ subversion/svn/util.c 2013-04-09 23:14:37.817293627 -0700
-@@ -63,6 +63,9 @@
- #include "private/svn_opt_private.h"
+--- subversion/svn/util.c.orig 2014-03-20 14:29:13.887966536 -0400
++++ subversion/svn/util.c 2014-03-20 14:29:53.806964066 -0400
+@@ -66,6 +66,9 @@
#include "private/svn_client_private.h"
+ #include "private/svn_cmdline_private.h"
#include "private/svn_string_private.h"
+#ifdef HAS_ORGANIZATION_NAME
+#include "freebsd-organization.h"
@@ -10,7 +10,7 @@
-@@ -682,6 +685,67 @@
+@@ -322,6 +325,68 @@
}
@@ -27,6 +27,7 @@
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
++ "Relnotes:",
+ "Security:",
+ "Sponsored by:"
+};
@@ -78,7 +79,7 @@
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
svn_error_t *
-@@ -697,8 +761,32 @@
+@@ -337,8 +402,34 @@
/* Set default message. */
default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
@@ -89,6 +90,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, "Relnotes:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"
+#ifdef HAS_ORGANIZATION_NAME
@@ -105,6 +107,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, "> 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);
@@ -112,7 +115,7 @@
*tmp_file = NULL;
if (lmb->message)
-@@ -710,6 +798,7 @@
+@@ -350,6 +441,7 @@
that follows it. */
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
EDITOR_EOF_PREFIX);
@@ -120,7 +123,7 @@
/* Make a string from a stringbuf, sharing the data allocation. */
log_msg_str->data = log_msg_buf->data;
-@@ -830,6 +919,13 @@
+@@ -470,6 +562,13 @@
if (message)
truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX);
Modified: head/devel/subversion16/Makefile.common
==============================================================================
--- head/devel/subversion16/Makefile.common Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion16/Makefile.common Thu Mar 20 18:42:22 2014 (r348715)
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES+= devel
PKGNAMESUFFIX= 16
MASTER_SITES= http://subversion.tigris.org/downloads/
Modified: head/devel/subversion16/files/extra-patch-fbsd-template
==============================================================================
--- head/devel/subversion16/files/extra-patch-fbsd-template Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion16/files/extra-patch-fbsd-template Thu Mar 20 18:42:22 2014 (r348715)
@@ -1,7 +1,6 @@
-diff -ruN subversion/svn/util.c subversion/svn/util.c
---- subversion/svn/util.c 2009-02-13 19:28:37.000000000 +0300
-+++ subversion/svn/util.c 2009-04-03 21:49:30.541875000 +0400
-@@ -639,6 +639,67 @@
+--- 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 @@
}
@@ -19,6 +18,7 @@ diff -ruN subversion/svn/util.c subversi
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
++ "Relnotes:",
+ "Security:",
+};
+
@@ -69,7 +69,7 @@ diff -ruN subversion/svn/util.c subversi
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
svn_error_t *
-@@ -654,8 +715,26 @@
+@@ -679,8 +741,28 @@
/* Set default message. */
default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
@@ -80,6 +80,7 @@ diff -ruN subversion/svn/util.c subversi
+ 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, "Relnotes:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
- svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR);
@@ -91,13 +92,14 @@ diff -ruN subversion/svn/util.c subversi
+ 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, "> 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);
+ svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
*tmp_file = NULL;
if (lmb->message)
-@@ -667,6 +746,7 @@
+@@ -692,6 +774,7 @@
that follows it. */
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
EDITOR_EOF_PREFIX);
@@ -105,7 +107,7 @@ diff -ruN subversion/svn/util.c subversi
/* Make a string from a stringbuf, sharing the data allocation. */
log_msg_str->data = log_msg_buf->data;
-@@ -786,6 +866,13 @@
+@@ -811,6 +894,13 @@
if (message)
truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX);
Modified: head/devel/subversion17/Makefile.common
==============================================================================
--- head/devel/subversion17/Makefile.common Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion17/Makefile.common Thu Mar 20 18:42:22 2014 (r348715)
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.7.16
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion17
Modified: head/devel/subversion17/files/extra-patch-fbsd-template
==============================================================================
--- head/devel/subversion17/files/extra-patch-fbsd-template Thu Mar 20 18:37:42 2014 (r348714)
+++ head/devel/subversion17/files/extra-patch-fbsd-template Thu Mar 20 18:42:22 2014 (r348715)
@@ -1,5 +1,5 @@
---- subversion/svn/util.c.orig 2011-10-20 07:01:47.000000000 -0700
-+++ subversion/svn/util.c 2013-04-09 23:14:37.817293627 -0700
+--- subversion/svn/util.c.orig 2011-10-20 10:01:47.000000000 -0400
++++ subversion/svn/util.c 2014-03-20 14:34:03.794946286 -0400
@@ -63,6 +63,9 @@
#include "private/svn_opt_private.h"
#include "private/svn_client_private.h"
@@ -10,7 +10,7 @@
-@@ -682,6 +685,67 @@
+@@ -682,6 +685,68 @@
}
@@ -27,6 +27,7 @@
+ "Approved by:",
+ "Obtained from:",
+ "MFC after:",
++ "Relnotes:",
+ "Security:",
+ "Sponsored by:"
+};
@@ -78,7 +79,7 @@
#define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
svn_error_t *
-@@ -697,8 +761,32 @@
+@@ -697,8 +762,34 @@
/* Set default message. */
default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
@@ -89,6 +90,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, "Relnotes:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Security:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Sponsored by:\t"
+#ifdef HAS_ORGANIZATION_NAME
@@ -105,6 +107,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, "> 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);
@@ -112,7 +115,7 @@
*tmp_file = NULL;
if (lmb->message)
-@@ -710,6 +798,7 @@
+@@ -710,6 +801,7 @@
that follows it. */
truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
EDITOR_EOF_PREFIX);
@@ -120,7 +123,7 @@
/* Make a string from a stringbuf, sharing the data allocation. */
log_msg_str->data = log_msg_buf->data;
-@@ -830,6 +919,13 @@
+@@ -830,6 +922,13 @@
if (message)
truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX);
More information about the svn-ports-head
mailing list