8 files changed, 24 insertions, 52 deletions

diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index d5038eec8215..5b2bd71df0a2 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	uade
-PORTVERSION=	3.02
-PORTREVISION=	1
+PORTVERSION=	3.03
 CATEGORIES=	audio
 MASTER_SITES=	http://zakalwe.fi/uade/uade3/ \
 		LOCAL/ehaupt
@@ -14,7 +13,8 @@ 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
@@ -30,7 +30,8 @@ CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man/man1 \
 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
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,6 +1,6 @@
---- 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
  
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
@@ -126,6 +126,7 @@ man/man1/uade123.1.gz
 %%DATADIR%%/players/PeterVerswyvelen
 %%DATADIR%%/players/PierreAdane
 %%DATADIR%%/players/Pokeynoise
+%%DATADIR%%/players/PreTracker
 %%DATADIR%%/players/ProfessionalSoundArtists
 %%DATADIR%%/players/PumaTracker
 %%DATADIR%%/players/QuadraComposer