[116511] trunk/dports/devel/subversion

[dluke at macports.org]

Revision: 116511
          https://trac.macports.org/changeset/116511
Author:   dluke at macports.org
Date:     2014-01-27 06:54:53 -0800 (Mon, 27 Jan 2014)
Log Message:
-----------
subversion: revision bump, update patch for +unicode_path

Modified Paths:
--------------
    trunk/dports/devel/subversion/Portfile
    trunk/dports/devel/subversion/files/patch-osx_unicode_precomp.diff

Modified: trunk/dports/devel/subversion/Portfile
===================================================================
--- trunk/dports/devel/subversion/Portfile	2014-01-27 14:54:37 UTC (rev 116510)
+++ trunk/dports/devel/subversion/Portfile	2014-01-27 14:54:53 UTC (rev 116511)
@@ -4,6 +4,7 @@
 
 name			subversion
 version			1.8.5
+revision		1
 categories		devel
 platforms		darwin
 maintainers		geeklair.net:dluke blair

Modified: trunk/dports/devel/subversion/files/patch-osx_unicode_precomp.diff
===================================================================
--- trunk/dports/devel/subversion/files/patch-osx_unicode_precomp.diff	2014-01-27 14:54:37 UTC (rev 116510)
+++ trunk/dports/devel/subversion/files/patch-osx_unicode_precomp.diff	2014-01-27 14:54:53 UTC (rev 116511)
@@ -1,6 +1,29 @@
-diff -daurp subversion/libsvn_subr/path.orig.c subversion/libsvn_subr/path.c
---- subversion/libsvn_subr/path.orig.c	2013-05-14 00:40:07.000000000 +0200
-+++ subversion/libsvn_subr/path.c	2013-06-22 01:58:05.000000000 +0200
+Index: subversion/libsvn_subr/io.c
+===================================================================
+--- subversion/libsvn_subr/io.c	(revision 1527683)
++++ subversion/libsvn_subr/io.c	(working copy)
+@@ -154,7 +154,7 @@
+                 const char *path_apr,
+                 apr_pool_t *pool)
+ {
+-#if defined(WIN32) || defined(DARWIN)
++#if defined(WIN32)
+   *path_utf8 = path_apr;
+   return SVN_NO_ERROR;
+ #else
+@@ -237,7 +237,7 @@
+                    const char *parent,
+                    apr_pool_t *pool)
+ {
+-#if defined(WIN32) || defined(DARWIN)
++#if defined(WIN32)
+   *name_p = apr_pstrdup(pool, name);
+   return SVN_NO_ERROR;
+ #else
+Index: subversion/libsvn_subr/path.c
+===================================================================
+--- subversion/libsvn_subr/path.c	(revision 1527683)
++++ subversion/libsvn_subr/path.c	(working copy)
 @@ -40,6 +40,9 @@
  
  #include "dirent_uri.h"
@@ -11,24 +34,34 @@
  
  /* The canonical empty path.  Can this be changed?  Well, change the empty
     test below and the path library will work, not so sure about the fs/wc
-@@ -1100,7 +1103,6 @@ svn_path_get_absolute(const char **pabso
+@@ -1100,7 +1103,7 @@
  }
  
  
 -#if !defined(WIN32) && !defined(DARWIN)
++#if !defined(WIN32)
  /** Get APR's internal path encoding. */
  static svn_error_t *
  get_path_encoding(svn_boolean_t *path_is_utf8, apr_pool_t *pool)
-@@ -1119,8 +1121,6 @@ get_path_encoding(svn_boolean_t *path_is
-   *path_is_utf8 = (encoding_style == APR_FILEPATH_ENCODING_UTF8);
-   return SVN_NO_ERROR;
- }
--#endif
--
- 
- svn_error_t *
- svn_path_cstring_from_utf8(const char **path_apr,
-@@ -1148,18 +1148,38 @@ svn_path_cstring_to_utf8(const char **pa
+@@ -1127,7 +1130,7 @@
+                            const char *path_utf8,
+                            apr_pool_t *pool)
+ {
+-#if !defined(WIN32) && !defined(DARWIN)
++#if !defined(WIN32)
+   svn_boolean_t path_is_utf8;
+   SVN_ERR(get_path_encoding(&path_is_utf8, pool));
+   if (path_is_utf8)
+@@ -1136,7 +1139,7 @@
+       *path_apr = apr_pstrdup(pool, path_utf8);
+       return SVN_NO_ERROR;
+     }
+-#if !defined(WIN32) && !defined(DARWIN)
++#if !defined(WIN32)
+   else
+     return svn_utf_cstring_from_utf8(path_apr, path_utf8, pool);
+ #endif
+@@ -1148,18 +1151,38 @@
                           const char *path_apr,
                           apr_pool_t *pool)
  {
@@ -70,10 +103,11 @@
  #endif
  }
  
-diff -daurp subversion/svn/proplist-cmd.orig.c subversion/svn/proplist-cmd.c
---- subversion/svn/proplist-cmd.orig.c	2013-02-24 19:31:38.000000000 +0100
-+++ subversion/svn/proplist-cmd.c	2013-06-22 01:55:34.000000000 +0200
-@@ -98,6 +98,11 @@ proplist_receiver_xml(void *baton,
+Index: subversion/svn/proplist-cmd.c
+===================================================================
+--- subversion/svn/proplist-cmd.c	(revision 1527683)
++++ subversion/svn/proplist-cmd.c	(working copy)
+@@ -98,6 +98,11 @@
    else
      name_local = path;
  
@@ -85,7 +119,7 @@
    sb = NULL;
  
  
-@@ -137,6 +142,11 @@ proplist_receiver(void *baton,
+@@ -137,6 +142,11 @@
    else
      name_local = path;
  
@@ -97,10 +131,11 @@
    if (inherited_props)
      {
        int i;
-diff -daurp subversion/svn/status-cmd.orig.c subversion/svn/status-cmd.c
---- subversion/svn/status-cmd.orig.c	2013-03-23 16:44:36.000000000 +0100
-+++ subversion/svn/status-cmd.c	2013-06-22 01:51:21.000000000 +0200
-@@ -111,6 +111,10 @@ print_start_target_xml(const char *targe
+Index: subversion/svn/status-cmd.c
+===================================================================
+--- subversion/svn/status-cmd.c	(revision 1527683)
++++ subversion/svn/status-cmd.c	(working copy)
+@@ -114,6 +114,10 @@
  {
    svn_stringbuf_t *sb = svn_stringbuf_create_empty(pool);
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140127/19ba916f/attachment.html>