diff --git a/audio/schismtracker/Makefile b/audio/schismtracker/Makefile
index 933a1ebb6974..1b9f0b96568c 100644
--- a/audio/schismtracker/Makefile
+++ b/audio/schismtracker/Makefile
@@ -1,40 +1,51 @@
 PORTNAME=	schismtracker
-DISTVERSION=	20250313
+DISTVERSION=	20250415
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module tracker editor/player resembling impulse tracker
 WWW=		https://schismtracker.org/ \
 		https://github.com/schismtracker/schismtracker
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc powerpc64 powerpc64le
 
-LIB_DEPENDS=	libFLAC.so:audio/flac \
-		libutf8proc.so:textproc/utf8proc
+LIB_DEPENDS=	libutf8proc.so:textproc/utf8proc
 
-USES=		autoreconf compiler:c++11-lib desktop-file-utils localbase \
-		pkgconfig python sdl xorg
-USE_GITHUB=	yes
-USE_SDL=	sdl2
-USE_XORG=	x11 xext xv
-GNU_CONFIGURE=	yes
+USES=			autoreconf compiler:c++11-lib desktop-file-utils \
+			localbase pkgconfig python xorg
+USE_GITHUB=		yes
+USE_XORG=		x11 xext xv
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--without-sdl12
 
 PLIST_FILES=	bin/schismtracker \
 		share/applications/schism.desktop \
 		share/man/man1/schismtracker.1.gz \
 		share/pixmaps/schism-icon-128.png \
 		share/pixmaps/schism-itf-icon-128.png
 
+OPTIONS_DEFINE=		FLAC SDL
+OPTIONS_DEFAULT=	FLAC SDL
+
+FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
+FLAC_CONFIGURE_ON=	--enable-flac-linking \
+			--with-flac
+
+SDL_USES=		sdl
+SDL_USE=		SDL=sdl2
+SDL_CONFIGURE_ON=	--enable-sdl2-linking \
+			--with-sdl2
+
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%LAST_GIT_COMMIT%%|${DISTVERSION}|" \
 		${WRKSRC}/configure.ac
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/sys/fd.org/*.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/schism-icon-128.png \
 		${WRKSRC}/icons/schism-itf-icon-128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff --git a/audio/schismtracker/distinfo b/audio/schismtracker/distinfo
index cbab2d148363..870b77ec1e70 100644
--- a/audio/schismtracker/distinfo
+++ b/audio/schismtracker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1741948979
-SHA256 (schismtracker-schismtracker-20250313_GH0.tar.gz) = 0811a1133cb7a8c4c69713a15389b6601ec909b406b9e4d7e8ca2833887f0124
-SIZE (schismtracker-schismtracker-20250313_GH0.tar.gz) = 1245032
+TIMESTAMP = 1746459006
+SHA256 (schismtracker-schismtracker-20250415_GH0.tar.gz) = ba9b8e4381e9f3a3110ae7bb4e7794ac2399e88bb26a50c86a6f45beed57c5f3
+SIZE (schismtracker-schismtracker-20250415_GH0.tar.gz) = 1258277
diff --git a/audio/schismtracker/files/patch-configure.ac b/audio/schismtracker/files/patch-configure.ac
index ed1ee3f5fb39..120591c15c33 100644
--- a/audio/schismtracker/files/patch-configure.ac
+++ b/audio/schismtracker/files/patch-configure.ac
@@ -1,14 +1,33 @@
---- configure.ac.orig	2024-12-26 07:15:43 UTC
+--- configure.ac.orig	2025-04-15 23:08:37 UTC
 +++ configure.ac
 @@ -23,9 +23,9 @@ m4_define([last_git_commit], patsubst(m4_esyscmd([git 
  
  dnl PACKAGE_VERSION will be either "" if not using git, or date of the last git commit in the form YYYYMMDD
  m4_define([last_git_commit], patsubst(m4_esyscmd([git log -n 1 --date=short --format=format:%cd]), [[^0-9]]))
 -AC_INIT([schismtracker],[last_git_commit])
 +AC_INIT([schismtracker],[%%LAST_GIT_COMMIT%%])
  
 -last_commit_date="last_git_commit"
 +last_commit_date="%%LAST_GIT_COMMIT%%"
  
  AC_CONFIG_SRCDIR([schism/main.c])
  
+@@ -999,18 +999,6 @@ SCHISM_CHECK_COMPILE_FLAG([-Werror=return-type])
+ dnl Unlike a grand -Werror, this one could be rather important:
+ dnl functions returning random values are no good under any circumstances.
+ SCHISM_CHECK_COMPILE_FLAG([-Werror=return-type])
+-
+-dnl GCC by default does not error for mesopotamian pre-ANSI C constructs
+-dnl before GCC 14. Enforce C99 function and variable declarations.
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=implicit-int])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=implicit-function-declaration])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=old-style-declaration])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=old-style-definition])
+-
+-dnl Error for misc. undefined behavior.
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=write-strings])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=restrict])
+-SCHISM_CHECK_COMPILE_FLAG([-Werror=overlength-strings])
+ 
+ dnl disable this for now, clang's implementation is incorrect  --paper
+ dnl SCHISM_CHECK_COMPILE_FLAG([-Werror=cast-function-type])