diff --git a/dev-vcs/subversion/patches/subversion-1.4.x.diff b/dev-vcs/subversion/patches/subversion-1.4.x.diff deleted file mode 100644 index 85c272dc5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.4.x.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 30382) -+++ configure.in (working copy) -@@ -184,7 +184,7 @@ - dnl So we only turn it on for platforms where we know we really need it. - AC_MSG_CHECKING([whether libtool needs -no-undefined]) - case $host in -- *-*-cygwin*) -+ *-*-cygwin* | *-*-beos* | *-*-haiku*) - AC_MSG_RESULT([yes]) - LT_NO_UNDEFINED="-no-undefined" - ;; diff --git a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff b/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff deleted file mode 100644 index 04563f7bb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.5.4-haiku.diff +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN subversion-1.5.4/configure.ac subversion-1.5.4-haiku/configure.ac ---- subversion-1.5.4/configure.ac 2008-12-15 00:35:49.000000000 -0800 -+++ subversion-1.5.4-haiku/configure.ac 2008-12-15 00:32:30.000000000 -0800 -@@ -220,6 +220,7 @@ - - # Berkeley DB on SCO OpenServer needs -lsocket - AC_CHECK_LIB(socket, socket) -+AC_CHECK_LIB(network, socket) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. diff --git a/dev-vcs/subversion/patches/subversion-1.6.11.patch b/dev-vcs/subversion/patches/subversion-1.6.11.patch deleted file mode 100644 index a3d5f7d17..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.11.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_file.c subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.11/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,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 - -@@ -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_USER_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); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#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_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.11/subversion/libsvn_subr/config_impl.h subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.11/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.11-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,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 "/etc/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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.12.patch b/dev-vcs/subversion/patches/subversion-1.6.12.patch deleted file mode 100644 index b9cef3beb..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.12.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.12/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,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 - -@@ -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 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#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_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.12/subversion/libsvn_subr/config_impl.h subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.12/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.12-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.13.patch b/dev-vcs/subversion/patches/subversion-1.6.13.patch deleted file mode 100644 index e1964f8e5..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.13.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_file.c subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.13/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,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 - -@@ -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 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#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_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.13/subversion/libsvn_subr/config_impl.h subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.13/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.13-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.17.patch b/dev-vcs/subversion/patches/subversion-1.6.17.patch deleted file mode 100644 index 8db6b23c0..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.17.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff -urN subversion-1.6.17/configure.ac subversion-1.6.17-haiku/configure.ac ---- subversion-1.6.17/configure.ac 2009-10-13 09:09:30.026214400 -0700 -+++ subversion-1.6.17-haiku/configure.ac 2011-08-02 14:32:39.227278848 -0700 -@@ -249,7 +249,7 @@ - dnl Check for libraries -------------------- - - # Berkeley DB on SCO OpenServer needs -lsocket --AC_CHECK_LIB(socket, socket) -+AC_SEARCH_LIBS(socket, socket network) - - # Build the BDB filesystem library only if we have an appropriate - # version of Berkeley DB. -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_file.c subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.17/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,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 - -@@ -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 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#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_path_join_many(pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.17/subversion/libsvn_subr/config_impl.h subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.17/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.17-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff deleted file mode 100644 index fe47041ec..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku-2.diff +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_file.c subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.5/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_file.c 2009-09-03 09:01:10.000000000 +0000 -@@ -32,6 +32,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 - -@@ -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_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-03 08:54:11.000000000 +0000 -@@ -109,7 +109,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 "/etc/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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff b/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff deleted file mode 100644 index bf7847a0d..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.5-haiku.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN subversion-1.6.5/subversion/libsvn_subr/config_impl.h subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.5/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.5-haiku/subversion/libsvn_subr/config_impl.h 2009-09-02 13:43:03.000000000 +0000 -@@ -109,6 +109,9 @@ - or svn_config_get_user_config_path() instead. */ - #ifdef WIN32 - # define SVN_CONFIG__SUBDIRECTORY "Subversion" -+#elif defined __HAIKU__ /* HAIKU */ -+# define SVN_CONFIG__SYS_DIRECTORY "/boot/common/etc/subversion" -+# define SVN_CONFIG__USR_DIRECTORY "config/settings/subversion" - #else /* ! WIN32 */ - # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" - # define SVN_CONFIG__USR_DIRECTORY ".subversion" diff --git a/dev-vcs/subversion/patches/subversion-1.6.6.patch b/dev-vcs/subversion/patches/subversion-1.6.6.patch deleted file mode 100644 index 6bbe00b59..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.6.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_file.c subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.6/subversion/libsvn_subr/config_file.c 2009-08-17 18:33:43.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_file.c 2009-11-23 08:28:19.000000000 +0000 -@@ -32,6 +32,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 - -@@ -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_USER_SETTINGS_DIRECTORY, -1, true, -+ folder, sizeof(folder)); -+ if (error) -+ return SVN_NO_ERROR; -+ -+ *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -diff -urN subversion-1.6.6/subversion/libsvn_subr/config_impl.h subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.6/subversion/libsvn_subr/config_impl.h 2009-01-27 13:23:50.000000000 +0000 -+++ subversion-1.6.6-haiku/subversion/libsvn_subr/config_impl.h 2009-11-23 08:28:19.000000000 +0000 -@@ -109,7 +109,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 "/etc/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 */ diff --git a/dev-vcs/subversion/patches/subversion-1.6.9.patch b/dev-vcs/subversion/patches/subversion-1.6.9.patch deleted file mode 100644 index dee400526..000000000 --- a/dev-vcs/subversion/patches/subversion-1.6.9.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_file.c subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c ---- subversion-1.6.9/subversion/libsvn_subr/config_file.c 2009-11-25 09:27:35.047972352 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_file.c 2010-03-15 22:59:57.000000000 -0700 -@@ -32,6 +32,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 - -@@ -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_USER_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); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - - *path_p = svn_path_join_many(pool, SVN_CONFIG__SYS_DIRECTORY, fname, NULL); - -@@ -1115,8 +1132,21 @@ - *path = svn_path_join_many(pool, folder, - SVN_CONFIG__SUBDIRECTORY, fname, NULL); - } -+ -+#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_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); -+} -+#else /* ! WIN32 && !__HAIKU__ */ - --#else /* ! WIN32 */ - { - const char *homedir = svn_user_get_homedir(pool); - if (! homedir) -diff -urN subversion-1.6.9/subversion/libsvn_subr/config_impl.h subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h ---- subversion-1.6.9/subversion/libsvn_subr/config_impl.h 2009-01-27 05:23:50.045350912 -0800 -+++ subversion-1.6.9-haiku/subversion/libsvn_subr/config_impl.h 2010-03-15 22:39:34.000000000 -0700 -@@ -109,7 +109,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 "/etc/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 */ diff --git a/dev-vcs/subversion/subversion-1.6.11.recipe b/dev-vcs/subversion/subversion-1.6.11.recipe deleted file mode 100644 index 88c98644a..000000000 --- a/dev-vcs/subversion/subversion-1.6.11.recipe +++ /dev/null @@ -1,29 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.11.tar.gz" -CHECKSUM_MD5="7331310fc786111899b305c6d141b02d" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.11 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=lpe \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.11 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.12.recipe b/dev-vcs/subversion/subversion-1.6.12.recipe deleted file mode 100644 index a0bd512b1..000000000 --- a/dev-vcs/subversion/subversion-1.6.12.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.12.tar.bz2" -CHECKSUM_MD5="a4b1d0d7f3a4587c59da9c1acf9dedd0" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.12 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.12 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.13.recipe b/dev-vcs/subversion/subversion-1.6.13.recipe deleted file mode 100644 index 87caf344b..000000000 --- a/dev-vcs/subversion/subversion-1.6.13.recipe +++ /dev/null @@ -1,30 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.13.tar.bz2" -CHECKSUM_MD5="7ae1c827689f21cf975804005be30aeb" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.13 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - ./autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=/boot/common \ - --with-editor=nano \ - --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.13 - make install -} -LICENSE="Apache-Subversion" -COPYRIGHT="2010 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.17.recipe b/dev-vcs/subversion/subversion-1.6.17.recipe deleted file mode 100644 index 4a6a0fe54..000000000 --- a/dev-vcs/subversion/subversion-1.6.17.recipe +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.17.tar.bz2" -CHECKSUM_MD5="81e5dc5beee4b3fc025ac70c0b6caa14" -REVISION="3" -STATUS_HAIKU="stable" -DEPEND="dev-libs/apr >= 1.4.4 - dev-libs/apr-util >= 1.3.12 - net-misc/neon >= 0.29.6 - dev-libs/libiconv >= 1.13.1 - dev-db/sqlite >= 3.7.7.1 - dev-libs/expat >= 2.0.1 - dev-libs/openssl >= 1.0.0d - dev-libs/libxml2 >= 2.7.8" - -BUILD() -{ - cd subversion-1.6.17 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - COMMON_DIR=`finddir B_COMMON_DIRECTORY` - ./configure --prefix=$COMMON_DIR \ - --mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \ - --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config \ - --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config \ - --with-neon=$COMMON_DIR \ - --with-zlib=$COMMON_DIR \ - --with-editor=nano \ - --disable-nls - make -} - -INSTALL() -{ - cd subversion-1.6.17 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} - -TEST() -{ - cd subversion-1.6.17 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.6.6.recipe b/dev-vcs/subversion/subversion-1.6.6.recipe deleted file mode 100644 index 5822f2138..000000000 --- a/dev-vcs/subversion/subversion-1.6.6.recipe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.6.tar.bz2" -CHECKSUM_MD5="e5109da756d74c7d98f683f004a539af" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.6 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=lpe --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.6 - make install -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet" diff --git a/dev-vcs/subversion/subversion-1.6.9.recipe b/dev-vcs/subversion/subversion-1.6.9.recipe deleted file mode 100644 index 5688cb562..000000000 --- a/dev-vcs/subversion/subversion-1.6.9.recipe +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.tigris.org" -SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.9.tar.gz" -CHECKSUM_MD5="facaa0ee78c8f24b9af12c74662bbd24" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" -BUILD() -{ - cd subversion-1.6.9 - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autogen.sh - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --with-apr=`finddir B_COMMON_BIN_DIRECTORY`/apr-1-config --with-apr-util=`finddir B_COMMON_BIN_DIRECTORY`/apu-1-config --with-neon=/boot/common --with-editor=nano --with-zlib=/boot/common - make -} - -INSTALL() -{ - cd subversion-1.6.9 - make install - if type -p swig > /dev/null;then - if type -p python > /dev/null;then - PYTHON_PKGDIR=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - make install-swig-py swig_pydir=${PYTHON_PKGDIR}/libsvn swig_pydir_extra=${PYTHON_PKGDIR}/svn - fi - #if type -p perl > /dev/null;then - # make install-swig-pl - #fi - #if type -p ruby > /dev/null;then - # make install-swig-rb - #fi - fi -} -LICENSE="Subversion" -COPYRIGHT="2000-2010 CollabNet"