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

Convert subversion 1.6.18 recipe to an actual recipe

Browse Source 
* Adjust recipe similar to the 1.6.15 recipe.
* Adjust the patch so that the correct global settings directory is
  used.
This commit is contained in:
Ingo Weinhold
2013-04-30 22:33:56 +02:00
parent 8fca2cffe2
commit 2dc7b77750
2 changed files with 105 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
dev-vcs/subversion/patches/subversion-1.6.18.patch
View File

@@ -1,6 +1,6 @@
diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac
--- subversion-1.6.18/configure.ac 2009-10-13 09:09:30.026214400 -0700
+++ subversion-1.6.18-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700
diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac
--- orig/subversion-1.6.18/configure.ac 2009-10-13 18:09:30.043778048 +0200
+++ subversion-1.6.18/configure.ac 2013-04-30 22:10:52.741605376 +0200
@@ -249,7 +249,7 @@
dnl Check for libraries --------------------
@@ -10,9 +10,9 @@ diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac
# Build the BDB filesystem library only if we have an appropriate
# version of Berkeley DB.
diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c
--- subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800
+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700
diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c
--- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 18:27:35.015728640 +0100
+++ subversion-1.6.18/subversion/libsvn_subr/config_file.c 2013-04-30 22:20:33.557842432 +0200
@@ -32,6 +32,11 @@
#include "svn_private_config.h"
@@ -25,28 +25,7 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
/* Used to terminate lines in large multi-line string literals. */
#define NL APR_EOL_STR
@@ -326,7 +331,19 @@
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_path_join_many(pool, folder,
+ SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
+}
+#else /* ! WIN32 && !__HAIKU__ */
*path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL);
@@ -1115,8 +1132,21 @@
@@ -1115,8 +1120,21 @@
*path = svn_path_join_many(pool, folder,
SVN_CONFIG__SUBDIRECTORY, fname, NULL);
}
@@ -69,18 +48,20 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
{
const char *homedir = svn_user_get_homedir(pool);
if (! homedir)
diff -urN subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h
--- subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800
+++ subversion-1.6.18-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700
@@ -109,7 +109,10 @@
diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h
--- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 14:23:50.020971520 +0100
+++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2013-04-30 22:19:32.338427904 +0200
@@ -109,8 +109,11 @@
or svn_config_get_user_config_path() instead. */
#ifdef WIN32
# define SVN_CONFIG__SUBDIRECTORY "Subversion"
-#else /* ! WIN32 */
-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
+#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__SYS_DIRECTORY "@HAIKU_GLOBAL_SETTINGS_DIR@"
# define SVN_CONFIG__USR_DIRECTORY ".subversion"
#endif /* WIN32 */