more work on OSX packaging

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2341 d708f5d6-7413-0410-9779-e7cbd77b26cf

14 files changed, 64 insertions, 399 deletions

diff --git a/tools/osx_packaging/Info.plist b/tools/osx_packaging/Info.plist.in
index a16cd2240e..a0cfb76155 100644
--- a/tools/osx_packaging/Info.plist
+++ b/tools/osx_packaging/Info.plist.in
@@ -23,7 +23,7 @@
 	<key>CFBundleExecutable</key>
 	<string>Ardour2</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Ardour 2.0.5 Copyright 2007 Paul Davis</string>
+	<string>Ardour @VERSION@ Copyright 2007 Paul Davis</string>
 	<key>CFBundleIconFile</key>
 	<string>appIcon.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -35,21 +35,17 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersions</key>
-	<string>2.0.5</string>
+	<string>@VERSION@</string>
 	<key>CFBundleSignature</key>
 	<string>ArDr</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.5</string>
+	<string>@VERSION@</string>
 	<key>LSUIElement</key>
 	<string>0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
-	<key>LSEnvironment</key>
-	<dict>
-	  <key>ARDOUR_SAE</key>
-	  <string>true</string>
-	</dict>
+	@ENV@
 </dict>
 </plist>
diff --git a/tools/osx_packaging/MenuBar.nib/classes.nib b/tools/osx_packaging/MenuBar.nib/classes.nib
deleted file mode 100644
index ea58db1189..0000000000
--- a/tools/osx_packaging/MenuBar.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
diff --git a/tools/osx_packaging/MenuBar.nib/info.nib b/tools/osx_packaging/MenuBar.nib/info.nib
deleted file mode 100644
index c0f4643eff..0000000000
--- a/tools/osx_packaging/MenuBar.nib/info.nib
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>99 362 356 240 0 0 1280 832 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>187</key>
-		<string>340 374 240 44 0 0 1280 832 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>349.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>187</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>7F44</string>
-	<key>targetFramework</key>
-	<string>IBCarbonFramework</string>
-</dict>
-</plist>
diff --git a/tools/osx_packaging/MenuBar.nib/objects.xib b/tools/osx_packaging/MenuBar.nib/objects.xib
deleted file mode 100644
index 78f0a0a012..0000000000
--- a/tools/osx_packaging/MenuBar.nib/objects.xib
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-  <array count="4" name="allObjects">
-    <object class="IBCarbonMenu" id="187">
-      <string name="title">MenuBar</string>
-      <array count="1" name="items">
-        <object class="IBCarbonMenuItem" id="195">
-          <string name="title">ScriptExec</string>
-          <object name="submenu" class="IBCarbonMenu" id="193">
-            <string name="title">ScriptExec</string>
-            <string name="name">_NSAppleMenu</string>
-          </object>
-        </object>
-      </array>
-      <string name="name">_NSMainMenu</string>
-    </object>
-    <reference idRef="193"/>
-    <reference idRef="195"/>
-    <object class="IBCarbonMenuItem" id="204">
-      <string name="title">Window</string>
-      <object name="submenu" class="IBCarbonMenu">
-        <string name="title">Window</string>
-        <array count="5" name="items">
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Minimize Window</string>
-            <string name="keyEquivalent">m</string>
-            <ostype name="command">mini</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Minimize All Windows</string>
-            <string name="keyEquivalent">m</string>
-            <int name="keyEquivalentModifier">1572864</int>
-            <ostype name="command">mini</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="separator">TRUE</boolean>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Bring All to Front</string>
-            <ostype name="command">frnt</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Bring in Front</string>
-            <int name="keyEquivalentModifier">1572864</int>
-            <ostype name="command">frnt</ostype>
-          </object>
-        </array>
-        <string name="name">_NSWindowsMenu</string>
-      </object>
-    </object>
-  </array>
-  <array count="4" name="allParents">
-    <reference idRef="1"/>
-    <reference idRef="195"/>
-    <reference idRef="187"/>
-    <reference idRef="187"/>
-  </array>
-  <dictionary count="2" name="nameTable">
-    <string>File&apos;s Owner</string>
-    <reference idRef="1"/>
-    <string>MenuBar</string>
-    <reference idRef="187"/>
-  </dictionary>
-  <unsigned_int name="nextObjectID">206</unsigned_int>
-</object>
diff --git a/tools/osx_packaging/ProgressWindow.nib/classes.nib b/tools/osx_packaging/ProgressWindow.nib/classes.nib
deleted file mode 100644
index ea58db1189..0000000000
--- a/tools/osx_packaging/ProgressWindow.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
diff --git a/tools/osx_packaging/ProgressWindow.nib/info.nib b/tools/osx_packaging/ProgressWindow.nib/info.nib
deleted file mode 100644
index 4e51560026..0000000000
--- a/tools/osx_packaging/ProgressWindow.nib/info.nib
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>124 298 356 240 0 0 1280 832 </string>
-	<key>IBFramework Version</key>
-	<string>349.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>180</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>7F44</string>
-	<key>targetFramework</key>
-	<string>IBCarbonFramework</string>
-</dict>
-</plist>
diff --git a/tools/osx_packaging/ProgressWindow.nib/objects.xib b/tools/osx_packaging/ProgressWindow.nib/objects.xib
deleted file mode 100644
index 6eaacc43e9..0000000000
--- a/tools/osx_packaging/ProgressWindow.nib/objects.xib
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-  <array count="4" name="allObjects">
-    <object class="IBCarbonWindow" id="180">
-      <string name="windowRect">404 523 457 899 </string>
-      <string name="title">Caching Fonts...</string>
-      <object name="rootControl" class="IBCarbonRootControl" id="183">
-        <string name="bounds">0 0 53 376 </string>
-        <array count="2" name="subviews">
-          <object class="IBCarbonProgressBar" id="181">
-            <string name="bounds">19 17 32 270 </string>
-            <boolean name="small">TRUE</boolean>
-            <int name="controlSize">1</int>
-            <int name="initialValue">50</int>
-          </object>
-          <object class="IBCarbonButton" id="185">
-            <string name="bounds">16 284 34 356 </string>
-            <boolean name="small">TRUE</boolean>
-            <int name="controlSize">1</int>
-            <string name="title">Cancel</string>
-            <ostype name="command">quit</ostype>
-          </object>
-        </array>
-      </object>
-      <boolean name="hasCloseBox">FALSE</boolean>
-      <boolean name="hasHorizontalZoom">FALSE</boolean>
-      <boolean name="isResizable">FALSE</boolean>
-      <boolean name="hasVerticalZoom">FALSE</boolean>
-      <int name="themeBrush">51</int>
-      <int name="windowPosition">1</int>
-    </object>
-    <reference idRef="181"/>
-    <reference idRef="183"/>
-    <reference idRef="185"/>
-  </array>
-  <array count="4" name="allParents">
-    <reference idRef="1"/>
-    <reference idRef="183"/>
-    <reference idRef="180"/>
-    <reference idRef="183"/>
-  </array>
-  <dictionary count="2" name="nameTable">
-    <string>File&apos;s Owner</string>
-    <reference idRef="1"/>
-    <string>Window</string>
-    <reference idRef="180"/>
-  </dictionary>
-  <unsigned_int name="nextObjectID">186</unsigned_int>
-</object>
diff --git a/tools/osx_packaging/Resources/MenuBar.nib/classes.nib b/tools/osx_packaging/Resources/MenuBar.nib/classes.nib
deleted file mode 100644
index ea58db1189..0000000000
--- a/tools/osx_packaging/Resources/MenuBar.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
diff --git a/tools/osx_packaging/Resources/MenuBar.nib/info.nib b/tools/osx_packaging/Resources/MenuBar.nib/info.nib
deleted file mode 100644
index c0f4643eff..0000000000
--- a/tools/osx_packaging/Resources/MenuBar.nib/info.nib
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>99 362 356 240 0 0 1280 832 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>187</key>
-		<string>340 374 240 44 0 0 1280 832 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>349.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>187</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>7F44</string>
-	<key>targetFramework</key>
-	<string>IBCarbonFramework</string>
-</dict>
-</plist>
diff --git a/tools/osx_packaging/Resources/MenuBar.nib/objects.xib b/tools/osx_packaging/Resources/MenuBar.nib/objects.xib
deleted file mode 100644
index 78f0a0a012..0000000000
--- a/tools/osx_packaging/Resources/MenuBar.nib/objects.xib
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-  <array count="4" name="allObjects">
-    <object class="IBCarbonMenu" id="187">
-      <string name="title">MenuBar</string>
-      <array count="1" name="items">
-        <object class="IBCarbonMenuItem" id="195">
-          <string name="title">ScriptExec</string>
-          <object name="submenu" class="IBCarbonMenu" id="193">
-            <string name="title">ScriptExec</string>
-            <string name="name">_NSAppleMenu</string>
-          </object>
-        </object>
-      </array>
-      <string name="name">_NSMainMenu</string>
-    </object>
-    <reference idRef="193"/>
-    <reference idRef="195"/>
-    <object class="IBCarbonMenuItem" id="204">
-      <string name="title">Window</string>
-      <object name="submenu" class="IBCarbonMenu">
-        <string name="title">Window</string>
-        <array count="5" name="items">
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Minimize Window</string>
-            <string name="keyEquivalent">m</string>
-            <ostype name="command">mini</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Minimize All Windows</string>
-            <string name="keyEquivalent">m</string>
-            <int name="keyEquivalentModifier">1572864</int>
-            <ostype name="command">mini</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="separator">TRUE</boolean>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Bring All to Front</string>
-            <ostype name="command">frnt</ostype>
-          </object>
-          <object class="IBCarbonMenuItem">
-            <boolean name="dynamic">TRUE</boolean>
-            <string name="title">Bring in Front</string>
-            <int name="keyEquivalentModifier">1572864</int>
-            <ostype name="command">frnt</ostype>
-          </object>
-        </array>
-        <string name="name">_NSWindowsMenu</string>
-      </object>
-    </object>
-  </array>
-  <array count="4" name="allParents">
-    <reference idRef="1"/>
-    <reference idRef="195"/>
-    <reference idRef="187"/>
-    <reference idRef="187"/>
-  </array>
-  <dictionary count="2" name="nameTable">
-    <string>File&apos;s Owner</string>
-    <reference idRef="1"/>
-    <string>MenuBar</string>
-    <reference idRef="187"/>
-  </dictionary>
-  <unsigned_int name="nextObjectID">206</unsigned_int>
-</object>
diff --git a/tools/osx_packaging/Resources/ProgressWindow.nib/classes.nib b/tools/osx_packaging/Resources/ProgressWindow.nib/classes.nib
deleted file mode 100644
index ea58db1189..0000000000
--- a/tools/osx_packaging/Resources/ProgressWindow.nib/classes.nib
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-IBClasses = ();
-IBVersion = 1;
-}
diff --git a/tools/osx_packaging/Resources/ProgressWindow.nib/info.nib b/tools/osx_packaging/Resources/ProgressWindow.nib/info.nib
deleted file mode 100644
index 4e51560026..0000000000
--- a/tools/osx_packaging/Resources/ProgressWindow.nib/info.nib
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>124 298 356 240 0 0 1280 832 </string>
-	<key>IBFramework Version</key>
-	<string>349.0</string>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>180</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>7F44</string>
-	<key>targetFramework</key>
-	<string>IBCarbonFramework</string>
-</dict>
-</plist>
diff --git a/tools/osx_packaging/Resources/ProgressWindow.nib/objects.xib b/tools/osx_packaging/Resources/ProgressWindow.nib/objects.xib
deleted file mode 100644
index 6eaacc43e9..0000000000
--- a/tools/osx_packaging/Resources/ProgressWindow.nib/objects.xib
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<object class="NSIBObjectData">
-  <string name="targetFramework">IBCarbonFramework</string>
-  <object name="rootObject" class="NSCustomObject" id="1">
-    <string name="customClass">NSApplication</string>
-  </object>
-  <array count="4" name="allObjects">
-    <object class="IBCarbonWindow" id="180">
-      <string name="windowRect">404 523 457 899 </string>
-      <string name="title">Caching Fonts...</string>
-      <object name="rootControl" class="IBCarbonRootControl" id="183">
-        <string name="bounds">0 0 53 376 </string>
-        <array count="2" name="subviews">
-          <object class="IBCarbonProgressBar" id="181">
-            <string name="bounds">19 17 32 270 </string>
-            <boolean name="small">TRUE</boolean>
-            <int name="controlSize">1</int>
-            <int name="initialValue">50</int>
-          </object>
-          <object class="IBCarbonButton" id="185">
-            <string name="bounds">16 284 34 356 </string>
-            <boolean name="small">TRUE</boolean>
-            <int name="controlSize">1</int>
-            <string name="title">Cancel</string>
-            <ostype name="command">quit</ostype>
-          </object>
-        </array>
-      </object>
-      <boolean name="hasCloseBox">FALSE</boolean>
-      <boolean name="hasHorizontalZoom">FALSE</boolean>
-      <boolean name="isResizable">FALSE</boolean>
-      <boolean name="hasVerticalZoom">FALSE</boolean>
-      <int name="themeBrush">51</int>
-      <int name="windowPosition">1</int>
-    </object>
-    <reference idRef="181"/>
-    <reference idRef="183"/>
-    <reference idRef="185"/>
-  </array>
-  <array count="4" name="allParents">
-    <reference idRef="1"/>
-    <reference idRef="183"/>
-    <reference idRef="180"/>
-    <reference idRef="183"/>
-  </array>
-  <dictionary count="2" name="nameTable">
-    <string>File&apos;s Owner</string>
-    <reference idRef="1"/>
-    <string>Window</string>
-    <reference idRef="180"/>
-  </dictionary>
-  <unsigned_int name="nextObjectID">186</unsigned_int>
-</object>
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 4c8bbe0e36..00189c748e 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -2,12 +2,29 @@
 
 # script for pulling together a MacOSX app bundle.
 
