diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index d5038eec8215..5b2bd71df0a2 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -1,56 +1,57 @@
 PORTNAME=	uade
-PORTVERSION=	3.02
-PORTREVISION=	1
+PORTVERSION=	3.03
 CATEGORIES=	audio
 MASTER_SITES=	http://zakalwe.fi/uade/uade3/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Unix Amiga Delitracker Emulator
 WWW=		https://zakalwe.fi/uade/
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:shells/bash \
 		vasmm68k_mot:devel/vasm
 LIB_DEPENDS=	libao.so:audio/libao \
-		libbencodetools.so:devel/bencodetools
+		libbencodetools.so:devel/bencodetools \
+		libzakalwe.so:devel/libzakalwe
 
 USES=		gmake localbase:ldflags pathfix pkgconfig python:build \
 		shebangfix tar:bzip2
 
 SHEBANG_FILES=	configure write_audio/generate_amiga_oscilloscope_view
 
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
 		--no-debug \
 		--prefix=${PREFIX} \
 		--without-write-audio
 CONFIGURE_ENV=	PYTHON_INTERPRETER=${PYTHON_CMD} \
 		SYSCFLAGS='${CFLAGS}'
 
-SHEBANG_FILES=	configure write_audio/generate_amiga_oscilloscope_view
+SHEBANG_FILES=	configure src/frontends/mod2ogg/mod2ogg2.sh.in \
+		write_audio/generate_amiga_oscilloscope_view
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS TEXTSCOPE
 OPTIONS_DEFAULT=	TEXTSCOPE
 OPTIONS_SUB=		yes
 
 TEXTSCOPE_DESC=	Audio register debug mode
 
 TEXTSCOPE_CONFIGURE_WITH=	text-scope
 
 post-extract:
 	@${RM} -r ${WRKSRC}/players/S
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/uade123 \
 	${STAGEDIR}${PREFIX}/lib/libuade.so \
 	${STAGEDIR}${PREFIX}/lib/uade/uadecore
 
 .include <bsd.port.mk>
diff --git a/audio/uade/distinfo b/audio/uade/distinfo
index 50f93d3be948..2024adb887b6 100644
--- a/audio/uade/distinfo
+++ b/audio/uade/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659213752
-SHA256 (uade-3.02.tar.bz2) = 2aa317525402e479ae8863222e3c341d135670fcb23a2853ac93075ac428f35b
-SIZE (uade-3.02.tar.bz2) = 3190260
+TIMESTAMP = 1694420386
+SHA256 (uade-3.03.tar.bz2) = e0a091cdbd5a11d314f48526212ba34cdb71bbdf5622dfc1f28aa6291c93ede8
+SIZE (uade-3.03.tar.bz2) = 3247062
diff --git a/audio/uade/files/patch-configure b/audio/uade/files/patch-configure
index 05f3611fcaa3..b55723e9406e 100644
--- a/audio/uade/files/patch-configure
+++ b/audio/uade/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2022-10-01 15:24:39 UTC
+--- configure.orig	2023-09-11 11:01:56 UTC
 +++ configure
-@@ -389,7 +389,7 @@ if test "$?" != "0"; then
+@@ -414,7 +414,7 @@ fi
      exit 1
  fi
  
 -VASM=$(which vasm.vasmm68k-mot)
 +VASM=$(which vasmm68k_mot)
  if [[ -n ${VASM} ]] ; then
      usescore="yes"
  fi
diff --git a/audio/uade/files/patch-src_Makefile.in b/audio/uade/files/patch-src_Makefile.in
index ad568b210f26..979ec9341da1 100644
--- a/audio/uade/files/patch-src_Makefile.in
+++ b/audio/uade/files/patch-src_Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	2022-10-01 15:24:39 UTC
+--- src/Makefile.in.orig	2023-09-08 20:23:51 UTC
 +++ src/Makefile.in
-@@ -7,7 +7,7 @@ ARCHFLAGS = {ARCHFLAGS}
- ARCHLIBS = {ARCHLIBS}
+@@ -8,7 +8,7 @@ ZAKALWEFLAGS = {ZAKALWEFLAGS}
  DEBUGFLAGS = {DEBUGFLAGS}
+ ZAKALWEFLAGS = {ZAKALWEFLAGS}
  
 -COMMONGCCOPTS = -Wall -Wno-unused -Wno-format -Wmissing-prototypes -Wstrict-prototypes -fno-exceptions -O2
-+COMMONGCCOPTS = -Wno-unused -Wno-format -Wmissing-prototypes -Wstrict-prototypes -fno-exceptions
++COMMONGCCOPTS = -Wall -Wno-unused -Wno-format -Wmissing-prototypes -Wstrict-prototypes -fno-exceptions
  
