diff --git a/audio/Makefile b/audio/Makefile
index 4806b8399212..95994f3ff7d4 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -30,6 +30,7 @@
     SUBDIR += amrcoder
     SUBDIR += anthem
     SUBDIR += aqualung
+    SUBDIR += ardour
     SUBDIR += arts
     SUBDIR += artswrapper
     SUBDIR += ascd
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
new file mode 100644
index 000000000000..5c3ed1a932bf
--- /dev/null
+++ b/audio/ardour/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for:	ardour
+# Date created:		2006-12-04
+# Whom:			trasz <trasz@pin.if.uz.zgora.pl>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	ardour
+DISTVERSION=	2.0beta9
+CATEGORIES=	audio
+MASTER_SITES=	http://ardour.org/files/releases/
+
+MAINTAINER=	trasz@pin.if.uz.zgora.pl
+COMMENT=	Ardour - a digital audio workstation
+
+LIB_DEPENDS=	lrdf.2:${PORTSDIR}/textproc/liblrdf \
+		raptor.2:${PORTSDIR}/textproc/raptor \
+		samplerate.1:${PORTSDIR}/audio/libsamplerate \
+		jack.0:${PORTSDIR}/audio/jack \
+		sndfile.1:${PORTSDIR}/audio/libsndfile \
+		boost_date_time.3:${PORTSDIR}/devel/boost \
+		gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		lo.6:${PORTSDIR}/audio/liblo
+
+USE_SCONS=	yes
+SCONS_ENV+=	SYSLIBS=yes PREFIX=${PREFIX}
+USE_BZIP2=	yes
+USE_GNOME=	gtk20 libxslt libgnomecanvas
+USE_LDCONFIG=	${PREFIX}/lib/ardour2 ${PREFIX}/lib/ardour2/surfaces
+
+.include <bsd.port.pre.mk>
+
+# Upstream uses these flags by default.
+.if !defined(WITHOUT_OPTIMIZED_CFLAGS)
+CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math -fstrength-reduce
+.endif
+
+.if ${OSVERSION} < 600000
+BROKEN=		Does not compile on 4.x and 5.x
+.endif
+
+post-patch:
+	${REINPLACE_CMD} -e "s|%%CFLAGS%%|${CFLAGS}|" ${WRKSRC}/SConstruct
+	${REINPLACE_CMD} -e "s|alsa_pcm|oss|g" ${WRKSRC}/templates/*
+
+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} ${EXAMPLESDIR}
+	${MKDIR} ${EXAMPLESDIR}/templates
+	${INSTALL_DATA} ${WRKSRC}/templates/*.template ${EXAMPLESDIR}/templates/
+
+.include <bsd.port.post.mk>
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
new file mode 100644
index 000000000000..4e7ae74a2e61
--- /dev/null
+++ b/audio/ardour/distinfo
@@ -0,0 +1,3 @@
+MD5 (ardour-2.0beta9.tar.bz2) = c34bba4984e7d651c5dcc724282a447a
+SHA256 (ardour-2.0beta9.tar.bz2) = 87da58c2025114d2949b8f9829b924da6ce0fc8c0002263a7389fc3bb6c24e78
+SIZE (ardour-2.0beta9.tar.bz2) = 2589830
diff --git a/audio/ardour/files/patch-SConstruct b/audio/ardour/files/patch-SConstruct
new file mode 100644
index 000000000000..3a1744cefddf
--- /dev/null
+++ b/audio/ardour/files/patch-SConstruct
@@ -0,0 +1,98 @@
+--- SConstruct.orig	Thu Nov 30 18:48:18 2006
++++ SConstruct	Thu Dec  7 20:11:33 2006
+@@ -38,7 +38,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', 0),
+     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),
+@@ -480,9 +480,6 @@
+ 
+ libraries['boost'] = LibraryInfo ()
+ conf = Configure (libraries['boost'])
+-if conf.CheckHeader ('boost/shared_ptr.hpp', language='CXX') == False:
+-        print "Boost header files do not appear to be installed."
+-        sys.exit (1)
+     
+ libraries['boost'] = conf.Finish ()
+ 
+@@ -493,9 +490,6 @@
+     libraries['lo'] = LibraryInfo ()
+     
+     conf = Configure (libraries['lo'])
+-    if conf.CheckLib ('lo', 'lo_server_new') == False:
+-        print "liblo does not appear to be installed."
+-        sys.exit (1)
+     
+     libraries['lo'] = conf.Finish ()
+ 
+@@ -526,7 +520,7 @@
+     libraries['sysmidi'] = LibraryInfo (LIBS='asound')
+     env['SYSMIDI'] = 'ALSA Sequencer'
+     subst_dict['%MIDITAG%'] = "seq"
+-    subst_dict['%MIDITYPE%'] = "alsa/sequencer"
++    subst_dict['%MIDITYPE%'] = "oss/sequencer"
+ elif conf.CheckCHeader('/System/Library/Frameworks/CoreMIDI.framework/Headers/CoreMIDI.h'):
+     # this line is needed because scons can't handle -framework in ParseConfig() yet.
+     libraries['sysmidi'] = LibraryInfo (LINKFLAGS= '-framework CoreMIDI -framework CoreFoundation -framework CoreAudio -framework CoreServices -framework AudioUnit -framework AudioToolbox -bind_at_load')
+@@ -534,8 +528,10 @@
+     subst_dict['%MIDITAG%'] = "ardour"
+     subst_dict['%MIDITYPE%'] = "coremidi"
+ else:
+-    print "It appears you don't have the required MIDI libraries installed. For Linux this means you are missing the development package for ALSA libraries."
+-    sys.exit (1)
++    libraries['sysmidi'] = LibraryInfo (LIBS='lo')
++    env['SYSMIDI'] = 'nie ma'
++    subst_dict['%MIDITAG%'] = "nie ma"
++    subst_dict['%MIDITYPE%'] = "nie ma"
+ 
+ env = conf.Finish()
+ 
+@@ -568,14 +564,17 @@
+ #    libraries['libglademm'].ParseConfig ('pkg-config --cflags --libs libglademm-2.4')
+ 
+ #    libraries['flowcanvas'] = LibraryInfo(LIBS='flowcanvas', LIBPATH='#/libs/flowcanvas', CPPPATH='#libs/flowcanvas')
+-    libraries['soundtouch'] = LibraryInfo()
+-    libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs soundtouch-1.0')
++    # We cannot use audio/soundtouch, because it doesn't install pkginfo file.
++    libraries['soundtouch'] = LibraryInfo(LIBS='soundtouch',
++                                          LIBPATH='#libs/soundtouch',
++                                          CPPPATH=['#libs', '#libs/soundtouch'])
+ 
+     libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+                                             LIBPATH='#libs/appleutility',
+                                             CPPPATH='#libs/appleutility')
+     
+     coredirs = [
++        'libs/soundtouch',
+         'templates'
+     ]
+     
+@@ -858,12 +857,7 @@
+ # prepend boiler plate optimization flags
+ #
+ 
+-opt_flags[:0] = [
+-    "-O3",
+-    "-fomit-frame-pointer",
+-    "-ffast-math",
+-    "-fstrength-reduce"
+-    ]
++opt_flags[:0] = [ "%%CFLAGS%%" ];
+ 
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+@@ -944,8 +938,8 @@
+     subst_dict['%JACK_INPUT%'] = "coreaudio:Built-in Audio:in"
+     subst_dict['%JACK_OUTPUT%'] = "coreaudio:Built-in Audio:out"
+ else:
+-    subst_dict['%JACK_INPUT%'] = "alsa_pcm:playback_"
+-    subst_dict['%JACK_OUTPUT%'] = "alsa_pcm:capture_"
++    subst_dict['%JACK_INPUT%'] = "oss:playback_"
++    subst_dict['%JACK_OUTPUT%'] = "oss:capture_"
+ 
+ # posix_memalign available
+ if not conf.CheckFunc('posix_memalign'):
diff --git a/audio/ardour/files/patch-libs-ardour-ardour-configuration_vars.h b/audio/ardour/files/patch-libs-ardour-ardour-configuration_vars.h
new file mode 100644
index 000000000000..57c2d0eb7aa4
--- /dev/null
+++ b/audio/ardour/files/patch-libs-ardour-ardour-configuration_vars.h
@@ -0,0 +1,13 @@
+--- libs/ardour/ardour/configuration_vars.h.orig	Thu Dec  7 17:48:57 2006
++++ libs/ardour/ardour/configuration_vars.h	Thu Dec  7 17:49:18 2006
+@@ -7,8 +7,8 @@
+ CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left",  "coreaudio:Built-in Audio:in1")
+ CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "coreaudio:Built-in Audio:in2")
+ #else
+-CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "alsa_pcm:playback_1")
+-CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "alsa_pcm:playback_2")
++CONFIG_VARIABLE (std::string, auditioner_output_left, "auditioner-output-left", "oss:playback_1")
++CONFIG_VARIABLE (std::string, auditioner_output_right, "auditioner-output-right", "oss:playback_2")
+ #endif
+ 
+ /* MIDI and MIDI related */
diff --git a/audio/ardour/files/patch-libs-ardour-io.cc b/audio/ardour/files/patch-libs-ardour-io.cc
new file mode 100644
index 000000000000..87f0381621f0
--- /dev/null
+++ b/audio/ardour/files/patch-libs-ardour-io.cc
@@ -0,0 +1,12 @@
+--- libs/ardour/io.cc.orig	Thu Dec  7 12:58:12 2006
++++ libs/ardour/io.cc	Thu Dec  7 13:02:49 2006
+@@ -2485,7 +2485,8 @@
+ 		} else {
+ 			// do falloff
+ 			new_peak = _visible_peak_power[n] - Config->get_meter_falloff();
+-			_visible_peak_power[n] = max (new_peak, -INFINITY);
++			// libs/ardour/io.cc:2488: error: no matching function for call to `max(float&, double)'
++			_visible_peak_power[n] = max (new_peak, (float)-INFINITY);
+ 		}
+ 	}
+ }
diff --git a/audio/ardour/files/patch-libs-ardour-session_state.cc b/audio/ardour/files/patch-libs-ardour-session_state.cc
new file mode 100644
index 000000000000..bd6d4619105a
--- /dev/null
+++ b/audio/ardour/files/patch-libs-ardour-session_state.cc
@@ -0,0 +1,13 @@
+--- libs/ardour/session_state.cc.orig	Thu Dec  7 13:20:07 2006
++++ libs/ardour/session_state.cc	Thu Dec  7 13:22:03 2006
+@@ -40,8 +40,9 @@
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #else
+-#include <sys/mount.h>
++// /usr/include/sys/ucred.h:71: error: `NGROUPS' was not declared in this scope
+ #include <sys/param.h>
++#include <sys/mount.h>
+ #endif
+ 
+ #include <glibmm.h>
diff --git a/audio/ardour/files/patch-libs-midi++2-SConscript b/audio/ardour/files/patch-libs-midi++2-SConscript
new file mode 100644
index 000000000000..37ca9c8ea3e0
--- /dev/null
+++ b/audio/ardour/files/patch-libs-midi++2-SConscript
@@ -0,0 +1,12 @@
+--- libs/midi++2/SConscript.orig	Sun Nov 12 16:24:06 2006
++++ libs/midi++2/SConscript	Wed Dec  6 00:49:53 2006
+@@ -39,8 +39,7 @@
+    midi2.Append (LINKFLAGS="-framework CoreMIDI")
+    midi2.Append (LINKFLAGS="-framework CoreFoundation")
+ else:
+-   sysdep_src = [ 'alsa_sequencer_midiport.cc' ]
+-   midi2.Append (CCFLAGS="-DWITH_ALSA")
++   sysdep_src = [ ]
+ 
+ midi2.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
+ midi2.Append(CCFLAGS="-DLIBSIGC_DISABLE_DEPRECATED")
diff --git a/audio/ardour/pkg-descr b/audio/ardour/pkg-descr
new file mode 100644
index 000000000000..6c0bae20a465
--- /dev/null
+++ b/audio/ardour/pkg-descr
@@ -0,0 +1,14 @@
+Ardour is a digital audio workstation.  You can use it to record,
+edit and mix multi-track audio.  Produce your own CD's.  Mix video
+soundtracks.  Experiment with new ideas about music and sound.
+Generate sound installations for 12 speaker gallery shows.
+Ardour capabilities include: multichannel recording, non-linear,
+non-destructive region based editing with unlimited undo/redo,
+full automation support, a mixer whose capabilities rival high
+end hardware consoles, lots of plugins to warp, shift and shape
+your music, and controllable from hardware control surfaces
+at the same time as it syncs to timecode.  If you've been looking
+for a tool similar to ProTools, Nuendo, Cubase SX, Digital
+Performer, Samplitude or Sequoia, you might have found it.
+
+WWW:	http://ardour.org/
diff --git a/audio/ardour/pkg-plist b/audio/ardour/pkg-plist
new file mode 100644
index 000000000000..2a726c2bdd11
--- /dev/null
+++ b/audio/ardour/pkg-plist
@@ -0,0 +1,104 @@
+bin/ardour2
+lib/ardour2/libsoundtouch.so
+lib/ardour2/libsndfile-ardour.so
+lib/ardour2/libpbd.so
+lib/ardour2/libmidi++.so
+lib/ardour2/libardour.so
+lib/ardour2/libgtkmm2ext.so
+lib/ardour2/ardour.bin
+lib/ardour2/libardour_cp.so
+lib/ardour2/surfaces/libardour_genericmidi.so
+@dirrm lib/ardour2/surfaces
+@dirrm lib/ardour2
+etc/ardour2/ardour2_ui.rc
+etc/ardour2/ardour.menus
+etc/ardour2/ardour.bindings
+etc/ardour2/ardour.colors
+etc/ardour2/ardour_system.rc
+etc/ardour2/ardour.rc
+@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/crossfade_out_dipped.png
+share/ardour2/icons/crossfade_in_transition.png
+share/ardour2/icons/tool_stretch.png
+share/ardour2/icons/crossfade_in_constant.png
+share/ardour2/icons/zoom_full.png
+share/ardour2/icons/crossfade_in_dipped.png
+share/ardour2/icons/tool_object.png
+share/ardour2/icons/transport_play.png
+share/ardour2/icons/fader_belt.png
+share/ardour2/icons/crossfade_in_fast-cut.png
+share/ardour2/icons/crossfade_out_fast-cut.png
+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/transport_loop.png
+share/ardour2/icons/tool_audition.png
+share/ardour2/icons/fader_belt_negative.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/gain_fader.png
+share/ardour2/icons/crossfade_out_constant.png
+share/ardour2/icons/fader_belt_positive.png
+share/ardour2/icons/tool_gain.png
+share/ardour2/icons/crossfade_in_slow-fade.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/crossfade_out_slow-fade.png
+share/ardour2/icons/nudge_right.png
+@dirrm share/ardour2/icons
+@dirrm share/ardour2
+%%EXAMPLESDIR%%/templates/16 Tracks.template
+%%EXAMPLESDIR%%/templates/2 Track.template
+%%EXAMPLESDIR%%/templates/32 Tracks.template
+%%EXAMPLESDIR%%/templates/4 Tracks.template
+%%EXAMPLESDIR%%/templates/8 Tracks.template
+@dirrm %%EXAMPLESDIR%%/templates
+@dirrm %%EXAMPLESDIR%%