+GTKQUARTZ_ROOT=/opt/gtk
+
+SAE=
+WITH_JACK=1
+
+while [ $# -gt 0 ] ; do
+    echo "arg = $1"
+    case $1 in
+	--sae) SAE=1 ; shift ;;
+	--nojack) WITH_JACK= ; shift ;;
+    esac
+done
+
 version=`grep -m 1 '^ardour_version' ../../SConstruct | cut -d' ' -f 3 | sed "s/'//g"`
 echo "Version is $version"
 
 # setup directory structure
 
 APPROOT=Ardour2.app/Contents
+Frameworks=$APPROOT/Frameworks
+Resources=$APPROOT/Resources
+Shared=$Resources/share
+Etc=$Resources/etc
 
 echo "Removing old Ardour2.app tree ..."
 
@@ -15,53 +32,65 @@ rm -rf Ardour2.app
 
 echo "Building new app directory structure ..."
 
-mkdir -p Ardour2.app/Contents/MacOS
-mkdir -p Ardour2.app/Contents/Resources
-mkdir -p Ardour2.app/Contents/Frameworks
+# only bother to make the longest paths
+
+mkdir -p $APPROOT/MacOS
+mkdir -p $APPROOT/Resources
+mkdir -p $Frameworks/modules
+mkdir -p $Shared/templates
+mkdir -p $Etc
+
+# maybe set variables
+env=""
+if test x$SAE != x ; then
+    env="$env<key>ARDOUR_SAE</key><string>true</string>"
+fi
+
+if test x$WITH_JACK != x ; then
+    env="$env<key>ARDOUR_WITH_JACK</key><string>true</string>"
+fi
+
+if test "x$env" != x ; then
+    env="<key>LSEnvironment</key><dict>$env</dict>"
+fi
+
+# edit plist
+sed -e "s?@ENV@?$env?g" -e "s?@VERSION@?$version?g" < Info.plist.in > Info.plist
 
 # copy static files
 
 cp Info.plist $APPROOT
