<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123630] trunk/dports/multimedia</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123630">123630</a></dd>
<dt>Author</dt> <dd>mf2k@macports.org</dd>
<dt>Date</dt> <dd>2014-08-11 12:47:30 -0700 (Mon, 11 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>audacious audacious-core audacious-plugins: update to version 3.5.1. (#44595)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmultimediaaudaciousPortfile">trunk/dports/multimedia/audacious/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorePortfile">trunk/dports/multimedia/audacious-core/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff">trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsPortfile">trunk/dports/multimedia/audacious-plugins/Portfile</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsfilespatchbuildsysdiff">trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff</a></li>
<li><a href="#trunkdportsmultimediaaudaciouspluginsfilespatchconfigureacselectlibsdldiff">trunk/dports/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmultimediaaudaciousPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious/Portfile (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious/Portfile 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious/Portfile 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -6,8 +6,8 @@
</span><span class="cx"> name audacious
</span><span class="cx">
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version 3.5
-revision 1
</del><ins>+version 3.5.1
+revision 0
</ins><span class="cx">
</span><span class="cx"> license BSD GPL-2+
</span><span class="cx"> categories multimedia
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/Portfile (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/Portfile 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious-core/Portfile 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -2,13 +2,14 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup conflicts_build 1.0
</ins><span class="cx">
</span><span class="cx"> name audacious-core
</span><span class="cx"> set real_name audacious
</span><span class="cx">
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version 3.5
-revision 1
</del><ins>+version 3.5.1
+revision 0
</ins><span class="cx">
</span><span class="cx"> license BSD
</span><span class="cx"> categories multimedia
</span><span class="lines">@@ -30,9 +31,11 @@
</span><span class="cx"> master_sites http://distfiles.audacious-media-player.org
</span><span class="cx"> distname ${real_name}-${version}
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums rmd160 7b801aa2ab8236bcd52dd1e9564d9d4c64ec83a8 \
- sha256 4180a1a922b42ef2b1fe47c708a226e03e7400b35e04ece4b2e73c01c5d42514
</del><ins>+checksums rmd160 8278c1a1173e38f61097f284cc0c8a4c8c26e97e \
+ sha256 df380e1ade112c703f57bc3883c71a1025e8d77091a772b86c0f9072efa69507
</ins><span class="cx">
</span><ins>+conflicts_build ${name}
+
</ins><span class="cx"> patchfiles patch-buildsys.diff
</span><span class="cx">
</span><span class="cx"> depends_build path:bin/pkg-config:pkgconfig \
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouscorefilespatchbuildsysdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious-core/files/patch-buildsys.diff 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -1,21 +1,396 @@
</span><del>---- 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 @@
</del><ins>+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</ins><span class="cx">
</span><span class="cx"> MO_FILES = ${LOCALES:.po=.mo}
</span><span class="cx">
</span><span class="cx"> -.SILENT:
</span><span class="cx"> .SUFFIXES:
</span><span class="cx"> .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
</span><del>- .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 @@
</del><ins>+-.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], [
</ins><span class="cx"> darwin*)
</span><span class="cx"> AC_MSG_RESULT(Darwin)
</span><span class="cx"> LIB_CFLAGS='-fPIC -DPIC'
</span><span class="cx"> - LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
</span><del>-+ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$''@'
</del><ins>++ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</ins><span class="cx"> LIB_PREFIX='lib'
</span><span class="cx"> LIB_SUFFIX='.dylib'
</span><span class="cx"> LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/Portfile (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/Portfile 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious-plugins/Portfile 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -2,12 +2,13 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup conflicts_build 1.0
</ins><span class="cx">
</span><span class="cx"> name audacious-plugins
</span><span class="cx">
</span><span class="cx"> # Please keep audacious, audacious-core and audacious-plugins synchronized.
</span><del>-version 3.5
-revision 1
</del><ins>+version 3.5.1
+revision 0
</ins><span class="cx">
</span><span class="cx"> # FIXME: probably more licenses involved here...
</span><span class="cx"> license BSD GPL-2+
</span><span class="lines">@@ -26,9 +27,11 @@
</span><span class="cx">
</span><span class="cx"> master_sites http://distfiles.audacious-media-player.org
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums rmd160 e04f24b7e67fe592ca8ad54d7ad507c0a16b0f09 \
- sha256 11bc39e5e386b218db62122411de15363cd5795f2e86ea7989d10d640f2dd4d2
</del><ins>+checksums rmd160 b513103930905813ae047a6e021b07d7c422716b \
+ sha256 e6da3346df520f3c6cee3c3706eb09290840ea12dfff28d6bec32e5842dc9e26
</ins><span class="cx">
</span><ins>+conflicts_build ${name}
+
</ins><span class="cx"> patchfiles patch-buildsys.diff \
</span><span class="cx"> patch-configure.ac-select-libsdl.diff
</span><span class="cx">
</span><span class="lines">@@ -78,7 +81,7 @@
</span><span class="cx"> --disable-aac \
</span><span class="cx"> --disable-sndfile \
</span><span class="cx"> --disable-modplug \
</span><del>- --disable-ffaudio \
</del><ins>+ --with-ffmpeg=none \
</ins><span class="cx"> --disable-jack \
</span><span class="cx"> --disable-sid \
</span><span class="cx"> --disable-oss4 \
</span><span class="lines">@@ -225,8 +228,8 @@
</span><span class="cx">
</span><span class="cx"> variant ffmpeg conflicts sdl2 description {Add support for decoding audio streams via ffmpeg} {
</span><span class="cx"> depends_lib-append path:lib/libavcodec.dylib:ffmpeg
</span><del>- configure.args-replace --disable-ffaudio \
- --enable-ffaudio
</del><ins>+ configure.args-replace --with-ffmpeg=none \
+ --with-ffmpeg=ffmpeg
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant jack description {Add support for the JACK Audio Connection Kit} {
</span><span class="lines">@@ -305,9 +308,9 @@
</span><span class="cx"> configure.args-append --with-libsdl=1
</span><span class="cx"> }
</span><span class="cx">
</span><del>-# ffmpeg is depending and using libsdl1. Loading both the ffmpeg and sdlout plugins
-# (when compiled with libsdl2) will hence lead to undefined behavior, as both
-# libsdl1 and libsdl2 expose functions with the same name.
</del><ins>+# ffmpeg is depending upon and using libsdl1. Loading both the ffmpeg and sdlout
+# plugins (when compiled with libsdl2) will hence lead to undefined behavior, as
+# both libsdl1 and libsdl2 expose functions with the same name.
</ins><span class="cx"> variant sdl2 conflicts sdl1 ffmpeg description {Add SDL audio output via libsdl2} {
</span><span class="cx"> depends_lib-append port:libsdl2
</span><span class="cx"> configure.args-replace --disable-sdlout \
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsfilespatchbuildsysdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious-plugins/files/patch-buildsys.diff 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -1,21 +1,396 @@
</span><del>---- 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 @@
</del><ins>+--- buildsys.mk.in.old
++++ buildsys.mk.in
+@@ -107,19 +107,24 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
</ins><span class="cx">
</span><span class="cx"> MO_FILES = ${LOCALES:.po=.mo}
</span><span class="cx">
</span><span class="cx"> -.SILENT:
</span><span class="cx"> .SUFFIXES:
</span><span class="cx"> .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
</span><del>- .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 @@
</del><ins>+-.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], [
</ins><span class="cx"> darwin*)
</span><span class="cx"> AC_MSG_RESULT(Darwin)
</span><span class="cx"> LIB_CFLAGS='-fPIC -DPIC'
</span><span class="cx"> - LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
</span><del>-+ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$''@'
</del><ins>++ LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
</ins><span class="cx"> LIB_PREFIX='lib'
</span><span class="cx"> LIB_SUFFIX='.dylib'
</span><span class="cx"> LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
</span></span></pre></div>
<a id="trunkdportsmultimediaaudaciouspluginsfilespatchconfigureacselectlibsdldiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff (123629 => 123630)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff 2014-08-11 19:34:55 UTC (rev 123629)
+++ trunk/dports/multimedia/audacious-plugins/files/patch-configure.ac-select-libsdl.diff 2014-08-11 19:47:30 UTC (rev 123630)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- configure.ac.old
</span><span class="cx"> +++ configure.ac
</span><del>-@@ -603,17 +603,47 @@ AC_ARG_ENABLE(sdlout,
</del><ins>+@@ -570,17 +570,47 @@ AC_ARG_ENABLE(sdlout,
</ins><span class="cx"> [AS_HELP_STRING([--disable-sdlout], [disable SDL output plugin])],
</span><span class="cx"> [enable_sdlout=$enableval], [enable_sdlout=auto])
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>