From 1f54de233de1180ce11d408a8e1a4aed5a7708bd Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Tue, 19 Jun 2012 03:27:43 +0000 Subject: [PATCH] Update subversion to 1.6.18 --- .../patches/subversion-1.6.18.patch | 86 +++++++++++++++++++ dev-vcs/subversion/subversion-1.6.18.bep | 56 ++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 dev-vcs/subversion/patches/subversion-1.6.18.patch create mode 100644 dev-vcs/subversion/subversion-1.6.18.bep diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch new file mode 100644 index 000000000..ac6c86321 --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch @@ -0,0 +1,86 @@ +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 +@@ -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.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 +@@ -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.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 @@ + 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/subversion-1.6.18.bep b/dev-vcs/subversion/subversion-1.6.18.bep new file mode 100644 index 000000000..5985c1fcd --- /dev/null +++ b/dev-vcs/subversion/subversion-1.6.18.bep @@ -0,0 +1,56 @@ +DESCRIPTION="Subversion is an open source version control system" +HOMEPAGE="http://subversion.apache.org" +SRC_URI="http://subversion.tigris.org/downloads/subversion-1.6.18.tar.bz2" +CHECKSUM_MD5="c5c662a5d19d047256fa333bd890a925" +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.18 + 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.18 + 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.18 + make check +} + +LICENSE="Apache-Subversion" +COPYRIGHT="2000-2009 CollabNet"