diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile
index c9a954a2baf1..910a9eb4fd0c 100644
--- a/audio/cheesecutter/Makefile
+++ b/audio/cheesecutter/Makefile
@@ -1,39 +1,47 @@
 PORTNAME=	cheesecutter
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.9-beta-3-25
-DISTVERSIONSUFFIX=	-gdbe9a9d
-PORTREVISION=	7
+DISTVERSION=	2.10
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tracker for composing music for the C64 SID chip
 WWW=		https://github.com/theyamo/CheeseCutter
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	acme:devel/acme \
 		ldc2:lang/ldc
 
-USES=		desktop-file-utils gmake
-
+USES=		desktop-file-utils gmake sdl
 USE_GITHUB=	yes
-GH_ACCOUNT=	ehaupt
+GH_ACCOUNT=	theyamo
 GH_PROJECT=	CheeseCutter
+USE_SDL=	sdl2
 
-MAKEFILE=	Makefile.ldc
 MAKE_ARGS=	DLDFLAGS=-L=-Wl,-z,nostart-stop-gc
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	EXAMPLES
 
-post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/man/fr/man1 ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/arch/fd/ccutter.desktop ${STAGEDIR}${DESKTOPDIR}
-	${INSTALL_DATA} ${WRKSRC}/icons/cc96.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ccutter ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/ct2util ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/arch/fd/ccutter.desktop \
+		${STAGEDIR}${DESKTOPDIR}/
+	${INSTALL_DATA} ${WRKSRC}/icons/cc96.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/man/fr/man1
 .for f in ccutter ct2util
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${PREFIX}/share/man/fr/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 \
+		${STAGEDIR}${PREFIX}/share/man/fr/man1/
 .endfor
 
+do-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/example_tunes
+	cd ${WRKSRC}/tunes && ${COPYTREE_SHARE} . \
+		${STAGEDIR}${EXAMPLESDIR}/example_tunes
+
 .include <bsd.port.mk>
diff --git a/audio/cheesecutter/distinfo b/audio/cheesecutter/distinfo
index 609f3a3fb474..d48e070c722b 100644
--- a/audio/cheesecutter/distinfo
+++ b/audio/cheesecutter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1611248944
-SHA256 (ehaupt-CheeseCutter-v2.9-beta-3-25-gdbe9a9d_GH0.tar.gz) = cd4fe2dc508e674fd01f2f464f0fb86b61a2c0dd052c3707e84609b037be2806
-SIZE (ehaupt-CheeseCutter-v2.9-beta-3-25-gdbe9a9d_GH0.tar.gz) = 407983
+TIMESTAMP = 1776322544
+SHA256 (theyamo-CheeseCutter-v2.10_GH0.tar.gz) = 20feb57bb4a272bbddcb5c284aacf44dd1e77cec47db5aac72ad1c6d183ffaaf
+SIZE (theyamo-CheeseCutter-v2.10_GH0.tar.gz) = 427592
diff --git a/audio/cheesecutter/files/patch-Makefile.ldc b/audio/cheesecutter/files/patch-Makefile.ldc
deleted file mode 100644
index 2bab9007ea46..000000000000
--- a/audio/cheesecutter/files/patch-Makefile.ldc
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.ldc.orig	2021-01-21 17:07:49 UTC
-+++ Makefile.ldc
-@@ -1,5 +1,7 @@
- # make install DESTDIR=/home/yamo/devel/cc2/snap/parts/ccutter/install
- 
-+PREFIX?=/usr
-+EXAMPLESDIR?=/usr/share/examples/ccutter
- LIBS=-L-ldl -L-lstdc++
- COMFLAGS=-O2
- VERSION=$(shell cat Version)
-@@ -19,7 +21,7 @@ include Makefile.objects.mk
- all: ct2util ccutter
- 
- ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS)
--	$(DC) $(COMFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS)
-+	$(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS)
- 
- 
- .cpp.o : $(CXX_SRCS)
-@@ -31,17 +33,17 @@ ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS)
- ct: $(C64OBJS) $(CTOBJS)
- 
- ct2util: $(C64OBJS) $(UTILOBJS)
--	$(DC) $(COMFLAGS) -of=$@ $(UTILOBJS)
-+	$(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(UTILOBJS)
- 
- c64: $(C64OBJS)
- 
- install: all
- 	strip ccutter$(EXE)
- 	strip ct2util$(EXE)
--	cp ccutter$(EXE) $(DESTDIR)
--	cp ct2util$(EXE) $(DESTDIR)
--	mkdir $(DESTDIR)/example_tunes
--	cp -r tunes/* $(DESTDIR)/example_tunes
-+	cp ccutter$(EXE) $(DESTDIR)$(PREFIX)/bin
-+	cp ct2util$(EXE) $(DESTDIR)$(PREFIX)/bin
-+	mkdir -p $(DESTDIR)/$(EXAMPLESDIR)/example_tunes
-+	cp -r tunes/* $(DESTDIR)/$(EXAMPLESDIR)/example_tunes
- 
- # release version with additional optimizations
- release: DFLAGS += -frelease -fno-bounds-check
diff --git a/audio/cheesecutter/files/patch-src_main.d b/audio/cheesecutter/files/patch-src_main.d
deleted file mode 100644
index c87f886073ef..000000000000
--- a/audio/cheesecutter/files/patch-src_main.d
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/main.d.orig	2020-12-25 15:36:31 UTC
-+++ src/main.d
-@@ -23,6 +23,10 @@ version(linux) {
- 	const DIR_SEPARATOR = '/';
- }
- 
-+version(FreeBSD) {
-+	const DIR_SEPARATOR = '/';
-+}
-+
- version(OSX) {
- 	const DIR_SEPARATOR = '/';
- }