aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/audacious-crossfade/Makefile2
-rw-r--r--audio/audacious-dumb/Makefile2
-rw-r--r--audio/audacious-dumb/files/patch-Makefile4
-rw-r--r--audio/audacious-dumb/files/patch-audacious-dumb.c11
-rw-r--r--audio/wmauda/Makefile2
-rw-r--r--multimedia/audacious-plugins/Makefile50
-rw-r--r--multimedia/audacious-plugins/distinfo6
-rw-r--r--multimedia/audacious-plugins/pkg-plist250
-rw-r--r--multimedia/audacious/Makefile12
-rw-r--r--multimedia/audacious/distinfo6
-rw-r--r--multimedia/audacious/pkg-plist265
-rw-r--r--multimedia/tunapie/Makefile2
-rw-r--r--multimedia/xfce4-xmms-plugin/Makefile2
-rw-r--r--sysutils/conky/Makefile2
-rw-r--r--x11-themes/audacious-skins/Makefile2
15 files changed, 294 insertions, 324 deletions
diff --git a/audio/audacious-crossfade/Makefile b/audio/audacious-crossfade/Makefile
index f279b6f04622..654b6e4744c2 100644
--- a/audio/audacious-crossfade/Makefile
+++ b/audio/audacious-crossfade/Makefile
@@ -13,4 +13,6 @@ CPPFLAGS+= -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/include/gtk-2.0 \
-I${LOCALBASE}/include/atk-1.0
MASTERDIR= ${.CURDIR}/../xmms-crossfade
+BROKEN= Does not compile
+
.include "${MASTERDIR}/Makefile"
diff --git a/audio/audacious-dumb/Makefile b/audio/audacious-dumb/Makefile
index 6fdf0c0dfdac..91eae5df4668 100644
--- a/audio/audacious-dumb/Makefile
+++ b/audio/audacious-dumb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= audacious-dumb
PORTVERSION= 0.57
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio
MASTER_SITES= http://www.netswarm.net/misc/ \
CRITICAL
diff --git a/audio/audacious-dumb/files/patch-Makefile b/audio/audacious-dumb/files/patch-Makefile
index 98832e186b01..7536885198a4 100644
--- a/audio/audacious-dumb/files/patch-Makefile
+++ b/audio/audacious-dumb/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig 2007-10-28 19:36:45.000000000 +0100
-+++ Makefile 2007-11-28 15:07:03.000000000 +0100
+--- ./Makefile.orig 2008-01-27 20:32:05.000000000 +0100
++++ ./Makefile 2009-12-02 00:14:08.000000000 +0100
@@ -7,7 +7,7 @@
CC ?= gcc
CFLAGS ?= -O2 -pipe
diff --git a/audio/audacious-dumb/files/patch-audacious-dumb.c b/audio/audacious-dumb/files/patch-audacious-dumb.c
new file mode 100644
index 000000000000..4774feb6b91e
--- /dev/null
+++ b/audio/audacious-dumb/files/patch-audacious-dumb.c
@@ -0,0 +1,11 @@
+--- ./audacious-dumb.c.orig 2009-12-02 00:14:15.000000000 +0100
++++ ./audacious-dumb.c 2009-12-02 00:14:26.000000000 +0100
+@@ -49,7 +49,7 @@
+ .stop = stop,
+ .pause = duh_pause,
+ .seek = seek,
+- .get_song_info = get_song_info,
++ NULL,
+ .file_info_box = file_info_box,
+ .get_song_tuple = get_tuple_info,
+ .is_our_file_from_vfs = is_our_file_from_vfs,
diff --git a/audio/wmauda/Makefile b/audio/wmauda/Makefile
index fbddcf73c231..f14e09210a8d 100644
--- a/audio/wmauda/Makefile
+++ b/audio/wmauda/Makefile
@@ -7,7 +7,7 @@
PORTNAME= wmauda
PORTVERSION= 0.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= audio windowmaker
MASTER_SITES= http://www.netswarm.net/misc/ \
${MASTER_SITE_GENTOO}
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 11bce82a992a..5d81465e3931 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= audacious-plugins
-PORTVERSION= 2.1
-PORTREVISION= 2
+PORTVERSION= 2.2
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.atheme.org/
EXTRACT_SUFX= .tgz
@@ -32,9 +31,9 @@ WANT_SDL= yes
PORTDOCS= AUTHORS
# no ports for:
-# PULSE "Enable PulseAudio output plugin" off \
-# COREAUDIO "Enable CoreAudio output plugin" off \
-# PROJECTM "Enable projectM vis plugin" off \
+# PULSE "Enable PulseAudio output plugin" on \
+# COREAUDIO "Enable CoreAudio output plugin" on \
+# PROJECTM "Enable projectM vis plugin" on \
OPTIONS= DBUS "Enable dbus support" on \
ESOUND "Enable Esound output output" off \
@@ -51,20 +50,16 @@ OPTIONS= DBUS "Enable dbus support" on \
AAC "Enable aac plugin" on \
SNDFILE "Enable sndfile extensions" off \
MODPLUG "Enable ModPlug plugin" off \
- MPC "Enable musepack input plugin" off \
- WMA "Enable wma plugin" on \
JACK "Enable jack output plugin" off \
SID "Enable sid input plugin" off \
OSS "Enable OSS output plugin" on \
OSS4 "Enable OSS4 output plugin" off \
- TIMIDITY "Enable timidity plugin" off \
CDAUDIO "Enable cdaudio-ng input plugin" on \
NEON "Enable neon (HTTP) support" on \
MMS "Enable mms support" off \
MTP "Enable MTP upload support" off \
PARANORMAL "Enable paranormal vis plugin" on \
XSPF "Enable XSPF support" on \
- TTA "Enable TrueAudio plugin" on \
GNOME "Build with gnomevfs/gconf support" off \
NLS "Native Language Support" on \
CURL "curl for lastfm/scrobbler support" off \
@@ -210,24 +205,6 @@ PLIST_SUB+= MODPLUG="@comment "
CONFIGURE_ARGS+=--disable-modplug
.endif
-.if defined(WITH_MPC)
-LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec \
- tag.1:${PORTSDIR}/audio/taglib
-PLIST_SUB+= MPCPLUGIN=""
-CONFIGURE_ARGS+=--enable-musepack
-.else
-PLIST_SUB+= MPCPLUGIN="@comment "
-CONFIGURE_ARGS+=--disable-musepack
-.endif
-
-.if !defined(WITHOUT_WMA)
-CONFIGURE_ARGS+=--enable-wma
-PLIST_SUB+= WMAPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-wma
-PLIST_SUB+= WMAPLUGIN="@comment "
-.endif
-
.if defined(WITH_JACK)
LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack \
samplerate.1:${PORTSDIR}/audio/libsamplerate
@@ -276,15 +253,6 @@ PLIST_SUB+= SIDPLUGIN="@comment "
CONFIGURE_ARGS+=--disable-sid
.endif
-.if !defined(WITHOUT_TIMIDITY)
-RUN_DEPENDS+= timidity:${PORTSDIR}/audio/timidity
-CONFIGURE_ARGS+=--enable-timidity
-PLIST_SUB+= TIMIDITYPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-timidity
-PLIST_SUB+= TIMIDITYPLUGIN="@comment "
-.endif
-
.if defined(WITH_CDAUDIO)
LIB_DEPENDS+= cdio.12:${PORTSDIR}/sysutils/libcdio \
cddb.4:${PORTSDIR}/audio/libcddb
@@ -344,14 +312,6 @@ CONFIGURE_ARGS+=--disable-xspf
PLIST_SUB+= XSPFPLUGIN="@comment "
.endif
-.if !defined(WITHOUT_TTA)
-CONFIGURE_ARGS+=--enable-tta
-PLIST_SUB+= TTAPLUGIN=""
-.else
-CONFIGURE_ARGS+=--disable-tta
-PLIST_SUB+= TTAPLUGIN="@comment "
-.endif
-
.if defined(WITH_GNOME)
USE_GNOME+= gnomevfs2 gconf2
CONFIGURE_ARGS+=--enable-gnome-vfs --enable-gconf
@@ -389,8 +349,6 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|$$EGREP|egrep|g; \
s| -ldl||g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|/etc/|${LOCALBASE}/lib/|g' \
- ${WRKSRC}/src/timidity/xmms-timidity.c
pre-configure:
.if defined(WITH_AUDIOCD) && !exists(${LOCALBASE}/lib/libcdio_cdda.so)
diff --git a/multimedia/audacious-plugins/distinfo b/multimedia/audacious-plugins/distinfo
index bb4a481267d5..0fa721069fc0 100644
--- a/multimedia/audacious-plugins/distinfo
+++ b/multimedia/audacious-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-plugins-2.1.tgz) = 087fcb1f6fb8429b267f18ed3e3acb7a
-SHA256 (audacious-plugins-2.1.tgz) = fe7441e9ee6ab903fa71d21e6ee6b1b2d398567a6618d519cbeb5fa0a6e3a013
-SIZE (audacious-plugins-2.1.tgz) = 3610509
+MD5 (audacious-plugins-2.2.tgz) = ed6790bf5667c824eda72301f0a886a8
+SHA256 (audacious-plugins-2.2.tgz) = aee812b34aa057bfff9e38dda29f1261e8e8cbdde65cf5fe553ab6b6a9ae33c8
+SIZE (audacious-plugins-2.2.tgz) = 3135776
diff --git a/multimedia/audacious-plugins/pkg-plist b/multimedia/audacious-plugins/pkg-plist
index 0a67766033c8..07fd456fbdd7 100644
--- a/multimedia/audacious-plugins/pkg-plist
+++ b/multimedia/audacious-plugins/pkg-plist
@@ -20,29 +20,21 @@ lib/audacious/General/song_change.so
%%STATUSICONPLUGIN%%lib/audacious/General/statusicon.so
lib/audacious/General/streambrowser.so
lib/audacious/General/vfstrace.so
-%%AACPLUGIN%%lib/audacious/Input/aac.so
%%ADPLUGPLUGIN%%lib/audacious/Input/adplug.so
-lib/audacious/Input/alac.so
%%CDAUDIOPLUGIN%%lib/audacious/Input/cdaudio-ng.so
-lib/audacious/Input/cuesheet_ng.so
lib/audacious/Input/console.so
-lib/audacious/Input/demac.so
%%FLACPLUGIN%%lib/audacious/Input/flacng.so
%%MP3PLUGIN%%lib/audacious/Input/madplug.so
lib/audacious/Input/metronom.so
%%MODPLUG%%lib/audacious/Input/modplug.so
%%MTPPLUGIN%%lib/audacious/General/mtp_up.so
-%%MPCPLUGIN%%lib/audacious/Input/musepack.so
lib/audacious/Input/psf2.so
%%SIDPLUGIN%%lib/audacious/Input/sid.so
%%SNDFILEPLUGIN%%lib/audacious/Input/sndfile.so
-%%TIMIDITYPLUGIN%%lib/audacious/Input/timidity.so
lib/audacious/Input/tonegen.so
-%%TTAPLUGIN%%lib/audacious/Input/tta.so
%%VORBISPLUGIN%%lib/audacious/Input/vorbis.so
lib/audacious/Input/vtx.so
%%WAVPACKPLUGIN%%lib/audacious/Input/wavpack.so
-%%WMAPLUGIN%%lib/audacious/Input/wma.so
lib/audacious/Input/xsf.so
%%OSSPLUGIN%%lib/audacious/Output/OSS.so
%%OSS4PLUGIN%%lib/audacious/Output/OSS4.so
@@ -52,9 +44,9 @@ lib/audacious/Output/filewriter.so
%%JACKPLUGIN%%lib/audacious/Output/jackout.so
lib/audacious/Output/null.so
lib/audacious/Transport/gio.so
-%%CURLPLUGIN%%lib/audacious/Transport/lastfm.so
%%MMSPLUGIN%%lib/audacious/Transport/mms.so
%%NEONPLUGIN%%lib/audacious/Transport/neon.so
+lib/audacious/Transport/unix-io.so
lib/audacious/Visualization/blur_scope.so
%%PARANORMALPLUGIN%%lib/audacious/Visualization/paranormal.so
%%ROCKLIGHTPLUGIN%%lib/audacious/Visualization/rocklight.so
@@ -100,6 +92,220 @@ share/audacious/images/shoutcast.png
share/audacious/images/streambrowser-16x16.png
share/audacious/images/streambrowser-64x64.png
share/audacious/images/xiph.png
+share/audacious/Skins/Classic/balance.png
+share/audacious/Skins/Classic/cbuttons.png
+share/audacious/Skins/Classic/eq_ex.png
+share/audacious/Skins/Classic/eqmain.png
+share/audacious/Skins/Classic/main.png
+share/audacious/Skins/Classic/monoster.png
+share/audacious/Skins/Classic/nums_ex.png
+share/audacious/Skins/Classic/playpaus.png
+share/audacious/Skins/Classic/pledit.png
+share/audacious/Skins/Classic/pledit.txt
+share/audacious/Skins/Classic/posbar.png
+share/audacious/Skins/Classic/shufrep.png
+share/audacious/Skins/Classic/skin.hints
+share/audacious/Skins/Classic/skin-classic.hints
+share/audacious/Skins/Classic/text.png
+share/audacious/Skins/Classic/titlebar.png
+share/audacious/Skins/Classic/viscolor.txt
+share/audacious/Skins/Classic/volume.png
+share/audacious/Skins/Classic1.3/balance.png
+share/audacious/Skins/Classic1.3/cbuttons.png
+share/audacious/Skins/Classic1.3/eq_ex.png
+share/audacious/Skins/Classic1.3/eqmain.png
+share/audacious/Skins/Classic1.3/main.png
+share/audacious/Skins/Classic1.3/monoster.png
+share/audacious/Skins/Classic1.3/nums_ex.png
+share/audacious/Skins/Classic1.3/playpaus.png
+share/audacious/Skins/Classic1.3/pledit.png
+share/audacious/Skins/Classic1.3/pledit.txt
+share/audacious/Skins/Classic1.3/posbar.png
+share/audacious/Skins/Classic1.3/shufrep.png
+share/audacious/Skins/Classic1.3/skin-classic.hints
+share/audacious/Skins/Classic1.3/skin.hints
+share/audacious/Skins/Classic1.3/text.png
+share/audacious/Skins/Classic1.3/titlebar.png
+share/audacious/Skins/Classic1.3/viscolor.txt
+share/audacious/Skins/Classic1.3/volume.png
+share/audacious/Skins/Default/cbuttons.png
+share/audacious/Skins/Default/eq_ex.png
+share/audacious/Skins/Default/eqmain.png
+share/audacious/Skins/Default/main.png
+share/audacious/Skins/Default/monoster.png
+share/audacious/Skins/Default/nums_ex.png
+share/audacious/Skins/Default/playpaus.png
+share/audacious/Skins/Default/pledit.png
+share/audacious/Skins/Default/pledit.txt
+share/audacious/Skins/Default/posbar.png
+share/audacious/Skins/Default/shufrep.png
+share/audacious/Skins/Default/skin.hints
+share/audacious/Skins/Default/text.png
+share/audacious/Skins/Default/titlebar.png
+share/audacious/Skins/Default/viscolor.txt
+share/audacious/Skins/Default/volume.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-down.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-left.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-right.png
+share/audacious/Skins/Default/gtk-2.0/Arrows/arrow-up.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-normal.png
+share/audacious/Skins/Default/gtk-2.0/Buttons/button-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/check6.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option1.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option2.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option3.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option4.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option5.png
+share/audacious/Skins/Default/gtk-2.0/Check-Radio/option6.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
+share/audacious/Skins/Default/gtk-2.0/Frame-Gap/frame.png
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-h.png
+share/audacious/Skins/Default/gtk-2.0/Handles/handle-v.png
+share/audacious/Skins/Default/gtk-2.0/Lines/line-h.png
+share/audacious/Skins/Default/gtk-2.0/Lines/line-v.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
+share/audacious/Skins/Default/gtk-2.0/ListHeaders/list_header.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
+share/audacious/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
+share/audacious/Skins/Default/gtk-2.0/Others/null.png
+share/audacious/Skins/Default/gtk-2.0/Others/ruler.png
+share/audacious/Skins/Default/gtk-2.0/Panel/panel-bg.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Range/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-horizontal.png
+share/audacious/Skins/Default/gtk-2.0/Range/trough-vertical.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
+share/audacious/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-in.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/shadow-out.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-.png
+share/audacious/Skins/Default/gtk-2.0/Shadows/text-entry.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-down.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
+share/audacious/Skins/Default/gtk-2.0/Spin/spin-up.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/notebook.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-left.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-right.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
+share/audacious/Skins/Default/gtk-2.0/Tabs/tab-top.png
+share/audacious/Skins/Default/gtk-2.0/Toolbar/toolbar.png
+share/audacious/Skins/Default/gtk-2.0/gtkrc
+share/audacious/Skins/Default/gtk-2.0/panel.rc
+share/audacious/Skins/Ivory/balance.png
+share/audacious/Skins/Ivory/cbuttons.png
+share/audacious/Skins/Ivory/eq_ex.png
+share/audacious/Skins/Ivory/eqmain.png
+share/audacious/Skins/Ivory/main.png
+share/audacious/Skins/Ivory/monoster.png
+share/audacious/Skins/Ivory/nums_ex.png
+share/audacious/Skins/Ivory/playpaus.png
+share/audacious/Skins/Ivory/pledit.png
+share/audacious/Skins/Ivory/pledit.txt
+share/audacious/Skins/Ivory/posbar.png
+share/audacious/Skins/Ivory/shufrep.png
+share/audacious/Skins/Ivory/skin.hints
+share/audacious/Skins/Ivory/text.png
+share/audacious/Skins/Ivory/titlebar.png
+share/audacious/Skins/Ivory/viscolor.txt
+share/audacious/Skins/Ivory/volume.png
+share/audacious/Skins/Osmosis/balance.png
+share/audacious/Skins/Osmosis/cbuttons.png
+share/audacious/Skins/Osmosis/eq_ex.png
+share/audacious/Skins/Osmosis/eqmain.png
+share/audacious/Skins/Osmosis/main.png
+share/audacious/Skins/Osmosis/monoster.png
+share/audacious/Skins/Osmosis/nums_ex.png
+share/audacious/Skins/Osmosis/playpaus.png
+share/audacious/Skins/Osmosis/pledit.png
+share/audacious/Skins/Osmosis/pledit.txt
+share/audacious/Skins/Osmosis/posbar.png
+share/audacious/Skins/Osmosis/shufrep.png
+share/audacious/Skins/Osmosis/skin.hints
+share/audacious/Skins/Osmosis/text.png
+share/audacious/Skins/Osmosis/titlebar.png
+share/audacious/Skins/Osmosis/viscolor.txt
+share/audacious/Skins/Osmosis/volume.png
+share/audacious/Skins/Refugee/cbuttons.png
+share/audacious/Skins/Refugee/eq_ex.png
+share/audacious/Skins/Refugee/eqmain.png
+share/audacious/Skins/Refugee/main.png
+share/audacious/Skins/Refugee/monoster.png
+share/audacious/Skins/Refugee/nums_ex.png
+share/audacious/Skins/Refugee/playpaus.png
+share/audacious/Skins/Refugee/pledit.png
+share/audacious/Skins/Refugee/pledit.txt
+share/audacious/Skins/Refugee/posbar.png
+share/audacious/Skins/Refugee/shufrep.png
+share/audacious/Skins/Refugee/skin.hints
+share/audacious/Skins/Refugee/text.png
+share/audacious/Skins/Refugee/titlebar.png
+share/audacious/Skins/Refugee/viscolor.txt
+share/audacious/Skins/Refugee/volume.png
+share/audacious/Skins/TinyPlayer/balance.png
+share/audacious/Skins/TinyPlayer/cbuttons.png
+share/audacious/Skins/TinyPlayer/eq_ex.png
+share/audacious/Skins/TinyPlayer/eqmain.png
+share/audacious/Skins/TinyPlayer/main.png
+share/audacious/Skins/TinyPlayer/monoster.png
+share/audacious/Skins/TinyPlayer/nums_ex.png
+share/audacious/Skins/TinyPlayer/playpaus.png
+share/audacious/Skins/TinyPlayer/pledit.png
+share/audacious/Skins/TinyPlayer/pledit.txt
+share/audacious/Skins/TinyPlayer/posbar.png
+share/audacious/Skins/TinyPlayer/shufrep.png
+share/audacious/Skins/TinyPlayer/skin.hints
+share/audacious/Skins/TinyPlayer/text.png
+share/audacious/Skins/TinyPlayer/titlebar.png
+share/audacious/Skins/TinyPlayer/viscolor.txt
+share/audacious/Skins/TinyPlayer/volume.png
%%NLS%%share/locale/ca/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/cs/LC_MESSAGES/audacious-plugins.mo
%%NLS%%share/locale/cy/LC_MESSAGES/audacious-plugins.mo
@@ -122,5 +328,31 @@ share/audacious/images/xiph.png
@dirrmtry lib/audacious
%%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal/Presets
%%PARANORMALPLUGIN%%@dirrm share/audacious/paranormal
+@dirrm share/audacious/Skins/Classic
+@dirrm share/audacious/Skins/Classic1.3
+@dirrm share/audacious/Skins/Default/gtk-2.0/Arrows
+@dirrm share/audacious/Skins/Default/gtk-2.0/Buttons
+@dirrm share/audacious/Skins/Default/gtk-2.0/Check-Radio
+@dirrm share/audacious/Skins/Default/gtk-2.0/Frame-Gap
+@dirrm share/audacious/Skins/Default/gtk-2.0/Handles
+@dirrm share/audacious/Skins/Default/gtk-2.0/Lines
+@dirrm share/audacious/Skins/Default/gtk-2.0/ListHeaders
+@dirrm share/audacious/Skins/Default/gtk-2.0/Menu-Menubar
+@dirrm share/audacious/Skins/Default/gtk-2.0/Others
+@dirrm share/audacious/Skins/Default/gtk-2.0/Panel
+@dirrm share/audacious/Skins/Default/gtk-2.0/ProgressBar
+@dirrm share/audacious/Skins/Default/gtk-2.0/Range
+@dirrm share/audacious/Skins/Default/gtk-2.0/Scrollbars
+@dirrm share/audacious/Skins/Default/gtk-2.0/Shadows
+@dirrm share/audacious/Skins/Default/gtk-2.0/Spin
+@dirrm share/audacious/Skins/Default/gtk-2.0/Tabs
+@dirrm share/audacious/Skins/Default/gtk-2.0/Toolbar
+@dirrm share/audacious/Skins/Default/gtk-2.0
+@dirrm share/audacious/Skins/Default
+@dirrm share/audacious/Skins/Ivory
+@dirrm share/audacious/Skins/Osmosis
+@dirrm share/audacious/Skins/Refugee
+@dirrm share/audacious/Skins/TinyPlayer
+@dirrm share/audacious/Skins
@dirrmtry share/audacious/images
@dirrmtry share/audacious
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index 114eb5e4292a..02744fd9c336 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= audacious
-PORTVERSION= 2.1
+PORTVERSION= 2.2
CATEGORIES= multimedia audio
MASTER_SITES= http://distfiles.atheme.org/
MASTER_SITE_SUBDIR=oliver
@@ -80,13 +80,15 @@ CONFIGURE_ARGS+=--with-xml-prefix=/
post-patch:
@${REINPLACE_CMD} 's|$${libdir}/pkgconfig|$${prefix}/libdata/pkgconfig|g' \
${WRKSRC}/Makefile
- @${REINPLACE_CMD} 's|+= $${LIB_CPPFLAGS} -I..|= -I.. $${LIB_CPPFLAGS}|' \
- ${WRKSRC}/src/libid3tag/Makefile
+# @${REINPLACE_CMD} 's|+= $${LIB_CPPFLAGS} -I..|= -I.. $${LIB_[8$CPPFLAGS}|' \
+# ${WRKSRC}/src/libid3tag/Makefile
+ @${REINPLACE_CMD} 's|CPPFLAGS +=|CPPFLAGS =|g' \
+ ${WRKSRC}/src/libid3tag/Makefile \
+ ${WRKSRC}/src/libaudgui/Makefile
@${REINPLACE_CMD} 's|FMT_FIXED32,|FMT_FIXED32|g; \
s|OUTPUT_PLUGIN_INIT_FOUND_DEVICES,|OUTPUT_PLUGIN_INIT_FOUND_DEVICES|g' \
${WRKSRC}/src/audacious/plugin.h
- @${REINPLACE_CMD} 's|WIDGET_COMBO_BOX,|WIDGET_COMBO_BOX|g; \
- s|VALUE_NULL,|VALUE_NULL|g' \
+ @${REINPLACE_CMD} 's|VALUE_NULL,|VALUE_NULL|g' \
${WRKSRC}/src/audacious/preferences.h
@${REINPLACE_CMD} 's|glib-2\.0/||g' \
${WRKSRC}/src/libaudtag/util.h \
diff --git a/multimedia/audacious/distinfo b/multimedia/audacious/distinfo
index 8c079b2afc35..91717f312251 100644
--- a/multimedia/audacious/distinfo
+++ b/multimedia/audacious/distinfo
@@ -1,3 +1,3 @@
-MD5 (audacious-2.1.tgz) = 03ab6a062e5909214841f90f767f1147
-SHA256 (audacious-2.1.tgz) = 32e16412d446f32744cb477d5b8a066447c0c826f71347ec653e9a8cb5ce747c
-SIZE (audacious-2.1.tgz) = 1852176
+MD5 (audacious-2.2.tgz) = ad0f7484692c529acfa91ce784170478
+SHA256 (audacious-2.2.tgz) = f15af7a90085e7be86f7f876a8e74a5ba03385880a165c4b2033944219213bea
+SIZE (audacious-2.2.tgz) = 1581717
diff --git a/multimedia/audacious/pkg-plist b/multimedia/audacious/pkg-plist
index 031ccf5d3880..5819fbae80a6 100644
--- a/multimedia/audacious/pkg-plist
+++ b/multimedia/audacious/pkg-plist
@@ -1,15 +1,14 @@
+bin/audacious
bin/audacious2
+%%WITH_DBUS%%bin/audtool
%%WITH_DBUS%%bin/audtool2
%%WITH_DBUS%%include/audacious/audctrl.h
include/audacious/audconfig.h
include/audacious/auddrct.h
-include/audacious/audtag.h
-include/audacious/audutil.h
include/audacious/configdb.h
include/audacious/custom_uri.h
include/audacious/dbus.h
include/audacious/dbus-service.h
-include/audacious/discovery.h
include/audacious/equalizer_preset.h
include/audacious/eventqueue.h
include/audacious/flow.h
@@ -22,262 +21,53 @@ include/audacious/main.h
include/audacious/mime.h
include/audacious/output.h
include/audacious/playback.h
-include/audacious/playlist.h
include/audacious/playlist_container.h
include/audacious/plugin.h
include/audacious/preferences.h
include/audacious/rcfile.h
-include/audacious/scanner.h
include/audacious/ui_fileinfopopup.h
include/audacious/ui_plugin_menu.h
include/audacious/ui_preferences.h
include/audacious/util.h
-include/audacious/vis_runner.h
include/libSAD/libSAD.h
include/libSAD/common.h
include/libSAD/dither.h
include/libaudcore/audstrings.h
+include/libaudcore/index.h
+include/libaudcore/stringpool.h
include/libaudcore/tuple.h
include/libaudcore/tuple_compiler.h
include/libaudcore/tuple_formatter.h
+include/libaudcore/log.h
+include/libaudcore/md5.h
include/libaudcore/vfs.h
include/libaudcore/vfs_buffer.h
include/libaudcore/vfs_buffered_file.h
+include/libaudgui/libaudgui.h
+include/libaudtag/audtag.h
+include/libaudtag/util.h
%%WITH_DBUS%%lib/libaudclient.so
%%WITH_DBUS%%lib/libaudclient.so.2
%%WITH_DBUS%%lib/libaudclient.so.2.0.0
lib/libaudcore.so
lib/libaudcore.so.1
lib/libaudcore.so.1.0.0
+lib/libaudgui.so
+lib/libaudgui.so.1
+lib/libaudgui.so.1.0.0
lib/libaudid3tag.so
lib/libaudid3tag.so.2
lib/libaudid3tag.so.2.0.0
lib/libaudtag.so
lib/libaudtag.so.1
lib/libaudtag.so.1.0.0
-lib/libaudutil.so
-lib/libaudutil.so.1
-lib/libaudutil.so.1.0.0
lib/libSAD.so
lib/libSAD.so.2
lib/libSAD.so.2.0.0
libdata/pkgconfig/audacious.pc
libdata/pkgconfig/audclient.pc
share/applications/audacious2.desktop
-%%DATADIR%%/Skins/Classic/balance.png
-%%DATADIR%%/Skins/Classic/cbuttons.png
-%%DATADIR%%/Skins/Classic/eq_ex.png
-%%DATADIR%%/Skins/Classic/eqmain.png
-%%DATADIR%%/Skins/Classic/main.png
-%%DATADIR%%/Skins/Classic/monoster.png
-%%DATADIR%%/Skins/Classic/nums_ex.png
-%%DATADIR%%/Skins/Classic/playpaus.png
-%%DATADIR%%/Skins/Classic/pledit.png
-%%DATADIR%%/Skins/Classic/pledit.txt
-%%DATADIR%%/Skins/Classic/posbar.png
-%%DATADIR%%/Skins/Classic/shufrep.png
-%%DATADIR%%/Skins/Classic/skin.hints
-%%DATADIR%%/Skins/Classic/skin-classic.hints
-%%DATADIR%%/Skins/Classic/text.png
-%%DATADIR%%/Skins/Classic/titlebar.png
-%%DATADIR%%/Skins/Classic/viscolor.txt
-%%DATADIR%%/Skins/Classic/volume.png
-%%DATADIR%%/Skins/Classic1.3/balance.png
-%%DATADIR%%/Skins/Classic1.3/cbuttons.png
-%%DATADIR%%/Skins/Classic1.3/eq_ex.png
-%%DATADIR%%/Skins/Classic1.3/eqmain.png
-%%DATADIR%%/Skins/Classic1.3/main.png
-%%DATADIR%%/Skins/Classic1.3/monoster.png
-%%DATADIR%%/Skins/Classic1.3/nums_ex.png
-%%DATADIR%%/Skins/Classic1.3/playpaus.png
-%%DATADIR%%/Skins/Classic1.3/pledit.png
-%%DATADIR%%/Skins/Classic1.3/pledit.txt
-%%DATADIR%%/Skins/Classic1.3/posbar.png
-%%DATADIR%%/Skins/Classic1.3/shufrep.png
-%%DATADIR%%/Skins/Classic1.3/skin-classic.hints
-%%DATADIR%%/Skins/Classic1.3/skin.hints
-%%DATADIR%%/Skins/Classic1.3/text.png
-%%DATADIR%%/Skins/Classic1.3/titlebar.png
-%%DATADIR%%/Skins/Classic1.3/viscolor.txt
-%%DATADIR%%/Skins/Classic1.3/volume.png
-%%DATADIR%%/Skins/Default/cbuttons.png
-%%DATADIR%%/Skins/Default/eq_ex.png
-%%DATADIR%%/Skins/Default/eqmain.png
-%%DATADIR%%/Skins/Default/main.png
-%%DATADIR%%/Skins/Default/monoster.png
-%%DATADIR%%/Skins/Default/nums_ex.png
-%%DATADIR%%/Skins/Default/playpaus.png
-%%DATADIR%%/Skins/Default/pledit.png
-%%DATADIR%%/Skins/Default/pledit.txt
-%%DATADIR%%/Skins/Default/posbar.png
-%%DATADIR%%/Skins/Default/shufrep.png
-%%DATADIR%%/Skins/Default/skin.hints
-%%DATADIR%%/Skins/Default/text.png
-%%DATADIR%%/Skins/Default/titlebar.png
-%%DATADIR%%/Skins/Default/viscolor.txt
-%%DATADIR%%/Skins/Default/volume.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-down.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-insens.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-left.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-right.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Arrows/arrow-up.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-insensitive.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-normal.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Buttons/button-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check1.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check2.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check3.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check4.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check5.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/check6.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option1.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option2.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option3.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option4.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option5.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio/option6.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap/frame.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Handles/handle-h.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Handles/handle-v.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Lines/line-h.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Lines/line-v.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders/list_header.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menu.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Others/null.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Others/ruler.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Panel/panel-bg.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/slider-vert.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/trough-horizontal.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Range/trough-vertical.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/shadow-in.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/shadow-out.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/text-.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Shadows/text-entry.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down-disable.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-down.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up-disable.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Spin/spin-up.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-left-top.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-right-top.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-current.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-left.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/gap-top-right.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/notebook.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-bottom.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-left-active.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-left.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-right-active.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-right.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-top-active.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Tabs/tab-top.png
-%%DATADIR%%/Skins/Default/gtk-2.0/Toolbar/toolbar.png
-%%DATADIR%%/Skins/Default/gtk-2.0/gtkrc
-%%DATADIR%%/Skins/Default/gtk-2.0/panel.rc
-%%DATADIR%%/Skins/Ivory/balance.png
-%%DATADIR%%/Skins/Ivory/cbuttons.png
-%%DATADIR%%/Skins/Ivory/eq_ex.png
-%%DATADIR%%/Skins/Ivory/eqmain.png
-%%DATADIR%%/Skins/Ivory/main.png
-%%DATADIR%%/Skins/Ivory/monoster.png
-%%DATADIR%%/Skins/Ivory/nums_ex.png
-%%DATADIR%%/Skins/Ivory/playpaus.png
-%%DATADIR%%/Skins/Ivory/pledit.png
-%%DATADIR%%/Skins/Ivory/pledit.txt
-%%DATADIR%%/Skins/Ivory/posbar.png
-%%DATADIR%%/Skins/Ivory/shufrep.png
-%%DATADIR%%/Skins/Ivory/skin.hints
-%%DATADIR%%/Skins/Ivory/text.png
-%%DATADIR%%/Skins/Ivory/titlebar.png
-%%DATADIR%%/Skins/Ivory/viscolor.txt
-%%DATADIR%%/Skins/Ivory/volume.png
-%%DATADIR%%/Skins/Osmosis/balance.png
-%%DATADIR%%/Skins/Osmosis/cbuttons.png
-%%DATADIR%%/Skins/Osmosis/eq_ex.png
-%%DATADIR%%/Skins/Osmosis/eqmain.png
-%%DATADIR%%/Skins/Osmosis/main.png
-%%DATADIR%%/Skins/Osmosis/monoster.png
-%%DATADIR%%/Skins/Osmosis/nums_ex.png
-%%DATADIR%%/Skins/Osmosis/playpaus.png
-%%DATADIR%%/Skins/Osmosis/pledit.png
-%%DATADIR%%/Skins/Osmosis/pledit.txt
-%%DATADIR%%/Skins/Osmosis/posbar.png
-%%DATADIR%%/Skins/Osmosis/shufrep.png
-%%DATADIR%%/Skins/Osmosis/skin.hints
-%%DATADIR%%/Skins/Osmosis/text.png
-%%DATADIR%%/Skins/Osmosis/titlebar.png
-%%DATADIR%%/Skins/Osmosis/viscolor.txt
-%%DATADIR%%/Skins/Osmosis/volume.png
-%%DATADIR%%/Skins/Refugee/cbuttons.png
-%%DATADIR%%/Skins/Refugee/eq_ex.png
-%%DATADIR%%/Skins/Refugee/eqmain.png
-%%DATADIR%%/Skins/Refugee/main.png
-%%DATADIR%%/Skins/Refugee/monoster.png
-%%DATADIR%%/Skins/Refugee/nums_ex.png
-%%DATADIR%%/Skins/Refugee/playpaus.png
-%%DATADIR%%/Skins/Refugee/pledit.png
-%%DATADIR%%/Skins/Refugee/pledit.txt
-%%DATADIR%%/Skins/Refugee/posbar.png
-%%DATADIR%%/Skins/Refugee/shufrep.png
-%%DATADIR%%/Skins/Refugee/skin.hints
-%%DATADIR%%/Skins/Refugee/text.png
-%%DATADIR%%/Skins/Refugee/titlebar.png
-%%DATADIR%%/Skins/Refugee/viscolor.txt
-%%DATADIR%%/Skins/Refugee/volume.png
-%%DATADIR%%/Skins/TinyPlayer/balance.png
-%%DATADIR%%/Skins/TinyPlayer/cbuttons.png
-%%DATADIR%%/Skins/TinyPlayer/eq_ex.png
-%%DATADIR%%/Skins/TinyPlayer/eqmain.png
-%%DATADIR%%/Skins/TinyPlayer/main.png
-%%DATADIR%%/Skins/TinyPlayer/monoster.png
-%%DATADIR%%/Skins/TinyPlayer/nums_ex.png
-%%DATADIR%%/Skins/TinyPlayer/playpaus.png
-%%DATADIR%%/Skins/TinyPlayer/pledit.png
-%%DATADIR%%/Skins/TinyPlayer/pledit.txt
-%%DATADIR%%/Skins/TinyPlayer/posbar.png
-%%DATADIR%%/Skins/TinyPlayer/shufrep.png
-%%DATADIR%%/Skins/TinyPlayer/skin.hints
-%%DATADIR%%/Skins/TinyPlayer/text.png
-%%DATADIR%%/Skins/TinyPlayer/titlebar.png
-%%DATADIR%%/Skins/TinyPlayer/viscolor.txt
-%%DATADIR%%/Skins/TinyPlayer/volume.png
+share/applications/audacious2-gtkui.desktop
%%DATADIR%%/images/about-logo.png
%%DATADIR%%/images/audacious_eq.xpm
%%DATADIR%%/images/audacious_playlist.xpm
@@ -290,7 +80,6 @@ share/applications/audacious2.desktop
%%DATADIR%%/images/menu_plugin.png
%%DATADIR%%/images/menu_queue_toggle.png
%%DATADIR%%/images/menu_randomize_playlist.png
-%%DATADIR%%/images/mouse.png
%%DATADIR%%/images/playback.png
%%DATADIR%%/images/playlist.png
%%DATADIR%%/images/plugins.png
@@ -336,37 +125,13 @@ share/applications/audacious2.desktop
%%NLS%%share/locale/zh_CN/LC_MESSAGES/audacious.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/audacious.mo
share/pixmaps/audacious2.png
-@dirrm %%DATADIR%%/Skins/Classic
-@dirrm %%DATADIR%%/Skins/Classic1.3
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Arrows
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Buttons
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Check-Radio
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Frame-Gap
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Handles
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Lines
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/ListHeaders
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Menu-Menubar
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Others
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Panel
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/ProgressBar
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Range
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Scrollbars
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Shadows
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Spin
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Tabs
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0/Toolbar
-@dirrm %%DATADIR%%/Skins/Default/gtk-2.0
-@dirrm %%DATADIR%%/Skins/Default
-@dirrm %%DATADIR%%/Skins/Ivory
-@dirrm %%DATADIR%%/Skins/Osmosis
-@dirrm %%DATADIR%%/Skins/Refugee
-@dirrm %%DATADIR%%/Skins/TinyPlayer
-@dirrm %%DATADIR%%/Skins
@dirrmtry %%DATADIR%%/images
@dirrm %%DATADIR%%/ui
@dirrmtry %%DATADIR%%
@dirrm include/audacious
@dirrm include/libSAD
@dirrm include/libaudcore
+@dirrm include/libaudgui
+@dirrm include/libaudtag
@dirrmtry lib/audacious
@dirrmtry share/applications
diff --git a/multimedia/tunapie/Makefile b/multimedia/tunapie/Makefile
index 7dc7335a252a..6356abb34f9f 100644
--- a/multimedia/tunapie/Makefile
+++ b/multimedia/tunapie/Makefile
@@ -7,7 +7,7 @@
PORTNAME= tunapie
PORTVERSION= 2.1.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/2.1
DISTNAME= ${PORTNAME}-${PORTVERSION:S,.r,rc,}
diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index 12e90176746e..2eeece5a6eec 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xfce4-xmms-plugin
PORTVERSION= 0.5.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia audio xfce
MASTER_SITES= http://goodies.xfce.org/releases/${PORTNAME}/
DIST_SUBDIR= xfce4
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index 17173562072a..6fe001800e03 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -7,7 +7,7 @@
PORTNAME= conky
PORTVERSION= 1.7.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= SF
diff --git a/x11-themes/audacious-skins/Makefile b/x11-themes/audacious-skins/Makefile
index cc32b2b526e5..95a4f5fa9995 100644
--- a/x11-themes/audacious-skins/Makefile
+++ b/x11-themes/audacious-skins/Makefile
@@ -7,7 +7,7 @@
PORTNAME= audacious-skins
PORTVERSION= 0.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-themes
MASTER_SITES= CRITICAL