- TARGETCFLAGS = -fomit-frame-pointer $(COMMONGCCOPTS) $(DEBUGFLAGS) $(ARCHFLAGS)
- LIBRARIES = -lm $(AUDIOLIBS) $(ARCHLIBS)
+ TARGETCFLAGS = -fomit-frame-pointer $(COMMONGCCOPTS) $(DEBUGFLAGS) $(ARCHFLAGS) $(ZAKALWEFLAGS)
+ LIBRARIES = -lm $(AUDIOLIBS) $(ARCHLIBS) -lzakalwe
diff --git a/audio/uade/files/patch-src_frontends_uade123_Makefile.in b/audio/uade/files/patch-src_frontends_uade123_Makefile.in
deleted file mode 100644
index ccf1c8b09e80..000000000000
--- a/audio/uade/files/patch-src_frontends_uade123_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/frontends/uade123/Makefile.in.orig	2022-10-01 15:24:39 UTC
-+++ src/frontends/uade123/Makefile.in
-@@ -2,7 +2,7 @@ BINDIR = $(DESTDIR){PACKAGEPREFIX}{BINDIR}
- UADE123NAME = {UADE123NAME}
- 
- CC = {CC}
--CFLAGS = -Wall -O2 -I../include -I../common {AOFLAGS} {DEBUGFLAGS} {ARCHFLAGS} {BENCODETOOLSFLAGS}
-+CFLAGS = -I../include -I../common {AOFLAGS} {DEBUGFLAGS} {ARCHFLAGS} {BENCODETOOLSFLAGS}
- CLIBS = {AOLIBS} {ARCHLIBS} -lm -lbencodetools
- 
- all:	uade123
diff --git a/audio/uade/files/patch-write__audio_Makefile.in b/audio/uade/files/patch-write__audio_Makefile.in
index ef2101747f63..a7b2f3643c5e 100644
--- a/audio/uade/files/patch-write__audio_Makefile.in
+++ b/audio/uade/files/patch-write__audio_Makefile.in
@@ -1,19 +1,11 @@
---- write_audio/Makefile.in.orig	2022-10-01 15:31:57 UTC
+--- write_audio/Makefile.in.orig	2023-09-08 20:23:51 UTC
 +++ write_audio/Makefile.in
-@@ -1,12 +1,12 @@
--CC = g++
--CCFLAGS = -W -Wall -O2 -g
--LDFLAGS = 
-+CXX ?= c++
-+CCFLAGS ?= -W -Wall -O2 -g
-+LDFLAGS ?= 
+@@ -1,6 +1,6 @@ CXX = {NATIVECXX}
+ CXX = {NATIVECXX}
+-CXXFLAGS = -W -Wall -O2 -g -std=c++11
+-LDFLAGS = -lm
++CXXFLAGS += -W -Wall -std=c++11
++LDFLAGS += -lm
  EXES = write_audio
  
  all:	$(EXES)
