From c08c5ac0fc801b270d47de65f547246736e2c4ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Andr=C3=A8s?= <leo@ndrs.fr>
Date: Tue, 18 Apr 2017 22:54:26 +0200
Subject: [PATCH 1/2] Use new brew package name syntax

---
 .travis/osx..script.sh          | 2 +-
 cmake/apple/install_apple.sh.in | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis/osx..script.sh b/.travis/osx..script.sh
index 10e0e8b54..ae0569fbd 100755
--- a/.travis/osx..script.sh
+++ b/.travis/osx..script.sh
@@ -4,7 +4,7 @@ set -e
 
 if [ "$QT5" ]; then
         # Workaround; No FindQt5.cmake module exists
-        CMAKE_PREFIX_PATH="$(brew --prefix qt55)"
+        CMAKE_PREFIX_PATH="$(brew --prefix qt@5.5)"
         export CMAKE_PREFIX_PATH
 fi
 
diff --git a/cmake/apple/install_apple.sh.in b/cmake/apple/install_apple.sh.in
index 277c00f0f..546fbb6c5 100644
--- a/cmake/apple/install_apple.sh.in
+++ b/cmake/apple/install_apple.sh.in
@@ -24,10 +24,10 @@ echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
 # Locate macdeployqt, assume homebrew & Qt5
 which macdeployqt > /dev/null 2>&1
 if [ $? -ne 0 ]; then
-  brew --prefix qt55 > /dev/null 2>&1
+  brew --prefix qt@5.5 > /dev/null 2>&1
   if [ $? -eq 0 ]; then
     # Prefer Qt 5.5 (QTBUG-53533)
-    PATH=$PATH:$(brew --prefix qt55)/bin
+    PATH=$PATH:$(brew --prefix qt@5.5)/bin
   else
     # Fallback Qt 5.6+
   	PATH=$PATH:$(brew --prefix qt5)/bin

From a74df5a4c5dcfebe6ab00960f9e9b0a17fd44c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Andr=C3=A8s?= <leo@ndrs.fr>
Date: Tue, 18 Apr 2017 23:17:36 +0200
Subject: [PATCH 2/2] Fix osx script, drop MacPorts support

---
 cmake/apple/install_apple.sh.in | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/cmake/apple/install_apple.sh.in b/cmake/apple/install_apple.sh.in
index 546fbb6c5..aaaa56f2a 100644
--- a/cmake/apple/install_apple.sh.in
+++ b/cmake/apple/install_apple.sh.in
@@ -7,12 +7,7 @@
 set -e
 
 # STK rawwaves directory
-STK_RAWWAVE_LIST=( $HOME/stk-*/rawwaves )
-STK_RAWWAVE=${STK_RAWWAVE_LIST[0]}
-
-if [ ! -d "$STK_RAWWAVE" ]; then
-   STK_RAWWAVE=$(brew --prefix stk)/share/stk/rawwaves
-fi
+STK_RAWWAVE=$(brew --prefix stk)/share/stk/rawwaves
 
 # Place to create ".app" bundle
 APP="@CMAKE_BINARY_DIR@/@PROJECT_NAME_UCASE@.app"
@@ -21,20 +16,16 @@ MSG_COLOR='\x1B[1;36m'
 COLOR_RESET='\x1B[0m'
 echo -e "$MSG_COLOR\n\nCreating App Bundle \"$APP\"...$COLOR_RESET"
 
-# Locate macdeployqt, assume homebrew & Qt5
-which macdeployqt > /dev/null 2>&1
-if [ $? -ne 0 ]; then
-  brew --prefix qt@5.5 > /dev/null 2>&1
-  if [ $? -eq 0 ]; then
-    # Prefer Qt 5.5 (QTBUG-53533)
-    PATH=$PATH:$(brew --prefix qt@5.5)/bin
-  else
-    # Fallback Qt 5.6+
-  	PATH=$PATH:$(brew --prefix qt5)/bin
-  fi
-  export PATH
+# Prefer Qt 5.5 (QTBUG-53533)
+qtpath=$(brew --prefix qt@5.5)/bin
+
+# Fallback Qt 5.6+
+if [ ! -d "$qtpath" ]; then
+  qtpath=$(brew--prefix qt5)/bin
 fi
 
+export PATH=$PATH:$qtpath
+
 # Remove any old .app bundles
 rm -Rf "$APP"