mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 20:20:06 +02:00
Merge branch 'package-management'
Conflicts: app-arch/p7zip/p7zip-9.04.bep app-arch/p7zip/p7zip-9.13.bep app-arch/tar/tar-1.22.bep app-arch/tar/tar-1.23.bep app-arch/tar/tar-1.25.bep app-arch/xz-utils/xz-utils-4.999.9.bep app-cdr/bchunk/bchunk-1.2.0.bep app-cdr/cdrtools/cdrtools-2.01.01a66.bep app-cdr/cdrtools/cdrtools-3.01a01.bep app-crypt/gnupg/gnupg-1.4.11.bep app-doc/doxygen/doxygen-1.6.3.bep app-editors/nano/nano-2.2.6.bep app-editors/vim/vim-7.3.bep app-text/antiword/antiword-0.37.bep app-text/libpaper/libpaper-1.1.23.bep app-text/libpaper/libpaper-1.1.24.bep app-text/rman/rman-3.2.bep dev-db/sqlite/sqlite-3.6.22.bep dev-db/sqlite/sqlite-3.6.23.bep dev-db/sqlite/sqlite-3.7.2.bep dev-db/sqlite/sqlite-3.7.3.bep dev-db/sqlite/sqlite-3.7.4.bep dev-db/sqlite/sqlite-3.7.5.bep dev-lang/lua/lua-5.1.4.bep dev-lang/nasm/nasm-2.08.01.bep dev-lang/perl/patches/perl-5.10.0.patch dev-lang/python/python-2.5.4.bep dev-lang/python/python-2.6.4.bep dev-lang/python/python-2.6.5.bep dev-lang/python/python-2.6.6.bep dev-lang/python/python-2.6.7.bep dev-lang/python/python-2.6.8.bep dev-lang/python/python-3.2.bep dev-lang/python/python-3.2.recipe dev-lang/python/python-3.2a4.bep dev-lang/yasm/yasm-1.1.0.bep dev-libs/apr-util/apr-util-1.3.10.bep dev-libs/apr-util/apr-util-1.3.9.bep dev-libs/apr/apr-1.3.8.bep dev-libs/apr/apr-1.3.9.bep dev-libs/apr/apr-1.4.2.bep dev-libs/apr/patches/apr-1.4.2.patch dev-libs/expat/expat-2.0.1.bep dev-libs/fribidi/fribidi-0.19.2.bep dev-libs/icu/icu-4.4.1.bep dev-libs/libedit/libedit-20090923.bep dev-libs/libedit/libedit-20100424.bep dev-libs/libevent/libevent-1.4.11.bep dev-libs/libevent/libevent-1.4.13.bep dev-libs/libevent/libevent-1.4.14b.bep dev-libs/libevent/libevent-2.0.10.bep dev-libs/libiconv/libiconv-1.12.bep dev-libs/libiconv/libiconv-1.13.1.bep dev-libs/libpcre/libpcre-8.00.bep dev-libs/libpcre/libpcre-8.02.bep dev-libs/libpcre/libpcre-8.12.bep dev-libs/libxml2/libxml2-2.7.3.bep dev-libs/libxml2/libxml2-2.7.6.bep dev-libs/libxml2/libxml2-2.7.7.bep dev-libs/libxml2/libxml2-2.7.8.bep dev-libs/openssl/openssl-0.9.8l.bep dev-libs/openssl/openssl-0.9.8m.bep dev-libs/openssl/openssl-1.0.0.bep dev-libs/openssl/openssl-1.0.0a.bep dev-libs/openssl/openssl-1.0.0c.bep dev-qt/qtcore/qtcore-4.8.x-git.bep dev-qt/qtcore/qtcore-4.8.x.recipe dev-util/ccache/ccache-3.0.1.bep dev-util/cmake/cmake-2.6.4.bep dev-util/cmake/cmake-2.8.0.bep dev-util/cmake/cmake-2.8.1.bep dev-util/cmake/cmake-2.8.2.bep dev-util/cmake/cmake-2.8.3.bep dev-util/cmake/cmake-2.8.4.bep dev-util/ctags/ctags-5.8.bep dev-util/fastdep/fastdep-0.16.bep dev-util/gperf/gperf-3.0.4.bep dev-util/pkgconfig/pkgconfig-0.23.bep dev-util/pkgconfig/pkgconfig-0.25.bep dev-vcs/cvs/cvs-1.12.13.1.bep dev-vcs/cvs/cvs-1.12.13.bep dev-vcs/subversion/subversion-1.6.11.bep dev-vcs/subversion/subversion-1.6.12.bep dev-vcs/subversion/subversion-1.6.13.bep dev-vcs/subversion/subversion-1.6.15.bep dev-vcs/subversion/subversion-1.6.6.bep dev-vcs/subversion/subversion-1.6.9.bep dev-vcs/subversion/subversion-1.7.xx-svn.bep haiku-apps/bepdf/bepdf-1.1.1b4.bep haiku-apps/libwalter/libwalter-97.bep haiku-apps/paladin/paladin-1.3-hg.bep haiku-apps/pe/pe-2.4.3-600.bep haiku-apps/vision/patches/vision-908-gcc4.patch haiku-apps/vision/vision-0.9.7.bep haiku-libs/libwalter/libwalter-97.bep haiku-libs/libwalter/libwalter-97.recipe media-gfx/graphviz/graphviz-2.24.bep media-gfx/graphviz/graphviz-2.26.3.bep media-libs/flac/flac-1.2.1.bep media-libs/freetype/freetype-2.3.11.bep media-libs/freetype/freetype-2.4.2.bep media-libs/freetype/freetype-2.4.4.bep media-libs/ftgl/ftgl-2.1-svn.bep media-libs/guilib/guilib-1.2.1.bep media-libs/jpeg/jpeg-7.bep media-libs/jpeg/jpeg-8b.bep media-libs/jpeg/jpeg-8c.bep media-libs/libao/libao-1.0.0.bep media-libs/libmad/libmad-0.15.1b.bep media-libs/libmng/libmng-1.0.10.bep media-libs/libogg/libogg-1.1.4.bep media-libs/libogg/libogg-1.2.0.bep media-libs/libogg/libogg-1.2.2.bep media-libs/libpng/libpng-1.2.29.bep media-libs/libpng/libpng-1.2.30.bep media-libs/libpng/libpng-1.2.40.bep media-libs/libpng/libpng-1.2.41.bep media-libs/libpng/libpng-1.2.43.bep media-libs/libpng/libpng-1.2.44.bep media-libs/libpng/libpng-1.4.1.bep media-libs/libpng/libpng-1.4.2.bep media-libs/libpng/libpng-1.4.3.bep media-libs/libpng/libpng-1.4.4.bep media-libs/libpng/libpng-1.5.0.bep media-libs/libsdl/patches/libsdl-1.2-hg.patch media-libs/libtheora/libtheora-1.1.1.bep media-libs/libvorbis/libvorbis-1.2.3.bep media-libs/libvorbis/libvorbis-1.3.1.bep media-libs/libvorbis/libvorbis-1.3.2.bep media-libs/libvpx/libvpx-0.9.2-git.bep media-libs/smpeg/smpeg-0.4.5.bep media-libs/speex/speex-1.2-git.bep media-libs/speex/speex-1.2rc1.bep media-sound/lame/lame-3.98.4.bep media-sound/lame/lame-398-2.bep media-sound/vorbis-tools/vorbis-tools-1.2.0.bep media-sound/vorbis-tools/vorbis-tools-1.4.0.bep media-video/ffmpeg/ffmpeg-0.5.bep media-video/ffmpeg/ffmpeg-0.6.bep net-misc/curl/curl-7.18.2.bep net-misc/curl/curl-7.19.1.bep net-misc/curl/curl-7.19.2.bep net-misc/curl/curl-7.19.5.bep net-misc/curl/curl-7.19.7.bep net-misc/curl/curl-7.20.0.bep net-misc/curl/curl-7.20.1.bep net-misc/curl/curl-7.21.1.bep net-misc/curl/curl-7.21.2.bep net-misc/curl/curl-7.21.3.bep net-misc/openssh/openssh-5.4p1.bep net-misc/openssh/openssh-5.5p1.bep net-misc/openssh/openssh-5.6p1.bep net-misc/openssh/openssh-5.7p1.bep net-misc/openssh/openssh-5.8p1.bep net-wireless/b43-fwcutter/b43-fwcutter-012.bep sci-libs/gsl/gsl-1.14.bep sys-apps/ed/ed-1.4.bep sys-apps/gawk/gawk-3.1.8.bep sys-apps/grep/grep-2.5.4.bep sys-apps/grep/grep-2.7.bep sys-apps/groff/groff-1.20.1.bep sys-apps/man/man-1.6f.bep sys-apps/sed/sed-4.2.1.bep sys-apps/texinfo/texinfo-4.13a.bep sys-devel/autoconf/autoconf-2.68.bep sys-devel/automake/automake-1.11.1.bep sys-devel/bison/bison-2.4.1.bep sys-devel/bison/bison-2.4.bep sys-devel/flex/flex-2.5.35.bep sys-devel/gettext/gettext-0.18.1.1-dev.bep sys-devel/gettext/gettext-0.18.1.1.bep sys-devel/jam/jam-2.5.bep sys-devel/m4/m4-1.4.14.bep sys-libs/ncurses/ncurses-5.6.bep sys-libs/ncurses/ncurses-5.7.bep sys-libs/readline/readline-5.2.bep sys-libs/readline/readline-6.0.bep sys-libs/readline/readline-6.1.bep sys-libs/zlib/zlib-1.2.3.bep sys-libs/zlib/zlib-1.2.5.bep x11-libs/qt/qt-4.8.x-git.bep
This commit is contained in:
Oliver Tappe
@@ -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"
|
||||
;;
|
||||
@@ -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.
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
@@ -1,6 +1,6 @@
|
||||
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
|
||||
diff -ur orig/subversion-1.6.18/configure.ac subversion-1.6.18/configure.ac
|
||||
--- orig/subversion-1.6.18/configure.ac 2009-10-13 18:09:30.043778048 +0200
|
||||
+++ subversion-1.6.18/configure.ac 2013-04-30 22:10:52.741605376 +0200
|
||||
@@ -249,7 +249,7 @@
|
||||
dnl Check for libraries --------------------
|
||||
|
||||
@@ -10,9 +10,9 @@ diff -urN subversion-1.6.18/configure.ac subversion-1.6.18-haiku/configure.ac
|
||||
|
||||
# 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
|
||||
diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.18/subversion/libsvn_subr/config_file.c
|
||||
--- orig/subversion-1.6.18/subversion/libsvn_subr/config_file.c 2009-11-25 18:27:35.015728640 +0100
|
||||
+++ subversion-1.6.18/subversion/libsvn_subr/config_file.c 2013-04-30 22:20:33.557842432 +0200
|
||||
@@ -32,6 +32,11 @@
|
||||
|
||||
#include "svn_private_config.h"
|
||||
@@ -25,28 +25,7 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
|
||||
/* 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 @@
|
||||
@@ -1115,8 +1120,21 @@
|
||||
*path = svn_path_join_many(pool, folder,
|
||||
SVN_CONFIG__SUBDIRECTORY, fname, NULL);
|
||||
}
|
||||
@@ -69,18 +48,20 @@ diff -urN subversion-1.6.18/subversion/libsvn_subr/config_file.c subversion-1.6.
|
||||
{
|
||||
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 @@
|
||||
diff -ur orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h subversion-1.6.18/subversion/libsvn_subr/config_impl.h
|
||||
--- orig/subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2009-01-27 14:23:50.020971520 +0100
|
||||
+++ subversion-1.6.18/subversion/libsvn_subr/config_impl.h 2013-04-30 22:19:32.338427904 +0200
|
||||
@@ -109,8 +109,11 @@
|
||||
or svn_config_get_user_config_path() instead. */
|
||||
#ifdef WIN32
|
||||
# define SVN_CONFIG__SUBDIRECTORY "Subversion"
|
||||
-#else /* ! WIN32 */
|
||||
-# define SVN_CONFIG__SYS_DIRECTORY "/etc/subversion"
|
||||
+#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__SYS_DIRECTORY "@HAIKU_GLOBAL_SETTINGS_DIR@"
|
||||
# define SVN_CONFIG__USR_DIRECTORY ".subversion"
|
||||
#endif /* WIN32 */
|
||||
|
||||
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
@@ -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"
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
@@ -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 <FindDirectory.h>
|
||||
+# include <StorageDefs.h>
|
||||
+#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 */
|
||||
Reference in New Issue
Block a user