diff --git a/dev-vcs/subversion/patches/subversion-1.8.10.patchset b/dev-vcs/subversion/patches/subversion-1.8.10.patchset new file mode 100644 index 000000000..02d792499 --- /dev/null +++ b/dev-vcs/subversion/patches/subversion-1.8.10.patchset @@ -0,0 +1,22 @@ +From b65259cbeda97f1bfe0549803bac4d497f21d3db Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Wed, 17 Sep 2014 16:54:23 +0200 +Subject: fix COMMON directory reference. + + +diff --git a/subversion/libsvn_subr/config_file.c b/subversion/libsvn_subr/config_file.c +index 9969b8e..a08410b 100644 +--- a/subversion/libsvn_subr/config_file.c ++++ b/subversion/libsvn_subr/config_file.c +@@ -401,7 +401,7 @@ svn_config__sys_config_path(const char **path_p, + { + char folder[B_PATH_NAME_LENGTH]; + +- status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false, ++ status_t error = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false, + folder, sizeof(folder)); + if (error) + return SVN_NO_ERROR; +-- +1.8.3.4 + diff --git a/dev-vcs/subversion/subversion-1.6.15.recipe b/dev-vcs/subversion/subversion-1.6.15.recipe deleted file mode 100644 index b6bf0d8f9..000000000 --- a/dev-vcs/subversion/subversion-1.6.15.recipe +++ /dev/null @@ -1,112 +0,0 @@ -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.15.tar.bz2" -CHECKSUM_SHA256="b2919d603a5f3c19f42e3265c4b930e2376c43b3969b90ef9c42b2f72d5aaa45" -REVISION="5" -ARCHITECTURES="x86_gcc2 ?x86" - -PATCHES="subversion-1.6.15.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 - " -BUILD_PREREQUIRES=" - haiku_devel >= $haikuVersion - cmd:aclocal - cmd:autoconf - cmd:gcc - cmd:ld - cmd:libtoolize - cmd:make - " - - -BUILD() -{ - libtoolize --force --copy --install - aclocal -I build -I build/ac-macros - autoconf - 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 $jobArgs -} - -INSTALL() -{ - 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 - - 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 -} diff --git a/dev-vcs/subversion/subversion-1.7.0_rc2.recipe b/dev-vcs/subversion/subversion-1.7.0_rc2.recipe deleted file mode 100644 index 1f9c5c8d3..000000000 --- a/dev-vcs/subversion/subversion-1.7.0_rc2.recipe +++ /dev/null @@ -1,59 +0,0 @@ -DESCRIPTION="Subversion is an open source version control system" -HOMEPAGE="http://subversion.apache.org" -SRC_URI="http://apache.deathculture.net/subversion/subversion-1.7.0-rc2.tar.bz2" -CHECKSUM_MD5="f0242ae5a2abc14cc22e65c2a23b09c4" -REVISION="1" -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.7.0-rc2 - 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.7.0-rc2 - 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.7.0-rc2 - make check -} - -LICENSE="Apache-Subversion" -COPYRIGHT="2011 The Apache Software Foundation" diff --git a/dev-vcs/subversion/subversion-1.8.10.recipe b/dev-vcs/subversion/subversion-1.8.10.recipe new file mode 100644 index 000000000..3fec3ed8e --- /dev/null +++ b/dev-vcs/subversion/subversion-1.8.10.recipe @@ -0,0 +1,159 @@ +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-2014 The Apache Software Foundation" +SRC_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2" +CHECKSUM_SHA256="1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc" +REVISION="1" +ARCHITECTURES="x86_gcc2 x86 x86_64" + +PROVIDES=" + subversion = $portVersion compat >= 1.8 + cmd:svn = $portVersion compat >= 1.8 + cmd:svnadmin = $portVersion compat >= 1.8 + cmd:svndumpfilter = $portVersion compat >= 1.8 + cmd:svnlook = $portVersion compat >= 1.8 + cmd:svnserve = $portVersion compat >= 1.8 + cmd:svnsync = $portVersion compat >= 1.8 + cmd:svnversion = $portVersion compat >= 1.8 + cmd:svnmucc = $portVersion compat >= 1.8 + cmd:svnrdump = $portVersion compat >= 1.8 + 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_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 + lib:libsvn_ra_serf_1 = 0.0.0 compat >= 0 + " +REQUIRES=" + haiku >= $haikuVersion + lib:libapr_1 + lib:libaprutil_1 + lib:libcrypto + lib:libexpat + lib:libiconv + lib:libserf_1 + lib:libsqlite3 + lib:libssl + lib:libxml2 + lib:libz + " +BUILD_REQUIRES=" + expat_devel >= 2.1 + libiconv_devel >= 1.13 + sqlite_devel >= 3.4 + devel:libapr_1 >= 0.3 + devel:libaprutil_1 >= 0.3 + devel:libcrypto + devel:libssl + devel:libxml2 >= 2.7 + devel:libz + devel:libserf_1 + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + cmd:pkg_config + cmd:python + cmd:aclocal + cmd:autoconf + cmd:gcc + cmd:ld + cmd:libtoolize + cmd:make + " + +USER_SETTINGS_FILES=" + settings/subversion directory + " + + +PATCHES="subversion-1.8.10.patchset" + +BUILD() +{ + CFLAGS=-std=c9x LIBS="-lcrypto -lssl" runConfigure ./configure \ + --with-apr=$portPackageLinksDir/devel~libapr_1 \ + --with-apr-util=$portPackageLinksDir/devel~libaprutil_1 \ + --with-serf=$portPackageLinksDir/devel~libserf_1 \ + --with-zlib=$portPackageLinksDir/devel~libz \ + --with-editor=nano \ + --disable-nls + make $jobArgs +} + +INSTALL() +{ + 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 + + 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_svn-1 \ + libsvn_repos-1 \ + libsvn_subr-1 \ + libsvn_wc-1 \ + libsvn_ra_serf-1 + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + subversion_devel = $portVersion compat >= 1.8 + devel:libsvn_client_1 = 0.0.0 compat >= 0 + devel:libsvn_delta_1 = 0.0.0 compat >= 0 + devel:libsvn_diff_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_fs_1 = 0.0.0 compat >= 0 + devel:libsvn_fs_util_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_local_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_svn_1 = 0.0.0 compat >= 0 + devel:libsvn_ra_serf_1 = 0.0.0 compat >= 0 + devel:libsvn_repos_1 = 0.0.0 compat >= 0 + devel:libsvn_subr_1 = 0.0.0 compat >= 0 + devel:libsvn_wc_1 = 0.0.0 compat >= 0 + " +REQUIRES_devel=" + subversion == $portVersion base + "