From 2dc7b777508fb2c1770eebf4d33a0dafdc3a97ad Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 30 Apr 2013 22:33:56 +0200 Subject: [PATCH] Convert subversion 1.6.18 recipe to an actual recipe * Adjust recipe similar to the 1.6.15 recipe. * Adjust the patch so that the correct global settings directory is used. --- .../patches/subversion-1.6.18.patch | 47 +++---- dev-vcs/subversion/subversion-1.6.18.recipe | 116 ++++++++++++++---- 2 files changed, 105 insertions(+), 58 deletions(-) diff --git a/dev-vcs/subversion/patches/subversion-1.6.18.patch b/dev-vcs/subversion/patches/subversion-1.6.18.patch index ac6c86321..097f8eebc 100644 --- a/dev-vcs/subversion/patches/subversion-1.6.18.patch +++ b/dev-vcs/subversion/patches/subversion-1.6.18.patch @@ -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 */ + diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index d484a9bcd..1be5d0a78 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -1,39 +1,94 @@ -DESCRIPTION="Subversion is an open source version control system" +SUMMARY="Open source version control system" +DESCRIPTION=" + Subversion exists to be universally recognized and adopted as an + open-source, centralized version control system characterized by its + reliability as a safe haven for valuable data; the simplicity of its + model and usage; and its ability to support the needs of a wide + variety of users and projects, from individuals to large-scale enterprise + operations. + " HOMEPAGE="http://subversion.apache.org" +LICENSE="Apache-Subversion" +COPYRIGHT="2010 The Apache Software Foundation" 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" +REVISION="4" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="subversion-1.6.18.patch" + +PROVIDES=" + subversion = $portVersion compat >= 1.6 + cmd:svn = $portVersion compat >= 1.6 + cmd:svnadmin = $portVersion compat >= 1.6 + cmd:svndumpfilter = $portVersion compat >= 1.6 + cmd:svnlook = $portVersion compat >= 1.6 + cmd:svnserve = $portVersion compat >= 1.6 + cmd:svnsync = $portVersion compat >= 1.6 + cmd:svnversion = $portVersion compat >= 1.6 + lib:libsvn_client_1 = 0.0.0 compat >= 0 + lib:libsvn_delta_1 = 0.0.0 compat >= 0 + lib:libsvn_diff_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + lib:libsvn_fs_util_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_local_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_neon_1 = 0.0.0 compat >= 0 + lib:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + lib:libsvn_repos_1 = 0.0.0 compat >= 0 + lib:libsvn_subr_1 = 0.0.0 compat >= 0 + lib:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + apr >= 1.3 + apr_util >= 1.3 + expat >= 2.0 + libiconv >= 1.13 + libxml2 >= 2.7 + neon >= 0.29 + sqlite >= 3.4 + zlib + " +BUILD_REQUIRES=" + $REQUIRES + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + +PATCH() +{ + sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ + subversion/libsvn_subr/config_impl.h +} 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 \ + runConfigure ./configure \ + --with-apr=$portPackageLinksDir/apr \ + --with-apr-util=$portPackageLinksDir/apr_util \ + --with-neon=$portPackageLinksDir/neon \ + --with-zlib=$portPackageLinksDir/zlib \ --with-editor=nano \ --disable-nls - make + make $jobArgs } INSTALL() { - cd subversion-1.6.18 make install if type -p swig > /dev/null;then if type -p python > /dev/null;then @@ -47,13 +102,24 @@ INSTALL() # make install-swig-rb #fi fi + + prepareInstalledDevelLibs \ + libsvn_client-1 \ + libsvn_delta-1 \ + libsvn_diff-1 \ + libsvn_fs-1 \ + libsvn_fs_fs-1 \ + libsvn_fs_util-1 \ + libsvn_ra-1 \ + libsvn_ra_local-1 \ + libsvn_ra_neon-1 \ + libsvn_ra_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 } TEST() { - cd subversion-1.6.18 make check } - -LICENSE="Apache-Subversion" -COPYRIGHT="2000-2009 CollabNet"