diff --git a/dev-libs/apr_util/apr_util-1.4.1.recipe b/dev-libs/apr_util/apr_util-1.4.1.recipe index 9eb2a0d83..4444950fa 100644 --- a/dev-libs/apr_util/apr_util-1.4.1.recipe +++ b/dev-libs/apr_util/apr_util-1.4.1.recipe @@ -4,24 +4,23 @@ SRC_URI="http://archive.apache.org/dist/apr/apr-util-1.4.1.tar.gz" LICENSE="Apache v2" COPYRIGHT="2011 The Apache Software Foundation." CHECKSUM_MD5="666a5d56098a9debf998510e304c8095" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="apr_util-1.4.1.patch" PROVIDES=" apr_util = $portVersion compat >= 1 - cmd:apu_1_config = $portVersion compat >= 1 - lib:libaprutil = $portVersion compat >= 1 - lib:libaprutil_1 = $portVersion compat >= 1 + lib:libaprutil_1 = 0.4.1 compat >= 0 " REQUIRES=" haiku >= $haikuVersion - apr >= 1.4.6 - expat >= 2.0 + lib:libapr_1 + lib:libexpat " BUILD_REQUIRES=" - $REQUIRES + apr_devel >= 1.4.6 + expat_devel >= 2.0 cmd:aclocal cmd:autoconf cmd:autoheader @@ -43,8 +42,8 @@ PATCH() BUILD() { - aprInstallDir=$portPackageLinksDir/apr - expatInstallDir=$portPackageLinksDir/expat + aprInstallDir=$portPackageLinksDir/apr_devel + expatInstallDir=$portPackageLinksDir/expat_devel rm -rf aclocal.m4 mkdir -p m4 @@ -81,6 +80,14 @@ INSTALL() # fix apu-1-config fixDevelopLibDirReferences $binDir/apu-1-config + + # remove superfluous .exp file + rm $libDir/aprutil.exp + + # devel package + packageEntries devel \ + $binDir \ + $developDir } DESCRIPTION=" @@ -108,3 +115,14 @@ DESCRIPTION=" - thread and Process management - various data structures (tables, hashes, priority queues, etc) " + +# ----- devel package ------------------------------------------------------- + +PROVIDES_devel=" + apr_util_devel = portVersion compat >= 1 + cmd:apu_1_config = $portVersion compat >= 1 + devel:libaprutil_1 = 0.4.1 compat >= 0 + " +REQUIRES_devel=" + apr_util == $portVersion base + "