commit 517019117b1cff0d172cdf1a4266f0e515d0b17f
Author: Mihai Moldovan <ionic@ionic.de>
Date:   Sun Aug 10 20:39:45 2014 +0200

    multimedia/audacious-{core,plugins}: update patch files for 3.5.1. Merge buildsys changes from upstream (https://github.com/Midar/buildsys).

diff --git a/multimedia/audacious-core/files/patch-buildsys.diff b/multimedia/audacious-core/files/patch-buildsys.diff
index b47d342..fc648d1 100644
--- a/multimedia/audacious-core/files/patch-buildsys.diff
+++ b/multimedia/audacious-core/files/patch-buildsys.diff
@@ -1,21 +1,396 @@
---- buildsys.mk.in.old	2014-05-10 20:05:12.000000000 +0200
-+++ buildsys.mk.in	2014-05-10 20:06:01.000000000 +0200
-@@ -107,7 +107,6 @@
+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
  .SUFFIXES:
  .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
---- m4/buildsys.m4.old	2014-05-10 20:05:12.000000000 +0200
-+++ m4/buildsys.m4	2014-05-10 20:05:47.000000000 +0200
-@@ -109,14 +109,14 @@
+-.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
++.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
+ 
+ all:
++	${MAKE} pre-all
+ 	${MAKE} ${MFLAGS} subdirs
+ 	${MAKE} ${MFLAGS} depend
+ 	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
++	${MAKE} ${MFLAGS} subdirs-after
++	${MAKE} post-all
++
++pre-all post-all:
+ 
+ subdirs: ${SUBDIRS}
++subdirs-after: ${SUBDIRS_AFTER}
+ 
+-${SUBDIRS}:
++${SUBDIRS} ${SUBDIRS_AFTER}:
+ 	for i in $@; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} || exit $$?; \
+@@ -205,6 +210,7 @@ pre-depend:
+ 
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ 	${LINK_STATUS}
++	out="$@"; \
+ 	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
+ 		${LINK_OK}; \
+ 	else \
+@@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
+ 	fi
+ 
+ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+-	${LINK_STATUS}; \
++	${LINK_STATUS}
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ 
+ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ 	${LINK_STATUS}
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${PLUGIN_OBJS}; do \
+@@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ 	${LINK_STATUS}
+ 	rm -f $@
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${OBJS} ${OBJS_EXTRA}; do \
+@@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ 	${LINK_STATUS}
+ 	rm -f $@
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -375,6 +385,8 @@ locales: ${MO_FILES}
+ 
+ .c.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -382,6 +394,8 @@ locales: ${MO_FILES}
+ 	fi
+ .c.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -389,6 +403,8 @@ locales: ${MO_FILES}
+ 	fi
+ .c.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -397,6 +413,8 @@ locales: ${MO_FILES}
+ 
+ .cc.o .cxx.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -404,6 +422,8 @@ locales: ${MO_FILES}
+ 	fi
+ .cc.lib.o .cxx.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -411,6 +431,8 @@ locales: ${MO_FILES}
+ 	fi
+ .cc.plugin.o .cxx.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -419,6 +441,8 @@ locales: ${MO_FILES}
+ 
+ .d.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if test x"$(basename ${DC})" = x"dmd"; then \
+ 		if ${DC} ${DFLAGS} -c -of$@ $<; then \
+ 			${COMPILE_OK}; \
+@@ -435,6 +459,8 @@ locales: ${MO_FILES}
+ 
+ .erl.beam:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -443,6 +469,8 @@ locales: ${MO_FILES}
+ 
+ .java.class:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${JAVAC} ${JAVACFLAGS} $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -451,6 +479,8 @@ locales: ${MO_FILES}
+ 
+ .m.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -458,6 +488,8 @@ locales: ${MO_FILES}
+ 	fi
+ .m.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -465,6 +497,8 @@ locales: ${MO_FILES}
+ 	fi
+ .m.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -473,6 +507,8 @@ locales: ${MO_FILES}
+ 
+ .mm.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -480,6 +516,8 @@ locales: ${MO_FILES}
+ 	fi
+ .mm.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -487,6 +525,8 @@ locales: ${MO_FILES}
+ 	fi
+ .mm.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -495,6 +535,8 @@ locales: ${MO_FILES}
+ 
+ .po.mo:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${MSGFMT} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -503,6 +545,8 @@ locales: ${MO_FILES}
+ 
+ .py.pyc:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -511,7 +555,9 @@ locales: ${MO_FILES}
+ 
+ .rc.o .rc.lib.o .rc.plugin.o:
+ 	${COMPILE_STATUS}
+-	if ${WINDRES} -J rc -O coff -o $@ $<; then \
++	in="$<"; \
++	out="$@"; \
++	if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+ 		${COMPILE_FAILED}; \
+@@ -519,6 +565,8 @@ locales: ${MO_FILES}
+ 
+ .S.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -526,6 +574,8 @@ locales: ${MO_FILES}
+ 	fi
+ .S.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -533,6 +583,8 @@ locales: ${MO_FILES}
+ 	fi
+ .S.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -541,6 +593,8 @@ locales: ${MO_FILES}
+ 
+ .xpm.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -548,6 +602,8 @@ locales: ${MO_FILES}
+ 	fi
+ .xpm.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -555,14 +611,16 @@ locales: ${MO_FILES}
+ 	fi
+ .xpm.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+ 		${COMPILE_PLUGIN_FAILED}; \
+ 	fi
+ 
+-install: install-extra
+-	for i in ${SUBDIRS}; do \
++install: all install-extra
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} install || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -643,7 +701,7 @@ install: install-extra
+ install-extra:
+ 
+ uninstall: uninstall-extra
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} uninstall || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -736,7 +794,7 @@ uninstall: uninstall-extra
+ uninstall-extra:
+ 
+ clean:
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} clean || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -753,7 +811,7 @@ clean:
+ 	done
+ 
+ distclean: clean
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} distclean || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -769,27 +827,39 @@ distclean: clean
+ 		fi \
+ 	done
+ 
+-DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
+-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
++print-hierarchy:
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
++		echo ${PRINT_HIERARCHY_PREFIX}$$i; \
++		cd $$i || exit $$?; \
++		${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
++		cd .. || exit $$?; \
++	done
++
++print-var:
++	echo '${${VAR}}'
++
++DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
++DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
+ DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
+ DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
+ DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
+-COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
+-COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
+-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
+-COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
+-COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
+-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
++COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
++COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
++COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
++COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
++COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
++COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
++COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
+ LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+ LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+ LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
+-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-
+-include .deps
++INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
++INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
++INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
++DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++
++.CURDIR ?= .
++include ${.CURDIR}/.deps
+--- m4/buildsys.m4.old
++++ m4/buildsys.m4
+@@ -109,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
  		darwin*)
  			AC_MSG_RESULT(Darwin)
  			LIB_CFLAGS='-fPIC -DPIC'
 -			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
