aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--devel/subversion/Makefile.common2
-rw-r--r--devel/subversion/files/extra-patch-fbsd-template11
-rw-r--r--devel/subversion16/Makefile.common2
-rw-r--r--devel/subversion16/files/extra-patch-fbsd-template15
-rw-r--r--devel/subversion17/Makefile.common2
-rw-r--r--devel/subversion17/files/extra-patch-fbsd-template15
6 files changed, 28 insertions, 19 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);
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);
diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common
index 8aa6660453ca..22911b8fe582 100644
--- a/devel/subversion17/Makefile.common
+++ b/devel/subversion17/Makefile.common
@@ -3,7 +3,7 @@
PORTNAME= subversion
PORTVERSION= 1.7.16
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES+= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
DIST_SUBDIR= subversion17
diff --git a/devel/subversion17/files/extra-patch-fbsd-template b/devel/subversion17/files/extra-patch-fbsd-template
index 2efe567af61a..d51db89770f7 100644
--- a/devel/subversion17/files/extra-patch-fbsd-template
+++ b/devel/subversion17/files/extra-patch-fbsd-template
@@ -1,5 +1,5 @@
---- 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
+--- ./subversion/svn/util.c.orig 2011-10-20 16:01:47.000000000 +0200
++++ ./subversion/svn/util.c 2014-04-11 19:04:14.000000000 +0200
@@ -63,6 +63,9 @@
#include "private/svn_opt_private.h"
#include "private/svn_client_private.h"
@@ -10,7 +10,7 @@
-@@ -682,6 +685,68 @@
+@@ -682,6 +685,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 *
-@@ -697,8 +762,34 @@
+@@ -697,8 +763,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)
-@@ -710,6 +801,7 @@
+@@ -710,6 +804,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;
-@@ -830,6 +922,13 @@
+@@ -830,6 +925,13 @@
if (message)
truncate_buffer_at_prefix(&message->len, message->data,
EDITOR_EOF_PREFIX);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-11 08:16:56 +0000