- Update to 2.1.

4 files changed, 134 insertions, 17 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index e6600e141fe1..47559956a1a6 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ardour
-PORTVERSION=	2.0.5
+PORTVERSION=	2.1
 CATEGORIES=	audio
 MASTER_SITES=	http://ardour.org/files/releases/
 DISTFILES=	ardour-${DISTVERSION}.tar.bz2
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
index 72c97f24639e..be5032e57e26 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,6 +1,6 @@
-MD5 (ardour-2.0.5.tar.bz2) = 7ac25b5837284fcae2ab3cb6825dc369
-SHA256 (ardour-2.0.5.tar.bz2) = 976b87920a3bd481b06edcbc756d1c5425397286f9b2a14546705a1f60a60848
-SIZE (ardour-2.0.5.tar.bz2) = 2777524
+MD5 (ardour-2.1.tar.bz2) = 18be414a37b832aae23c068ba9fcf8ab
+SHA256 (ardour-2.1.tar.bz2) = 160482d87d8eb2188481fc42d7f6442efe6bff38544a321a79e2e23a7aa9501b
+SIZE (ardour-2.1.tar.bz2) = 2788128
 MD5 (vst_sdk2_3.zip) = c91d3be58ad4e9c695d0a90b2198be0d
 SHA256 (vst_sdk2_3.zip) = 5400e0bbfeef0ab8a67b48899a9e8067db47552f43b30d8d15323ab999523226
 SIZE (vst_sdk2_3.zip) = 4147357
