From d7f1b0d1cf93e3bc1846ab27cd61f74cefb5edd2 Mon Sep 17 00:00:00 2001 From: Dareus Date: Fri, 6 Dec 2013 05:53:37 +0000 Subject: [PATCH] aalib and bc recipe files updated --- media-libs/aalib/aalib-1.4rc4.recipe | 28 +++++++++++++++------------- sys-devel/bc/bc-1.06.recipe | 4 +--- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index 42f872401..aade064cd 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -14,20 +14,22 @@ ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" - aalib$secondaryArchSuffix = $portVersion compat >= 1.0.4 - lib:libaa$secondaryArchSuffix + aalib$secondaryArchSuffix = $portVersion compat >= 1 + lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1 " + REQUIRES=" haiku >= $haikuVersion " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - cmd:gcc + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix cmd:make cmd:libtoolize cmd:aclocal @@ -66,18 +68,18 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1.0.4 - cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1.0.4 - devel:libaa$secondaryArchSuffix = $portVersion compat >= 1.0.4 + libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1 + cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 + cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 + cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 + cmd:aasavefont${secondaryArchSuffix} = $portVersion compat >= 1 + cmd:aatest${secondaryArchSuffix} = $portVersion compat >= 1 + devel:libaa$secondaryArchSuffix = $portVersion compat >= 1 " REQUIRES_devel=" libaa$secondaryArchSuffix == $portVersion base - lib:libaa$secondaryArchSuffix - lib:libroot$secondaryArchSuffix + lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 + lib:libroot$secondaryArchSuffix >= $haikuVersion " diff --git a/sys-devel/bc/bc-1.06.recipe b/sys-devel/bc/bc-1.06.recipe index 3ef625c6b..be5c4fb85 100644 --- a/sys-devel/bc/bc-1.06.recipe +++ b/sys-devel/bc/bc-1.06.recipe @@ -41,9 +41,7 @@ PATCHES=" BUILD() { - ./configure --prefix=$prefix \ - --infodir=$infoDir \ - --mandir=$manDir + runConfigure --omit-dirs "docDir dataRootDir" ./configure make $jobArgs }