5 files changed, 194 insertions, 280 deletions

diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
index 6bb54065382a..9e7a4f77bd22 100644
--- a/audio/ardour/Makefile
+++ b/audio/ardour/Makefile
@@ -6,59 +6,42 @@
 #
 
 PORTNAME=	ardour
-PORTVERSION=	2.8.2
-PORTREVISION=	6
+PORTVERSION=	2.8.14
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://freebsd.nsu.ru/distfiles/ \
-		#http://releases.ardour.org/
-MASTER_SITE_SUBDIR=	trasz
+MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 
 MAINTAINER=	danfe@FreeBSD.org
-COMMENT=	A multichannel digital audio workstation
+COMMENT=	Multichannel digital audio workstation
 
-LIB_DEPENDS=	lrdf.2:${PORTSDIR}/textproc/liblrdf \
-		raptor.3:${PORTSDIR}/textproc/raptor \
-		samplerate.1:${PORTSDIR}/audio/libsamplerate \
-		jack.0:${PORTSDIR}/audio/jack \
-		sndfile.1:${PORTSDIR}/audio/libsndfile \
-		boost_date_time.4:${PORTSDIR}/devel/boost-libs \
-		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \
-		sqlite3:${PORTSDIR}/databases/sqlite3 \
-		lo.7:${PORTSDIR}/audio/liblo \
-		SoundTouch.0:${PORTSDIR}/audio/soundtouch \
-		fftw3f:${PORTSDIR}/math/fftw3-float \
-		fftw3:${PORTSDIR}/math/fftw3 \
-		aubio.3:${PORTSDIR}/audio/aubio
-BUILD_DEPENDS=	jackit>=0.109.2:${PORTSDIR}/audio/jack
+LICENSE=	GPLv2
 
-# 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.
+LIB_DEPENDS=	lo:${PORTSDIR}/audio/liblo \
+		lrdf:${PORTSDIR}/textproc/liblrdf \
+		aubio:${PORTSDIR}/audio/aubio \
+		fftw3:${PORTSDIR}/math/fftw3 \
+		boost_date_time:${PORTSDIR}/devel/boost-libs \
+		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
 
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_SCONS=	yes
 SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX} NLS=yes
 CFLAGS+=	-I${LOCALBASE}/include
-USE_BZIP2=	yes
-USE_GNOME=	gtk20 libxslt libgnomecanvas intltool
-USE_GETTEXT=	yes
+USE_GNOME=	libxslt
 USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces
 TEMPLATESDIR=	${PREFIX}/share/ardour2/templates
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
-OPTIONS=	OPTIMIZED_CFLAGS "Builds with compiler optimizations" on \
-		VST "Enable VST plugins support" off
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	OPTIMIZED_CFLAGS VST
+VST_DESC=	VST plugins support
 
-.if ${OSVERSION} < 800000 && ${ARCH} == "amd64"
-BROKEN=		does not compile
-.endif
+.include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 800069
 LIB_DEPENDS+=	usb:${PORTSDIR}/devel/libusb
 .endif
 
-.if defined(WITH_VST)
+.if ${PORT_OPTIONS:MVST}
 SCONS_ENV+=	VST=yes
 BUILD_DEPENDS+=	winegcc:${PORTSDIR}/emulators/wine \
 		unzip:${PORTSDIR}/archivers/unzip \
@@ -72,45 +55,29 @@ PLIST_SUB+=	NO_VST=""
 PLIST_SUB+=	VST="@comment "
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not install
-.endif
-
-# Upstream uses these flags by default.
+# Upstream uses these flags by default
 .if !defined(WITHOUT_OPTIMIZED_CFLAGS)
 CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
-
-.if ${ARCH} == "amd64"
+.  if ${ARCH} == "amd64"
 SCONS_ENV+=	DIST_TARGET=x86_64
 SCONS_ENV+=	FPU_OPTIMIZATION=1
