haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
B_COMMON_SETTINGS
This commit is contained in:
Scott McCreary
2010-09-30 19:55:48 +00:00
parent 08989945bb
commit 25a2418b6b
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dev-vcs/subversion/patches/subversion-1.6.12.patch
View File

@@ -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"

6
dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch
View File

@@ -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"