-+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$''@'
++			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
  			LIB_PREFIX='lib'
  			LIB_SUFFIX='.dylib'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
diff --git a/multimedia/audacious-plugins/files/patch-buildsys.diff b/multimedia/audacious-plugins/files/patch-buildsys.diff
index ab01b82..fc648d1 100644
--- a/multimedia/audacious-plugins/files/patch-buildsys.diff
+++ b/multimedia/audacious-plugins/files/patch-buildsys.diff
@@ -1,21 +1,396 @@
---- buildsys.mk.in.old	2014-05-10 20:05:19.000000000 +0200
-+++ buildsys.mk.in	2014-05-10 20:08:27.000000000 +0200
-@@ -107,7 +107,6 @@
+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
  .SUFFIXES:
  .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
---- m4/buildsys.m4.old	2014-05-10 20:05:19.000000000 +0200
-+++ m4/buildsys.m4	2014-05-10 20:08:17.000000000 +0200
-@@ -109,14 +109,14 @@
+-.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
++.PHONY: all subdirs subdirs-after pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} ${SUBDIRS_AFTER}
+ 
+ all:
++	${MAKE} pre-all
+ 	${MAKE} ${MFLAGS} subdirs
+ 	${MAKE} ${MFLAGS} depend
+ 	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
++	${MAKE} ${MFLAGS} subdirs-after
++	${MAKE} post-all
++
++pre-all post-all:
+ 
+ subdirs: ${SUBDIRS}
++subdirs-after: ${SUBDIRS_AFTER}
+ 
+-${SUBDIRS}:
++${SUBDIRS} ${SUBDIRS_AFTER}:
+ 	for i in $@; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} || exit $$?; \
+@@ -205,6 +210,7 @@ pre-depend:
+ 
+ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ 	${LINK_STATUS}
++	out="$@"; \
+ 	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
+ 		${LINK_OK}; \
+ 	else \
+@@ -228,7 +234,8 @@ ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
+ 	fi
+ 
+ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+-	${LINK_STATUS}; \
++	${LINK_STATUS}
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -264,6 +271,7 @@ ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ 
+ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ 	${LINK_STATUS}
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${PLUGIN_OBJS}; do \
+@@ -300,6 +308,7 @@ ${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ 	${LINK_STATUS}
+ 	rm -f $@
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${OBJS} ${OBJS_EXTRA}; do \
+@@ -337,6 +346,7 @@ ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
+ ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+ 	${LINK_STATUS}
+ 	rm -f $@
++	out="$@"; \
+ 	objs=""; \
+ 	ars=""; \
+ 	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+@@ -375,6 +385,8 @@ locales: ${MO_FILES}
+ 
+ .c.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -382,6 +394,8 @@ locales: ${MO_FILES}
+ 	fi
+ .c.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -389,6 +403,8 @@ locales: ${MO_FILES}
+ 	fi
+ .c.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -397,6 +413,8 @@ locales: ${MO_FILES}
+ 
+ .cc.o .cxx.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -404,6 +422,8 @@ locales: ${MO_FILES}
+ 	fi
+ .cc.lib.o .cxx.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -411,6 +431,8 @@ locales: ${MO_FILES}
+ 	fi
+ .cc.plugin.o .cxx.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -419,6 +441,8 @@ locales: ${MO_FILES}
+ 
+ .d.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if test x"$(basename ${DC})" = x"dmd"; then \
+ 		if ${DC} ${DFLAGS} -c -of$@ $<; then \
+ 			${COMPILE_OK}; \
+@@ -435,6 +459,8 @@ locales: ${MO_FILES}
+ 
+ .erl.beam:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -443,6 +469,8 @@ locales: ${MO_FILES}
+ 
+ .java.class:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${JAVAC} ${JAVACFLAGS} $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -451,6 +479,8 @@ locales: ${MO_FILES}
+ 
+ .m.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -458,6 +488,8 @@ locales: ${MO_FILES}
+ 	fi
+ .m.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -465,6 +497,8 @@ locales: ${MO_FILES}
+ 	fi
+ .m.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -473,6 +507,8 @@ locales: ${MO_FILES}
+ 
+ .mm.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -480,6 +516,8 @@ locales: ${MO_FILES}
+ 	fi
+ .mm.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -487,6 +525,8 @@ locales: ${MO_FILES}
+ 	fi
+ .mm.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -495,6 +535,8 @@ locales: ${MO_FILES}
+ 
+ .po.mo:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${MSGFMT} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -503,6 +545,8 @@ locales: ${MO_FILES}
+ 
+ .py.pyc:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -511,7 +555,9 @@ locales: ${MO_FILES}
+ 
+ .rc.o .rc.lib.o .rc.plugin.o:
+ 	${COMPILE_STATUS}
+-	if ${WINDRES} -J rc -O coff -o $@ $<; then \
++	in="$<"; \
++	out="$@"; \
++	if ${WINDRES} ${CPPFLAGS} -J rc -O coff -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+ 		${COMPILE_FAILED}; \
+@@ -519,6 +565,8 @@ locales: ${MO_FILES}
+ 
+ .S.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -526,6 +574,8 @@ locales: ${MO_FILES}
+ 	fi
+ .S.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -533,6 +583,8 @@ locales: ${MO_FILES}
+ 	fi
+ .S.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+@@ -541,6 +593,8 @@ locales: ${MO_FILES}
+ 
+ .xpm.o:
+ 	${COMPILE_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_OK}; \
+ 	else \
+@@ -548,6 +602,8 @@ locales: ${MO_FILES}
+ 	fi
+ .xpm.lib.o:
+ 	${COMPILE_LIB_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_LIB_OK}; \
+ 	else \
+@@ -555,14 +611,16 @@ locales: ${MO_FILES}
+ 	fi
+ .xpm.plugin.o:
+ 	${COMPILE_PLUGIN_STATUS}
++	in="$<"; \
++	out="$@"; \
+ 	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+ 		${COMPILE_PLUGIN_OK}; \
+ 	else \
+ 		${COMPILE_PLUGIN_FAILED}; \
+ 	fi
+ 
+-install: install-extra
+-	for i in ${SUBDIRS}; do \
++install: all install-extra
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} install || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -643,7 +701,7 @@ install: install-extra
+ install-extra:
+ 
+ uninstall: uninstall-extra
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} uninstall || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -736,7 +794,7 @@ uninstall: uninstall-extra
+ uninstall-extra:
+ 
+ clean:
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} clean || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -753,7 +811,7 @@ clean:
+ 	done
+ 
+ distclean: clean
+-	for i in ${SUBDIRS}; do \
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+ 		${DIR_ENTER}; \
+ 		${MAKE} ${MFLAGS} distclean || exit $$?; \
+ 		${DIR_LEAVE}; \
+@@ -769,27 +827,39 @@ distclean: clean
+ 		fi \
+ 	done
+ 
+-DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
+-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
++print-hierarchy:
++	for i in ${SUBDIRS} ${SUBDIRS_AFTER}; do \
++		echo ${PRINT_HIERARCHY_PREFIX}$$i; \
++		cd $$i || exit $$?; \
++		${MAKE} ${MFLAGS} PRINT_HIERARCHY_PREFIX=$$i/ print-hierarchy || exit $$?; \
++		cd .. || exit $$?; \
++	done
++
++print-var:
++	echo '${${VAR}}'
++
++DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
++DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
+ DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
+ DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
+ DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
+-COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
+-COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
+-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
+-COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
+-COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
+-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
++COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
++COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
++COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
++COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
++COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
++COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
++COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
++COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
+ LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+ LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+ LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
+-INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
+-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
+-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+-
+-include .deps
++INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
++INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
++INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
++DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
++
++.CURDIR ?= .
++include ${.CURDIR}/.deps
+--- m4/buildsys.m4.old
++++ m4/buildsys.m4
+@@ -109,14 +109,14 @@ AC_DEFUN([BUILDSYS_SHARED_LIB], [
  		darwin*)
  			AC_MSG_RESULT(Darwin)
  			LIB_CFLAGS='-fPIC -DPIC'
 -			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
-+			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$''@'
++			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
  			LIB_PREFIX='lib'
  			LIB_SUFFIX='.dylib'
  			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
diff --git a/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff b/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff
index fef14b5..a96a0da 100644
--- a/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff
+++ b/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff
@@ -1,6 +1,6 @@
 --- configure.ac.old
 +++ configure.ac
-@@ -603,17 +603,47 @@ AC_ARG_ENABLE(sdlout,
+@@ -570,17 +570,47 @@ AC_ARG_ENABLE(sdlout,
   [AS_HELP_STRING([--disable-sdlout], [disable SDL output plugin])],
   [enable_sdlout=$enableval], [enable_sdlout=auto])
  
