From 2edd28639319b23ef4cc79a547cd965529cb2c5f Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Wed, 8 Feb 2023 20:18:35 +0000
Subject: [PATCH] update to d11amp-0.61, from Thomas Dettbarn
 (maintainer+upstream) with small tweaks

---
 audio/d11amp/Makefile               |  9 +++--
 audio/d11amp/distinfo               |  4 +-
 audio/d11amp/patches/patch-Makefile | 61 -----------------------------
 audio/d11amp/patches/patch-d11amp_1 | 17 --------
 audio/d11amp/pkg/DESCR              |  4 +-
 5 files changed, 9 insertions(+), 86 deletions(-)
 delete mode 100644 audio/d11amp/patches/patch-Makefile
 delete mode 100644 audio/d11amp/patches/patch-d11amp_1

diff --git a/audio/d11amp/Makefile b/audio/d11amp/Makefile
index 27a38c7944a..a793c750a63 100644
--- a/audio/d11amp/Makefile
+++ b/audio/d11amp/Makefile
@@ -1,6 +1,6 @@
 COMMENT=	simple MP3 player
 
-V=		0.59
+V=		0.61
 DISTNAME=	d11amp_${V}
 PKGNAME=	d11amp-${V}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,10 +24,11 @@ LIB_DEPENDS=	graphics/gdk-pixbuf2	\
 		audio/mpg123		\
 		audio/portaudio-svn
 
-FAKE_FLAGS=	INSTALLMAN="${WRKINST}${PREFIX}/man"
+MAKE_FLAGS=	CC="${CC}" CFLAGS="${CFLAGS}"
+FAKE_FLAGS=	INSTALLMAN="${WRKINST}${PREFIX}/man" \
+		DESTDIR=
+
 TEST_ENV=	SHA256_CMD=sha256 TMP_DIR=/tmp/d11amp/
 TEST_TARGET=	check
 
 .include <bsd.port.mk>
-
-
diff --git a/audio/d11amp/distinfo b/audio/d11amp/distinfo
index 2b8a6ba1faf..4ffc8edd878 100644
--- a/audio/d11amp/distinfo
+++ b/audio/d11amp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (d11amp_0.59.tar.bz2) = WW/ij9KgiYv/8Aqlt5RXYz5z51JrhmtphBnBNASemEE=
-SIZE (d11amp_0.59.tar.bz2) = 73479
+SHA256 (d11amp_0.61.tar.bz2) = wOtBbAMwd7GV3cJKnSMum/qAb7d3tXKA5/gztiZ87Qk=
+SIZE (d11amp_0.61.tar.bz2) = 76507
diff --git a/audio/d11amp/patches/patch-Makefile b/audio/d11amp/patches/patch-Makefile
deleted file mode 100644
index 4a2b5bad1b1..00000000000
--- a/audio/d11amp/patches/patch-Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-Make the Makefile work in the ports tree.
---- Makefile.orig	2022-12-07 18:40:47.911485894 +0100
-+++ Makefile	2022-12-07 18:46:14.805995288 +0100
-@@ -31,35 +31,36 @@
- 
- CC?=gcc
- AR?=ar
--CFLAGS= -O3 -Os
-+CFLAGS?= -O3 -Os
- #CFLAGS?=-O0 -g
- CFLAGS+=-Wall
- #CFLAGS+=-Werror
- PROJ_HOME=./
- INCFLAGS= -I$(PROJ_HOME)src/
- LINK=$(CC)
-+LINKFLAGS=""
- 
- # Library gdk-pixbuf
--LDFLAGS+= `pkg-config    --libs gdk-pixbuf-2.0`
--CFLAGS+=  `pkg-config  --cflags gdk-pixbuf-2.0`
-+LINKFLAGS+= `pkg-config    --libs gdk-pixbuf-2.0`
-+INCFLAGS+=  `pkg-config  --cflags gdk-pixbuf-2.0`
- 
- # Library: gtk4
--LDFLAGS+= `pkg-config    --libs gtk4`
--CFLAGS+=  `pkg-config  --cflags gtk4`
-+LINKFLAGS+= `pkg-config    --libs gtk4`
-+INCFLAGS+=  `pkg-config  --cflags gtk4`
- 
- # Library: libMPG123
--LDFLAGS+= `pkg-config    --libs libmpg123`
--CFLAGS+=  `pkg-config  --cflags libmpg123`
-+LINKFLAGS+= `pkg-config    --libs libmpg123`
-+INCFLAGS+=  `pkg-config  --cflags libmpg123`
- 
- # Library: portaudio
--LDFLAGS+= `pkg-config    --libs portaudio-2.0`
--CFLAGS+=  `pkg-config  --cflags portaudio-2.0`
-+LINKFLAGS+= `pkg-config    --libs portaudio-2.0`
-+INCFLAGS+=  `pkg-config  --cflags portaudio-2.0`
- 
- # Library: libzip
--LDFLAGS+= `pkg-config    --libs libzip`
--CFLAGS+=  `pkg-config  --cflags libzip`
-+LINKFLAGS+= `pkg-config    --libs libzip`
-+INCFLAGS+=  `pkg-config  --cflags libzip`
- 
--LDFLAGS+=-lpthread -lm
-+LINKFLAGS+=-lpthread -lm
- 
- 
- 
-@@ -125,7 +126,7 @@
- 	cp d11amp.1 $(INSTALLMAN)/man1/
- 
- d11amp: $(OBJFILES)
--	$(LINK) -o $@ $(OBJFILES) $(LDFLAGS)
-+	$(LINK) -o $@ $(OBJFILES) $(LDFLAGS) $(LINKFLAGS)
- 
- .c.o:
- 	$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(INCFLAGS) -c -o $@ $< 
diff --git a/audio/d11amp/patches/patch-d11amp_1 b/audio/d11amp/patches/patch-d11amp_1
deleted file mode 100644
index 0238836759d..00000000000
--- a/audio/d11amp/patches/patch-d11amp_1
+++ /dev/null
@@ -1,17 +0,0 @@
-Typos in the manpage.
---- d11amp.1.orig	2022-12-07 18:40:54.551637309 +0100
-+++ d11amp.1	2022-12-07 18:41:17.196146490 +0100
-@@ -30,11 +30,11 @@
- .Nm
- .Op --audiooutput.portaudio.device=NUMBER
- .br
--The audio output is being handled through the portaudio library. This allows to select any audio output present in the device on which
-+The audio output is being handled through the portaudio library. This allows one to select any audio output present in the device on which
- .Nm
- has been started. The outputs are identified through a number, and a list of available outputs can be seen by using a question mark instead of the number.
- .br
--The default audio output device can be adressed by using -1.
-+The default audio output device can be addressed by using -1.
- .Pp
- .Nm
- .Op --bsd
diff --git a/audio/d11amp/pkg/DESCR b/audio/d11amp/pkg/DESCR
index 7a103ebbda4..5105cae7000 100644
--- a/audio/d11amp/pkg/DESCR
+++ b/audio/d11amp/pkg/DESCR
@@ -1,2 +1,2 @@
-D11AMP is a frontend to MPG123, trying to resemble WinAmp, utilizing its
-treasure trove of themes.
+D11AMP is an oldskool MP3 player. In addition to being a frontend
+to mpg123, it can handle WinAMP's treasure trove of skins. Looks awesome!