-cp PkgInfo $APPROOT
-cp -r Resources/* $APPROOT/Resources
-
-Frameworks=$APPROOT/Frameworks
-Resources=$APPROOT/Resources
-Shared=$Resources/share
-Etc=$Resources/etc
+cp -R Resources $APPROOT
 
-# only bother to make the longest paths
 
-mkdir -p $Frameworks/modules
-mkdir -p $Shared/templates
-mkdir -p $Etc
 
 
 # copy executable
 echo "Copying Ardour executable ..."
 cp ../../gtk2_ardour/ardour-$version $APPROOT/MacOS/Ardour2
+strip $APPROOT/MacOS/Ardour2
 
 # copy everything related to gtk-quartz
 echo "Copying GTK-Quartz tree ..."
-cp -R /opt/gtk/lib/*.dylib $Frameworks/
-cp -R /opt/gtk/etc/* $Etc
+cp -R $GTKQUARTZ_ROOT/lib/*.dylib $Frameworks/
+cp -R $GTKQUARTZ_ROOT/etc/* $Etc
 echo "Copying all Pango modules ..."
-cp -R /opt/gtk/lib/pango/1.6.0/modules/*.so $Frameworks/modules
+cp -R $GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/*.so $Frameworks/modules
 echo "Copying all GDK Pixbuf loaders ..."
-cp -R /opt/gtk/lib/gtk-2.0/2.10.0/loaders/*.so $Frameworks/modules
+cp -R $GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders/*.so $Frameworks/modules
 # charset alias file
-cp -R /opt/gtk/lib/charset.alias $Resources
+cp -R $GTKQUARTZ_ROOT/lib/charset.alias $Resources
 
 # generate new Pango module file
 cat > pangorc <<EOF 
 [Pango]
-ModulesPath=/opt/gtk/lib/pango/1.6.0/modules
+ModulesPath=$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules
 EOF
-env PANGO_RC_FILE=pangorc /opt/gtk/bin/pango-querymodules | sed 's?/opt/gtk/lib/pango/1.6.0/modules/?@executable_path/../Frameworks/modules/?' > $Resources/pango.modules
+env PANGO_RC_FILE=pangorc $GTKQUARTZ_ROOT/bin/pango-querymodules | sed "s?$GTKQUARTZ_ROOT/lib/pango/1.6.0/modules/?@executable_path/../Frameworks/modules/?" > $Resources/pango.modules
 rm pangorc
 
 # generate a new GDK pixbufs loaders file
-sed 's?/opt/gtk/lib/gtk-2.0/2.10.0/loaders/?@executable_path/../Frameworks/modules/?' < /opt/gtk/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders
+sed "s?$GTKQUARTZ_ROOT/lib/gtk-2.0/2.10.0/loaders/?@executable_path/../Frameworks/modules/?" < $GTKQUARTZ_ROOT/etc/gtk-2.0/gdk-pixbuf.loaders > $Resources/gdk-pixbuf.loaders
 
 echo "Copying Ardour libraries into .app ..."
 cp ../../libs/pbd/libpbd.dylib $Frameworks
@@ -91,10 +120,12 @@ cp /opt/local/lib/libraptor.1.dylib $Frameworks
 cp /opt/local/lib/liblo.0.dylib $Frameworks
 
 # JACK
-
-cp /usr/local/lib/libjack.0.dylib $Frameworks
-cp /usr/local/bin/jackd $APPROOT/MacOS/jackd
-
+if test x$WITH_JACK != x ; then
+    cp /usr/local/lib/libjack.0.dylib $Frameworks
+    cp /usr/local/lib/jack/jack_coreaudio.so $Frameworks
+    cp /usr/local/bin/jackd $APPROOT/MacOS/jackd
+fi
+    
 # XXX STILL NEED TO DO SURFACES AND PANNERS
 
 cp ../../libs/surfaces/control_protocol/libardour_cp.dylib $Frameworks
@@ -123,10 +154,11 @@ for svndir in `find Ardour2.app -name .svn -type dir`; do
 done
 
 # now fix up the executables
+echo "Fixing up executable dependency names ..."
 for exe in Ardour2 jackd ; do
     EXE=$APPROOT/MacOS/$exe
     changes=""
-    for lib in `otool -L $EXE | egrep '(/opt/gtk|/local/|libs/)' | awk '{print $1}'` ; do
+    for lib in `otool -L $EXE | egrep "($GTKQUARTZ_ROOT|/local/|libs/)" | awk '{print $1}'` ; do
 	base=`basename $lib`
 	changes="$changes -change $lib @executable_path/../Frameworks/$base"
     done
@@ -144,7 +176,7 @@ for dylib in $Frameworks/*.dylib $Frameworks/modules/*.so ; do
 	# change all the dependencies
 
 	changes=""
-	for lib in `otool -L $dylib | egrep '(/opt/gtk|/local/|libs/)' | awk '{print $1}'` ; do
+	for lib in `otool -L $dylib | egrep "($GTKQUARTZ_ROOT|/local/|libs/)" | awk '{print $1}'` ; do
 	    base=`basename $lib`
 	    changes="$changes -change $lib @executable_path/../Frameworks/$base"
 	done
@@ -164,18 +196,5 @@ for dylib in $Frameworks/*.dylib $Frameworks/modules/*.so ; do
     fi
 done
 
-exit 0
-
-# make DMG
-rm -rf macdist
-mkdir "macdist"
-cp -r README.rtf COPYING Ardour2.app macdist/
-# reduce size
-strip macdist/Ardour2.app/Contents/MacOS/Ardour2
-dmgname="Ardour-$version"
-rm -f $dmgname.dmg
-echo "Creating DMG"
-hdiutil create -fs HFS+ -volname $dmgname -srcfolder macdist $dmgname.dmg
-
 echo "Done."