From 25a2418b6b1c235d570b9e27c9742e39ebd8f4ff Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Thu, 30 Sep 2010 19:55:48 +0000 Subject: [PATCH] Updated patches for subversion 1.6.12 and svn. Fixed so that it now puts usr settings in B_USER_SETTINGS, and sys settings in B_COMMON_SETTINGS --- .../subversion/patches/subversion-1.6.12.patch | 16 ++++++++-------- .../patches/subversion-1.7.xx-svn.patch | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dev-vcs/subversion/patches/subversion-1.6.12.patch b/dev-vcs/subversion/patches/subversion-1.6.12.patch index 72f6cadeb..b9cef3beb 100644 --- a/dev-vcs/subversion/patches/subversion-1.6.12.patch +++ b/dev-vcs/subversion/patches/subversion-1.6.12.patch @@ -22,13 +22,13 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6. +{ + char folder[B_PATH_NAME_LENGTH]; + -+ status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); ++ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, ++ folder, sizeof(folder)); + if (error) + return SVN_NO_ERROR; + -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++ *path_p = svn_path_join_many(pool, folder, ++ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); +} +#else /* ! WIN32 && !__HAIKU__ */ @@ -44,12 +44,12 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6. + char folder[B_PATH_NAME_LENGTH]; + + status_t error = find_directory (B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); ++ folder, sizeof(folder)); + if (error) + return SVN_NO_ERROR; + -+ *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++ *path = svn_path_join_many(pool, folder, ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); +} +#else /* ! WIN32 && !__HAIKU__ */ @@ -66,7 +66,7 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_impl.h subversion-1.6. # define SVN_CONFIG__SUBDIRECTORY "Subversion" -#else /* ! WIN32 */ +#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" ++# define SVN_CONFIG__SYS_DIRECTORY "subversion" +# define SVN_CONFIG__USR_DIRECTORY "subversion" +#else /* ! WIN32 && ! __HAIKU__ */ # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" diff --git a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch index 8b2f1d164..8607c71c5 100644 --- a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch +++ b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch @@ -23,13 +23,13 @@ Index: libsvn_subr/config_file.c + { + char folder[B_PATH_NAME_LENGTH]; -+ status_t error = find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, ++ status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, + folder, sizeof(folder)); + if (error) + return SVN_NO_ERROR; + + *path_p = svn_dirent_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++ SVN_CONFIG__SYS_DIRECTORY, fname, NULL); + } +#else /* ! WIN32 && !__HAIKU__ */ + @@ -69,7 +69,7 @@ Index: libsvn_subr/config_impl.h # define SVN_CONFIG__SUBDIRECTORY "Subversion" -#else /* ! WIN32 */ +#elif defined __HAIKU__ /* HAIKU */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" + # define SVN_CONFIG__SYS_DIRECTORY "subversion" +# define SVN_CONFIG__USR_DIRECTORY "subversion" +#else /* ! WIN32 && ! __HAIKU__ */ +# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"