diff --git a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch deleted file mode 100644 index 3d4351a6a..000000000 --- a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch +++ /dev/null @@ -1,77 +0,0 @@ -Index: subversion/libsvn_subr/config_file.c -=================================================================== ---- subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (revision 1022152) -+++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (working copy) -@@ -38,6 +38,11 @@ - - #include "svn_private_config.h" - -+#ifdef __HAIKU__ -+# include -+# include -+#endif -+ - /* Used to terminate lines in large multi-line string literals. */ - #define NL APR_EOL_STR - -@@ -331,8 +336,20 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) -+ { -+ char folder[B_PATH_NAME_LENGTH]; - -+ 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__SYS_DIRECTORY, fname, NULL); -+ } -+#else /* ! WIN32 && !__HAIKU__ */ -+ - *path_p = svn_dirent_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - - #endif /* WIN32 */ -@@ -1117,8 +1134,21 @@ - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } - --#else /* ! WIN32 */ -+#elif defined(__HAIKU__) - { -+ char folder[B_PATH_NAME_LENGTH]; -+ -+ status_t error = find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path = svn_dirent_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+ } -+#else /* ! WIN32 && !__HAIKU__ */ -+ -+ { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) - return SVN_NO_ERROR; -Index: subversion/libsvn_subr/config_impl.h -=================================================================== ---- subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (revision 1022152) -+++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (working copy) -@@ -114,7 +114,10 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" --#else /* ! WIN32 */ -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "subversion" -+# define SVN_CONFIG__USR_DIRECTORY "subversion" -+#else /* ! WIN32 && ! __HAIKU__ */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" - #endif /* WIN32 */