Index | Thread | Search

From:
Courtney <courtney@courtnix.systems>
Subject:
Re: UPDATE audio/audacious to 4.4
To:
ports@openbsd.org
Date:
Fri, 14 Jun 2024 09:12:09 -0700

Download raw body.

Thread
I built this port with this diff and it works for me!

Courtney

On 6/13/24 8:43 AM, Bjorn Ketelaars wrote:
> Diff below updates {audio,meta}/audacious to 4.4. Changes are listed on
> https://audacious-media-player.org/news/59-audacious-4-4-released.
>
> Changes to port:
> - bumped minor of libaudcore because of an addition
> - bumped major of libaudqt because of a removal
> - updated dependencies
> - synced patches and WANTLIB
>
> Tested on amd64.
>
> Comments/OK?
>
>
> diff --git audio/audacious/Makefile.inc audio/audacious/Makefile.inc
> index dc147db461f..7a0a5713d63 100644
> --- audio/audacious/Makefile.inc
> +++ audio/audacious/Makefile.inc
> @@ -1,5 +1,5 @@
>   # Do not forget to sync meta/audacious
> -VERSION =	4.3.1
> +VERSION =	4.4
>   
>   CATEGORIES =	audio multimedia
>   
> @@ -18,7 +18,7 @@ BUILD_DEPENDS +=	devel/gettext,-tools
>   
>   MODULES +=		x11/qt5
>   CONFIGURE_ARGS +=	--disable-gtk \
> -			--enable-qt
> +			--enable-qt5
>   
>   USE_GMAKE =		Yes
>   
> diff --git audio/audacious/player/Makefile audio/audacious/player/Makefile
> index fe25b02d5f7..79bc651b73d 100644
> --- audio/audacious/player/Makefile
> +++ audio/audacious/player/Makefile
> @@ -3,22 +3,22 @@ COMMENT =		graphical audio player which supports lots of formats
>   DISTNAME =		audacious-${VERSION}
>   PKGNAME =		audacious-player-${VERSION}
>   
> -REVISION =		0
> -
> -SHARED_LIBS +=		audcore		5.2	# 5.3
> -SHARED_LIBS +=		audtag		3.0	# 3.0
> -SHARED_LIBS +=		audqt		0.2	# 2.4
> +SHARED_LIBS +=		audcore		5.3
> +SHARED_LIBS +=		audtag		3.0
> +SHARED_LIBS +=		audqt		1.0
>   
>   # BSD
>   PERMIT_PACKAGE =	Yes
>   
> -WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets c gio-2.0
> -WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 iconv intl m
> +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Svg Qt5Widgets
> +WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 iconv intl
> +WANTLIB += m
> +
> +# needed for displaying icons
> +LIB_DEPENDS =		x11/qt5/qtsvg
>   
>   RUN_DEPENDS =		devel/desktop-file-utils \
>   			x11/gtk+4,-guic
> -# needed for displaying icons
> -RUN_DEPENDS +=		x11/qt5/qtsvg
>   
>   MAKE_ENV =		LIBaudcore_VERSION=${LIBaudcore_VERSION} \
>   			LIBaudtag_VERSION=${LIBaudtag_VERSION} \
> diff --git audio/audacious/player/distinfo audio/audacious/player/distinfo
> index 17417f6e3f5..1b3848192e9 100644
> --- audio/audacious/player/distinfo
> +++ audio/audacious/player/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (audacious-4.3.1.tar.bz2) = heniaEFQW1HjQu5yotBfGb74lPVnoCnrs/Pgwa20IEI=
> -SIZE (audacious-4.3.1.tar.bz2) = 630820
> +SHA256 (audacious-4.4.tar.bz2) = qtxdJuopVCNqABU+QkCU2ebrVcXDJMCP0EkbfCri+DA=
> +SIZE (audacious-4.4.tar.bz2) = 635856
> diff --git audio/audacious/player/patches/patch-buildsys_mk_in audio/audacious/player/patches/patch-buildsys_mk_in
> deleted file mode 100644
> index b5370c4f27c..00000000000
> --- audio/audacious/player/patches/patch-buildsys_mk_in
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -Show compiler invocations.
> -
> -Index: buildsys.mk.in
> ---- buildsys.mk.in.orig
> -+++ buildsys.mk.in
> -@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep}			\
> -
> - MO_FILES = ${LOCALES:.po=.mo}
> -
> --.SILENT:
> -+#.SILENT:
> - .SUFFIXES:
> - .SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
> - .PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
> -
> - all:
> --	${MAKE} -s pre-all
> --	${MAKE} -s subdirs
> --	${MAKE} -s depend
> --	${MAKE} -s ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
> --	${MAKE} -s subdirs-after
> --	${MAKE} -s post-all
> -+	${MAKE} pre-all
> -+	${MAKE} subdirs
> -+	${MAKE} depend
> -+	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
> -+	${MAKE} subdirs-after
> -+	${MAKE} post-all
> -
> - pre-all post-all:
> -
> -@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER}
> - ${SUBDIRS} ${SUBDIRS_AFTER}:
> - 	for i in $@; do \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s || exit $$?; \
> -+		${MAKE} || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
> - ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
> - 	${LINK_STATUS}
> - 	out="$@"; \
> --	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
> -+	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
> - 		${LINK_OK}; \
> - 	else \
> - 		rm -fr $$out; false; \
> -@@ -205,7 +205,7 @@ copy-headers-into-framework:
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		cd $$i || exit 1; \
> --		${MAKE} -s copy-headers-into-framework || exit $$?; \
> -+		${MAKE} copy-headers-into-framework || exit $$?; \
> - 		cd .. || exit 1; \
> - 	done
> -
> -@@ -654,7 +654,7 @@ install: install-extra
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s install || exit $$?; \
> -+		${MAKE} install || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -767,7 +767,7 @@ uninstall: uninstall-extra
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s uninstall || exit $$?; \
> -+		${MAKE} uninstall || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -882,7 +882,7 @@ clean:
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s clean || exit $$?; \
> -+		${MAKE} clean || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -903,7 +903,7 @@ distclean: clean
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s distclean || exit $$?; \
> -+		${MAKE} distclean || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -923,7 +923,7 @@ print-hierarchy:
> - 		test x"$$i" = x"" && continue; \
> - 		echo ${PRINT_HIERARCHY_PREFIX}$$i; \
> - 		cd $$i || exit $$?; \
> --		${MAKE} -s PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
> -+		${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
> - 		cd .. || exit $$?; \
> - 	done
> -
> diff --git audio/audacious/player/patches/patch-src_libaudcore_Makefile audio/audacious/player/patches/patch-src_libaudcore_Makefile
> index 3be6a06faed..c0ee7d6c21a 100644
> --- audio/audacious/player/patches/patch-src_libaudcore_Makefile
> +++ audio/audacious/player/patches/patch-src_libaudcore_Makefile
> @@ -5,5 +5,5 @@ Index: src/libaudcore/Makefile
>   -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
>   +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
>    LIB_MAJOR = 5
> - LIB_MINOR = 4
> + LIB_MINOR = 5
>    
> diff --git audio/audacious/player/patches/patch-src_libaudcore_vfs_h audio/audacious/player/patches/patch-src_libaudcore_vfs_h
> index 861e084fd4d..875146c939b 100644
> --- audio/audacious/player/patches/patch-src_libaudcore_vfs_h
> +++ audio/audacious/player/patches/patch-src_libaudcore_vfs_h
> @@ -8,4 +8,4 @@ Index: src/libaudcore/vfs.h
>   +    VFS_SEEK_UNK = -1,
>        VFS_SEEK_SET = 0,
>        VFS_SEEK_CUR = 1,
> -     VFS_SEEK_END = 2
> +     VFS_SEEK_END = 2,
> diff --git audio/audacious/player/patches/patch-src_libaudqt_Makefile audio/audacious/player/patches/patch-src_libaudqt_Makefile
> index 6d69686b2a4..e639589320b 100644
> --- audio/audacious/player/patches/patch-src_libaudqt_Makefile
> +++ audio/audacious/player/patches/patch-src_libaudqt_Makefile
> @@ -5,6 +5,6 @@ Index: src/libaudqt/Makefile
>   -SHARED_LIB = ${LIB_PREFIX}audqt${LIB_SUFFIX}
>   +SHARED_LIB = ${LIB_PREFIX}audqt.so.${LIBaudqt_VERSION}
>   +
> - LIB_MAJOR = 2
> - LIB_MINOR = 4
> + LIB_MAJOR = 3
> + LIB_MINOR = 0
>    
> diff --git audio/audacious/plugins/Makefile audio/audacious/plugins/Makefile
> index ce6140ca1f2..64d5367ad54 100644
> --- audio/audacious/plugins/Makefile
> +++ audio/audacious/plugins/Makefile
> @@ -1,7 +1,6 @@
>   COMMENT =		input and output plugins for Audacious
>   
>   DISTNAME =		audacious-plugins-${VERSION}
> -REVISION =		1
>   
>   # BSD / GPL
>   PERMIT_PACKAGE =	Yes
> @@ -11,8 +10,8 @@ WANTLIB += Qt5Widgets Qt5X11Extras X11 adplug audcore audqt audtag
>   WANTLIB += avcodec avformat avutil binio cddb cdio cdio_cdda cue
>   WANTLIB += curl faad gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
>   WANTLIB += iconv intl m mms modplug mp3lame mpg123 neon notify
> -WANTLIB += ogg opus opusfile samplerate sndfile sndio soxr vorbis
> -WANTLIB += vorbisenc vorbisfile wavpack xml2 z
> +WANTLIB += ogg opusfile samplerate sndfile sndio soxr vorbis vorbisenc
> +WANTLIB += vorbisfile wavpack xml2 z
>   
>   # needed for the gio plugin
>   RUN_DEPENDS =		x11/gnome/gvfs
> @@ -30,7 +29,6 @@ LIB_DEPENDS =		audio/adplug \
>   			audio/libsoxr \
>   			audio/libvorbis \
>   			audio/mpg123 \
> -			audio/opus \
>   			audio/opusfile \
>   			audio/wavpack \
>   			devel/libnotify>=0.7.2 \
> diff --git audio/audacious/plugins/distinfo audio/audacious/plugins/distinfo
> index fe59c716fbc..b0b1e120eb5 100644
> --- audio/audacious/plugins/distinfo
> +++ audio/audacious/plugins/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (audacious-plugins-4.3.1.tar.bz2) = Leom469YOi1oTfJAsnsrKTK81lPfTbUAqF9P5dX9yKY=
> -SIZE (audacious-plugins-4.3.1.tar.bz2) = 1786114
> +SHA256 (audacious-plugins-4.4.tar.bz2) = PK86X+W28oCPRh+FEy+/9K4ipT7589JtnmAw9sbVuqI=
> +SIZE (audacious-plugins-4.4.tar.bz2) = 1810406
> diff --git audio/audacious/plugins/patches/patch-buildsys_mk_in audio/audacious/plugins/patches/patch-buildsys_mk_in
> deleted file mode 100644
> index b5370c4f27c..00000000000
> --- audio/audacious/plugins/patches/patch-buildsys_mk_in
> +++ /dev/null
> @@ -1,103 +0,0 @@
> -Show compiler invocations.
> -
> -Index: buildsys.mk.in
> ---- buildsys.mk.in.orig
> -+++ buildsys.mk.in
> -@@ -123,18 +123,18 @@ DEPS = ${OBJS:.o=.dep}			\
> -
> - MO_FILES = ${LOCALES:.po=.mo}
> -
> --.SILENT:
> -+#.SILENT:
> - .SUFFIXES:
> - .SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
> - .PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
> -
> - all:
> --	${MAKE} -s pre-all
> --	${MAKE} -s subdirs
> --	${MAKE} -s depend
> --	${MAKE} -s ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
> --	${MAKE} -s subdirs-after
> --	${MAKE} -s post-all
> -+	${MAKE} pre-all
> -+	${MAKE} subdirs
> -+	${MAKE} depend
> -+	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} ${AMIGA_LIB} ${AMIGA_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
> -+	${MAKE} subdirs-after
> -+	${MAKE} post-all
> -
> - pre-all post-all:
> -
> -@@ -144,7 +144,7 @@ subdirs-after: ${SUBDIRS_AFTER}
> - ${SUBDIRS} ${SUBDIRS_AFTER}:
> - 	for i in $@; do \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s || exit $$?; \
> -+		${MAKE} || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -194,7 +194,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_
> - ${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
> - 	${LINK_STATUS}
> - 	out="$@"; \
> --	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} -s COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
> -+	if rm -fr $$out && ${MKDIR_P} $$out && ${MAKE} COPY_HEADERS_IF_SUBDIR=${includesubdir} COPY_HEADERS_DESTINATION=$$PWD/$@/Headers copy-headers-into-framework && if test -f Info.plist; then ${INSTALL} -m 644 Info.plist $$out/Info.plist; fi && if test -f module.modulemap; then ${MKDIR_P} $$out/Modules && ${INSTALL} -m 644 module.modulemap $$out/Modules/module.modulemap; fi && ${LD} -o $$out/$${out%.framework} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} ${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${FRAMEWORK_LIBS} && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
> - 		${LINK_OK}; \
> - 	else \
> - 		rm -fr $$out; false; \
> -@@ -205,7 +205,7 @@ copy-headers-into-framework:
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		cd $$i || exit 1; \
> --		${MAKE} -s copy-headers-into-framework || exit $$?; \
> -+		${MAKE} copy-headers-into-framework || exit $$?; \
> - 		cd .. || exit 1; \
> - 	done
> -
> -@@ -654,7 +654,7 @@ install: install-extra
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s install || exit $$?; \
> -+		${MAKE} install || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -767,7 +767,7 @@ uninstall: uninstall-extra
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s uninstall || exit $$?; \
> -+		${MAKE} uninstall || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -882,7 +882,7 @@ clean:
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s clean || exit $$?; \
> -+		${MAKE} clean || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -903,7 +903,7 @@ distclean: clean
> - 	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
> - 		test x"$$i" = x"" && continue; \
> - 		${DIR_ENTER}; \
> --		${MAKE} -s distclean || exit $$?; \
> -+		${MAKE} distclean || exit $$?; \
> - 		${DIR_LEAVE}; \
> - 	done
> -
> -@@ -923,7 +923,7 @@ print-hierarchy:
> - 		test x"$$i" = x"" && continue; \
> - 		echo ${PRINT_HIERARCHY_PREFIX}$$i; \
> - 		cd $$i || exit $$?; \
> --		${MAKE} -s PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
> -+		${MAKE} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
> - 		cd .. || exit $$?; \
> - 	done
> -
> diff --git audio/audacious/plugins/patches/patch-configure audio/audacious/plugins/patches/patch-configure
> index bc73a8f82aa..2c95a6cdce5 100644
> --- audio/audacious/plugins/patches/patch-configure
> +++ audio/audacious/plugins/patches/patch-configure
> @@ -5,7 +5,7 @@ polluted very early on, breaking most of the checks using AC_CHECK_LIB.
>   Index: configure
>   --- configure.orig
>   +++ configure
> -@@ -11758,8 +11758,6 @@ printf "%s\n" "yes" >&6; }
> +@@ -11977,8 +11977,6 @@ printf "%s\n" "yes" >&6; }
>    
>    fi
>    
> @@ -14,7 +14,7 @@ Index: configure
>    
>    
>    if test $HAVE_DARWIN = yes ; then
> -@@ -17192,6 +17190,8 @@ then :
> +@@ -17629,6 +17627,8 @@ then :
>    
>    fi
>    
> diff --git audio/audacious/plugins/patches/patch-src_neon_neon_cc audio/audacious/plugins/patches/patch-src_neon_neon_cc
> index 40d0e88e56d..e46219bea5a 100644
> --- audio/audacious/plugins/patches/patch-src_neon_neon_cc
> +++ audio/audacious/plugins/patches/patch-src_neon_neon_cc
> @@ -6,7 +6,7 @@ bool NeonFile::feof ()
>   Index: src/neon/neon.cc
>   --- src/neon/neon.cc.orig
>   +++ src/neon/neon.cc
> -@@ -45,6 +45,8 @@
> +@@ -50,6 +50,8 @@
>    #define NEON_ICY_BUFSIZE    (4096)
>    #define NEON_RETRY_COUNT 6
>    
> diff --git audio/audacious/plugins/pkg/PLIST audio/audacious/plugins/pkg/PLIST
> index 085fe33e349..d653b0a4a36 100644
> --- audio/audacious/plugins/pkg/PLIST
> +++ audio/audacious/plugins/pkg/PLIST
> @@ -11,6 +11,7 @@ lib/audacious/Container/
>   @so lib/audacious/Container/pls.so
>   @so lib/audacious/Container/xspf.so
>   lib/audacious/Effect/
> +@so lib/audacious/Effect/background_music.so
>   @so lib/audacious/Effect/bitcrusher.so
>   @so lib/audacious/Effect/compressor.so
>   @so lib/audacious/Effect/crossfade.so
> @@ -27,7 +28,7 @@ lib/audacious/General/
>   @so lib/audacious/General/albumart-qt.so
>   @so lib/audacious/General/cd-menu-items.so
>   @so lib/audacious/General/delete-files.so
> -@so lib/audacious/General/lyricwiki-qt.so
> +@so lib/audacious/General/lyrics-qt.so
>   @so lib/audacious/General/mpris2.so
>   @so lib/audacious/General/notify.so
>   @so lib/audacious/General/playlist-manager-qt.so
> diff --git meta/audacious/Makefile meta/audacious/Makefile
> index b13f16bed74..52d76b142b9 100644
> --- meta/audacious/Makefile
> +++ meta/audacious/Makefile
> @@ -1,6 +1,6 @@
>   COMMENT =	audacious meta-package
>   
> -VERSION =	4.3.1
> +VERSION =	4.4.0
>   PKGNAME =	audacious-${VERSION}
>   
>   MAINTAINER =	Bjorn Ketelaars <bket@openbsd.org>
>