From a96af2db2552cae5fb04e6a48c799072453dcb95 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 12 Jun 2013 16:02:43 +0200 Subject: [PATCH] openssl: update recipe --- dev-libs/openssl/openssl-1.0.0j.recipe | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.0j.recipe b/dev-libs/openssl/openssl-1.0.0j.recipe index fde0ea5a3..aa565941f 100644 --- a/dev-libs/openssl/openssl-1.0.0j.recipe +++ b/dev-libs/openssl/openssl-1.0.0j.recipe @@ -22,7 +22,7 @@ COPYRIGHT=" 1995-1998 Eric Young 1998-2012 The OpenSSL Project. " -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="openssl-1.0.0j.patch" @@ -36,16 +36,15 @@ PROVIDES=" " REQUIRES=" haiku >= $haikuVersion - zlib >= 1.2.3 + lib:libz >= 1.2.3 " BUILD_REQUIRES=" - $REQUIRES cmd:gcc cmd:ld cmd:make cmd:perl >= 5 cmd:sed - zlib_devel >= 1.2.3 + devel:libz >= 1.2.3 " BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion @@ -61,6 +60,7 @@ BUILD() ./config --prefix=$prefix zlib shared --openssldir=$dataRootDir/ssl make + # multi-job builds don't work correctly } INSTALL() @@ -74,6 +74,11 @@ INSTALL() # prepare develop/lib prepareInstalledDevelLibs libcrypto libssl fixPkgconfig + + # devel package + packageEntries devel \ + $developDir \ + $manDir/man3 } TEST() @@ -81,3 +86,15 @@ TEST() cd openssl-1.0.0j make test } + +# ----- devel package ------------------------------------------------------- + +SUMMARY_devel="The openssl development files" +PROVIDES_devel=" + openssl_devel = $portVersion + devel:libcrypto = $portVersion compat >= 1.0.0 + devel:libssl = $portVersion compat >= 1.0.0 + " +REQUIRES_devel=" + openssl == $portVersion base + "