- Update to 2.0.3.

Approved by:	miwi (mentor)

4 files changed, 22 insertions, 11 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index f5576f09b334..9bd1284571a6 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ardour
-PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTVERSION=	2.0.3
 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 e3245b9eea14..4ad7d50cdd95 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,6 +1,6 @@
-MD5 (ardour-2.0.2.tar.bz2) = f135c9c4706b19b04946ea0a4626c768
-SHA256 (ardour-2.0.2.tar.bz2) = 2174f6902e4fe4086dc1cc5f9a0ef069aee27ef8ce740ebbf16cfb5d502bc7db
-SIZE (ardour-2.0.2.tar.bz2) = 2737191
+MD5 (ardour-2.0.3.tar.bz2) = d047d3f9e7b5b4bf80980c5b267c1068
+SHA256 (ardour-2.0.3.tar.bz2) = 36df4728b92aaab141ed7dbfab4c29f8a1fb83e4ebb95bc2ffa40c831f4d787e
+SIZE (ardour-2.0.3.tar.bz2) = 2745744
 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-SConstruct b/audio/ardour/files/patch-SConstruct
index fdb95c7be1f9..2e4ace440b80 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	Mon Apr 30 00:19:46 2007
-+++ SConstruct	Mon Apr 30 23:51:40 2007
+--- SConstruct.orig	Mon Jul  2 19:14:26 2007
++++ SConstruct	Wed Jul  4 14:23:38 2007
 @@ -38,7 +38,7 @@
      BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
      BoolOption('LIBLO', 'Compile with support for liblo library', 1),
@@ -33,7 +33,7 @@
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -761,6 +755,7 @@
+@@ -771,6 +765,7 @@
  if env['LIBLO']:
      libraries['lo'] = LibraryInfo ()
      prep_libcheck(env, libraries['lo'])
@@ -41,7 +41,7 @@
  
      conf = Configure (libraries['lo'])
      if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -774,6 +769,7 @@
+@@ -784,6 +779,7 @@
  
  libraries['dmalloc'] = LibraryInfo ()
  prep_libcheck(env, libraries['dmalloc'])
@@ -49,7 +49,7 @@
  
  #
  # look for the threaded version
-@@ -805,8 +801,10 @@
+@@ -815,8 +811,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -62,7 +62,17 @@
  
  env = conf.Finish()
  
-@@ -1073,8 +1071,8 @@
+@@ -986,8 +984,7 @@
+ surface_subdirs = [ 'libs/surfaces/control_protocol',
+                     'libs/surfaces/generic_midi',
+                     'libs/surfaces/tranzport',
+-                    'libs/surfaces/mackie',
+-                    'libs/surfaces/powermate'
++                    'libs/surfaces/mackie'
+                     ]
+ 
+ if env['SURFACES']:
+@@ -1090,8 +1087,8 @@
      subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
      subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
  else:
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
index ae1c6f9da26d..f5f58ea9b26e 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -76,6 +76,8 @@ share/ardour2/icons/record_normal_red.png
 share/ardour2/icons/crossfade_out_transition.png
 share/ardour2/icons/crossfade_out_slow-cut.png
 share/ardour2/icons/crossfade_in_slow-cut.png
+share/ardour2/icons/crossfade_in_default.png
+share/ardour2/icons/crossfade_out_default.png
 share/ardour2/icons/transport_loop.png
 share/ardour2/icons/tool_audition.png
 share/ardour2/icons/transport_end.png