From ba16479659a0a6aaf85e64ea12c6d78566cf6f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20P=C3=B6chtrager?= Date: Fri, 26 Dec 2014 11:17:38 +0100 Subject: [PATCH] osxcross-macports: improve resolving package dependencies --- tools/osxcross-macports | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/osxcross-macports b/tools/osxcross-macports index 54ffb2b..0c5ba66 100755 --- a/tools/osxcross-macports +++ b/tools/osxcross-macports @@ -274,8 +274,9 @@ installPkg() local pkgfile=$(echo "$pkgurl" | awk -F'/' '{print $NF}') if [ -z "$pkgurl" ]; then - local oldpkgname=$pkgname - pkgname=$(echo "$pkgname" | cut -f1 -d'-') + local oldpkgname=$pkgname + local tmp=$(echo "$pkgname" | awk -F'-' '{print $NF}') + [ -n "$tmp" ] && pkgname=${pkgname/-$tmp/} if [ "$pkgname" != "$oldpkgname" ]; then echo "trying $pkgname instead ..."