audio/ardour: Update to 7.2.0 release, replace audio/ardour6

 - Submitter becomes maintainer

This patch provides an update to Ardour 7.1.0, thereby replacing Ardour
6.9.0 in audio/ardour6 and moving the port to audio/ardour. There's no
reason to keep the major version in the portname, we only had one version
for quite some time.

The patch also incorporates bug #267065, relaxing the version requirement
on the python build dependency.

Some notes about the changes I made:

Issue 1 - Official download is now tailored to browsers only, that's why
the distfile is named "510". Put it in a named and versioned subdirectory
to not mess up the distfiles directory. I didn't find a better download
alternative. Github is not an option, because the download there is
deliberately made empty (sic).

Issue 2 - Even though I followed the advice in the porters handbook to
the best of my knowledge, portlint warns about the use of DISTFILES and
DISTNAME. The problem is the odd distfile name (Issue 1) combined with
non-matching extraction path and portname. If I follow the suggestions of
portlint, I have to define WRKSRC above the license block which portlint
doesn't like either.

Issue 3 - Ardour includes its major version (e.g. "ardour7") in many
pkg-plist paths. I factored these out into a substitution variable named
ARDOUR_MAJOR, to ease future updates to the port. Some of these
substitutions came through the portname previously.

ChangeLog:	https://ardour.org/whatsnew.html
PR:		267065, 267868

9 files changed, 246 insertions, 260 deletions

diff --git a/MOVED b/MOVED
index af727ba51662..7bddc803448f 100644
--- a/MOVED
+++ b/MOVED
@@ -15865,7 +15865,6 @@ editors/atom||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
 devel/electron4||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
 devel/electron5||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
 devel/electron6||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
-audio/ardour|audio/ardour6|2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
 audio/mixxx21|audio/mixxx|2021-01-02|Has expired: Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream
 databases/arangodb32||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
 databases/arangodb33||2021-01-02|Has expired: Uses Python 2.7 which is EOLed upstream
@@ -17703,3 +17702,4 @@ devel/php74-pcntl|devel/php80-pcntl|2022-12-25|Has expired: Security support end
 devel/php74-sysvshm|devel/php80-sysvshm|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-gettext|devel/php80-gettext|2022-12-25|Has expired: Security support ended on 2022-11-22
 devel/php74-readline|devel/php80-readline|2022-12-25|Has expired: Security support ended on 2022-11-22
+audio/ardour6|audio/ardour|2022-12-26|Remove major version from portname as we update from 6.9.0 to 7.2.0
diff --git a/audio/Makefile b/audio/Makefile
index 5043faf692a1..dc0846a42c3e 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -30,7 +30,7 @@
     SUBDIR += ample
     SUBDIR += amsynth
     SUBDIR += aqualung
