diff --git a/dev-vcs/subversion/subversion-1.6.18.recipe b/dev-vcs/subversion/subversion-1.6.18.recipe index 35d9082a8..a6d630ed8 100644 --- a/dev-vcs/subversion/subversion-1.6.18.recipe +++ b/dev-vcs/subversion/subversion-1.6.18.recipe @@ -14,6 +14,10 @@ PATCHES="subversion-1.6.18.patch" ARCHITECTURES="x86_gcc2 x86 x86_64" +USER_SETTINGS_FILES=" + settings/subversion directory + " + PROVIDES=" subversion = $portVersion compat >= 1.6 cmd:svn = $portVersion compat >= 1.6 @@ -94,10 +98,6 @@ BUILD_PREREQUIRES=" cmd:make " -USER_SETTINGS_FILES=" - settings/subversion directory - " - PATCH() { sed -i "s,@HAIKU_GLOBAL_SETTINGS_DIR@,$sysconfDir," \ diff --git a/dev-vcs/subversion/subversion-1.8.11.recipe b/dev-vcs/subversion/subversion-1.8.11.recipe index 070b1af78..5c2006ea9 100644 --- a/dev-vcs/subversion/subversion-1.8.11.recipe +++ b/dev-vcs/subversion/subversion-1.8.11.recipe @@ -10,9 +10,14 @@ LICENSE="Apache-Subversion" REVISION="8" 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 @@ -96,12 +101,6 @@ BUILD_PREREQUIRES=" cmd:make " -USER_SETTINGS_FILES=" - settings/subversion directory - " - -PATCHES="subversion-$portVersion.patchset" - BUILD() { CFLAGS=-std=c9x LIBS="-lcrypto -lssl" runConfigure ./configure \ diff --git a/dev-vcs/subversion/subversion-1.9.7.recipe b/dev-vcs/subversion/subversion-1.9.7.recipe index e27b60881..324f0a3b5 100644 --- a/dev-vcs/subversion/subversion-1.9.7.recipe +++ b/dev-vcs/subversion/subversion-1.9.7.recipe @@ -14,6 +14,10 @@ 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 @@ -106,10 +110,6 @@ BUILD_PREREQUIRES=" cmd:swig " -USER_SETTINGS_FILES=" - settings/subversion directory - " - BUILD() { CFLAGS=-std=c9x CPPFLAGS=-P LIBS="-lcrypto -lssl" runConfigure ./configure \