diff --git a/audio/ardour/files/patch-gtk2_ardour-engine_dialog.cc b/audio/ardour/files/patch-gtk2_ardour-engine_dialog.cc
new file mode 100644
index 000000000000..a85da80853e6
--- /dev/null
+++ b/audio/ardour/files/patch-gtk2_ardour-engine_dialog.cc
@@ -0,0 +1,110 @@
+--- gtk2_ardour/engine_dialog.cc.orig	2007-09-20 20:05:43.000000000 +0200
++++ gtk2_ardour/engine_dialog.cc	2007-09-29 23:55:29.000000000 +0200
+@@ -10,7 +10,7 @@
+ #include <CoreFoundation/CFString.h>
+ #include <sys/param.h>
+ #include <mach-o/dyld.h>
+-#else
++#elif !defined(__FreeBSD__)
+ #include <alsa/asoundlib.h>
+ #endif
+ 
+@@ -110,7 +110,9 @@
+ #ifdef __APPLE__
+ 	strings.push_back (X_("CoreAudio"));
+ #else
++#ifndef __FreeBSD__
+ 	strings.push_back (X_("ALSA"));
++#endif
+ 	strings.push_back (X_("OSS"));
+ 	strings.push_back (X_("FFADO"));
+ #endif
+@@ -158,7 +160,7 @@
+ 	basic_packer.attach (period_size_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	row++;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	label = manage (new Label (_("Number of buffers")));
+ 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	basic_packer.attach (periods_spinner, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -179,7 +181,7 @@
+ 	row++;
+ 	/* no audio mode with CoreAudio, its duplex or nuthin' */
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	label = manage (new Label (_("Audio Mode")));
+ 	basic_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	basic_packer.attach (audio_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -218,7 +220,7 @@
+ 	realtime_button.signal_toggled().connect (mem_fun (*this, &EngineControl::realtime_changed));
+ 	realtime_changed ();
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	label = manage (new Label (_("Realtime Priority")));
+ 	label->set_alignment (1.0, 0.5);
+ 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+@@ -268,7 +270,7 @@
+ 	options_packer.attach (*label, 0, 1, row, row + 1, FILL|EXPAND, (AttachOptions) 0);
+ 	++row;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	label = manage (new Label (_("Dither")));	
+ 	label->set_alignment (1.0, 0.5);
+ 	options_packer.attach (dither_mode_combo, 1, 2, row, row + 1, FILL|EXPAND, AttachOptions(0));
+@@ -299,7 +301,7 @@
+ 	device_packer.set_spacings (6);
+ 	row = 0;
+ 
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	label = manage (new Label (_("Input device")));
+ 	label->set_alignment (1.0, 0.5);
+ 	device_packer.attach (*label, 0, 1, row, row+1, FILL|EXPAND, (AttachOptions) 0);
+@@ -573,7 +575,7 @@
+ void
+ EngineControl::realtime_changed ()
+ {
+-#ifndef __APPLE__
++#if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 	priority_spinner.set_sensitive (realtime_button.get_active());
+ #endif
+ }
+@@ -586,7 +588,9 @@
+ #ifdef __APPLE__
+ 	devices["CoreAudio"] = enumerate_coreaudio_devices ();
+ #else
++#ifndef __FreeBSD__
+ 	devices["ALSA"] = enumerate_alsa_devices ();
++#endif
+ 	devices["FFADO"] = enumerate_ffado_devices ();
+ 	devices["OSS"] = enumerate_oss_devices ();
+ 	devices["Dummy"] = enumerate_dummy_devices ();
+@@ -665,6 +669,7 @@
+ 	return devs;
+ }
+ #else
++#ifndef __FreeBSD__
+ vector<string>
+ EngineControl::enumerate_alsa_devices ()
+ {
+@@ -725,6 +730,7 @@
+ 
+ 	return devs;
+ }
++#endif
+ 
+ vector<string>
+ EngineControl::enumerate_ffado_devices ()
+@@ -803,7 +809,7 @@
+ EngineControl::redisplay_latency ()
+ {
+ 	uint32_t rate = get_rate();
+-#ifdef __APPLE_
++#if defined(__APPLE_) || defined(__FreeBSD__)
+ 	float periods = 2;
+ #else
+ 	float periods = periods_adjustment.get_value();
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
index d09c2d87c155..2dab535bd3b2 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -102,6 +102,7 @@ share/ardour2/icons/ardour_icon_22px.png
 share/ardour2/icons/ardour_icon_48px.png
 share/ardour2/icons/ardour_icon_32px.png
 share/ardour2/icons/ardour_icon_16px.png
+share/ardour2/icons/saelogo.png
 @dirrm share/ardour2/icons
 share/ardour2/templates/16 Tracks.template
 share/ardour2/templates/2 Track.template
@@ -110,23 +111,23 @@ share/ardour2/templates/4 Tracks.template
 share/ardour2/templates/8 Tracks.template
 @dirrm share/ardour2/templates
 @dirrm share/ardour2
-share/locale/it_IT/LC_MESSAGES/libardour.mo
-share/locale/sv_SE/LC_MESSAGES/libardour.mo
-share/locale/el_GR/LC_MESSAGES/libardour.mo
-share/locale/ru_RU/LC_MESSAGES/libardour.mo
 share/locale/el_GR/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/el_GR/LC_MESSAGES/libardour2.mo
+share/locale/el_GR/LC_MESSAGES/gtk2_ardour.mo
 share/locale/ru_RU/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/ru_RU/LC_MESSAGES/libardour2.mo
+share/locale/ru_RU/LC_MESSAGES/gtk2_ardour.mo
 share/locale/pt_BR/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt_BR/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
 share/locale/es_ES/LC_MESSAGES/libgtkmm2ext.mo
-share/locale/it_IT/LC_MESSAGES/gtk_ardour.mo
-share/locale/sv_SE/LC_MESSAGES/gtk_ardour.mo
-share/locale/el_GR/LC_MESSAGES/gtk_ardour.mo
-share/locale/fr_FR/LC_MESSAGES/gtk_ardour.mo
-share/locale/ru_RU/LC_MESSAGES/gtk_ardour.mo
-share/locale/pt_BR/LC_MESSAGES/gtk_ardour.mo
-share/locale/es_ES/LC_MESSAGES/gtk_ardour.mo
-share/locale/de_DE/LC_MESSAGES/gtk_ardour.mo
-share/locale/pt_PT/LC_MESSAGES/gtk_ardour.mo
+share/locale/es_ES/LC_MESSAGES/gtk2_ardour.mo
+share/locale/fr_FR/LC_MESSAGES/gtk2_ardour.mo
+share/locale/it_IT/LC_MESSAGES/libardour2.mo
+share/locale/it_IT/LC_MESSAGES/gtk2_ardour.mo
+share/locale/sv_SE/LC_MESSAGES/libardour2.mo
+share/locale/sv_SE/LC_MESSAGES/gtk2_ardour.mo
+share/locale/de_DE/LC_MESSAGES/gtk2_ardour.mo
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
 @dirrmtry share/locale/sv_SE/LC_MESSAGES
@@ -137,3 +138,9 @@ share/locale/pt_PT/LC_MESSAGES/gtk_ardour.mo
 @dirrmtry share/locale/ru_RU
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
+@dirrmtry share/locale/pt_PT/LC_MESSAGES
+@dirrmtry share/locale/pt_PT
+@dirrmtry share/locale/es_ES/LC_MESSAGES
+@dirrmtry share/locale/es_ES
+@dirrmtry share/locale/fr_FR/LC_MESSAGES
+@dirrmtry share/locale/fr_FR