diff --git a/dev-vcs/subversion/patches/subversion-1.6.12.patch b/dev-vcs/subversion/patches/subversion-1.6.12.patch index 81c904608..72f6cadeb 100644 --- a/dev-vcs/subversion/patches/subversion-1.6.12.patch +++ b/dev-vcs/subversion/patches/subversion-1.6.12.patch @@ -6,8 +6,8 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6. #include "svn_private_config.h" +#ifdef __HAIKU__ -+# include -+# include ++# include ++# include +#endif + /* Used to terminate lines in large multi-line string literals. */ @@ -21,14 +21,14 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6. +#elif defined(__HAIKU__) +{ + 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; ++ return SVN_NO_ERROR; + + *path_p = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); +} +#else /* ! WIN32 && !__HAIKU__ */ @@ -42,14 +42,14 @@ diff -urN subversion-1.6.12/subversion/libsvn_subr/config_file.c subversion-1.6. +#elif defined(__HAIKU__) +{ + 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; -+ ++ return SVN_NO_ERROR; ++ + *path = svn_path_join_many (pool, folder, -+ SVN_CONFIG__USR_DIRECTORY, fname, NULL); ++ SVN_CONFIG__USR_DIRECTORY, fname, NULL); +} +#else /* ! WIN32 && !__HAIKU__ */ diff --git a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch new file mode 100644 index 000000000..8b2f1d164 --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch @@ -0,0 +1,78 @@ +Index: libsvn_subr/config_file.c +=================================================================== +--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (revision 1002735) ++++ 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_USER_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); ++ } ++#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: libsvn_subr/config_impl.h +=================================================================== +--- subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (revision 1002735) ++++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (working copy) +@@ -114,8 +114,11 @@ + 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.7.xx-svn.bep b/dev-vcs/subversion/subversion-1.7.xx-svn.bep new file mode 100644 index 000000000..0392ab968 --- /dev/null +++ b/dev-vcs/subversion/subversion-1.7.xx-svn.bep @@ -0,0 +1,28 @@ +DESCRIPTION="Subversion is an open source version control system" +HOMEPAGE="http://svn.apache.org" +SRC_URI="svn+http://svn.apache.org/repos/asf/subversion/trunk" +#CHECKSUM_MD5="" +REVISION="1" +STATUS_HAIKU="stable" +DEPEND="" +BUILD { + cd subversion-1.7.xx-svn + libtoolize --force --copy --install + aclocal -I build -I build/ac-macros + autoconf + ./autogen.sh + ./configure --prefix=/boot/common \ + --with-apr=/boot/common/bin/apr-1-config \ + --with-apr-util=/boot/common/bin/apu-1-config \ + --with-neon=/boot/common \ + --with-editor=nano \ + --with-zlib=/boot/common + make +} + +INSTALL { + cd subversion-1.7.xx-svn + make install +} +LICENSE="Subversion" +COPYRIGHT="2000-2010 CollabNet"