Update Ardour to 2.5. Yes, I know there is already a newer

version there.

4 files changed, 44 insertions, 24 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 5de10f340630..612b42af3d72 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	ardour
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.5
 CATEGORIES=	audio
-MASTER_SITES=	http://ardour.org/files/releases/
+MASTER_SITES=	http://releases.ardour.org/
 DISTFILES=	ardour-${DISTVERSION}.tar.bz2
 EXTRACT_ONLY=	ardour-${DISTVERSION}.tar.bz2
 
@@ -28,7 +27,13 @@ LIB_DEPENDS=	lrdf.2:${PORTSDIR}/textproc/liblrdf \
 		SoundTouch.0:${PORTSDIR}/audio/soundtouch \
 		usb:${PORTSDIR}/devel/libusb \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
-		fftw3:${PORTSDIR}/math/fftw3
+		fftw3:${PORTSDIR}/math/fftw3 \
+		aubio.3:${PORTSDIR}/audio/aubio
+BUILD_DEPENDS=	jackit>=0.109.2:${PORTSDIR}/audio/jack
+
+# Between 0.109.0 and earlier versions there was an api change in JACK.
+# However, the library version number was not changed.  The line above
+# is supposed to work around that.
 
 USE_SCONS=	yes
 SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
index d844ff15ecfe..45adf6a4cf4e 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,6 +1,6 @@
-MD5 (ardour-2.4.1.tar.bz2) = f132caaf613f3cb44ca9f9dafb38fbae
-SHA256 (ardour-2.4.1.tar.bz2) = 29d6ca482e13e58058616b6118a0d036429db2141fbd95811d7ad7536690484e
-SIZE (ardour-2.4.1.tar.bz2) = 3147427
+MD5 (ardour-2.5.tar.bz2) = 88180d400e8c19ceea41aabadc098116
+SHA256 (ardour-2.5.tar.bz2) = 735611e2fe44626adbb46567b14c3d9e700bb8ad0556dafa0688ea87032d14a3
+SIZE (ardour-2.5.tar.bz2) = 3254328
 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 6718656314a4..b30474c8cd71 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -1,6 +1,6 @@
---- SConstruct.orig	2008-02-06 18:54:40.000000000 +0100
-+++ SConstruct	2008-02-11 09:56:44.000000000 +0100
-@@ -41,7 +41,7 @@
+--- SConstruct.orig	2008-07-07 17:29:40.000000000 +0200
++++ SConstruct	2008-07-22 20:53:29.000000000 +0200
+@@ -48,7 +48,7 @@
      BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
      BoolOption('LIBLO', 'Compile with support for liblo library', 1),
      BoolOption('NLS', 'Set to turn on i18n support', 1),
@@ -9,7 +9,7 @@
      BoolOption('SURFACES', 'Build support for control surfaces', 1),
      BoolOption('SYSLIBS', 'USE AT YOUR OWN RISK: CANCELS ALL SUPPORT FROM ARDOUR AUTHORS: Use existing system versions of various libraries instead of internal ones', 0),
      BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
-@@ -387,7 +387,7 @@
+@@ -397,7 +397,7 @@
  # Make sure they know what they are doing
  #
  
@@ -18,7 +18,20 @@
      if os.path.isfile('.personal_use_only'):
          print "Enabling VST support. Note that distributing a VST-enabled ardour\nis a violation of several different licences.\nBuild with VST=false if you intend to distribute ardour to others."
      else:
-@@ -663,9 +663,9 @@
+@@ -551,9 +551,9 @@
+ 
+         conf = Configure(libraries['aubio'])
+ 
+-        if conf.CheckHeader ('aubio/aubio.h') == False:
+-            print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed')
+-            env['AUBIO'] = 0
++#        if conf.CheckHeader ('aubio/aubio.h') == False:
++#            print ('AUBIO-related features be compiled without the aubio headers, which do not seem to be installed')
++#            env['AUBIO'] = 0
+         conf.Finish()
+ 
+ if env['FREESOUND']:
+@@ -711,9 +711,9 @@
      opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
      opt_flags.extend (["-Os"])
  
@@ -30,7 +43,7 @@
      
      debug_flags.append ("-DARCH_X86")
      opt_flags.append ("-DARCH_X86")
-@@ -710,12 +710,7 @@
+@@ -758,12 +758,7 @@
              print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
  # end optimization section
  
@@ -44,7 +57,7 @@
  
  #
  # a single way to test if we're on OS X
-@@ -746,13 +741,7 @@
+@@ -794,13 +789,7 @@
  # prepend boiler plate optimization flags
  #
  
@@ -59,7 +72,7 @@
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -838,6 +827,7 @@
+@@ -890,6 +879,7 @@
  
  libraries['usb'] = LibraryInfo ()
  prep_libcheck(env, libraries['usb'])
@@ -67,7 +80,7 @@
  
  conf = Configure (libraries['usb'])
  if conf.CheckLib ('usb', 'usb_interrupt_write'):
-@@ -896,6 +886,7 @@
+@@ -948,6 +938,7 @@
  if env['LIBLO']:
      libraries['lo'] = LibraryInfo ()
      prep_libcheck(env, libraries['lo'])
@@ -75,7 +88,7 @@
  
      conf = Configure (libraries['lo'])
      if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -909,6 +900,7 @@
+@@ -961,6 +952,7 @@
  
  libraries['dmalloc'] = LibraryInfo ()
  prep_libcheck(env, libraries['dmalloc'])
@@ -83,7 +96,7 @@
  
  #
  # look for the threaded version
-@@ -946,8 +938,10 @@
+@@ -1018,8 +1010,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -96,7 +109,7 @@
  
  env = conf.Finish()
  
-@@ -1001,9 +995,9 @@
+@@ -1073,9 +1067,9 @@
  
  #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
      libraries['soundtouch'] = LibraryInfo()
@@ -108,7 +121,7 @@
  
      libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
                                              LIBPATH='#libs/appleutility',
-@@ -1119,8 +1113,7 @@
+@@ -1191,8 +1185,7 @@
  surface_subdirs = [ 'libs/surfaces/control_protocol',
                      'libs/surfaces/generic_midi',
                      'libs/surfaces/tranzport',
@@ -118,7 +131,7 @@
                      ]
  
  if env['SURFACES']:
-@@ -1225,8 +1218,8 @@
+@@ -1297,8 +1290,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 6ced76a74ba6..26372b70ccc1 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -134,7 +134,6 @@ 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/po_PO/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
@@ -146,6 +145,11 @@ 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
+share/locale/pl_PL/LC_MESSAGES/libardour2.mo
+share/locale/pl_PL/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pl_PL/LC_MESSAGES/gtk2_ardour.mo
+@dirrmtry share/locale/pl_PL/LC_MESSAGES
+@dirrmtry share/locale/pl_PL
 @dirrmtry share/locale/it_IT/LC_MESSAGES
 @dirrmtry share/locale/it_IT
 @dirrmtry share/locale/sv_SE/LC_MESSAGES
@@ -156,5 +160,3 @@ share/locale/de_DE/LC_MESSAGES/gtk2_ardour.mo
 @dirrmtry share/locale/ru_RU
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
-@dirrmtry share/locale/po_PO/LC_MESSAGES
-@dirrmtry share/locale/po_PO