-    SUBDIR += ardour6
+    SUBDIR += ardour
     SUBDIR += ario
     SUBDIR += arss
     SUBDIR += artyfx-lv2
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile
new file mode 100644
index 000000000000..8eb2eddf8f2c
--- /dev/null
+++ b/audio/ardour/Makefile
@@ -0,0 +1,102 @@
+PORTNAME=	ardour
+DISTVERSION=	7.2.0
+CATEGORIES=	audio
+# Official source download is tailored to browsers, downloads from github are
+# deliberately made empty. Put the badly named distfile into a subdirectory.
+MASTER_SITES=	https://community.ardour.org/download/release/
+DISTNAME=	Ardour-${DISTVERSION}
+DISTFILES=	516
+DIST_SUBDIR=	${DISTNAME}
+
+MAINTAINER=	dev@submerge.ch
+COMMENT=	Multichannel digital audio workstation
+WWW=		https://ardour.org/
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	lv2>=1.18.0:audio/lv2 \
+		itstool>2.0.0:textproc/itstool \
+		${BUILD_DEPENDS_${ARCH}}
+BUILD_DEPENDS_aarch64=	as:devel/binutils
+LIB_DEPENDS=	libserd-0.so:devel/serd \
+		libsord-0.so:devel/sord \
+		libsratom-0.so:audio/sratom \
+		liblilv-0.so:audio/lilv \
+		libsuil-0.so:audio/suil \
+		libaubio.so:audio/aubio \
+		librubberband.so:audio/rubberband \
+		liblo.so:audio/liblo \
+		liblrdf.so:textproc/liblrdf \
+		libjack.so:audio/jack \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libharfbuzz.so:print/harfbuzz \
+		libboost_date_time.so:devel/boost-libs \
+		libvamp-hostsdk.so:audio/vamp-plugin-sdk \
+		libsamplerate.so:audio/libsamplerate \
+		libsndfile.so:audio/libsndfile \
+		libtag.so:audio/taglib \
+		libfftw3.so:math/fftw3 \
+		libfftw3f.so:math/fftw3-float \
+		libcurl.so:ftp/curl \
+		libogg.so:audio/libogg \
+		libFLAC.so:audio/flac \
+		libSoundTouch.so:audio/soundtouch \
+		libwebsockets.so:net/libwebsockets
+
+USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
+		libarchive pkgconfig python:3.7+,build readline tar:bzip2 \
+		waf xorg shared-mime-info
+USE_CXXSTD=	c++11
+USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango
+USE_LDCONFIG=	yes
+USE_XORG=	x11
+
+CONFIGURE_ARGS=	--optimize --ptformat --freedesktop --no-phone-home \
+		--with-backends=jack,dummy --internal-shared-libs --no-vst3 \
+		${CONFIGURE_ARGS_${ARCH}}
+CONFIGURE_ARGS_amd64=	--arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
+# only support for i686 or better
+CONFIGURE_ARGS_i386=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
+
+LDFLAGS_powerpc=	-Wl,-z,notext
+
+BINARY_ALIAS+=	gas=${CC}
+
+ARDOUR_MAJOR=	ardour7
+DATADIR=	${PREFIX}/share/${ARDOUR_MAJOR}
+ETCDIR=		${PREFIX}/etc/${ARDOUR_MAJOR}
+PLIST_SUB+=	VERSION=${PORTVERSION} \
+		ARDOUR_MAJOR=${ARDOUR_MAJOR}
+
+post-patch:
+	@${REINPLACE_CMD} -e 's/obj\.use            = '\''libsmf libpbd'\''/obj\.use            = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript
+	@${REINPLACE_CMD} -e 's/libsmf\.name         = '\''libsmf'\''/libsmf\.name         = '\''libsmf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript
+	@${REINPLACE_CMD} -e 's/libsmf\.target       = '\''smf'\''/libsmf\.target       = '\''smf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript
+
+post-install:
+	@${FIND} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR} \
+		-name '*.so*' -exec ${STRIP_CMD} {} +
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/sanityCheck
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-copy-mixer
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-export
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-new_empty_session
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/utils/${ARDOUR_MAJOR}-new_session
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-exec-wrapper
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-vst-scanner
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/ardour-${PORTVERSION}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/hardour-${PORTVERSION}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${ARDOUR_MAJOR}/luasession
+	@${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \
+		${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-new_session
+	@${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \
+		${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-copy-mixer
+	@${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \
+		${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-export
+	@${LN} -sf ../lib/${ARDOUR_MAJOR}/utils/ardour-util.sh \
+		${STAGEDIR}${PREFIX}/bin/${ARDOUR_MAJOR}-new_empty_session
+	@${LN} -sf ffmpeg ${STAGEDIR}${PREFIX}/bin/ffmpeg_harvid
+	@${LN} -sf ffprobe ${STAGEDIR}${PREFIX}/bin/ffprobe_harvid
+
+.include <bsd.port.mk>
diff --git a/audio/ardour/distinfo b/audio/ardour/distinfo
new file mode 100644
index 000000000000..666a17a5c8d2
--- /dev/null
+++ b/audio/ardour/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1671141631
+SHA256 (Ardour-7.2.0/516) = c92d5b1dd09e7b8a580121478934b30cd9322fe052f45229dcf49363ca6e377f
+SIZE (Ardour-7.2.0/516) = 12882609
diff --git a/audio/ardour6/pkg-descr b/audio/ardour/pkg-descr
index ee750ecf0869..ee750ecf0869 100644
--- a/audio/ardour6/pkg-descr
+++ b/audio/ardour/pkg-descr
diff --git a/audio/ardour6/pkg-plist b/audio/ardour/pkg-plist
index eb4f40b079df..9ea13963efac 100644
--- a/audio/ardour6/pkg-plist
+++ b/audio/ardour/pkg-plist
@@ -1,10 +1,9 @@
-bin/ardour6
-bin/ardour6-copy-mixer
-bin/ardour6-export
-bin/ardour6-fix_bbtppq
-bin/ardour6-lua
-bin/ardour6-new_empty_session
-bin/ardour6-new_session
+bin/%%ARDOUR_MAJOR%%
+bin/%%ARDOUR_MAJOR%%-copy-mixer
+bin/%%ARDOUR_MAJOR%%-export
+bin/%%ARDOUR_MAJOR%%-lua
+bin/%%ARDOUR_MAJOR%%-new_empty_session
+bin/%%ARDOUR_MAJOR%%-new_session
 bin/ffmpeg_harvid
 bin/ffprobe_harvid
 %%ETCDIR%%/ardour.keys
@@ -13,128 +12,128 @@ bin/ffprobe_harvid
 %%ETCDIR%%/clearlooks.rc
 %%ETCDIR%%/default_ui_config
 %%ETCDIR%%/system_config
-%%ETCDIR%%/trx.menus
-lib/ardour6/LV2/a-comp.lv2/a-comp#stereo.ttl
-lib/ardour6/LV2/a-comp.lv2/a-comp.so
-lib/ardour6/LV2/a-comp.lv2/a-comp.ttl
-lib/ardour6/LV2/a-comp.lv2/manifest.ttl
-lib/ardour6/LV2/a-comp.lv2/presets.ttl
-lib/ardour6/LV2/a-delay.lv2/a-delay.so
-lib/ardour6/LV2/a-delay.lv2/a-delay.ttl
-lib/ardour6/LV2/a-delay.lv2/manifest.ttl
-lib/ardour6/LV2/a-delay.lv2/presets.ttl
-lib/ardour6/LV2/a-eq.lv2/a-eq.so
-lib/ardour6/LV2/a-eq.lv2/a-eq.ttl
-lib/ardour6/LV2/a-eq.lv2/manifest.ttl
-lib/ardour6/LV2/a-exp.lv2/a-exp#stereo.ttl
-lib/ardour6/LV2/a-exp.lv2/a-exp.so
-lib/ardour6/LV2/a-exp.lv2/a-exp.ttl
-lib/ardour6/LV2/a-exp.lv2/manifest.ttl
-lib/ardour6/LV2/a-fluidsynth.lv2/a-fluidsynth.so
-lib/ardour6/LV2/a-fluidsynth.lv2/a-fluidsynth.ttl
-lib/ardour6/LV2/a-fluidsynth.lv2/manifest.ttl
-lib/ardour6/LV2/a-reverb.lv2/a-reverb.so
-lib/ardour6/LV2/a-reverb.lv2/a-reverb.ttl
-lib/ardour6/LV2/a-reverb.lv2/manifest.ttl
-lib/ardour6/LV2/reasonablesynth.lv2/manifest.ttl
-lib/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.so
-lib/ardour6/LV2/reasonablesynth.lv2/reasonablesynth.ttl
-lib/ardour6/ardour-%%ARDOURVERSION%%
-lib/ardour6/ardour-exec-wrapper
-lib/ardour6/ardour-vst-scanner
-lib/ardour6/backends/libdummy_audiobackend.so
-lib/ardour6/backends/libjack_audiobackend.so
-lib/ardour6/engines/libclearlooks.so
-lib/ardour6/hardour-%%ARDOURVERSION%%
-lib/ardour6/libardour.so
-lib/ardour6/libardour.so.3
-lib/ardour6/libardour.so.3.0.0
-lib/ardour6/libardourcp.so
-lib/ardour6/libaudiographer.so
-lib/ardour6/libaudiographer.so.0
-lib/ardour6/libaudiographer.so.0.0.0
-lib/ardour6/libcanvas.so
-lib/ardour6/libcanvas.so.0
-lib/ardour6/libcanvas.so.0.0.0
-lib/ardour6/libevoral.so
-lib/ardour6/libevoral.so.0
-lib/ardour6/libevoral.so.0.0.0
-lib/ardour6/libgtkmm2ext.so
-lib/ardour6/libgtkmm2ext.so.0
-lib/ardour6/libgtkmm2ext.so.0.8.3
-lib/ardour6/libmidipp.so
-lib/ardour6/libmidipp.so.4
-lib/ardour6/libmidipp.so.4.1.0
-lib/ardour6/libpbd.so
-lib/ardour6/libpbd.so.4
-lib/ardour6/libpbd.so.4.1.0
-lib/ardour6/libptformat.so
-lib/ardour6/libptformat.so.0
-lib/ardour6/libptformat.so.0.0.0
-lib/ardour6/libtemporal.so
-lib/ardour6/libtemporal.so.0
-lib/ardour6/libtemporal.so.0.0.0
-lib/ardour6/libwaveview.so
-lib/ardour6/libwaveview.so.0
-lib/ardour6/libwaveview.so.0.0.0
-lib/ardour6/libwidgets.so
-lib/ardour6/libwidgets.so.0
-lib/ardour6/libwidgets.so.0.0.0
-lib/ardour6/luasession
-lib/ardour6/panners/libpan1in2out.so
-lib/ardour6/panners/libpan2in2out.so
-lib/ardour6/panners/libpanbalance.so
-lib/ardour6/panners/libpanvbap.so
-lib/ardour6/sanityCheck
-lib/ardour6/surfaces/libardour_cc121.so
-lib/ardour6/surfaces/libardour_contourdesign.so
-lib/ardour6/surfaces/libardour_faderport.so
-lib/ardour6/surfaces/libardour_faderport16.so
-lib/ardour6/surfaces/libardour_faderport2.so
-lib/ardour6/surfaces/libardour_faderport8.so
-lib/ardour6/surfaces/libardour_generic_midi.so
-lib/ardour6/surfaces/libardour_launch_control_xl.so
-lib/ardour6/surfaces/libardour_mcp.so
-lib/ardour6/surfaces/libardour_osc.so
-lib/ardour6/surfaces/libardour_push2.so
-lib/ardour6/surfaces/libardour_us2400.so
-lib/ardour6/surfaces/libardour_websockets.so
-lib/ardour6/utils/ardour-util.sh
-lib/ardour6/utils/ardour6-copy-mixer
-lib/ardour6/utils/ardour6-export
-lib/ardour6/utils/ardour6-fix_bbtppq
-lib/ardour6/utils/ardour6-new_empty_session
-lib/ardour6/utils/ardour6-new_session
-lib/ardour6/vamp/libardourvampplugins.so
-lib/ardour6/vamp/libardourvampplugins.so.0
-lib/ardour6/vamp/libardourvampplugins.so.0.0.0
-lib/ardour6/vamp/libardourvamppyin.so
-lib/ardour6/vamp/libardourvamppyin.so.0
-lib/ardour6/vamp/libardourvamppyin.so.0.0.0
-share/appdata/ardour6.appdata.xml
-share/applications/ardour6.desktop
+lib/%%ARDOUR_MAJOR%%/LV2/a-comp.lv2/a-comp#stereo.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-comp.lv2/a-comp.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-comp.lv2/a-comp.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-comp.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-comp.lv2/presets.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-delay.lv2/a-delay.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-delay.lv2/a-delay.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-delay.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-delay.lv2/presets.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-eq.lv2/a-eq.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-eq.lv2/a-eq.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-eq.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-exp.lv2/a-exp#stereo.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-exp.lv2/a-exp.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-exp.lv2/a-exp.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-exp.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-fluidsynth.lv2/a-fluidsynth.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-fluidsynth.lv2/a-fluidsynth.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-fluidsynth.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-reverb.lv2/a-reverb.so
+lib/%%ARDOUR_MAJOR%%/LV2/a-reverb.lv2/a-reverb.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/a-reverb.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/reasonablesynth.lv2/manifest.ttl
+lib/%%ARDOUR_MAJOR%%/LV2/reasonablesynth.lv2/reasonablesynth.so
+lib/%%ARDOUR_MAJOR%%/LV2/reasonablesynth.lv2/reasonablesynth.ttl
+lib/%%ARDOUR_MAJOR%%/ardour-%%VERSION%%
+lib/%%ARDOUR_MAJOR%%/ardour-avahi
+lib/%%ARDOUR_MAJOR%%/ardour-exec-wrapper
+lib/%%ARDOUR_MAJOR%%/ardour-vst-scanner
+lib/%%ARDOUR_MAJOR%%/backends/libdummy_audiobackend.so
+lib/%%ARDOUR_MAJOR%%/backends/libjack_audiobackend.so
+lib/%%ARDOUR_MAJOR%%/engines/libclearlooks.so
+lib/%%ARDOUR_MAJOR%%/hardour-%%VERSION%%
+lib/%%ARDOUR_MAJOR%%/libardour.so
+lib/%%ARDOUR_MAJOR%%/libardour.so.3
+lib/%%ARDOUR_MAJOR%%/libardour.so.3.0.0
+lib/%%ARDOUR_MAJOR%%/libardour_midisurface.so
+lib/%%ARDOUR_MAJOR%%/libardourcp.so
+lib/%%ARDOUR_MAJOR%%/libaudiographer.so
+lib/%%ARDOUR_MAJOR%%/libaudiographer.so.0
+lib/%%ARDOUR_MAJOR%%/libaudiographer.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libcanvas.so
+lib/%%ARDOUR_MAJOR%%/libcanvas.so.0
+lib/%%ARDOUR_MAJOR%%/libcanvas.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libevoral.so
+lib/%%ARDOUR_MAJOR%%/libevoral.so.0
+lib/%%ARDOUR_MAJOR%%/libevoral.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libgtkmm2ext.so
+lib/%%ARDOUR_MAJOR%%/libgtkmm2ext.so.0
+lib/%%ARDOUR_MAJOR%%/libgtkmm2ext.so.0.8.3
+lib/%%ARDOUR_MAJOR%%/libmidipp.so
+lib/%%ARDOUR_MAJOR%%/libmidipp.so.4
+lib/%%ARDOUR_MAJOR%%/libmidipp.so.4.1.0
+lib/%%ARDOUR_MAJOR%%/libpbd.so
+lib/%%ARDOUR_MAJOR%%/libpbd.so.4
+lib/%%ARDOUR_MAJOR%%/libpbd.so.4.1.0
+lib/%%ARDOUR_MAJOR%%/libptformat.so
+lib/%%ARDOUR_MAJOR%%/libptformat.so.0
+lib/%%ARDOUR_MAJOR%%/libptformat.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libtemporal.so
+lib/%%ARDOUR_MAJOR%%/libtemporal.so.0
+lib/%%ARDOUR_MAJOR%%/libtemporal.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libwaveview.so
+lib/%%ARDOUR_MAJOR%%/libwaveview.so.0
+lib/%%ARDOUR_MAJOR%%/libwaveview.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/libwidgets.so
+lib/%%ARDOUR_MAJOR%%/libwidgets.so.0
+lib/%%ARDOUR_MAJOR%%/libwidgets.so.0.0.0
+lib/%%ARDOUR_MAJOR%%/luasession
+lib/%%ARDOUR_MAJOR%%/panners/libpan1in2out.so
+lib/%%ARDOUR_MAJOR%%/panners/libpan2in2out.so
+lib/%%ARDOUR_MAJOR%%/panners/libpanbalance.so
+lib/%%ARDOUR_MAJOR%%/panners/libpanvbap.so
+lib/%%ARDOUR_MAJOR%%/sanityCheck
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_cc121.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_contourdesign.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport16.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport2.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_faderport8.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_generic_midi.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_launch_control_xl.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_mcp.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_osc.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_push2.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_us2400.so
+lib/%%ARDOUR_MAJOR%%/surfaces/libardour_websockets.so
+lib/%%ARDOUR_MAJOR%%/utils/ardour-util.sh
+lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-copy-mixer
+lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-export
+lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_empty_session
+lib/%%ARDOUR_MAJOR%%/utils/%%ARDOUR_MAJOR%%-new_session
+lib/%%ARDOUR_MAJOR%%/vamp/libardourvampplugins.so
+lib/%%ARDOUR_MAJOR%%/vamp/libardourvamppyin.so
+lib/%%ARDOUR_MAJOR%%/vamp/libardourvamppyin.so.0
+lib/%%ARDOUR_MAJOR%%/vamp/libardourvamppyin.so.0.0.0
+share/appdata/%%ARDOUR_MAJOR%%.appdata.xml
+share/applications/%%ARDOUR_MAJOR%%.desktop
 %%DATADIR%%/ArdourMono.ttf
 %%DATADIR%%/ArdourSans.ttf
-%%DATADIR%%/export/Amazon Music.format  
+%%DATADIR%%/export/Amazon Music.format
 %%DATADIR%%/export/Apple Music.format
 %%DATADIR%%/export/BWAV 24bit Export.format
 %%DATADIR%%/export/BWAV 32float Export.format
 %%DATADIR%%/export/CD (Red Book).format
 %%DATADIR%%/export/CD + Ogg_Vorbis + FLAC.preset
 %%DATADIR%%/export/CD only.preset
-%%DATADIR%%/export/FLAC 24 bit.format 
+%%DATADIR%%/export/FLAC 24 bit.format
 %%DATADIR%%/export/FLAC.preset
 %%DATADIR%%/export/MP3 (extreme).format
 %%DATADIR%%/export/MP3 (medium).format
 %%DATADIR%%/export/MP3 (standard).format
 %%DATADIR%%/export/Ogg_Vorbis + FLAC.preset
 %%DATADIR%%/export/Ogg_Vorbis.format
-%%DATADIR%%/export/Ogg_Vorbis.preset         
+%%DATADIR%%/export/Ogg_Vorbis.preset
 %%DATADIR%%/export/Ring Tone.format
 %%DATADIR%%/export/Soundcloud and Spotify.format
-%%DATADIR%%/export/Streaming.preset         
+%%DATADIR%%/export/Streaming.preset
 %%DATADIR%%/export/WAV (tagged).format
 %%DATADIR%%/export/YouTube and Deezer.format
+%%DATADIR%%/export/mp3.preset
+%%DATADIR%%/export/wav.preset
 %%DATADIR%%/icons/act-disabled.png
 %%DATADIR%%/icons/add.png
 %%DATADIR%%/icons/anchored_trim_left_cursor.png
@@ -250,7 +249,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/mcp/SSL Nucleus Ardour.profile
 %%DATADIR%%/mcp/artist_control.device
 %%DATADIR%%/mcp/artist_mix.device
-%%DATADIR%%/mcp/arturiaMkII.device 
+%%DATADIR%%/mcp/arturiaMkII.device
 %%DATADIR%%/mcp/arturiaMkII.profile
 %%DATADIR%%/mcp/bcf2000.device
 %%DATADIR%%/mcp/cmc.device
@@ -262,6 +261,9 @@ share/applications/ardour6.desktop
 %%DATADIR%%/mcp/midikbd.device
 %%DATADIR%%/mcp/nucleus-platform-midi.device
 %%DATADIR%%/mcp/nucleus.device
+%%DATADIR%%/mcp/platform_m+.device
+%%DATADIR%%/mcp/platform_m+_platformx+.device
+%%DATADIR%%/mcp/platform_x+_platform_m+.device
 %%DATADIR%%/mcp/qcon+qex.device
 %%DATADIR%%/mcp/qcon.device
 %%DATADIR%%/mcp/qcon_g2+g2ex.device
@@ -269,6 +271,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/mcp/qcon_g2ex+g2.device
 %%DATADIR%%/mcp/qex+qcon.device
 %%DATADIR%%/mcp/ruco.device
+%%DATADIR%%/mcp/two_platform_x+_platform_m+.device
 %%DATADIR%%/mcp/user.profile
 %%DATADIR%%/mcp/x-touch+2x-touch-compact.device
 %%DATADIR%%/mcp/x-touch+x-touch-compact.device
@@ -279,10 +282,17 @@ share/applications/ardour6.desktop
 %%DATADIR%%/mcp/xt+mc+xt.device
 %%DATADIR%%/mcp/xt+mc.device
 %%DATADIR%%/mcp/xt+xt+mc.device
+%%DATADIR%%/media/.daw-meta.xml
+%%DATADIR%%/media/click-120bpm.flac
+%%DATADIR%%/media/click.mid
 %%DATADIR%%/midi_maps/AKAI_MIDIMix_EQ_Mode.map
 %%DATADIR%%/midi_maps/AKAI_MIDIMix_Normal_Mode.map
+%%DATADIR%%/midi_maps/AKAI_MPK225_Normal.map
+%%DATADIR%%/midi_maps/AKAI_MPK225_Plugins.map
+%%DATADIR%%/midi_maps/AKAI_MPK249.map
 %%DATADIR%%/midi_maps/AKAI_MPK61.map
 %%DATADIR%%/midi_maps/AKAI_MPKmini.map
+%%DATADIR%%/midi_maps/Alesis_Q49v2.map
 %%DATADIR%%/midi_maps/Alesis_QX25.map
 %%DATADIR%%/midi_maps/Alesis_VI25.map
 %%DATADIR%%/midi_maps/Arturia_KeyLab49.map
@@ -306,6 +316,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/midi_maps/Novation_LaunchControl_XL.map
 %%DATADIR%%/midi_maps/Novation_LaunchKey25.map
 %%DATADIR%%/midi_maps/Novation_LaunchKey49.map
+%%DATADIR%%/midi_maps/Roland_A-30.map
 %%DATADIR%%/midi_maps/Roland_SI-24.map
 %%DATADIR%%/midi_maps/Roland_V_Studio_20.map
 %%DATADIR%%/midi_maps/Yamaha_KX25.map
@@ -512,6 +523,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/patchfiles/Korg_ER_1.midnam
 %%DATADIR%%/patchfiles/Korg_EX_8000.midnam
 %%DATADIR%%/patchfiles/Korg_Karma.midnam
+%%DATADIR%%/patchfiles/Korg_Kross_2.midnam
 %%DATADIR%%/patchfiles/Korg_M1(R).midnam
 %%DATADIR%%/patchfiles/Korg_M3R.midnam
 %%DATADIR%%/patchfiles/Korg_MS2000R.midnam
@@ -559,6 +571,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/patchfiles/Kurzweil_Mark_12_152.midnam
 %%DATADIR%%/patchfiles/Kurzweil_Micro_Piano.midnam
 %%DATADIR%%/patchfiles/Kurzweil_PC2_PC2r_w_Orch.midnam
+%%DATADIR%%/patchfiles/Kurzweil_PC3A.midnam
 %%DATADIR%%/patchfiles/Kurzweil_PC88.midnam
 %%DATADIR%%/patchfiles/Kurzweil_PC88_MX.midnam
 %%DATADIR%%/patchfiles/Kurzweil_PC88_VGM.midnam
@@ -788,6 +801,9 @@ share/applications/ardour6.desktop
 %%DATADIR%%/scripts/a_slow_mute.lua
 %%DATADIR%%/scripts/ab_switch.lua
 %%DATADIR%%/scripts/access_action.lua
+%%DATADIR%%/scripts/add_MIDI_monitor.lua
+%%DATADIR%%/scripts/add_audio_track.lua
+%%DATADIR%%/scripts/add_cdmarker.lua
 %%DATADIR%%/scripts/addscopes.lua
 %%DATADIR%%/scripts/amp5.lua
 %%DATADIR%%/scripts/avldrums_midimap.lua
@@ -797,7 +813,6 @@ share/applications/ardour6.desktop
 %%DATADIR%%/scripts/create_drum_tracks.lua
 %%DATADIR%%/scripts/delete_xrun_markers.lua
 %%DATADIR%%/scripts/export_mp4chaps.lua
-%%DATADIR%%/scripts/faders_to_trims.lua
 %%DATADIR%%/scripts/jump_to_marker.lua
 %%DATADIR%%/scripts/lfo_automation.lua
 %%DATADIR%%/scripts/list_plugins.lua
@@ -816,6 +831,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/scripts/pitch_to_mts.lua
 %%DATADIR%%/scripts/post_export_save_hook.lua
 %%DATADIR%%/scripts/preare_record_example.lua
+%%DATADIR%%/scripts/record_now.lua
 %%DATADIR%%/scripts/remove_unknown_procs.lua
 %%DATADIR%%/scripts/reset_mixer.lua
 %%DATADIR%%/scripts/rubberband_swing.lua
@@ -836,6 +852,7 @@ share/applications/ardour6.desktop
 %%DATADIR%%/scripts/s_selection.lua
 %%DATADIR%%/scripts/s_set_region_fades.lua
 %%DATADIR%%/scripts/s_showhide_track.lua
+%%DATADIR%%/scripts/s_tempo_map.lua
 %%DATADIR%%/scripts/s_thin_automation.lua
 %%DATADIR%%/scripts/s_timecode.lua
 %%DATADIR%%/scripts/s_track_props.lua
@@ -853,7 +870,6 @@ share/applications/ardour6.desktop
 %%DATADIR%%/scripts/split_all_markers.lua
 %%DATADIR%%/scripts/stop_at_marker.lua
 %%DATADIR%%/scripts/store_recall_mixer.lua
-%%DATADIR%%/scripts/synth1.lua
 %%DATADIR%%/scripts/tomsloop.lua
 %%DATADIR%%/scripts/track_organizer.lua
 %%DATADIR%%/scripts/tx_raw_midi_from_file.lua
@@ -866,8 +882,10 @@ share/applications/ardour6.desktop
 %%DATADIR%%/themes/clear_gray-ardour.colors
 %%DATADIR%%/themes/cubasish-ardour.colors
 %%DATADIR%%/themes/dark-ardour.colors
+%%DATADIR%%/themes/diehard3-ardour.colors
 %%DATADIR%%/themes/recbox-ardour.colors
 %%DATADIR%%/themes/unastudia-ardour.colors
+%%DATADIR%%/themes/xcolors-ardour.colors
 %%DATADIR%%/web_surfaces/builtin/mixer/ardour-toolkit-theme/css/button.css
 %%DATADIR%%/web_surfaces/builtin/mixer/ardour-toolkit-theme/css/buttonarray.css
 %%DATADIR%%/web_surfaces/builtin/mixer/ardour-toolkit-theme/css/chart.css
@@ -1079,10 +1097,10 @@ share/applications/ardour6.desktop
 %%DATADIR%%/web_surfaces/shared/components/plugin.js
 %%DATADIR%%/web_surfaces/shared/components/strip.js
 %%DATADIR%%/web_surfaces/shared/components/transport.js
-share/icons/hicolor/16x16/apps/ardour6.png
-share/icons/hicolor/22x22/apps/ardour6.png
-share/icons/hicolor/256x256/apps/ardour6.png
-share/icons/hicolor/32x32/apps/ardour6.png
-share/icons/hicolor/48x48/apps/ardour6.png
-share/icons/hicolor/512x512/apps/ardour6.png
-share/mime/application/ardour.xml
+share/icons/hicolor/16x16/apps/%%ARDOUR_MAJOR%%.png
+share/icons/hicolor/22x22/apps/%%ARDOUR_MAJOR%%.png
+share/icons/hicolor/256x256/apps/%%ARDOUR_MAJOR%%.png
+share/icons/hicolor/32x32/apps/%%ARDOUR_MAJOR%%.png
+share/icons/hicolor/48x48/apps/%%ARDOUR_MAJOR%%.png
+share/icons/hicolor/512x512/apps/%%ARDOUR_MAJOR%%.png
+share/mime/packages/ardour.xml
diff --git a/audio/ardour6/Makefile b/audio/ardour6/Makefile
deleted file mode 100644
index 515abb6a8f84..000000000000
--- a/audio/ardour6/Makefile
+++ /dev/null
@@ -1,116 +0,0 @@
-PORTNAME=	ardour6
-PORTVERSION=	6.9.0
-PORTREVISION=	6
-CATEGORIES=	audio
-MASTER_SITES=	LOCAL/nc/mirror/ \
-		https://community.ardour.org/srctar/ \
-		https://misc.neelc.org/mirror/
-# The original master side points to the latest release only:
-# MASTER_SITES=	https://community.ardour.org/srctar/
-DISTNAME=	Ardour-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multichannel digital audio workstation
-WWW=		https://ardour.org/
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-BUILD_DEPENDS=	lv2>=1.18.0:audio/lv2 \
-		itstool>2.0.0:textproc/itstool \
-		${BUILD_DEPENDS_${ARCH}}
-BUILD_DEPENDS_aarch64=	as:devel/binutils
-LIB_DEPENDS=	libserd-0.so:devel/serd \
-		libsord-0.so:devel/sord \
-		libsratom-0.so:audio/sratom \
-		liblilv-0.so:audio/lilv \
-		libsuil-0.so:audio/suil \
-		libaubio.so:audio/aubio \
-		librubberband.so:audio/rubberband \
-		liblo.so:audio/liblo \
-		liblrdf.so:textproc/liblrdf \
-		libjack.so:audio/jack \
-		libfontconfig.so:x11-fonts/fontconfig \
-		libfreetype.so:print/freetype2 \
-		libharfbuzz.so:print/harfbuzz \
-		libboost_date_time.so:devel/boost-libs \
-		libvamp-hostsdk.so:audio/vamp-plugin-sdk \
-		libsamplerate.so:audio/libsamplerate \
-		libsndfile.so:audio/libsndfile \
-		libtag.so:audio/taglib \
-		libfftw3.so:math/fftw3 \
-		libfftw3f.so:math/fftw3-float \
-		libcurl.so:ftp/curl \
-		libogg.so:audio/libogg \
-		libFLAC.so:audio/flac \
-		libSoundTouch.so:audio/soundtouch \
-		libwebsockets.so:net/libwebsockets
-
-USES=		compiler:c++11-lang desktop-file-utils gettext gnome \
-		libarchive pkgconfig python:3.7,build readline tar:bzip2 \
-		waf xorg
-USE_CXXSTD=	c++11
-USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 pango
-USE_LDCONFIG=	yes
-USE_XORG=	x11
-
-CONFIGURE_ARGS=	--optimize --ptformat --freedesktop --no-phone-home \
-		--with-backends=jack,dummy --internal-shared-libs --no-vst3 \
-		${CONFIGURE_ARGS_${ARCH}}
-CONFIGURE_ARGS_amd64=	--arch='-msse -mfpmath=sse -DARCH_X86' --dist-target=x86_64
-# only support for i686 or better
-CONFIGURE_ARGS_i386=	--arch='-msse -mfpmath=sse -march=i686 -DARCH_X86' --dist-target=i686
-
-LDFLAGS_powerpc=	-Wl,-z,notext
-
-BINARY_ALIAS+=	gas=${CC}
-
-PLIST_SUB=	ARDOURVERSION=${PORTVERSION}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's/obj\.use            = '\''libsmf libpbd'\''/obj\.use            = '\''libsmf_internal libpbd'\''/g' ${WRKSRC}/libs/evoral/wscript
-	@${REINPLACE_CMD} -e 's/libsmf\.name         = '\''libsmf'\''/libsmf\.name         = '\''libsmf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript
-	@${REINPLACE_CMD} -e 's/libsmf\.target       = '\''smf'\''/libsmf\.target       = '\''smf_internal'\''/g' ${WRKSRC}/libs/evoral/wscript
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/appdata
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
-	@${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.appdata.xml \
-		${STAGEDIR}${PREFIX}/share/appdata/${PORTNAME}.appdata.xml
-	@${CP} ${WRKSRC}/build/gtk2_ardour/${PORTNAME}.desktop \
-		${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_16px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/16x16/apps/${PORTNAME}.png
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_22px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/22x22/apps/${PORTNAME}.png
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_32px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/32x32/apps/${PORTNAME}.png
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_48px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_256px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps/${PORTNAME}.png
-	@${CP} ${STAGEDIR}${PREFIX}/share/${PORTNAME}/resources/Ardour-icon_512px.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png
-	@${FIND} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} \
-		-name '*.so*' -exec ${STRIP_CMD} {} +
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/sanityCheck
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-copy-mixer
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-export
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-fix_bbtppq
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_empty_session
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/utils/${PORTNAME}-new_session
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-exec-wrapper
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-vst-scanner
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ardour-${PORTVERSION}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/hardour-${PORTVERSION}
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/luasession
-	@${LN} -sf ffmpeg ${STAGEDIR}${PREFIX}/bin/ffmpeg_harvid
-	@${LN} -sf ffprobe ${STAGEDIR}${PREFIX}/bin/ffprobe_harvid
-
-.include <bsd.port.mk>
diff --git a/audio/ardour6/distinfo b/audio/ardour6/distinfo
deleted file mode 100644
index 2dab16a50fba..000000000000
--- a/audio/ardour6/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1640539358
-SHA256 (Ardour-6.9.0.tar.bz2) = dcb68215822e3f826c9fc0826c7f9f98c9b6d39a4cb9ab67432c85eb5c636732
-SIZE (Ardour-6.9.0.tar.bz2) = 12297369
diff --git a/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc b/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc
deleted file mode 100644
index 64b2507b3393..000000000000
--- a/audio/ardour6/files/patch-libs_ardour_plugin__manager.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- libs/ardour/plugin_manager.cc.orig	2021-08-13 16:20:07 UTC
-+++ libs/ardour/plugin_manager.cc
-@@ -87,6 +87,7 @@
- #include "ardour/search_paths.h"
- 
- #if (defined WINDOWS_VST_SUPPORT || defined MACVST_SUPPORT || defined LXVST_SUPPORT)
-+#include "ardour/system_exec.h"
- #include "ardour/vst2_scan.h"
- #endif
- 
-@@ -113,6 +114,7 @@
- 
- #include "ardour/audio_unit.h"
- #include "ardour/auv2_scan.h"
-+#include "ardour/system_exec.h"
- #include <Carbon/Carbon.h>
- #endif
-