-.elif ${MACHINE_CPU:Msse}
+.  elif ${MACHINE_CPU:Msse}
 SCONS_ENV+=	DIST_TARGET=i686
 SCONS_ENV+=	FPU_OPTIMIZATION=1
-.else
+.  else
 SCONS_ENV+=	DIST_TARGET=i386
 SCONS_ENV+=	FPU_OPTIMIZATION=0
-.endif
-
+.  endif
 .else
 SCONS_ENV+=	FPU_OPTIMIZATION=0
 .endif
 
-CFLAGS:=	${CFLAGS:N-fno-strict-aliasing}
-
 post-patch:
-	${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|g" \
-		-e "s|soundtouch-1.4|soundtouch-1.6|g" \
-		${WRKSRC}/SConstruct
-	${REINPLACE_CMD} -e "s|alsa_pcm|oss|g" ${WRKSRC}/templates/*.template
+	${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/SConstruct
+	${REINPLACE_CMD} -e 's|alsa_pcm|oss|g' ${WRKSRC}/templates/*.template
 
 post-install:
-	${CHOWN} -R 0:0 ${PREFIX}/lib/ardour2/
-	${CHMOD} -R a+rX ${PREFIX}/lib/ardour2/
-	${CHOWN} -R 0:0 ${PREFIX}/etc/ardour2/
-	${CHMOD} -R a+rX ${PREFIX}/etc/ardour2/
-	${CHOWN} -R 0:0 ${PREFIX}/share/ardour2/
-	${CHMOD} -R a+rX ${PREFIX}/share/ardour2/
-	${MKDIR} ${TEMPLATESDIR}
-	${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR}/
+	@${MKDIR} ${TEMPLATESDIR}
+	${INSTALL_DATA} ${WRKSRC}/templates/*.template ${TEMPLATESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
index 06257ed4754c..077074d0c74a 100644
--- a/audio/ardour/distinfo
+++ b/audio/ardour/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ardour-2.8.2.tar.bz2) = 659c4a50a2d045bdfd9b93ab7966726438a555f14d6122986acbd36c72d8fcc5
-SIZE (ardour-2.8.2.tar.bz2) = 3430971
+SHA256 (ardour-2.8.14.tar.bz2) = e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe
+SIZE (ardour-2.8.14.tar.bz2) = 2169985
diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct
index 4f30853d4141..e898b5ec9852 100644
--- a/audio/ardour/files/patch-SConstruct
+++ b/audio/ardour/files/patch-SConstruct
@@ -1,41 +1,18 @@
---- SConstruct.orig	2009-07-20 17:55:10.000000000 +0200
-+++ SConstruct	2009-09-15 12:54:21.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),
--    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local'),
-+    PathOption('PREFIX', 'Set the install "prefix"', '/usr/local', PathOption.PathIsDirCreate),
-     BoolOption('SURFACES', 'Build support for control surfaces', 1),
-     BoolOption('WIIMOTE', 'Build the wiimote control surface', 0),
-     ('LIBDIR', 'Set librarydir (typically lib or lib64)', 'lib'),
-@@ -679,9 +679,9 @@
-     opt_flags.extend (["-mhard-float", "-mpowerpc-gfxopt"])
-     opt_flags.extend (["-Os"])
+--- SConstruct.orig
++++ SConstruct
+@@ -784,10 +784,7 @@ if env['FPU_OPTIMIZATION']:
+ # handle x86/x86_64 libdir properly
  
--elif ((re.search ("i[0-9]86", config[config_cpu]) != None) or (re.search ("x86_64", config[config_cpu]) != None)) and env['DIST_TARGET'] != 'none':
-+elif ((re.search ("i[0-9]86", env['DIST_TARGET']) != None) or (re.search ("x86_64", env['DIST_TARGET']) != None)):
-     
--    build_host_supports_sse = 0
-+    build_host_supports_sse = 1
-     
-     #
-     # ARCH_X86 means anything in the x86 family from i386 to x86_64
-@@ -740,12 +740,7 @@
-             print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be anerror, especially if you are a package maintainer)"
- # end optimization section
- 
--# handle x86/x86_64 libdir properly
--
--if env['DIST_TARGET'] == 'x86_64':
--    env['LIBDIR']='lib64'
--else:
--    env['LIBDIR']='lib'
-+env['LIBDIR']='lib'
+ if env['DIST_LIBDIR'] == '':
+-    if env['DIST_TARGET'] == 'x86_64':
+-        env['LIBDIR']='lib64'
+-    else:
+-        env['LIBDIR']='lib'
++    env['LIBDIR']='lib'
+ else:
+     env['LIBDIR'] = env['DIST_LIBDIR']
  
- #
- # no VST on x86_64
-@@ -794,13 +789,7 @@
+@@ -838,13 +835,7 @@ if env['ARCH'] != '':
  # prepend boiler plate optimization flags
  #
  
@@ -50,7 +27,7 @@
  
  if env['DEBUG'] == 1:
      env.Append(CCFLAGS=" ".join (debug_flags))
-@@ -889,6 +878,7 @@
+@@ -954,6 +945,7 @@ conf.Finish()
  
  libraries['usb'] = LibraryInfo ()
  prep_libcheck(env, libraries['usb'])
@@ -58,15 +35,7 @@
  
  conf = Configure (libraries['usb'])
  if conf.CheckLib ('usb', 'usb_interrupt_write'):
-@@ -961,6 +951,7 @@
- if env['LIBLO']:
-     libraries['lo'] = LibraryInfo ()
-     prep_libcheck(env, libraries['lo'])
-+    libraries['lo'].Append(CCFLAGS="-I/usr/local/include", LINKFLAGS="-L/usr/local/lib")
- 
-     conf = Configure (libraries['lo'])
-     if conf.CheckLib ('lo', 'lo_server_new') == False:
-@@ -974,6 +965,7 @@
+@@ -1005,6 +997,7 @@ libraries['boost'] = conf.Finish ()
  
  libraries['dmalloc'] = LibraryInfo ()
  prep_libcheck(env, libraries['dmalloc'])
@@ -74,7 +43,7 @@
  
  #
  # look for the threaded version
-@@ -1031,8 +1023,10 @@
+@@ -1062,8 +1055,10 @@ elif conf.CheckCHeader('/System/Library/
      subst_dict['%MIDITAG%'] = "ardour"
      subst_dict['%MIDITYPE%'] = "coremidi"
  else:
@@ -85,18 +54,9 @@
 +    subst_dict['%MIDITAG%'] = "none"
 +    subst_dict['%MIDITYPE%'] = "none"
  
- env = conf.Finish()
- 
-@@ -1091,7 +1085,7 @@
- 
- #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
-     libraries['soundtouch'] = LibraryInfo()
--    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
-+    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.4')
-     # Comment the previous line and uncomment this for old versions of Debian:
-     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
- 
-@@ -1321,8 +1315,8 @@
+ pname = env['PROGRAM_NAME']
+ subst_dict['%MIDI_DEVICE_NAME%'] = pname.lower()
+@@ -1349,8 +1344,8 @@ if conf.CheckCHeader('/System/Library/Fr
      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
index 773d810b8899..b43a8672ea34 100644
--- a/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
+++ b/audio/ardour/files/patch-gtk2_ardour-ardour_ui.cc
@@ -1,6 +1,6 @@
---- 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 @@
+--- gtk2_ardour/ardour_ui.cc.orig
++++ gtk2_ardour/ardour_ui.cc
+@@ -31,6 +31,8 @@
  #include <iostream>
  
  #include <sys/resource.h>
@@ -9,7 +9,7 @@
  
  #include <gtkmm/messagedialog.h>
  #include <gtkmm/accelmap.h>
-@@ -456,8 +458,11 @@
+@@ -696,8 +698,11 @@ ARDOUR_UI::check_memory_locking ()
  		struct rlimit limits;
  		int64_t ram;
  		long pages, page_size;
@@ -22,12 +22,12 @@
  			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"));
- 				
+@@ -716,7 +721,7 @@ ARDOUR_UI::check_memory_locking ()
+ 								     "This might cause %1 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"), PROGRAM_NAME));
++								     "and it is normally controlled by /etc/login.conf"), PROGRAM_NAME));
+ 						   
  				VBox* vbox = msg.get_vbox();
  				HBox hbox;
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
index cea6e9e2a8f3..d44c92dde228 100644
--- a/audio/ardour/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -1,179 +1,166 @@
 %%NO_VST%%bin/ardour2
 %%VST%%bin/ardourvst
-lib/ardour2/libsndfile-ardour.so
-lib/ardour2/libpbd.so
-lib/ardour2/libmidi++.so
-lib/ardour2/libardour.so
+etc/ardour2/SAE-de-keypad.bindings
+etc/ardour2/SAE-de-nokeypad.bindings
+etc/ardour2/SAE-us-keypad.bindings
+etc/ardour2/SAE-us-nokeypad.bindings
+etc/ardour2/ardour-sae.menus
+etc/ardour2/ardour.menus
+etc/ardour2/ardour2_ui_dark.rc
+etc/ardour2/ardour2_ui_dark_sae.rc
+etc/ardour2/ardour2_ui_default.conf
+etc/ardour2/ardour2_ui_light.rc
+etc/ardour2/ardour2_ui_light_sae.rc
+etc/ardour2/ardour_system.rc
+etc/ardour2/ergonomic-us.bindings
+etc/ardour2/mnemonic-us.bindings
 %%NO_VST%%lib/ardour2/ardour-%%DISTVERSION%%
 %%VST%%lib/ardour2/ardour_vst.exe.so
+lib/ardour2/engines/libclearlooks.so
+lib/ardour2/libardour.so
+lib/ardour2/libardour_cp.so
 %%VST%%lib/ardour2/libardourgtk.so
 lib/ardour2/libgtkmm2ext.so
-lib/ardour2/libardour_cp.so
-lib/ardour2/libvampsdk.so
-lib/ardour2/libvamphostsdk.so
-lib/ardour2/libsoundtouch.so
+lib/ardour2/libmidi++.so
+lib/ardour2/libpbd.so
 lib/ardour2/librubberband.so
+lib/ardour2/libvamphostsdk.so
+lib/ardour2/libvampsdk.so
 lib/ardour2/surfaces/libardour_genericmidi.so
 lib/ardour2/surfaces/libardour_mackie.so
 lib/ardour2/surfaces/libardour_tranzport.so
-@dirrm lib/ardour2/surfaces
-lib/ardour2/engines/libclearlooks.so
-@dirrm lib/ardour2/engines
 lib/ardour2/vamp/libardourvampplugins.so
-@dirrm lib/ardour2/vamp
-@dirrm lib/ardour2
-etc/ardour2/ardour.menus
-etc/ardour2/ardour_system.rc
-etc/ardour2/ardour2_ui_dark.rc
-etc/ardour2/ardour2_ui_light.rc
-etc/ardour2/ardour2_ui_default.conf
-etc/ardour2/ardour-sae.menus
-etc/ardour2/ergonomic-us.bindings
-etc/ardour2/mnemonic-us.bindings
-etc/ardour2/ardour2_ui_dark_sae.rc
-etc/ardour2/ardour2_ui_light_sae.rc
-etc/ardour2/SAE-de-keypad.bindings
-etc/ardour2/SAE-us-keypad.bindings
-etc/ardour2/SAE-de-nokeypad.bindings
-etc/ardour2/SAE-us-nokeypad.bindings
-@dirrmtry etc/ardour2
-share/ardour2/splash.png
-share/ardour2/pixmaps/hslider00.xpm
-share/ardour2/pixmaps/vslider01.xpm
-share/ardour2/pixmaps/tool_audition.xpm
-share/ardour2/pixmaps/vslider02_slider.xpm
-share/ardour2/pixmaps/right_arrow.xpm
-share/ardour2/pixmaps/vslider_slider_16wide.xpm
-share/ardour2/pixmaps/lr.xpm
-share/ardour2/pixmaps/hiout.xpm
-share/ardour2/pixmaps/hiin.xpm
-share/ardour2/pixmaps/tool_range.xpm
-share/ardour2/pixmaps/zoom_full.xpm
-share/ardour2/pixmaps/regin.xpm
-share/ardour2/pixmaps/revdblarrow.xpm
-share/ardour2/pixmaps/tool_gain.xpm
-share/ardour2/pixmaps/left_arrow.xpm
-share/ardour2/pixmaps/toggle-button-00.xpm
-share/ardour2/pixmaps/tool_stretch.xpm
-share/ardour2/pixmaps/forwardblarrow.xpm
-share/ardour2/pixmaps/vslider02_rail.xpm
-share/ardour2/pixmaps/loin.xpm
-share/ardour2/pixmaps/linout.xpm
-share/ardour2/pixmaps/small_x.xpm
-share/ardour2/pixmaps/toggle-button-01.xpm
-share/ardour2/pixmaps/regin2.xpm
-share/ardour2/pixmaps/tool_zoom.xpm
-share/ardour2/pixmaps/regout.xpm
-share/ardour2/pixmaps/linin.xpm
-share/ardour2/pixmaps/regout2.xpm
-share/ardour2/pixmaps/zoom_out.xpm
-share/ardour2/pixmaps/loout.xpm
-share/ardour2/pixmaps/tool_object.xpm
-share/ardour2/pixmaps/set-next-button.xpm
-share/ardour2/pixmaps/loop.xpm
-share/ardour2/pixmaps/small-round-button-01.xpm
-share/ardour2/pixmaps/hslider01.xpm
-share/ardour2/pixmaps/vslider00.xpm
-share/ardour2/pixmaps/zoom_in.xpm
-@dirrm share/ardour2/pixmaps
-share/ardour2/icons/tool_stretch.png
-share/ardour2/icons/zoom_full.png
-share/ardour2/icons/tool_object.png
-share/ardour2/icons/transport_play.png
-share/ardour2/icons/fader_belt.png
-share/ardour2/icons/record_normal_red.png
-share/ardour2/icons/transport_loop.png
-share/ardour2/icons/tool_audition.png
-share/ardour2/icons/transport_end.png
-share/ardour2/icons/record_tape_red.png
-share/ardour2/icons/hide.png
-share/ardour2/icons/tool_zoom.png
-share/ardour2/icons/transport_range.png
-share/ardour2/icons/zoom_out.png
-share/ardour2/icons/zoom_in.png
-share/ardour2/icons/tool_gain.png
-share/ardour2/icons/strip_width.png
-share/ardour2/icons/transport_start.png
-share/ardour2/icons/transport_stop.png
-share/ardour2/icons/nudge_left.png
-share/ardour2/icons/transport_record.png
-share/ardour2/icons/nudge_right.png
-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
-share/ardour2/icons/sae.png
-share/ardour2/icons/ferret_02.png
-share/ardour2/icons/grabber_edit_point.png
+share/ardour2/icons/application-x-ardour_16px.png
 share/ardour2/icons/application-x-ardour_22px.png
-share/ardour2/icons/fader_belt_h.png
 share/ardour2/icons/application-x-ardour_32px.png
 share/ardour2/icons/application-x-ardour_48px.png
-share/ardour2/icons/application-x-ardour_16px.png
+share/ardour2/icons/ardour_icon_16px.png
+share/ardour2/icons/ardour_icon_22px.png
+share/ardour2/icons/ardour_icon_32px.png
+share/ardour2/icons/ardour_icon_48px.png
 share/ardour2/icons/computer_keyboard.png
 share/ardour2/icons/computer_keyboard_active.png
-share/ardour2/icons/crossfade-out-linear.png
-share/ardour2/icons/crossfade-out-long-cut.png
+share/ardour2/icons/crossfade-in-S1.png
 share/ardour2/icons/crossfade-in-S2.png
-share/ardour2/icons/crossfade-out-short-cut.png
-share/ardour2/icons/crossfade-in-long-cut.png
-share/ardour2/icons/crossfade-out-slow-cut.png
+share/ardour2/icons/crossfade-in-constant-power.png
 share/ardour2/icons/crossfade-in-fast-cut.png
 share/ardour2/icons/crossfade-in-linear.png
+share/ardour2/icons/crossfade-in-long-cut.png
 share/ardour2/icons/crossfade-in-short-cut.png
-share/ardour2/icons/crossfade-out-S1.png
-share/ardour2/icons/crossfade-in-S1.png
-share/ardour2/icons/crossfade-out-constant-power.png
-share/ardour2/icons/crossfade-in-constant-power.png
 share/ardour2/icons/crossfade-in-slow-cut.png
+share/ardour2/icons/crossfade-out-S1.png
 share/ardour2/icons/crossfade-out-S2.png
+share/ardour2/icons/crossfade-out-constant-power.png
 share/ardour2/icons/crossfade-out-fast-cut.png
-@dirrm share/ardour2/icons
+share/ardour2/icons/crossfade-out-linear.png
+share/ardour2/icons/crossfade-out-long-cut.png
+share/ardour2/icons/crossfade-out-short-cut.png
+share/ardour2/icons/crossfade-out-slow-cut.png
+share/ardour2/icons/fader_belt.png
+share/ardour2/icons/fader_belt_h.png
+share/ardour2/icons/ferret_02.png
+share/ardour2/icons/grabber_edit_point.png
+share/ardour2/icons/hide.png
+share/ardour2/icons/nudge_left.png
+share/ardour2/icons/nudge_right.png
+share/ardour2/icons/record_normal_red.png
+share/ardour2/icons/record_tape_red.png
+share/ardour2/icons/sae.png
+share/ardour2/icons/saelogo.png
+share/ardour2/icons/strip_width.png
+share/ardour2/icons/tool_audition.png
+share/ardour2/icons/tool_gain.png
+share/ardour2/icons/tool_object.png
+share/ardour2/icons/tool_stretch.png
+share/ardour2/icons/tool_zoom.png
+share/ardour2/icons/transport_end.png
+share/ardour2/icons/transport_loop.png
+share/ardour2/icons/transport_play.png
+share/ardour2/icons/transport_range.png
+share/ardour2/icons/transport_record.png
+share/ardour2/icons/transport_start.png
+share/ardour2/icons/transport_stop.png
+share/ardour2/icons/zoom_full.png
+share/ardour2/icons/zoom_in.png
+share/ardour2/icons/zoom_out.png
+share/ardour2/pixmaps/forwardblarrow.xpm
+share/ardour2/pixmaps/hiin.xpm
+share/ardour2/pixmaps/hiout.xpm
+share/ardour2/pixmaps/hslider00.xpm
+share/ardour2/pixmaps/hslider01.xpm
+share/ardour2/pixmaps/left_arrow.xpm
+share/ardour2/pixmaps/linin.xpm
+share/ardour2/pixmaps/linout.xpm
+share/ardour2/pixmaps/loin.xpm
+share/ardour2/pixmaps/loop.xpm
+share/ardour2/pixmaps/loout.xpm
+share/ardour2/pixmaps/lr.xpm
+share/ardour2/pixmaps/regin.xpm
+share/ardour2/pixmaps/regin2.xpm
+share/ardour2/pixmaps/regout.xpm
+share/ardour2/pixmaps/regout2.xpm
+share/ardour2/pixmaps/revdblarrow.xpm
+share/ardour2/pixmaps/right_arrow.xpm
+share/ardour2/pixmaps/set-next-button.xpm
+share/ardour2/pixmaps/small-round-button-01.xpm
+share/ardour2/pixmaps/small_x.xpm
+share/ardour2/pixmaps/toggle-button-00.xpm
+share/ardour2/pixmaps/toggle-button-01.xpm
+share/ardour2/pixmaps/tool_audition.xpm
+share/ardour2/pixmaps/tool_gain.xpm
+share/ardour2/pixmaps/tool_object.xpm
+share/ardour2/pixmaps/tool_range.xpm
+share/ardour2/pixmaps/tool_stretch.xpm
+share/ardour2/pixmaps/tool_zoom.xpm
+share/ardour2/pixmaps/vslider00.xpm
+share/ardour2/pixmaps/vslider01.xpm
+share/ardour2/pixmaps/vslider02_rail.xpm
+share/ardour2/pixmaps/vslider02_slider.xpm
+share/ardour2/pixmaps/vslider_slider_16wide.xpm
+share/ardour2/pixmaps/zoom_full.xpm
+share/ardour2/pixmaps/zoom_in.xpm
+share/ardour2/pixmaps/zoom_out.xpm
+share/ardour2/splash.png
 share/ardour2/templates/16 Tracks.template
 share/ardour2/templates/2 Track.template
 share/ardour2/templates/32 Tracks.template
 share/ardour2/templates/4 Tracks.template
 share/ardour2/templates/8 Tracks.template
+share/locale/cs/LC_MESSAGES/gtk2_ardour.mo
+share/locale/de/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/gtk2_ardour.mo
+share/locale/el/LC_MESSAGES/libardour2.mo
+share/locale/el/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/es/LC_MESSAGES/gtk2_ardour.mo
+share/locale/es/LC_MESSAGES/libardour2.mo
+share/locale/es/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/eu/LC_MESSAGES/gtk2_ardour.mo
+share/locale/eu/LC_MESSAGES/libardour2.mo
+share/locale/eu/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/fr/LC_MESSAGES/gtk2_ardour.mo
+share/locale/fr/LC_MESSAGES/libardour2.mo
+share/locale/it/LC_MESSAGES/gtk2_ardour.mo
+share/locale/it/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/gtk2_ardour.mo
+share/locale/nn/LC_MESSAGES/libardour2.mo
+share/locale/nn/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pl/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pl/LC_MESSAGES/libardour2.mo
+share/locale/pl/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt/LC_MESSAGES/gtk2_ardour.mo
+share/locale/pt/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/pt_PT/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/gtk2_ardour.mo
+share/locale/ru/LC_MESSAGES/libardour2.mo
+share/locale/ru/LC_MESSAGES/libgtkmm2ext.mo
+share/locale/sv/LC_MESSAGES/gtk2_ardour.mo
+share/locale/sv/LC_MESSAGES/libardour2.mo
 @dirrm share/ardour2/templates
+@dirrm share/ardour2/pixmaps
+@dirrm share/ardour2/icons
 @dirrm share/ardour2
-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/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
-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
-share/locale/es_ES/LC_MESSAGES/libardour2.mo
-share/locale/fr_FR/LC_MESSAGES/libardour2.mo
-share/locale/cs_CZ/LC_MESSAGES/gtk2_ardour.mo
-share/locale/nn_NO/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
-@dirrmtry share/locale/sv_SE
-@dirrmtry share/locale/el_GR/LC_MESSAGES
-@dirrmtry share/locale/el_GR
-@dirrmtry share/locale/ru_RU/LC_MESSAGES
-@dirrmtry share/locale/ru_RU
-@dirrmtry share/locale/de_DE/LC_MESSAGES
-@dirrmtry share/locale/de_DE
-@dirrmtry share/locale/cs_CZ/LC_MESSAGES
-@dirrmtry share/locale/cs_CZ
-@dirrmtry share/locale/nn_NO/LC_MESSAGES
-@dirrmtry share/locale/nn_NO
+@dirrm lib/ardour2/vamp
+@dirrm lib/ardour2/surfaces
+@dirrm lib/ardour2/engines
+@dirrm lib/ardour2
+@dirrmtry etc/ardour2