From 9d6d61946609b70dfbf0175aca834200aeb39740 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 13 Oct 2010 17:52:13 +0000 Subject: [PATCH] Updated subversion-1.7.xx-svn patch due to recent changes to svn's trunk. --- .../patches/subversion-1.7.xx-svn.patch | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch index 8607c71c5..3d4351a6a 100644 --- a/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch +++ b/dev-vcs/subversion/patches/subversion-1.7.xx-svn.patch @@ -1,6 +1,6 @@ -Index: libsvn_subr/config_file.c +Index: subversion/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 (revision 1022152) +++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_file.c (working copy) @@ -38,6 +38,11 @@ @@ -59,20 +59,19 @@ Index: libsvn_subr/config_file.c const char *homedir = svn_user_get_homedir(pool); if (! homedir) return SVN_NO_ERROR; -Index: libsvn_subr/config_impl.h +Index: subversion/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 (revision 1022152) +++ subversion-1.7.xx-svn/subversion/libsvn_subr/config_impl.h (working copy) -@@ -114,8 +114,11 @@ +@@ -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__SYS_DIRECTORY "subversion" +# define SVN_CONFIG__USR_DIRECTORY "subversion" +#else /* ! WIN32 && ! __HAIKU__ */ -+# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" + # define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion" # define SVN_CONFIG__USR_DIRECTORY ".subversion" #endif /* WIN32 */ -