From 38c1f6bcbff6fe862d0e0064a17e9a1e0d3d90cc Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Mon, 23 Nov 2009 08:59:22 +0000 Subject: [PATCH] Initial .bep file for subversion-1.6.6, added patches directory --- .../subversion/patches/subversion-1.6.6.patch | 51 +++++++++++++++++++ dev-util/subversion/subversion-1.6.6.bep | 19 +++++++ 2 files changed, 70 insertions(+) create mode 100644 dev-util/subversion/patches/subversion-1.6.6.patch create mode 100644 dev-util/subversion/subversion-1.6.6.bep diff --git a/dev-util/subversion/patches/subversion-1.6.6.patch b/dev-util/subversion/patches/subversion-1.6.6.patch new file mode 100644 index 000000000..6bbe00b59 --- /dev/null +++ b/dev-util/subversion/patches/subversion-1.6.6.patch @@ -0,0 +1,51 @@ +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-util/subversion/subversion-1.6.6.bep b/dev-util/subversion/subversion-1.6.6.bep new file mode 100644 index 000000000..e423f832d --- /dev/null +++ b/dev-util/subversion/subversion-1.6.6.bep @@ -0,0 +1,19 @@ +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" +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=/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=lpe --with-zlib=/boot/common + make +} + +INSTALL { + cd subversion-1.6.6 + make install +}