- 
- write_audio:	write_audio.cc
--	$(CC) $(CCFLAGS) -o $@ $< $(LDFLAGS)
-+	$(CXX) $(CCFLAGS) -o $@ $< $(LDFLAGS)
- 
- clean:
- 	rm -f $(EXES)
diff --git a/audio/uade/files/patch-write__audio_write__audio.cc b/audio/uade/files/patch-write__audio_write__audio.cc
deleted file mode 100644
index 9c51979df7c9..000000000000
--- a/audio/uade/files/patch-write__audio_write__audio.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- write_audio/write_audio.cc.orig	2022-10-01 15:28:01 UTC
-+++ write_audio/write_audio.cc
-@@ -3,7 +3,7 @@
- #include <cassert>
- #include <cstdio>
- #include <cstring>
--#include <endian.h>
-+#include <sys/endian.h>
- #include <iostream>
- #include <math.h>
- #include <string>
diff --git a/audio/uade/pkg-plist b/audio/uade/pkg-plist
index 0017deb82816..9996ed6acd57 100644
--- a/audio/uade/pkg-plist
+++ b/audio/uade/pkg-plist
@@ -1,196 +1,197 @@
 bin/mod2ogg2.sh
 bin/uade123
 include/uade/options.h
 include/uade/uade.h
 include/uade/uadeconfstructure.h
 lib/libuade.so
 lib/uade/uadecore
 libdata/pkgconfig/libuade.pc
 man/man1/uade123.1.gz
 %%DATADIR%%/eagleplayer.conf
 %%DATADIR%%/players/ADPCM_mono
 %%DATADIR%%/players/AM-Composer
 %%DATADIR%%/players/AMOS
 %%DATADIR%%/players/AProSys
 %%DATADIR%%/players/AbyssHighestExperience
 %%DATADIR%%/players/ActionAmics
 %%DATADIR%%/players/Alcatraz_Packer
 %%DATADIR%%/players/Anders_0land
 %%DATADIR%%/players/Andrew_Parton
 %%DATADIR%%/players/ArtAndMagic
 %%DATADIR%%/players/ArtOfNoise-4V
 %%DATADIR%%/players/ArtOfNoise-8V
 %%DATADIR%%/players/Ashley_Hogg
 %%DATADIR%%/players/AudioSculpture
 %%DATADIR%%/players/BeathovenSynthesizer
 %%DATADIR%%/players/BenDaglish
 %%DATADIR%%/players/BenDaglish-SID
 %%DATADIR%%/players/BladePacker
 %%DATADIR%%/players/ChipTracker
 %%DATADIR%%/players/Cinemaware
 %%DATADIR%%/players/CoreDesign
 %%DATADIR%%/players/CustomMade
 %%DATADIR%%/players/DIGI-Booster
 %%DATADIR%%/players/DariusZendeh
 %%DATADIR%%/players/DaveLowe
 %%DATADIR%%/players/DaveLoweNew
 %%DATADIR%%/players/DaveLowe_Deli
 %%DATADIR%%/players/DavidHanney
 %%DATADIR%%/players/DavidWhittaker
 %%DATADIR%%/players/DeltaMusic1.3
 %%DATADIR%%/players/DeltaMusic2.0
 %%DATADIR%%/players/Desire
 %%DATADIR%%/players/DigitalSonixChrome
 %%DATADIR%%/players/DigitalSoundStudio
 %%DATADIR%%/players/DirkBialluch
 %%DATADIR%%/players/DynamicSynthesizer
 %%DATADIR%%/players/EMS
 %%DATADIR%%/players/EMS-6
 %%DATADIR%%/players/ENV/EaglePlayer/EP-Hippel_7V.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/EP-Mugician_II.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/EP-PTK-Prowiz.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/EP-S3M.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/EP-TFMX_7V.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/EP-TFMX_Pro.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/ahx
 %%DATADIR%%/players/ENV/EaglePlayer/ahx.waves
 %%DATADIR%%/players/ENV/EaglePlayer/ems_v6.cfg
 %%DATADIR%%/players/ENV/EaglePlayer/ems_v6.cfg.txt
 %%DATADIR%%/players/EarAche
 %%DATADIR%%/players/FashionTracker
 %%DATADIR%%/players/ForgottenWorlds_Game
 %%DATADIR%%/players/Fred
 %%DATADIR%%/players/FredGray
 %%DATADIR%%/players/FutureComposer-BSI
 %%DATADIR%%/players/FutureComposer1.3
 %%DATADIR%%/players/FutureComposer1.4
 %%DATADIR%%/players/FuturePlayer
 %%DATADIR%%/players/GMC
 %%DATADIR%%/players/GlueMon
 %%DATADIR%%/players/HowieDavies
 %%DATADIR%%/players/ImagesMusicSystem
 %%DATADIR%%/players/InStereo
 %%DATADIR%%/players/InStereo2.0
 %%DATADIR%%/players/Infogrames
 %%DATADIR%%/players/JamCracker
 %%DATADIR%%/players/JankoMrsicFlogel
 %%DATADIR%%/players/Janne_Salmijarvi_Optimizer
 %%DATADIR%%/players/JasonBrooke
 %%DATADIR%%/players/JasonPage
 %%DATADIR%%/players/JasonPage_JP
 %%DATADIR%%/players/JeroenTel
 %%DATADIR%%/players/JesperOlsen
 %%DATADIR%%/players/JesperOlsen_EP
 %%DATADIR%%/players/JochenHippel
 %%DATADIR%%/players/JochenHippel-7V
 %%DATADIR%%/players/JochenHippel-CoSo
 %%DATADIR%%/players/JochenHippel_UADE
 %%DATADIR%%/players/Jochen_Hippel_ST
 %%DATADIR%%/players/Kim_Christensen
 %%DATADIR%%/players/KrisHatlelid
 %%DATADIR%%/players/Laxity
 %%DATADIR%%/players/LegglessMusicEditor
 %%DATADIR%%/players/Lionheart_Game
 %%DATADIR%%/players/MCMD
 %%DATADIR%%/players/MED
 %%DATADIR%%/players/MIDI-Loriciel
 %%DATADIR%%/players/MMDC
 %%DATADIR%%/players/MagneticFieldsPacker
 %%DATADIR%%/players/MajorTom
 %%DATADIR%%/players/ManiacsOfNoise
 %%DATADIR%%/players/MarkII
 %%DATADIR%%/players/Mark_Cooksey
 %%DATADIR%%/players/Mark_Cooksey_Old
 %%DATADIR%%/players/MartinWalker
 %%DATADIR%%/players/Maximum_Effect
 %%DATADIR%%/players/Medley
 %%DATADIR%%/players/MikeDavies
 %%DATADIR%%/players/Mosh_Packer
 %%DATADIR%%/players/Mugician
 %%DATADIR%%/players/MugicianII
 %%DATADIR%%/players/MultiMedia_Sound
 %%DATADIR%%/players/MusicAssembler
 %%DATADIR%%/players/MusicMaker-4V
 %%DATADIR%%/players/MusicMaker-8V
 %%DATADIR%%/players/MusiclineEditor
 %%DATADIR%%/players/NTSP-system
 %%DATADIR%%/players/Nick_Pelling_Packer
 %%DATADIR%%/players/NovoTradePacker
 %%DATADIR%%/players/Octa-MED
 %%DATADIR%%/players/Oktalyzer
 %%DATADIR%%/players/PTK-Prowiz
 %%DATADIR%%/players/PaulRobotham
 %%DATADIR%%/players/PaulShields
 %%DATADIR%%/players/PaulSummers
 %%DATADIR%%/players/Paul_Tonge
 %%DATADIR%%/players/PeterVerswyvelen
 %%DATADIR%%/players/PierreAdane
 %%DATADIR%%/players/Pokeynoise
