From owner-svn-ports-head@FreeBSD.ORG Sat Mar 23 03:41:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 56C0A834; Sat, 23 Mar 2013 03:41:22 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3B020E18; Sat, 23 Mar 2013 03:41:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2N3fMYN060048; Sat, 23 Mar 2013 03:41:22 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2N3fLpO060046; Sat, 23 Mar 2013 03:41:21 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <201303230341.r2N3fLpO060046@svn.freebsd.org> From: Rui Paulo Date: Sat, 23 Mar 2013 03:41:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314983 - in head/devel/subversion: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Mar 2013 03:41:22 -0000 Author: rpaulo (src committer) Date: Sat Mar 23 03:41:21 2013 New Revision: 314983 URL: http://svnweb.freebsd.org/changeset/ports/314983 Log: Add 'Sponsored by:' to the FreeBSD template. Furthermore, auto complete the Sponsored by field if ORGANIZATION is defined in /etc/make.conf. This means that you can set: ORGANIZATION=The FreeBSD Foundation in /etc/make.conf and then, after (re)building subversion, the FreeBSD template will have the name of the organization you defined automatically filled. Maintainer timeout after 10 days. Reviewed by: eadler, gjb, peter Approved by: gjb Modified: head/devel/subversion/Makefile.common head/devel/subversion/files/extra-patch-fbsd-template Modified: head/devel/subversion/Makefile.common ============================================================================== --- head/devel/subversion/Makefile.common Sat Mar 23 02:32:33 2013 (r314982) +++ head/devel/subversion/Makefile.common Sat Mar 23 03:41:21 2013 (r314983) @@ -146,6 +146,10 @@ CONFIGURE_ARGS+=--enable-maintainer-mode 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 " @@ -194,3 +198,6 @@ post-patch: .if defined(SVN_BUILD_BINDINGS) @${CP} ${FILESDIR}/build-outputs.mk ${WRKSRC} .endif +.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION) + @${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h +.endif Modified: head/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- head/devel/subversion/files/extra-patch-fbsd-template Sat Mar 23 02:32:33 2013 (r314982) +++ head/devel/subversion/files/extra-patch-fbsd-template Sat Mar 23 03:41:21 2013 (r314983) @@ -1,7 +1,16 @@ -diff -ruN subversion/svn/util.c subversion/svn/util.c ---- subversion/svn/util.c 2011-06-28 21:10:44.000000000 +0400 -+++ subversion/svn/util.c 2011-09-07 21:47:19.000000000 +0400 -@@ -682,6 +682,67 @@ +--- subversion/svn/util.c.orig 2011-10-20 07:01:47.000000000 -0700 ++++ subversion/svn/util.c 2013-03-12 11:45:35.754374859 -0700 +@@ -63,6 +63,9 @@ + #include "private/svn_opt_private.h" + #include "private/svn_client_private.h" + #include "private/svn_string_private.h" ++#ifdef HAS_ORGANIZATION_NAME ++#include "freebsd-organization.h" ++#endif + + + +@@ -682,6 +685,68 @@ } @@ -20,6 +29,7 @@ diff -ruN subversion/svn/util.c subversi + "Obtained from:", + "MFC after:", + "Security:", ++ "Sponsored by:" +}; + +void @@ -69,7 +79,7 @@ diff -ruN subversion/svn/util.c subversi #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -697,8 +758,26 @@ +@@ -697,8 +762,32 @@ /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); @@ -81,6 +91,11 @@ diff -ruN subversion/svn/util.c subversi + 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, "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); @@ -92,12 +107,13 @@ diff -ruN subversion/svn/util.c subversi + 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, "> 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) -@@ -710,6 +789,7 @@ +@@ -710,6 +799,7 @@ that follows it. */ truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, EDITOR_EOF_PREFIX); @@ -105,7 +121,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; -@@ -830,6 +910,13 @@ +@@ -830,6 +920,13 @@ if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX);