diff --git a/audio/moony-lv2/Makefile b/audio/moony-lv2/Makefile
index 4d414f18a85f..28f46477df95 100644
--- a/audio/moony-lv2/Makefile
+++ b/audio/moony-lv2/Makefile
@@ -1,22 +1,25 @@
 PORTNAME=	moony
-DISTVERSION=	0.36.0
-PORTREVISION=	1
+DISTVERSION=	0.40.0
 CATEGORIES=	audio
-MASTER_SITES=	https://git.open-music-kontrollers.ch/lv2/moony.lv2/snapshot/
+MASTER_SITES=	https://git.open-music-kontrollers.ch/~hp/moony.lv2/archive/
 PKGNAMESUFFIX=	-lv2
-DISTNAME=	${PORTNAME}.lv2-${DISTVERSION}
+DISTNAME=	${DISTVERSION}
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Realtime Lua as programmable glue in LV2
 WWW=		https://open-music-kontrollers.ch/lv2/moony
 
 LICENSE=	ART20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lv2>0:audio/lv2
+LIB_DEPENDS=	libvterm.so:devel/libvterm
 
-USES=		compiler:c++11-lang gl meson pkgconfig tar:xz xorg
+USES=		compiler:c++11-lang gl meson pkgconfig xorg
 USE_XORG=	x11 xext
 USE_GL=		gl glew glu
 
+WRKSRC=		${WRKDIR}/${PORTNAME}.lv2-${DISTVERSION}
+
 .include <bsd.port.mk>
diff --git a/audio/moony-lv2/distinfo b/audio/moony-lv2/distinfo
index c04600f32759..e37c79f4a654 100644
--- a/audio/moony-lv2/distinfo
+++ b/audio/moony-lv2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665376484
-SHA256 (moony.lv2-0.36.0.tar.xz) = 825d4c6449dbe5c8efd629c38e41128cb3941e5c1b3b8c75d852a36b669ea484
-SIZE (moony.lv2-0.36.0.tar.xz) = 5186096
+TIMESTAMP = 1775968248
+SHA256 (moony/0.40.0.tar.gz) = 9c296c7412a184087b549678154617482f747862f41b94a211499738c8368598
+SIZE (moony/0.40.0.tar.gz) = 6847639
diff --git a/audio/moony-lv2/files/patch-subprojects_d2tk_src_base__pty.c b/audio/moony-lv2/files/patch-subprojects_d2tk_src_base__pty.c
new file mode 100644
index 000000000000..b55fa3d07b29
--- /dev/null
+++ b/audio/moony-lv2/files/patch-subprojects_d2tk_src_base__pty.c
@@ -0,0 +1,56 @@
+--- subprojects/d2tk/src/base_pty.c.orig	2021-07-15 21:37:59 UTC
++++ subprojects/d2tk/src/base_pty.c
+@@ -19,12 +19,15 @@
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
++#include <stdlib.h>
+ #include <fcntl.h>
++#include <unistd.h>
+ #include <vterm.h>
+-#include <pty.h>
+-#include <utmp.h>
++#include <libutil.h>
++#include <termios.h>
+ #include <sched.h>
+ #include <limits.h>
++#include <sys/ioctl.h>
+ #include <sys/wait.h>
+ #include <sys/mman.h>
+ #include <pthread.h>
+@@ -32,6 +35,8 @@
+ 
+ #include "base_internal.h"
+ 
++extern char **environ;
++
+ #define DEFAULT_FG 0xddddddff
+ #define DEFAULT_BG 0x222222ff
+ 
+@@ -183,7 +188,7 @@
+ 		return 0;
+ 	}
+ 
+-	pthread_join(vpty->kid, NULL);
++	pthread_join((pthread_t)vpty->kid, NULL);
+ 
+ #if D2TK_DEBUG == 1
+ 				fprintf(stderr, "[%s] child with pid %ld has exited\n",
+@@ -432,7 +437,7 @@
+ 
+ 	*amaster = thread_data_master;
+ 
+-	return thread;
++	return (ptrdiff_t)thread;
+ }
+ 
+ static ptrdiff_t
+@@ -587,7 +592,7 @@
+ 		// send CTRL-C
+ 		vterm_keyboard_unichar(vpty->vterm, 0x3, VTERM_MOD_NONE);
+ 
+-		pthread_join(vpty->kid, NULL);
++		pthread_join((pthread_t)vpty->kid, NULL);
+ 
+ #if D2TK_DEBUG == 1
+ 				fprintf(stderr, "[%s] child with pid %ld has exited\n",
diff --git a/audio/moony-lv2/files/patch-subprojects_d2tk_src_util__spawn.c b/audio/moony-lv2/files/patch-subprojects_d2tk_src_util__spawn.c
deleted file mode 100644
index 9b4719c0ca18..000000000000
--- a/audio/moony-lv2/files/patch-subprojects_d2tk_src_util__spawn.c
+++ /dev/null
@@ -1,12 +0,0 @@
-- https://gitlab.com/OpenMusicKontrollers/moony.lv2/-/issues/2
-
---- subprojects/d2tk/src/util_spawn.c.orig	2021-03-06 18:21:48 UTC
-+++ subprojects/d2tk/src/util_spawn.c
-@@ -23,6 +23,7 @@
- #include <sched.h>
- #include <sys/wait.h>
- #include <sys/mman.h>
-+#include <sys/signal.h>
- 
- #include <d2tk/util.h>
-