head 1.2; access; symbols pkgsrc-2022Q4:1.1.0.2 pkgsrc-2022Q4-base:1.1; locks; strict; comment @# @; 1.2 date 2023.01.06.23.52.50; author wiz; state dead; branches; next 1.1; commitid S9JsQb95iYmVwx8E; 1.1 date 2022.12.10.12.50.58; author wiz; state Exp; branches; next ; commitid UCvYphcUlRfMJ05E; desc @@ 1.2 log @d11amp: update to 0.61. From Thomas Dettbarn in PR 57165. Changes: * Improved Playlist * Improved Keyboard Control * Improved Audio Output options @ text @$NetBSD: patch-Makefile,v 1.1 2022/12/10 12:50:58 wiz Exp $ Don't override CFLAGS/LDFLAGS. --- Makefile.orig 2022-11-27 18:03:47.000000000 +0000 +++ Makefile @@@@ -31,7 +31,7 @@@@ INSTALLMAN=$(PREFIX)/share/man CC?=gcc AR?=ar -CFLAGS= -O3 -Os +CFLAGS?= -O3 -Os #CFLAGS?=-O0 -g CFLAGS+=-Wall #CFLAGS+=-Werror @@@@ -40,26 +40,26 @@@@ INCFLAGS= -I$(PROJ_HOME)src/ LINK=$(CC) # 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 +125,7 @@@@ install: d11amp d11amp.1 cp d11amp.1 $(INSTALLMAN)/man1/ d11amp: $(OBJFILES) - $(LINK) -o $@@ $(OBJFILES) $(LDFLAGS) + $(LINK) -o $@@ $(OBJFILES) $(LINKFLAGS) $(LDFLAGS) .c.o: $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_EXTRA) $(INCFLAGS) -c -o $@@ $< @ 1.1 log @audio/d11amp: import d11amp-0.59 From Thomas Dettbarn in PR 57099. D11AMP is is a frontend to MPG123, trying to resemble WinAmp, utilizing its treasure trove of themes. @ text @d1 1 a1 1 $NetBSD$ @