Update subversion 1.6.15 recipe

* Specify patch explicitly.
* Remove bogus copied and pasted provides. Add the libraries.
* Use runConfigure.
* Use jobArgs.
* Use prepareInstalledDevelLibs.
This commit is contained in:
Ingo Weinhold
2013-04-30 21:57:28 +02:00
parent 88cc2bcdb9
commit 8fca2cffe2

View File

@@ -8,11 +8,15 @@ DESCRIPTION="
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_MD5="113fca1d9e4aa389d7dc2b210010fa69"
REVISION="4"
REVISION="5"
ARCHITECTURES="x86_gcc2 ?x86"
PATCHES="subversion-1.6.15.patch"
PROVIDES="
subversion = $portVersion compat >= 1.6
cmd:svn = $portVersion compat >= 1.6
@@ -22,8 +26,19 @@ PROVIDES="
cmd:svnserve = $portVersion compat >= 1.6
cmd:svnsync = $portVersion compat >= 1.6
cmd:svnversion = $portVersion compat >= 1.6
lib:libiconv = 2.5.0 compat >= 2
lib:libcharset = 1.0.0 compat >= 1
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
@@ -56,15 +71,14 @@ BUILD()
libtoolize --force --copy --install
aclocal -I build -I build/ac-macros
autoconf
subversionPackageLinksDir=$(finddir B_PACKAGE_LINKS_DIRECTORY)/$portRevisionedName
./configure $configureDirArgs \
--with-apr=$subversionPackageLinksDir/apr/bin/apr-1-config \
--with-apr-util=$subversionPackageLinksDir/apr_util/bin/apu-1-config \
--with-neon=$subversionPackageLinksDir/neon \
--with-zlib=$subversionPackageLinksDir/zlib \
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()
@@ -82,7 +96,19 @@ INSTALL()
# make install-swig-rb
#fi
fi
}
LICENSE="Apache-Subversion"
COPYRIGHT="2010 The Apache Software Foundation"
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
}