From 54391a5df206f617a4bf6e67fe5baf9c8b70a525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 3 Nov 2012 13:37:27 +0100
Subject: [PATCH] Fix installoptionalpackage for OpenSSL and Webkit

* The regex for the OpenSSL package name variable didn't catch up
with the changed file which checked for the gcc version.
* Webkit was declared using a custom variable that wasn't grepped for.
---
 data/bin/installoptionalpackage | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index 612549fc57..bd8c40c4f0 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -65,6 +65,7 @@ HAIKU_INCLUDE_SOURCES=0
 $urlLine
 $sslPkgLine
 $sslUrlLine
+$webkitFileLine
 declare -a functionArgs
 expanderRulesFile=`finddir B_COMMON_DATA_DIRECTORY`/expander.rules
 if [ -f \${expanderRulesFile} ] ; then
@@ -686,7 +687,7 @@ function ConvertJamToBash()
 	#icuDevelPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
 	#ConvertVariableDeclarationLines "$regExp" 'icuDevelPkgLine'
 
-	local regExp='/^HAIKU_OPENSSL_PACKAGE/p'
+	local regExp="/^\s*HAIKU_OPENSSL_PACKAGE = .*-gcc${HAIKU_GCC_VERSION[1]}-/p"
 	sslPkgLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
 	ConvertVariableDeclarationLines "$regExp" 'sslPkgLine'
 
@@ -694,6 +695,10 @@ function ConvertJamToBash()
 	sslUrlLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
 	ConvertVariableDeclarationLines "$regExp" 'sslUrlLine'
 
+	local regExp='/^HAIKU_WEBKIT_FILE/p'
+	webkitFileLine=`sed -n -e "$regExp" ${baseDir}/OptionalBuildFeatures`
+	ConvertVariableDeclarationLines "$regExp" 'webkitFileLine'
+
 	local regExp='/^local\ baseURL/p'
 	urlLine=`sed -n -e "$regExp" ${baseDir}/OptionalPackages`
 	urlLine=${urlLine/local\ /''}