mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
subversion: Bump.
This commit is contained in:
Augustin Cavalier
@@ -1,22 +0,0 @@
|
||||
From b65259cbeda97f1bfe0549803bac4d497f21d3db Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@gmail.com>
|
||||
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
|
||||
|
||||
@@ -5,14 +5,14 @@ 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="https://subversion.apache.org/"
|
||||
COPYRIGHT="2010-2017 The Apache Software Foundation"
|
||||
COPYRIGHT="2010-2020 The Apache Software Foundation"
|
||||
LICENSE="Apache-Subversion"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://archive.apache.org/dist/subversion/subversion-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623"
|
||||
CHECKSUM_SHA256="6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102"
|
||||
PATCHES="subversion-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
ARCHITECTURES="?x86_gcc2 x86 x86_64"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/subversion directory
|
||||
@@ -1,155 +0,0 @@
|
||||
SUMMARY="Open source version control system"
|
||||
DESCRIPTION="Subversion (svn) 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"
|
||||
COPYRIGHT="2010-2014 The Apache Software Foundation"
|
||||
LICENSE="Apache-Subversion"
|
||||
REVISION="9"
|
||||
SOURCE_URI="http://wwwftp.ciril.fr/pub/apache/subversion/subversion-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9"
|
||||
PATCHES="subversion-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="x86_gcc2 x86 x86_64"
|
||||
|
||||
USER_SETTINGS_FILES="
|
||||
settings/subversion directory
|
||||
"
|
||||
|
||||
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:svnmucc = $portVersion compat >= 1.8
|
||||
cmd:svnrdump = $portVersion compat >= 1.8
|
||||
cmd:svnserve = $portVersion compat >= 1.8
|
||||
cmd:svnsync = $portVersion compat >= 1.8
|
||||
cmd:svnversion = $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_serf_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
|
||||
lib:libapr_1
|
||||
lib:libaprutil_1
|
||||
lib:libcrypto
|
||||
lib:libexpat
|
||||
lib:libiconv
|
||||
lib:libserf_1
|
||||
lib:libsqlite3
|
||||
lib:libssl
|
||||
lib:libxml2
|
||||
lib:libz
|
||||
"
|
||||
|
||||
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_serf_1 = 0.0.0 compat >= 0
|
||||
devel:libsvn_ra_svn_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
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku_devel
|
||||
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:libserf_1
|
||||
devel:libssl
|
||||
devel:libxml2 >= 2.7
|
||||
devel:libz
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:gcc
|
||||
cmd:ld
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
cmd:pkg_config
|
||||
cmd:python
|
||||
"
|
||||
|
||||
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
|
||||
}
|
||||
Reference in New Issue
Block a user