[Midnightbsd-cvs] mports [21500] trunk/devel/subversion: drop template
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon Aug 1 19:22:04 EDT 2016
Revision: 21500
http://svnweb.midnightbsd.org/mports/?rev=21500
Author: laffer1
Date: 2016-08-01 19:22:03 -0400 (Mon, 01 Aug 2016)
Log Message:
-----------
drop template
Modified Paths:
--------------
trunk/devel/subversion/Makefile
trunk/devel/subversion/Makefile.common
Removed Paths:
-------------
trunk/devel/subversion/files/extra-patch-fbsd-template
Modified: trunk/devel/subversion/Makefile
===================================================================
--- trunk/devel/subversion/Makefile 2016-08-01 23:08:29 UTC (rev 21499)
+++ trunk/devel/subversion/Makefile 2016-08-01 23:22:03 UTC (rev 21500)
@@ -12,7 +12,6 @@
OPTIONS_DEFINE= \
BDB \
DOCS \
- FREEBSD_TEMPLATE\
GNOME_KEYRING \
MAINTAINER_DEBUG\
MOD_DAV_SVN \
@@ -26,7 +25,6 @@
TOOLS
OPTIONS_DEFAULT=P4_STYLE_MARKERS \
- FREEBSD_TEMPLATE \
SERF
GNOME_KEYRING_DESC= Build with GNOME Keyring auth support
@@ -33,7 +31,6 @@
MAINTAINER_DEBUG_DESC= Build debug version
MOD_DAV_SVN_DESC= mod_dav_svn module for Apache 2.X
P4_STYLE_MARKERS_DESC= Perforce-style conflict markers
-FREEBSD_TEMPLATE_DESC= FreeBSD Project log template
SERF_DESC= WebDAV/Delta-V (HTTP/HTTPS) repo access module
STATIC_DESC= Build static version (no shared libs)
SVNSERVE_WRAPPER_DESC= Enable svnserve wrapper (umask setter)
@@ -62,9 +59,6 @@
.if ${PORT_OPTIONS:MP4_STYLE_MARKERS}
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-3way-conflict-markers
.endif
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
-EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-fbsd-template
-.endif
.if empty(PORT_OPTIONS:MMAINTAINER_DEBUG)
EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-Makefile.in
Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common 2016-08-01 23:08:29 UTC (rev 21499)
+++ trunk/devel/subversion/Makefile.common 2016-08-01 23:22:03 UTC (rev 21500)
@@ -110,10 +110,6 @@
CFLAGS+= -g
.endif
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
-CFLAGS+= -DHAS_ORGANIZATION_NAME
-.endif
-
.if ${PORT_OPTIONS:MSTATIC}
CONFIGURE_ARGS+=--enable-all-static
PLIST_SUB+= DYNAMIC_ENABLED="@comment "
@@ -156,6 +152,3 @@
.endif
@${REINPLACE_CMD} "s#^swig_pydir =.*#swig_pydir = ${PYTHON_SITELIBDIR}/libsvn#" ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} "s#^swig_pydir_extra =.*#swig_pydir_extra = ${PYTHON_SITELIBDIR}/svn#" ${WRKSRC}/Makefile.in
-.if ( ${PORT_OPTIONS:MFREEBSD_TEMPLATE} || !${OPTIONS_FILE_UNSET:MFREEBSD_TEMPLATE} ) && defined(ORGANIZATION)
- @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
-.endif
Deleted: trunk/devel/subversion/files/extra-patch-fbsd-template
===================================================================
--- trunk/devel/subversion/files/extra-patch-fbsd-template 2016-08-01 23:08:29 UTC (rev 21499)
+++ trunk/devel/subversion/files/extra-patch-fbsd-template 2016-08-01 23:22:03 UTC (rev 21500)
@@ -1,145 +0,0 @@
---- 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"
-+#endif
-
-
-
-@@ -322,6 +325,70 @@
- }
-
-
-+/*
-+ * Since we're adding freebsd-specific tokens to the log message,
-+ * clean out any leftovers to avoid accidently sending them to other
-+ * projects that won't be expecting them.
-+ */
-+
-+static const char *prefixes[] = {
-+ "PR:",
-+ "Differential Revision:",
-+ "Submitted by:",
-+ "Reviewed by:",
-+ "Approved by:",
-+ "Obtained from:",
-+ "MFC after:",
-+ "MFH:",
-+ "Relnotes:",
-+ "Security:",
-+ "Sponsored by:"
-+};
-+
-+void
-+cleanmsg(apr_size_t *l, char *s)
-+{
-+ int i;
-+ char *pos;
-+ char *kw;
-+ char *p;
-+ int empty;
-+
-+ for (i = 0; i < sizeof(prefixes) / sizeof(prefixes[0]); i++) {
-+ pos = s;
-+ while ((kw = strstr(pos, prefixes[i])) != NULL) {
-+ /* Check to see if keyword is at start of line (or buffer) */
-+ if (!(kw == s || kw[-1] == '\r' || kw[-1] == '\n')) {
-+ pos = kw + 1;
-+ continue;
-+ }
-+ p = kw + strlen(prefixes[i]);
-+ empty = 1;
-+ while (1) {
-+ if (*p == ' ' || *p == '\t') {
-+ p++;
-+ continue;
-+ }
-+ if (*p == '\0' || *p == '\r' || *p == '\n')
-+ break;
-+ empty = 0;
-+ break;
-+ }
-+ if (empty && (*p == '\r' || *p == '\n')) {
-+ memmove(kw, p + 1, strlen(p + 1) + 1);
-+ if (l)
-+ *l -= (p + 1 - kw);
-+ } else if (empty) {
-+ *kw = '\0';
-+ if (l)
-+ *l -= (p - kw);
-+ } else {
-+ pos = p;
-+ }
-+ }
-+ }
-+}
-+
- #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--")
-
- svn_error_t *
-@@ -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);
-+ 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\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
-+ ORGANIZATION_NAME
-+#endif
-+ APR_EOL_STR);
- svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
-- 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, "> 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);
-
- *tmp_file = NULL;
- if (lmb->message)
-@@ -350,6 +444,7 @@
- that follows it. */
- truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
- EDITOR_EOF_PREFIX);
-+ cleanmsg(NULL, (char*)log_msg_buf->data);
-
- /* Make a string from a stringbuf, sharing the data allocation. */
- log_msg_str->data = log_msg_buf->data;
-@@ -470,6 +565,13 @@
- if (message)
- truncate_buffer_at_prefix(&message->len, message->data,
- EDITOR_EOF_PREFIX);
-+ /*
-+ * Since we're adding freebsd-specific tokens to the log message,
-+ * clean out any leftovers to avoid accidently sending them to other
-+ * projects that won't be expecting them.
-+ */
-+ if (message)
-+ cleanmsg(&message->len, message->data);
-
- if (message)
- {
More information about the Midnightbsd-cvs
mailing list