+%%DATADIR%%/players/PreTracker
 %%DATADIR%%/players/ProfessionalSoundArtists
 %%DATADIR%%/players/PumaTracker
 %%DATADIR%%/players/QuadraComposer
 %%DATADIR%%/players/Quartet
 %%DATADIR%%/players/Quartet_PSG
 %%DATADIR%%/players/Quartet_ST
 %%DATADIR%%/players/RichardJoseph
 %%DATADIR%%/players/RichardJoseph_Player
 %%DATADIR%%/players/RiffRaff
 %%DATADIR%%/players/RobHubbard
 %%DATADIR%%/players/RobHubbard_ST
 %%DATADIR%%/players/SCUMM
 %%DATADIR%%/players/SIDMon1.0
 %%DATADIR%%/players/SIDMon2.0
 %%DATADIR%%/players/SUN-Tronic
 %%DATADIR%%/players/ScottJohnston
 %%DATADIR%%/players/SeanConnolly
 %%DATADIR%%/players/SeanConran
 %%DATADIR%%/players/Sierra-AGI
 %%DATADIR%%/players/Silmarils
 %%DATADIR%%/players/SonicArranger
 %%DATADIR%%/players/SonicArranger-pc-all
 %%DATADIR%%/players/SonixMusicDriver
 %%DATADIR%%/players/Sound-FX
 %%DATADIR%%/players/SoundControl
 %%DATADIR%%/players/SoundFactory
 %%DATADIR%%/players/SoundImages
 %%DATADIR%%/players/SoundMaster
 %%DATADIR%%/players/SoundMon2.0
 %%DATADIR%%/players/SoundMon2.2
 %%DATADIR%%/players/SoundPlayer
 %%DATADIR%%/players/SoundProgrammingLanguage
 %%DATADIR%%/players/Soundtracker-IV
 %%DATADIR%%/players/Special-FX
 %%DATADIR%%/players/Special-FX_ST
 %%DATADIR%%/players/SpeedyA1System
 %%DATADIR%%/players/SpeedySystem
 %%DATADIR%%/players/SteveBarrett
 %%DATADIR%%/players/SteveTurner
 %%DATADIR%%/players/SynTracker
 %%DATADIR%%/players/Synth
 %%DATADIR%%/players/SynthDream
 %%DATADIR%%/players/SynthPack
 %%DATADIR%%/players/TCB_Tracker
 %%DATADIR%%/players/TFMX
 %%DATADIR%%/players/TFMX-7V
 %%DATADIR%%/players/TFMX-7V-TFHD
 %%DATADIR%%/players/TFMX-Pro
 %%DATADIR%%/players/TFMX-Pro-TFHD
 %%DATADIR%%/players/TFMX-TFHD
 %%DATADIR%%/players/TFMX_ST
 %%DATADIR%%/players/TheMusicalEnlightenment
 %%DATADIR%%/players/ThomasHermann
 %%DATADIR%%/players/TimFollin
 %%DATADIR%%/players/TimeTracker
 %%DATADIR%%/players/Titanics_Packer
 %%DATADIR%%/players/TomyTracker
 %%DATADIR%%/players/Tronic
 %%DATADIR%%/players/UFO
 %%DATADIR%%/players/UltimateSoundtracker
 %%DATADIR%%/players/VoodooSupremeSynthesizer
 %%DATADIR%%/players/WallyBeben
 %%DATADIR%%/players/YM-2149
 %%DATADIR%%/players/ZoundMonitor
 %%DATADIR%%/players/onEscapee
 %%DATADIR%%/score
 %%DATADIR%%/uade.conf
 %%DATADIR%%/uaerc