5 files changed, 53 insertions, 18 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 9d4073f6049c..e7594aaefe62 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ardour
-DISTVERSION=	2.0beta11.1
-PORTREVISION=	1
+DISTVERSION=	2.0beta12
 CATEGORIES=	audio
 MASTER_SITES=	http://ardour.org/files/releases/
 
@@ -22,8 +21,8 @@ LIB_DEPENDS=	lrdf.2:${PORTSDIR}/textproc/liblrdf \
 		boost_date_time.3:${PORTSDIR}/devel/boost \
 		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \
 		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		lo.6:${PORTSDIR}/audio/liblo
-BUILD_DEPENDS=	${LOCALBASE}/lib/libSoundTouch.a:${PORTSDIR}/audio/soundtouch
+		lo.6:${PORTSDIR}/audio/liblo \
+		SoundTouch.0:${PORTSDIR}/audio/soundtouch
 
 USE_SCONS=	yes
 SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes FPU_OPTIMIZATION=0
@@ -38,11 +37,13 @@ PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 # Upstream uses these flags by default.
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
-CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fno-strict-aliasing
+CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
 .endif
 
+CFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
+
 .if ${OSVERSION} < 600000
-BROKEN=		Does not compile on 4.x and 5.x
+BROKEN=		Does not compile on 5.x
 .endif
 
 post-patch:
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
index 9d468ca505d0..227b02728084 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,3 +1,3 @@
-MD5 (ardour-2.0beta11.1.tar.bz2) = f1df82de972e0dab5eef03155de7f523
-SHA256 (ardour-2.0beta11.1.tar.bz2) = 6d2ca6a3e003942f95e826d6a001365d98b536b0db999a591a3bb1c30317bb70
-SIZE (ardour-2.0beta11.1.tar.bz2) = 2681611
+MD5 (ardour-2.0beta12.tar.bz2) = d9ac67f73963a36ed61c378a4ccda223
+SHA256 (ardour-2.0beta12.tar.bz2) = 67268501571ca21946b236773f8317452922f60e08a33edb2a921aff25c8c9ab
+SIZE (ardour-2.0beta12.tar.bz2) = 2706928
diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct
index 0d6e40912e10..6fbc57172bc0 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- SConstruct.orig	Wed Jan 17 22:13:21 2007
-+++ SConstruct	Wed Jan 17 22:55:30 2007
+--- SConstruct.orig	Fri Mar 16 22:45:44 2007
++++ SConstruct	Sun Mar 18 09:53:00 2007
 @@ -38,7 +38,7 @@
      BoolOption('FPU_OPTIMIZATION', 'Build runtime checked assembler code', 1),
      BoolOption('LIBLO', 'Compile with support for liblo library', 1),
@@ -8,8 +8,8 @@
 +    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate),
      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('VERSIONED', 'Add revision information to ardour/gtk executable name inside the build directory', 0),
-@@ -655,13 +655,7 @@
+     BoolOption('UNIVERSAL', 'Compile as universal binary.  Requires that external libraries are already universal.', 0),
+@@ -660,13 +660,7 @@
  # prepend boiler plate optimization flags
  #
  
@@ -18,13 +18,13 @@
 -    "-fomit-frame-pointer",
 -    "-ffast-math",
 -    "-fstrength-reduce",
--    "-fno-strict-aliasing"
+-    "-pipe"
 -    ]
 +opt_flags[:0] = [ "%%CFLAGS%%" ];
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -742,9 +736,9 @@
+@@ -754,9 +748,9 @@
      prep_libcheck(env, libraries['lo'])
  
      conf = Configure (libraries['lo'])
@@ -37,7 +37,7 @@
      
      libraries['lo'] = conf.Finish ()
  
-@@ -784,8 +778,10 @@
+@@ -796,8 +790,10 @@
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -50,7 +50,7 @@
  
  env = conf.Finish()
  
-@@ -1006,33 +1002,33 @@
+@@ -1021,33 +1017,33 @@
  # i18n support
  #
  
@@ -111,7 +111,7 @@
  
  if env['NLS'] == 1:
      env.Append(CCFLAGS="-DENABLE_NLS")
-@@ -1049,8 +1045,8 @@
+@@ -1064,8 +1060,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/files/patch-gtk2_ardour-ardour_ui.cc b/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
new file mode 100644
index 000000000000..773d810b8899
--- /dev/null
+++ b/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
@@ -0,0 +1,33 @@
+--- gtk2_ardour/ardour_ui.cc.orig	Sat Mar 17 02:55:45 2007
++++ gtk2_ardour/ardour_ui.cc	Sun Mar 18 14:44:03 2007
+@@ -28,6 +28,8 @@
+ #include <iostream>
+ 
+ #include <sys/resource.h>
++#include <sys/types.h>
++#include <sys/sysctl.h>
+ 
+ #include <gtkmm/messagedialog.h>
+ #include <gtkmm/accelmap.h>
+@@ -456,8 +458,11 @@
+ 		struct rlimit limits;
+ 		int64_t ram;
+ 		long pages, page_size;
++		size_t pages_len=sizeof(pages);
++
++		if ((page_size = getpagesize()) < 0 ||
++			sysctlbyname("hw.availpages", &pages, &pages_len, NULL, 0)) {
+ 
+-		if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
+ 			ram = 0;
+ 		} else {
+ 			ram = (int64_t) pages * (int64_t) page_size;
+@@ -476,7 +481,7 @@
+ 						     "This might cause Ardour to run out of memory before your system "
+ 						     "runs out of memory. \n\n"
+ 						     "You can view the memory limit with 'ulimit -l', "
+-						     "and it is normally controlled by /etc/security/limits.conf"));
++						     "and it is normally controlled by /etc/login.conf"));
+ 				
+ 				VBox* vbox = msg.get_vbox();
+ 				HBox hbox;
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
index d62621c2917e..e61255e483a1 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -7,6 +7,7 @@ lib/ardour2/libgtkmm2ext.so
 lib/ardour2/ardour-%%DISTVERSION%%
 lib/ardour2/libardour_cp.so
 lib/ardour2/surfaces/libardour_genericmidi.so
+lib/ardour2/surfaces/libardour_mackie.so
 @dirrm lib/ardour2/surfaces
 lib/ardour2/engines/libclearlooks.so
 @dirrm lib/ardour2/engines