[Midnightbsd-cvs] mports [16517] U trunk/devel/subversion/files: subversion 1.8.10

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Aug 22 21:16:15 EDT 2014 

Revision: 16517
          http://svnweb.midnightbsd.org/mports/?rev=16517
Author:   laffer1
Date:     2014-08-22 21:16:15 -0400 (Fri, 22 Aug 2014)
Log Message:
-----------
subversion 1.8.10

Modified Paths:
--------------
    trunk/devel/subversion/Makefile.common
    trunk/devel/subversion/distinfo
    trunk/devel/subversion/files/extra-patch-Makefile.in
    trunk/devel/subversion/files/extra-patch-fbsd-template
    trunk/devel/subversion/files/patch-Makefile.in
    trunk/devel/subversion/files/patch-configure

Property Changed:
----------------
    trunk/devel/subversion/files/build-outputs.mk
    trunk/devel/subversion/files/extra-patch-3way-conflict-markers
    trunk/devel/subversion/files/extra-patch-Makefile.in
    trunk/devel/subversion/files/extra-patch-fbsd-template
    trunk/devel/subversion/files/extra-patch-svnserve-wrapper
    trunk/devel/subversion/files/patch-Makefile.in
    trunk/devel/subversion/files/patch-build--ltmain.sh
    trunk/devel/subversion/files/patch-build-outputs.mk
    trunk/devel/subversion/files/patch-configure
    trunk/devel/subversion/files/patch-configure.ac
    trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm
    trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in
    trunk/devel/subversion/files/pkg-deinstall.in
    trunk/devel/subversion/files/pkg-install.in
    trunk/devel/subversion/files/svnserve.in
    trunk/devel/subversion/files/svnserve.wrapper

Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/Makefile.common	2014-08-23 01:16:15 UTC (rev 16517)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.8.8
+PORTVERSION=	1.8.10
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}

Modified: trunk/devel/subversion/distinfo
===================================================================
--- trunk/devel/subversion/distinfo	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/distinfo	2014-08-23 01:16:15 UTC (rev 16517)
@@ -1,2 +1,2 @@
-SHA256 (subversion18/subversion-1.8.8.tar.bz2) = 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3
-SIZE (subversion18/subversion-1.8.8.tar.bz2) = 6821200
+SHA256 (subversion18/subversion-1.8.10.tar.bz2) = 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc
+SIZE (subversion18/subversion-1.8.10.tar.bz2) = 6899384

Index: trunk/devel/subversion/files/build-outputs.mk
===================================================================
--- trunk/devel/subversion/files/build-outputs.mk	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/build-outputs.mk	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/build-outputs.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/devel/subversion/files/extra-patch-3way-conflict-markers
===================================================================
--- trunk/devel/subversion/files/extra-patch-3way-conflict-markers	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/extra-patch-3way-conflict-markers	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/extra-patch-3way-conflict-markers
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/subversion/files/extra-patch-Makefile.in
===================================================================
--- trunk/devel/subversion/files/extra-patch-Makefile.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/extra-patch-Makefile.in	2014-08-23 01:16:15 UTC (rev 16517)
@@ -1,11 +1,24 @@
---- Makefile.in.orig	2013-06-20 01:29:45.000000000 +0400
-+++ Makefile.in	2013-06-20 01:29:45.000000000 +0400
-@@ -247,7 +247,7 @@
+--- Makefile.in.orig	2014-02-10 08:04:51.000000000 +0400
++++ Makefile.in	2014-06-16 15:40:47.000000000 +0400
+@@ -253,7 +253,7 @@
+ LINK_JAVAHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LT_CXX_LIBADD) -rpath $(libdir)
+ 
+ INSTALL = @INSTALL@
+-INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL)
++INSTALL_LIB = $(LIBTOOL) --mode=install $(INSTALL) -s
+ INSTALL_FSMOD_LIB = $(INSTALL_LIB)
+ INSTALL_RAMOD_LIB = $(INSTALL_LIB)
+ INSTALL_APR_MEMCACHE_LIB = $(INSTALL_LIB)
+@@ -262,9 +262,9 @@
  INSTALL_GNOME_KEYRING_LIB = $(INSTALL_LIB)
  INSTALL_KWALLET_LIB = $(INSTALL_LIB)
  INSTALL_SERF_LIB = $(INSTALL_LIB)
 -INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL)
+-INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
+-INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
 +INSTALL_BIN = $(LIBTOOL) --mode=install $(INSTALL) -s
- INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL)
- INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL)
++INSTALL_CONTRIB = $(LIBTOOL) --mode=install $(INSTALL) -s
++INSTALL_TOOLS = $(LIBTOOL) --mode=install $(INSTALL) -s
  INSTALL_INCLUDE = $(INSTALL) -m 644
+ INSTALL_MOD_SHARED = @APXS@ -i -S LIBEXECDIR="$(APACHE_LIBEXECDIR)" @MOD_ACTIVATION@
+ INSTALL_DATA = $(INSTALL) -m 644


Property changes on: trunk/devel/subversion/files/extra-patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/subversion/files/extra-patch-fbsd-template
===================================================================
--- trunk/devel/subversion/files/extra-patch-fbsd-template	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/extra-patch-fbsd-template	2014-08-23 01:16:15 UTC (rev 16517)
@@ -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,69 @@
  }
  
  
@@ -27,6 +27,8 @@
 +  "Approved by:",
 +  "Obtained from:",
 +  "MFC after:",
