From 5b8ac1a0f3135a46080aab66a41aa13760b9d7fc Mon Sep 17 00:00:00 2001 From: noryb009 Date: Sat, 14 Dec 2013 21:44:20 -0500 Subject: [PATCH 1/2] Fix aalib recipe The non-devel package provided "aalib", while the devel package needed "libaa" --- media-libs/aalib/aalib-1.4rc4.recipe | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index aade064cd..bcbcc4185 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -36,11 +36,11 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:automake cmd:makeinfo -" + " PATCHES=" aalib-1.4rc4.patch -" + " BUILD() { @@ -68,7 +68,7 @@ INSTALL() # ----- devel package ------------------------------------------------------- PROVIDES_devel=" - libaa${secondaryArchSuffix}_devel = $portVersion compat >= 1 + aalib${secondaryArchSuffix}_devel = $portVersion compat >= 1 cmd:aafire${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aainfo${secondaryArchSuffix} = $portVersion compat >= 1 cmd:aalib_config${secondaryArchSuffix} = $portVersion compat >= 1 @@ -78,8 +78,7 @@ PROVIDES_devel=" " REQUIRES_devel=" - libaa$secondaryArchSuffix == $portVersion base + aalib$secondaryArchSuffix == $portVersion base lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 - lib:libroot$secondaryArchSuffix >= $haikuVersion " From 8e43a176778b7efe55dfd30e031290206269ef7c Mon Sep 17 00:00:00 2001 From: noryb009 Date: Fri, 20 Dec 2013 18:32:10 -0500 Subject: [PATCH 2/2] Clean up aalib recipe --- media-libs/aalib/aalib-1.4rc4.recipe | 39 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/media-libs/aalib/aalib-1.4rc4.recipe b/media-libs/aalib/aalib-1.4rc4.recipe index bcbcc4185..74bf61761 100644 --- a/media-libs/aalib/aalib-1.4rc4.recipe +++ b/media-libs/aalib/aalib-1.4rc4.recipe @@ -1,14 +1,14 @@ SUMMARY="aalib is an ASCII rendering 2D library" DESCRIPTION="aalib is a software library which allows applications to automatically convert still and moving images into ASCII art. -" + " HOMEPAGE="http://aa-project.sourceforge.net/aalib/" SRC_URI="http://prdownloads.sourceforge.net/aa-project/aalib-1.4rc4.tar.gz" SOURCE_DIR="aalib-1.4.0" CHECKSUM_MD5="d5aa8e9eae07b7441298b5c30490f6a6" REVISION="2" LICENSE="Public Domain" -COPYRIGHT="1997 by Jam Hubicka" +COPYRIGHT="1997 Jam Hubicka" ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="x86_gcc2 x86" @@ -16,26 +16,26 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" aalib$secondaryArchSuffix = $portVersion compat >= 1 lib:libaa$secondaryArchSuffix = 1.0.4 compat >= 1 -" - + " REQUIRES=" haiku >= $haikuVersion -" + " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel >= $haikuVersion -" + " BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:libtoolize cmd:aclocal cmd:autoconf cmd:automake + cmd:gcc$secondaryArchSuffix + cmd:ld$secondaryArchSuffix + cmd:libtoolize + cmd:make cmd:makeinfo + cmd:ranlib " PATCHES=" @@ -61,24 +61,25 @@ INSTALL() # devel package packageEntries devel \ $binDir \ + $dataDir \ $developDir \ - $manDir/man3 + $documentationDir } # ----- devel package ------------------------------------------------------- PROVIDES_devel=" aalib${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:aalib$secondaryArchSuffix = $portVersion compat >= 1 devel:libaa$secondaryArchSuffix = $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 + " REQUIRES_devel=" aalib$secondaryArchSuffix == $portVersion base - lib:libaa$secondaryArchSuffix >= 1.0.4 compat >= 1 -" + "