++  "MFH:",
++  "Relnotes:",
 +  "Security:",
 +  "Sponsored by:"
 +};
@@ -78,7 +80,7 @@
  #define EDITOR_EOF_PREFIX  _("--This line, and those below, will be ignored--")
  
  svn_error_t *
-@@ -697,8 +761,32 @@
+@@ -337,8 +403,36 @@
  
    /* Set default message.  */
    default_msg = svn_stringbuf_create(APR_EOL_STR, pool);
@@ -89,6 +91,8 @@
 +  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
@@ -105,6 +109,8 @@
 +  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);
@@ -112,7 +118,7 @@
  
    *tmp_file = NULL;
    if (lmb->message)
-@@ -710,6 +798,7 @@
+@@ -350,6 +444,7 @@
           that follows it.  */
        truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data,
                                  EDITOR_EOF_PREFIX);
@@ -120,7 +126,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 +565,13 @@
        if (message)
          truncate_buffer_at_prefix(&message->len, message->data,
                                    EDITOR_EOF_PREFIX);


Property changes on: trunk/devel/subversion/files/extra-patch-fbsd-template
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/subversion/files/extra-patch-svnserve-wrapper
===================================================================
--- trunk/devel/subversion/files/extra-patch-svnserve-wrapper	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/extra-patch-svnserve-wrapper	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/extra-patch-svnserve-wrapper
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/subversion/files/patch-Makefile.in
===================================================================
--- trunk/devel/subversion/files/patch-Makefile.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-Makefile.in	2014-08-23 01:16:15 UTC (rev 16517)
@@ -1,5 +1,8 @@
---- Makefile.in.orig	2013-06-06 21:01:29.000000000 +0400
-+++ Makefile.in	2013-06-20 01:28:44.000000000 +0400
+========================================================================
+This patch is required to build SVN Apache modules with staging support
+========================================================================
+--- ./Makefile.in.orig	2013-10-21 21:12:04.000000000 +0200
++++ ./Makefile.in	2013-10-21 21:13:30.000000000 +0200
 @@ -85,7 +85,7 @@
  swig_pydir_extra = @libdir@/svn-python/svn
  swig_pldir = @libdir@/svn-perl


Property changes on: trunk/devel/subversion/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/subversion/files/patch-build--ltmain.sh
===================================================================
--- trunk/devel/subversion/files/patch-build--ltmain.sh	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-build--ltmain.sh	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/patch-build--ltmain.sh
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/subversion/files/patch-build-outputs.mk
===================================================================
--- trunk/devel/subversion/files/patch-build-outputs.mk	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-build-outputs.mk	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/patch-build-outputs.mk
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/devel/subversion/files/patch-configure
===================================================================
--- trunk/devel/subversion/files/patch-configure	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-configure	2014-08-23 01:16:15 UTC (rev 16517)
@@ -1,15 +1,6 @@
---- configure.orig	2013-06-13 13:08:08.000000000 +0400
-+++ configure	2013-06-19 19:54:23.000000000 +0400
-@@ -4496,7 +4496,7 @@
- # ==== Libraries, for which we may have source to build ======================
- 
- 
--APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.1[0-9] 1\. 2\."
-+APR_VER_REGEXES="0\.9\.[7-9] 0\.9\.[12][0-9] 1\. 2\."
- 
- 
-   APR_WANTED_REGEXES="$APR_VER_REGEXES"
-@@ -18971,11 +18971,11 @@
+--- configure.orig	2014-04-30 20:29:25.000000000 +0400
++++ configure	2014-05-18 15:22:03.000000000 +0400
+@@ -19419,11 +19419,11 @@
                  SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_dir/include"
                  qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
                  SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
@@ -23,7 +14,7 @@
    input_flags="$qt_lib_dirs -L$kde_dir/lib$kde_lib_suffix"
    output_flags=""
    filtered_dirs="/lib /lib64 /usr/lib /usr/lib64"
-@@ -18994,7 +18994,7 @@
+@@ -19442,7 +19442,7 @@
    if test -n "$output_flags"; then
      printf "%s" "${output_flags# }"
    fi


Property changes on: trunk/devel/subversion/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Index: trunk/devel/subversion/files/patch-configure.ac
===================================================================
--- trunk/devel/subversion/files/patch-configure.ac	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-configure.ac	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/patch-configure.ac
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm
===================================================================
--- trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Base.pm
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in
===================================================================
--- trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/patch-subversion--bindings--swig--perl--native--Makefile.PL.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/devel/subversion/files/pkg-deinstall.in
===================================================================
--- trunk/devel/subversion/files/pkg-deinstall.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/pkg-deinstall.in	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/subversion/files/pkg-install.in
===================================================================
--- trunk/devel/subversion/files/pkg-install.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/pkg-install.in	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/pkg-install.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/devel/subversion/files/svnserve.in
===================================================================
--- trunk/devel/subversion/files/svnserve.in	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/svnserve.in	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/svnserve.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Index: trunk/devel/subversion/files/svnserve.wrapper
===================================================================
--- trunk/devel/subversion/files/svnserve.wrapper	2014-08-23 00:02:13 UTC (rev 16516)
+++ trunk/devel/subversion/files/svnserve.wrapper	2014-08-23 01:16:15 UTC (rev 16517)

Property changes on: trunk/devel/subversion/files/svnserve.wrapper
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list