summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2009-11-28 20:06:37 +0000
commitf76d32b8e89fed7c0e459c1a7fe7a4b57661b01c (patch)
treead29e6808ff698f84e08dab8e047f0ae72838df9 /audio
parent- Update x11-tookits/py-kde to 3.16.6 (diff)
Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.28/ . Officially, this is mostly a polishing release in preparation for GNOME 3.0 due in about a year. On the FreeBSD front, though, a lot went into this release. Major thanks goes to kwm and avl who did a lot of the porting work for this release. In particular, kwm brought in Evolution MAPI support for better Microsoft Exchange integration. Avl made sure that the new gobject introspection repository ports were nicely compartmentalized so that large dependencies aren't brought in wholesale. But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself) contributed to this release. Other major improvements include an updated HAL with better volume probing code, ufsid integration, and support for volume names containing spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord; an updated Gimp; and a preview of the new GNOME Shell project (thanks to Pawel Worach). The FreeBSD GNOME Team would like to that the following additional contributors to this release whose patches and testing really helped make it a success: Andrius Morkunas Dominique Goncalves Eric L. Chen J.R. Oldroyd Joseph S. Atkinson Li Pawel Worach Romain Tartière Thomas Vogt Yasuda Keisuke Rui Paulo Martin Wilke (and an extra shout out to miwi and pav for pointyhat runs) We would like to send this release out to Alexander Loginov (avl) in hopes that he feels better soon. PR: 136676 136967 138872 (obsolete with new epiphany-webkit) 139160 134737 139941 140097 140838 140929
Diffstat (limited to 'audio')
-rw-r--r--audio/audacity-devel/Makefile1
-rw-r--r--audio/audacity-devel/files/patch-src_AudacityApp.cpp30
-rw-r--r--audio/freedesktop-sound-theme/Makefile7
-rw-r--r--audio/freedesktop-sound-theme/distinfo6
-rw-r--r--audio/freedesktop-sound-theme/pkg-plist75
-rw-r--r--audio/gmpc-wikipedia/Makefile3
-rw-r--r--audio/gnome-media/Makefile58
-rw-r--r--audio/gnome-media/distinfo6
-rw-r--r--audio/gnome-media/pkg-plist199
-rw-r--r--audio/gstreamer-plugins-cdparanoia/Makefile4
-rw-r--r--audio/libcanberra/Makefile7
-rw-r--r--audio/libcanberra/distinfo6
-rw-r--r--audio/libcanberra/files/patch-Makefile.in28
-rw-r--r--audio/libcanberra/files/patch-configure27
-rw-r--r--audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in30
-rw-r--r--audio/libcanberra/files/patch-src_oss.c23
-rw-r--r--audio/libcanberra/pkg-plist32
-rw-r--r--audio/pulseaudio/Makefile8
-rw-r--r--audio/pulseaudio/distinfo6
-rw-r--r--audio/pulseaudio/files/patch-configure22
-rw-r--r--audio/pulseaudio/files/patch-src_pulsecore_shm.c17
-rw-r--r--audio/pulseaudio/files/patch-src_tests_rtstutter.c27
-rw-r--r--audio/pulseaudio/pkg-plist6
-rw-r--r--audio/rhythmbox/Makefile5
-rw-r--r--audio/sound-juicer/Makefile9
-rw-r--r--audio/sound-juicer/distinfo6
-rw-r--r--audio/sound-juicer/pkg-plist17
27 files changed, 304 insertions, 361 deletions
diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
index ce04285e23ab..9968bf25a6ce 100644
--- a/audio/audacity-devel/Makefile
+++ b/audio/audacity-devel/Makefile
@@ -6,6 +6,7 @@
PORTNAME= audacity
PORTVERSION= 1.3.9
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
diff --git a/audio/audacity-devel/files/patch-src_AudacityApp.cpp b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
new file mode 100644
index 000000000000..8026532a212a
--- /dev/null
+++ b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
@@ -0,0 +1,30 @@
+--- src/AudacityApp.cpp.orig 2009-11-27 00:27:29.000000000 +0100
++++ src/AudacityApp.cpp 2009-11-27 00:48:36.000000000 +0100
+@@ -23,6 +23,15 @@ It handles initialization and terminatio
+
+ #include "Audacity.h" // This should always be included first
+
++/*
++ * Get Gtk.h and Glib.h included and working around that glib got
++ * a GSocket class now
++ */
++#include <dlfcn.h>
++#define GSocket GlibGSocket
++#include <gtk/gtk.h>
++#undef GSocket
++
+ #include <wx/defs.h>
+ #include <wx/app.h>
+ #include <wx/docview.h>
+@@ -328,8 +337,11 @@ void QuitAudacity()
+ // Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
+ ///////////////////////////////////////////////////////////////////////////////
+
++/* moved up so it doesn't undefs GSocket from wxgtk */
++/*
+ #include <dlfcn.h>
+ #include <gtk/gtk.h>
++*/
+
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
diff --git a/audio/freedesktop-sound-theme/Makefile b/audio/freedesktop-sound-theme/Makefile
index 35afe0e2a925..7b2d23ae6432 100644
--- a/audio/freedesktop-sound-theme/Makefile
+++ b/audio/freedesktop-sound-theme/Makefile
@@ -3,13 +3,14 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.2 2008/12/21 20:39:32 marcus Exp $
+# $MCom: ports/audio/freedesktop-sound-theme/Makefile,v 1.6 2009/11/27 22:09:57 marcus Exp $
#
PORTNAME= freedesktop-sound-theme
-PORTVERSION= 0.2
+PORTVERSION= 0.7
CATEGORIES= audio gnome
-MASTER_SITES= http://people.freedesktop.org/~mccann/dist/
+MASTER_SITES= LOCAL
+MASTER_SITE_SUBDIR= kwm
DISTNAME= sound-theme-freedesktop-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
diff --git a/audio/freedesktop-sound-theme/distinfo b/audio/freedesktop-sound-theme/distinfo
index decd5b7ce5d6..4d0c659a3ffa 100644
--- a/audio/freedesktop-sound-theme/distinfo
+++ b/audio/freedesktop-sound-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (sound-theme-freedesktop-0.2.tar.bz2) = 45c8383071d5c6514aa1899e2d0fc675
-SHA256 (sound-theme-freedesktop-0.2.tar.bz2) = cc7b5320bef9088d77aa11e6041bf6019152dac51cc7beef7a256484faf5b683
-SIZE (sound-theme-freedesktop-0.2.tar.bz2) = 852304
+MD5 (sound-theme-freedesktop-0.7.tar.bz2) = c55786fdc4455f7437cc6fe49ea13ed8
+SHA256 (sound-theme-freedesktop-0.7.tar.bz2) = 5a0d064fa4a6880438e46739ce8a8eebb9b8a0a7da723fc37585bbc18a076404
+SIZE (sound-theme-freedesktop-0.7.tar.bz2) = 505168
diff --git a/audio/freedesktop-sound-theme/pkg-plist b/audio/freedesktop-sound-theme/pkg-plist
index 43a95d6b96a2..b950de745b36 100644
--- a/audio/freedesktop-sound-theme/pkg-plist
+++ b/audio/freedesktop-sound-theme/pkg-plist
@@ -1,43 +1,38 @@
share/sounds/freedesktop/index.theme
-share/sounds/freedesktop/stereo/audio-channel-front-center.ogg
-share/sounds/freedesktop/stereo/audio-channel-front-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-front-right.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-center.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-rear-right.ogg
-share/sounds/freedesktop/stereo/audio-channel-side-left.ogg
-share/sounds/freedesktop/stereo/audio-channel-side-right.ogg
-share/sounds/freedesktop/stereo/audio-test-signal.ogg
-share/sounds/freedesktop/stereo/battery-low.ogg
-share/sounds/freedesktop/stereo/bell.ogg
-share/sounds/freedesktop/stereo/button-pressed.ogg
-share/sounds/freedesktop/stereo/button-toggle-off.ogg
-share/sounds/freedesktop/stereo/button-toggle-on.ogg
-share/sounds/freedesktop/stereo/complete-media-burn.ogg
-share/sounds/freedesktop/stereo/desktop-login.ogg
-share/sounds/freedesktop/stereo/desktop-logout.ogg
-share/sounds/freedesktop/stereo/dialog-cancel.ogg
-share/sounds/freedesktop/stereo/dialog-error.ogg
-share/sounds/freedesktop/stereo/dialog-information.ogg
-share/sounds/freedesktop/stereo/dialog-ok.ogg
-share/sounds/freedesktop/stereo/dialog-question.ogg
-share/sounds/freedesktop/stereo/dialog-warning.ogg
-share/sounds/freedesktop/stereo/link-pressed.ogg
-share/sounds/freedesktop/stereo/menu-click.ogg
-share/sounds/freedesktop/stereo/message-new-email.ogg
-share/sounds/freedesktop/stereo/message-new-instant.ogg
-share/sounds/freedesktop/stereo/phone-incoming-call.ogg
-share/sounds/freedesktop/stereo/phone-outgoing-busy.ogg
-share/sounds/freedesktop/stereo/power-unplug.ogg
-share/sounds/freedesktop/stereo/service-login.ogg
-share/sounds/freedesktop/stereo/service-logout.ogg
-share/sounds/freedesktop/stereo/suspend-error.ogg
-share/sounds/freedesktop/stereo/trash-empty.ogg
-share/sounds/freedesktop/stereo/window-close.ogg
-share/sounds/freedesktop/stereo/window-maximized.ogg
-share/sounds/freedesktop/stereo/window-minimized.ogg
-share/sounds/freedesktop/stereo/window-move-start.ogg
-share/sounds/freedesktop/stereo/window-move-stop.ogg
-share/sounds/freedesktop/stereo/window-slide.ogg
+share/sounds/freedesktop/stereo/alarm-clock-elapsed.oga
+share/sounds/freedesktop/stereo/audio-channel-front-center.oga
+share/sounds/freedesktop/stereo/audio-channel-front-left.oga
+share/sounds/freedesktop/stereo/audio-channel-front-right.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-center.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-left.oga
+share/sounds/freedesktop/stereo/audio-channel-rear-right.oga
+share/sounds/freedesktop/stereo/audio-channel-side-left.oga
+share/sounds/freedesktop/stereo/audio-channel-side-right.oga
+share/sounds/freedesktop/stereo/audio-test-signal.oga
+share/sounds/freedesktop/stereo/audio-volume-change.oga
+share/sounds/freedesktop/stereo/bell.oga
+share/sounds/freedesktop/stereo/camera-shutter.oga
+share/sounds/freedesktop/stereo/complete.oga
+share/sounds/freedesktop/stereo/device-added.oga
+share/sounds/freedesktop/stereo/device-removed.oga
+share/sounds/freedesktop/stereo/dialog-error.oga
+share/sounds/freedesktop/stereo/dialog-information.oga
+share/sounds/freedesktop/stereo/dialog-warning.oga
+share/sounds/freedesktop/stereo/message-new-instant.oga
+share/sounds/freedesktop/stereo/message.oga
+share/sounds/freedesktop/stereo/network-connectivity-established.oga
+share/sounds/freedesktop/stereo/network-connectivity-lost.oga
+share/sounds/freedesktop/stereo/phone-incoming-call.oga
+share/sounds/freedesktop/stereo/phone-outgoing-busy.oga
+share/sounds/freedesktop/stereo/phone-outgoing-calling.oga
+share/sounds/freedesktop/stereo/power-plug.oga
+share/sounds/freedesktop/stereo/power-unplug.oga
+share/sounds/freedesktop/stereo/screen-capture.oga
+share/sounds/freedesktop/stereo/service-login.oga
+share/sounds/freedesktop/stereo/service-logout.oga
+share/sounds/freedesktop/stereo/suspend-error.oga
+share/sounds/freedesktop/stereo/trash-empty.oga
+share/sounds/freedesktop/stereo/window-attention.oga
+share/sounds/freedesktop/stereo/window-question.oga
@dirrm share/sounds/freedesktop/stereo
@dirrm share/sounds/freedesktop
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 189908b845f0..a6700ecf7572 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gmpc-wikipedia
PORTVERSION= 0.19.0
+PORTREVISION= 1
CATEGORIES= audio
MASTER_SITES= http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
http://freebsd.unixfreunde.de/sources/
@@ -16,7 +17,7 @@ COMMENT= Wikipedia info for gmpc
LIB_DEPENDS= mpd:${PORTSDIR}/audio/libmpd \
curl.5:${PORTSDIR}/ftp/curl \
- webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+ webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
RUN_DEPEND= gmpc:${PORTSDIR}/audio/gmpc
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 986ce70212d6..83548a6d5b65 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gnome-media/Makefile,v 1.130 2009/03/17 22:20:16 kwm Exp $
+# $MCom: ports/audio/gnome-media/Makefile,v 1.147 2009/11/26 06:20:13 marcus Exp $
#
PORTNAME= gnome-media
-PORTVERSION= 2.26.0
-PORTREVISION= 7
+PORTVERSION= 2.28.1
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -16,7 +16,9 @@ DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
COMMENT= Multimedia applications for the GNOME 2 desktop
+BUILD_DEPENDS= xml2po:${PORTSDIR}/textproc/gnome-doc-utils
LIB_DEPENDS= canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
+ pulse.0:${PORTSDIR}/audio/pulseaudio \
unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
USE_BZIP2= yes
@@ -27,58 +29,14 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
GNOME_DESKTOP_VERSION=2
-USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libgnomeui libxml2 \
+USE_GNOME= gnomeprefix gnomehack intlhack gtk20 libxml2 libglade2 \
gconf2
USE_GSTREAMER= gconf good
+CONFIGURE_ARGS= --disable-gstmix
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
GCONF_SCHEMAS= gnome-audio-profiles.schemas \
gnome-sound-recorder.schemas
-OPTIONS= ESOUND "Enable the EsounD module" on \
- IPV6 "Enable support for IPv6" on \
- PULSEAUDIO "Enable the PulseAudio module" on
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_ESOUND)
-USE_GSTREAMER+= esound
-PLIST_SUB+= VUMETER=""
-.else
-CONFIGURE_ARGS+=--disable-esound --disable-esdtest
-PLIST_SUB+= VUMETER="@comment "
-.endif
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+=--disable-ipv6
-.endif
-
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+= PULSE=""
-.else
-CONFIGURE_ARGS+=--disable-pulseaudio
-PLIST_SUB+= PULSE="@comment "
-.endif
-
-.if defined(WITH_ESOUND) && defined(WITHOUT_PULSEAUDIO)
-CONFIGURE_ARGS+=--enable-gstmix
-PLIST_SUB+= GSTMIX=""
-GCONF_SCHEMAS+= gnome-volume-control.schemas
-.else
-CONFIGURE_ARGS+=--disable-gstmix
-PLIST_SUB+= GSTMIX="@comment "
-.endif
-
-.if defined(WITH_ESOUND) || defined(WITH_PULSEAUDIO)
-PLIST_SUB+= GVC=""
-.else
-PLIST_SUB+= GVC="@comment "
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e 's|== "xyes|= "xyes|g' \
- ${WRKSRC}/configure
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index d98b2233165f..a06e5462aef4 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-media-2.26.0.tar.bz2) = 3d519bc7d812aed8f6e4288b6d3cdf26
-SHA256 (gnome2/gnome-media-2.26.0.tar.bz2) = 39e7646d0790e05a010da1eb2d7552dcb5311abd72f001477c9c465d7146b9f7
-SIZE (gnome2/gnome-media-2.26.0.tar.bz2) = 2662523
+MD5 (gnome2/gnome-media-2.28.1.tar.bz2) = 44fa273824cb18bb3118756d4bef69e6
+SHA256 (gnome2/gnome-media-2.28.1.tar.bz2) = 1a1efc4f8f0b127cde4839d64343a5041c00ffb87597d45aabd4e22c4422eed0
+SIZE (gnome2/gnome-media-2.28.1.tar.bz2) = 2557601
diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist
index a6f55e16f2f9..b00877874fb1 100644
--- a/audio/gnome-media/pkg-plist
+++ b/audio/gnome-media/pkg-plist
@@ -1,9 +1,9 @@
bin/gnome-audio-profiles-properties
bin/gnome-sound-recorder
-%%GVC%%bin/gnome-volume-control
-%%GVC%%bin/gnome-volume-control-applet
+bin/gnome-volume-control
+bin/gnome-volume-control-applet
bin/gstreamer-properties
-%%GVC%%etc/xdg/autostart/gnome-volume-control-applet.desktop
+etc/xdg/autostart/gnome-volume-control-applet.desktop
include/gnome-media/profiles/audio-profile-choose.h
include/gnome-media/profiles/audio-profile-edit.h
include/gnome-media/profiles/audio-profile.h
@@ -18,40 +18,46 @@ lib/libgnome-media-profiles.so
lib/libgnome-media-profiles.so.0
libdata/pkgconfig/gnome-media-profiles.pc
share/applications/gnome-sound-recorder.desktop
-%%GVC%%share/applications/gnome-volume-control.desktop
+share/applications/gnome-volume-control.desktop
share/applications/gstreamer-properties.desktop
%%DATADIR%%/glade/gnome-audio-profiles.glade2
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
-%%GVC%%%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
-%%GVC%%%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
-%%GSTMIX%%%%DATADIR%%/pixmaps/chain-broken.png
-%%GSTMIX%%%%DATADIR%%/pixmaps/chain.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/22x22/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/24x24/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-high.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-low.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-medium.png
+%%DATADIR%%/icons/hicolor/32x32/status/audio-input-microphone-muted.png
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-high.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-low.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-medium.svg
+%%DATADIR%%/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
%%DATADIR%%/sounds/gnome-sounds-default.xml
share/gnome-sound-recorder/ui/ui.xml
+share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profile-window.png
+share/gnome/help/gnome-audio-profiles/C/figures/gnome-audio-profiles-profiles-window.png
+share/gnome/help/gnome-audio-profiles/C/gnome-audio-profiles.xml
+share/gnome/help/gnome-audio-profiles/C/legal.xml
share/gnome/help/gnome-sound-recorder/C/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/C/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/C/legal.xml
share/gnome/help/gnome-sound-recorder/ca/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/ca/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/cs/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/cs/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/de/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/de/gnome-sound-recorder.xml
+share/gnome/help/gnome-sound-recorder/el/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/el/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/en_GB/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/en_GB/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/es/figures/grecord_window.png
@@ -68,32 +74,19 @@ share/gnome/help/gnome-sound-recorder/sv/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/sv/gnome-sound-recorder.xml
share/gnome/help/gnome-sound-recorder/uk/figures/grecord_window.png
share/gnome/help/gnome-sound-recorder/uk/gnome-sound-recorder.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/C/legal.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ca/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ca/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/de/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/de/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/es/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/es/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/fr/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/fr/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/it/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/it/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/oc/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/oc/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ru/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/ru/gnome-volume-control.xml
-%%GSTMIX%%share/gnome/help/gnome-volume-control/sv/figures/gnome-volume-control_window.png
-%%GSTMIX%%share/gnome/help/gnome-volume-control/sv/gnome-volume-control.xml
+share/gnome/help/gnome-sound-recorder/zh_CN/figures/grecord_window.png
+share/gnome/help/gnome-sound-recorder/zh_CN/gnome-sound-recorder.xml
share/gnome/help/gstreamer-properties/C/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/C/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/C/legal.xml
share/gnome/help/gstreamer-properties/ca/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/ca/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/cs/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/cs/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/de/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/de/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/el/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/el/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/en_GB/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/en_GB/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/es/figures/gstreamer_properties_window.png
@@ -104,38 +97,38 @@ share/gnome/help/gstreamer-properties/it/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/it/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/oc/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/oc/gstreamer-properties.xml
+share/gnome/help/gstreamer-properties/pt_BR/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/pt_BR/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/ru/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/ru/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/sv/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/sv/gstreamer-properties.xml
share/gnome/help/gstreamer-properties/th/figures/gstreamer_properties_window.png
share/gnome/help/gstreamer-properties/th/gstreamer-properties.xml
-share/gstreamer-properties/glade/gstreamer-properties.glade
+share/gnome/help/gstreamer-properties/zh_CN/figures/gstreamer_properties_window.png
+share/gnome/help/gstreamer-properties/zh_CN/gstreamer-properties.xml
+share/gstreamer-properties/gstreamer-properties.ui
share/gstreamer-properties/icons/gstreamer-properties.png
share/icons/hicolor/16x16/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/16x16/apps/gnome-volume-control.svg
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-3d-sound.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-headphones.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-line-in.png
-%%GSTMIX%%share/icons/hicolor/16x16/devices/gvc-tone.png
-%%GSTMIX%%share/icons/hicolor/16x16/status/audio-input-microphone-muted.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.png
+share/icons/hicolor/16x16/apps/gnome-volume-control.svg
share/icons/hicolor/22x22/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/22x22/apps/gnome-volume-control.svg
+share/icons/hicolor/22x22/apps/gnome-volume-control.png
+share/icons/hicolor/22x22/apps/gnome-volume-control.svg
share/icons/hicolor/24x24/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/24x24/apps/gnome-volume-control.png
+share/icons/hicolor/24x24/apps/gnome-volume-control.png
share/icons/hicolor/32x32/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.png
-%%GVC%%share/icons/hicolor/32x32/apps/gnome-volume-control.svg
+share/icons/hicolor/32x32/apps/gnome-volume-control.png
+share/icons/hicolor/32x32/apps/gnome-volume-control.svg
share/icons/hicolor/48x48/apps/gnome-sound-recorder.png
-%%GVC%%share/icons/hicolor/48x48/apps/gnome-volume-control.png
+share/icons/hicolor/48x48/apps/gnome-volume-control.png
share/icons/hicolor/48x48/apps/gstreamer-properties.png
share/icons/hicolor/scalable/apps/gnome-sound-recorder.svg
-%%GVC%%share/icons/hicolor/scalable/apps/gnome-volume-control.svg
+share/icons/hicolor/scalable/apps/gnome-volume-control.svg
share/locale/am/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-media-2.0.mo
share/locale/as/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ast/LC_MESSAGES/gnome-media-2.0.mo
share/locale/az/LC_MESSAGES/gnome-media-2.0.mo
share/locale/be/LC_MESSAGES/gnome-media-2.0.mo
share/locale/be@latin/LC_MESSAGES/gnome-media-2.0.mo
@@ -145,6 +138,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/br/LC_MESSAGES/gnome-media-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-media-2.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-media-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-media-2.0.mo
share/locale/da/LC_MESSAGES/gnome-media-2.0.mo
@@ -214,29 +208,27 @@ share/locale/xh/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-media-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-media-2.0.mo
+share/omf/gnome-audio-profiles/gnome-audio-profiles-C.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-C.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ca.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-cs.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-de.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-el.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-en_GB.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-es.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-fr.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-it.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-oc.omf
+share/omf/gstreamer-properties/gstreamer-properties-pt_BR.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-ru.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-sv.omf
share/omf/gnome-sound-recorder/gnome-sound-recorder-uk.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-C.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ca.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-de.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-es.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-fr.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-it.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-oc.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-ru.omf
-%%GSTMIX%%share/omf/gnome-volume-control/gnome-volume-control-sv.omf
+share/omf/gnome-sound-recorder/gnome-sound-recorder-zh_CN.omf
share/omf/gstreamer-properties/gstreamer-properties-C.omf
share/omf/gstreamer-properties/gstreamer-properties-ca.omf
+share/omf/gstreamer-properties/gstreamer-properties-cs.omf
share/omf/gstreamer-properties/gstreamer-properties-de.omf
+share/omf/gstreamer-properties/gstreamer-properties-el.omf
share/omf/gstreamer-properties/gstreamer-properties-en_GB.omf
share/omf/gstreamer-properties/gstreamer-properties-es.omf
share/omf/gstreamer-properties/gstreamer-properties-fr.omf
@@ -245,6 +237,7 @@ share/omf/gstreamer-properties/gstreamer-properties-oc.omf
share/omf/gstreamer-properties/gstreamer-properties-ru.omf
share/omf/gstreamer-properties/gstreamer-properties-sv.omf
share/omf/gstreamer-properties/gstreamer-properties-th.omf
+share/omf/gstreamer-properties/gstreamer-properties-zh_CN.omf
share/sounds/gnome/default/alerts/bark.ogg
share/sounds/gnome/default/alerts/drip.ogg
share/sounds/gnome/default/alerts/glass.ogg
@@ -253,17 +246,20 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/sounds/gnome/default
@dirrm share/sounds/gnome
@dirrm share/omf/gstreamer-properties
-%%GSTMIX%%@dirrm share/omf/gnome-volume-control
@dirrm share/omf/gnome-sound-recorder
+@dirrm share/omf/gnome-audio-profiles
@dirrm share/gstreamer-properties/icons
-@dirrm share/gstreamer-properties/glade
@dirrm share/gstreamer-properties
+@dirrm share/gnome/help/gstreamer-properties/zh_CN/figures
+@dirrm share/gnome/help/gstreamer-properties/zh_CN
@dirrm share/gnome/help/gstreamer-properties/th/figures
@dirrm share/gnome/help/gstreamer-properties/th
@dirrm share/gnome/help/gstreamer-properties/sv/figures
@dirrm share/gnome/help/gstreamer-properties/sv
@dirrm share/gnome/help/gstreamer-properties/ru/figures
@dirrm share/gnome/help/gstreamer-properties/ru
+@dirrm share/gnome/help/gstreamer-properties/pt_BR/figures
+@dirrm share/gnome/help/gstreamer-properties/pt_BR
@dirrm share/gnome/help/gstreamer-properties/oc/figures
@dirrm share/gnome/help/gstreamer-properties/oc
@dirrm share/gnome/help/gstreamer-properties/it/figures
@@ -274,32 +270,19 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gstreamer-properties/es
@dirrm share/gnome/help/gstreamer-properties/en_GB/figures
@dirrm share/gnome/help/gstreamer-properties/en_GB
+@dirrm share/gnome/help/gstreamer-properties/el/figures
+@dirrm share/gnome/help/gstreamer-properties/el
@dirrm share/gnome/help/gstreamer-properties/de/figures
@dirrm share/gnome/help/gstreamer-properties/de
+@dirrm share/gnome/help/gstreamer-properties/cs/figures
+@dirrm share/gnome/help/gstreamer-properties/cs
@dirrm share/gnome/help/gstreamer-properties/ca/figures
@dirrm share/gnome/help/gstreamer-properties/ca
@dirrm share/gnome/help/gstreamer-properties/C/figures
@dirrm share/gnome/help/gstreamer-properties/C
@dirrm share/gnome/help/gstreamer-properties
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/sv
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ru
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/oc
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/it
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/fr
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/es
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/de
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/ca
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C/figures
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control/C
-%%GSTMIX%%@dirrm share/gnome/help/gnome-volume-control
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN/figures
+@dirrm share/gnome/help/gnome-sound-recorder/zh_CN
@dirrm share/gnome/help/gnome-sound-recorder/uk/figures
@dirrm share/gnome/help/gnome-sound-recorder/uk
@dirrm share/gnome/help/gnome-sound-recorder/sv/figures
@@ -316,29 +299,35 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrm share/gnome/help/gnome-sound-recorder/es
@dirrm share/gnome/help/gnome-sound-recorder/en_GB/figures
@dirrm share/gnome/help/gnome-sound-recorder/en_GB
+@dirrm share/gnome/help/gnome-sound-recorder/el/figures
+@dirrm share/gnome/help/gnome-sound-recorder/el
@dirrm share/gnome/help/gnome-sound-recorder/de/figures
@dirrm share/gnome/help/gnome-sound-recorder/de
+@dirrm share/gnome/help/gnome-sound-recorder/cs/figures
+@dirrm share/gnome/help/gnome-sound-recorder/cs
@dirrm share/gnome/help/gnome-sound-recorder/ca/figures
@dirrm share/gnome/help/gnome-sound-recorder/ca
@dirrm share/gnome/help/gnome-sound-recorder/C/figures
@dirrm share/gnome/help/gnome-sound-recorder/C
@dirrm share/gnome/help/gnome-sound-recorder
+@dirrm share/gnome/help/gnome-audio-profiles/C/figures
+@dirrm share/gnome/help/gnome-audio-profiles/C
+@dirrm share/gnome/help/gnome-audio-profiles
@dirrm share/gnome-sound-recorder/ui
@dirrm share/gnome-sound-recorder
@dirrm %%DATADIR%%/sounds
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/scalable
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/32x32
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/24x24
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/22x22
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16/status
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor/16x16
-%%GVC%%@dirrm %%DATADIR%%/icons/hicolor
-%%GVC%%@dirrm %%DATADIR%%/icons
-%%GSTMIX%%@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%/icons/hicolor/scalable/status
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/32x32/status
+@dirrm %%DATADIR%%/icons/hicolor/32x32
+@dirrm %%DATADIR%%/icons/hicolor/24x24/status
+@dirrm %%DATADIR%%/icons/hicolor/24x24
+@dirrm %%DATADIR%%/icons/hicolor/22x22/status
+@dirrm %%DATADIR%%/icons/hicolor/22x22
+@dirrm %%DATADIR%%/icons/hicolor/16x16/status
+@dirrm %%DATADIR%%/icons/hicolor/16x16
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%
@dirrmtry share/applications
@@ -368,9 +357,13 @@ share/sounds/gnome/default/alerts/sonar.ogg
@dirrmtry share/locale/ku
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES
@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
@dirrmtry share/locale/as/LC_MESSAGES
@dirrmtry share/locale/as
diff --git a/audio/gstreamer-plugins-cdparanoia/Makefile b/audio/gstreamer-plugins-cdparanoia/Makefile
index 01ca95b19746..fff94ddd0cad 100644
--- a/audio/gstreamer-plugins-cdparanoia/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia/Makefile
@@ -3,10 +3,10 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.6 2008/03/21 04:01:31 ahze Exp $
+# $MCom: ports/audio/gstreamer-plugins-cdparanoia/Makefile,v 1.8 2009/11/17 19:08:45 kwm Exp $
#
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= audio
COMMENT= Gstreamer CDDA extraction (aka audio ripping) plugin
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 827f9b310a47..77c66579ecb3 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= libcanberra
-PORTVERSION= 0.10
-PORTREVISION= 5
+PORTVERSION= 0.22
CATEGORIES= audio devel
MASTER_SITES= http://0pointer.de/lennart/projects/libcanberra/
@@ -20,7 +19,7 @@ USE_GMAKE= yes
USE_GNOME= gnomeprefix gnomehack gtk20 ltverhack gconf2
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:22 libltdl:22
-CONFIGURE_ARGS= --disable-lynx
+CONFIGURE_ARGS= --disable-lynx --disable-tdb
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -29,6 +28,8 @@ GCONF_SCHEMAS= libcanberra.schemas
OPTIONS= PULSE "Enable Pulse Audio support" off \
GSTREAMER "Enable GStreamer audio support" off
+PLIST_SUB= VERSION=${PORTVERSION}
+
.include <bsd.port.pre.mk>
.if !defined(WITHOUT_PULSE)
diff --git a/audio/libcanberra/distinfo b/audio/libcanberra/distinfo
index 7adb467b8697..f771edecc145 100644
--- a/audio/libcanberra/distinfo
+++ b/audio/libcanberra/distinfo
@@ -1,3 +1,3 @@
-MD5 (libcanberra-0.10.tar.gz) = 2623370bfcecaeecaeb85e5ec445f340
-SHA256 (libcanberra-0.10.tar.gz) = b0e3cb59e605412a52352cf9cf36344b165463d4e65916c95deb73fc51838272
-SIZE (libcanberra-0.10.tar.gz) = 826222
+MD5 (libcanberra-0.22.tar.gz) = e24e2f956fedfbcc58edfa40471b18d8
+SHA256 (libcanberra-0.22.tar.gz) = 6a87737c3d045549a4a9c789cfc565a48185a586aa1a59243dea6421e9978581
+SIZE (libcanberra-0.22.tar.gz) = 459404
diff --git a/audio/libcanberra/files/patch-Makefile.in b/audio/libcanberra/files/patch-Makefile.in
deleted file mode 100644
index bd5972c313b2..000000000000
--- a/audio/libcanberra/files/patch-Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.in.orig 2008-12-20 13:42:12.000000000 -0500
-+++ Makefile.in 2008-12-20 20:43:22.000000000 -0500
-@@ -271,7 +271,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- dist_doc_DATA = README
- EXTRA_DIST = bootstrap.sh autogen.sh LGPL libcanberra.schemas
--SUBDIRS = src gtkdoc libltdl doc
-+SUBDIRS = src gtkdoc doc
- MAINTAINERCLEANFILES = README
- noinst_DATA = README
- pkgconfigdir = $(prefix)/libdata/pkgconfig
-@@ -794,11 +794,11 @@ uninstall-am: uninstall-dist_docDATA uni
-
-
- @GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
--@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
--@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
--@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p ; \
--@GCONF_SCHEMAS_INSTALL_TRUE@ done \
--@GCONF_SCHEMAS_INSTALL_TRUE@ fi
-+@GCONF_SCHEMAS_INSTALL_TRUE@ if test -z "$(DESTDIR)" ; then \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ for p in $(schemas_DATA) ; do \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/$$p ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ done ; \
-+@GCONF_SCHEMAS_INSTALL_TRUE@ fi
- @GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
-
- README:
diff --git a/audio/libcanberra/files/patch-configure b/audio/libcanberra/files/patch-configure
deleted file mode 100644
index 7d643125157c..000000000000
--- a/audio/libcanberra/files/patch-configure
+++ /dev/null
@@ -1,27 +0,0 @@
---- configure.orig 2008-12-19 19:07:23.000000000 -0500
-+++ configure 2008-12-19 19:08:01.000000000 -0500
-@@ -791,7 +791,6 @@ ac_includes_default="\
- # include <unistd.h>
- #endif"
-
--enable_option_checking=no
- ac_subst_vars='LTLIBOBJS
- LIBOBJS
- GTK_DOC_USE_LIBTOOL_FALSE
-@@ -878,7 +877,6 @@ USE_VERSION_SCRIPT_FALSE
- USE_VERSION_SCRIPT_TRUE
- OS_IS_WIN32_FALSE
- OS_IS_WIN32_TRUE
--subdirs
- LIBLTDL
- LTDLINCL
- LIBTOOL
-@@ -1054,7 +1052,7 @@ TDB_CFLAGS
- TDB_LIBS
- VORBIS_CFLAGS
- VORBIS_LIBS'
--ac_subdirs_all='libltdl'
-+
-
- # Initialize some variables set by options.
- ac_init_help=
diff --git a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in b/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
deleted file mode 100644
index c779f3f6e450..000000000000
--- a/audio/libcanberra/files/patch-src_libcanberra-login-sound.desktop.in
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5081594cb8cbb69fc282260388b2bb0164ce31dd Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Sun, 14 Dec 2008 22:04:01 +0100
-Subject: [PATCH] Run lc-l-s in "Application" phase of gnome-session
-
-There is no need to make g-s wait for this lc-l-s when it plays the
-welcome tune. Hence move it to "Application" phase instead of "Desktop"
-phase.
-
-This is a result of a discussion with Behdad Esfahbod to optimize the
-login time.
----
- src/libcanberra-login-sound.desktop.in | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/libcanberra-login-sound.desktop.in b/src/libcanberra-login-sound.desktop.in
-index 5b4cf7f..9fcf357 100644
---- src/libcanberra-login-sound.desktop.in
-+++ src/libcanberra-login-sound.desktop.in
-@@ -4,6 +4,6 @@ Name=GNOME Login Sound
- Exec=@bindir@/canberra-gtk-play --id="desktop-login" --description="GNOME Login"
- OnlyShowIn=GNOME;
- AutostartCondition=GNOME /desktop/gnome/sound/event_sounds
--X-GNOME-Autostart-Phase=Desktop
-+X-GNOME-Autostart-Phase=Application
- X-GNOME-Provides=login-sound
- X-GNOME-Autostart-Notify=true
---
-1.6.0.5
-
diff --git a/audio/libcanberra/files/patch-src_oss.c b/audio/libcanberra/files/patch-src_oss.c
index ec8bdc3c4011..d4b910a3c0a8 100644
--- a/audio/libcanberra/files/patch-src_oss.c
+++ b/audio/libcanberra/files/patch-src_oss.c
@@ -1,15 +1,6 @@
---- src/oss.c.orig 2008-09-01 19:53:47.000000000 -0400
-+++ src/oss.c 2008-12-21 13:51:09.000000000 -0500
-@@ -235,7 +235,7 @@ static int open_oss(ca_context *c, struc
- ca_return_val_if_fail(c, CA_ERROR_INVALID);
- ca_return_val_if_fail(c->private, CA_ERROR_STATE);
- ca_return_val_if_fail(out, CA_ERROR_INVALID);
-- ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) > 2, CA_ERROR_NOTSUPPORTED);
-+ ca_return_val_if_fail(ca_sound_file_get_nchannels(out->file) <= 2, CA_ERROR_NOTSUPPORTED);
-
- p = PRIVATE(c);
-
-@@ -258,7 +258,7 @@ static int open_oss(ca_context *c, struc
+--- src/oss.c.orig 2009-08-26 21:58:16.000000000 -0400
++++ src/oss.c 2009-11-25 20:47:07.000000000 -0500
+@@ -260,7 +260,7 @@ static int open_oss(ca_context *c, struc
val = AFMT_S16_NE;
break;
case CA_SAMPLE_S16RE:
@@ -18,11 +9,3 @@
val = AFMT_S16_BE;
#else
val = AFMT_S16_LE;
-@@ -423,6 +423,7 @@ int driver_play(ca_context *c, uint32_t
- out->callback = cb;
- out->userdata = userdata;
- out->pipe_fd[0] = out->pipe_fd[1] = -1;
-+ out->pcm = -1;
-
- if (pipe(out->pipe_fd) < 0) {
- ret = CA_ERROR_SYSTEM;
diff --git a/audio/libcanberra/pkg-plist b/audio/libcanberra/pkg-plist
index 816a75992ec4..e32487a18e5e 100644
--- a/audio/libcanberra/pkg-plist
+++ b/audio/libcanberra/pkg-plist
@@ -15,18 +15,18 @@ lib/libcanberra.so.0
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.a
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.la
%%GSTREAMER%%lib/libcanberra/libcanberra-gstreamer.so
-lib/libcanberra/libcanberra-multi.a
-lib/libcanberra/libcanberra-multi.la
-lib/libcanberra/libcanberra-multi.so
-lib/libcanberra/libcanberra-null.a
-lib/libcanberra/libcanberra-null.la
-lib/libcanberra/libcanberra-null.so
-lib/libcanberra/libcanberra-oss.a
-lib/libcanberra/libcanberra-oss.la
-lib/libcanberra/libcanberra-oss.so
-%%PULSE%%lib/libcanberra/libcanberra-pulse.a
-%%PULSE%%lib/libcanberra/libcanberra-pulse.la
-%%PULSE%%lib/libcanberra/libcanberra-pulse.so
+lib/libcanberra-%%VERSION%%/libcanberra-multi.a
+lib/libcanberra-%%VERSION%%/libcanberra-multi.la
+lib/libcanberra-%%VERSION%%/libcanberra-multi.so
+lib/libcanberra-%%VERSION%%/libcanberra-null.a
+lib/libcanberra-%%VERSION%%/libcanberra-null.la
+lib/libcanberra-%%VERSION%%/libcanberra-null.so
+lib/libcanberra-%%VERSION%%/libcanberra-oss.a
+lib/libcanberra-%%VERSION%%/libcanberra-oss.la
+lib/libcanberra-%%VERSION%%/libcanberra-oss.so
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.a
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.la
+%%PULSE%%lib/libcanberra-%%VERSION%%/libcanberra-pulse.so
libdata/pkgconfig/libcanberra-gtk.pc
libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/README
@@ -42,8 +42,14 @@ libdata/pkgconfig/libcanberra.pc
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
+share/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop
share/gnome/autostart/libcanberra-login-sound.desktop
share/gnome/shutdown/libcanberra-logout-sound.sh
+share/vala/vapi/libcanberra-gtk.vapi
+share/vala/vapi/libcanberra.vapi
@dirrmtry share/gnome/shutdown
+@dirrmtry share/gdm/autostart/LoginWindow
+@dirrmtry share/gdm/autostart
+@dirrmtry share/gdm
@dirrm %%DOCSDIR%%
-@dirrm lib/libcanberra
+@dirrm lib/libcanberra-%%VERSION%%
diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index fd3a0acfc8fb..bab70c26ba67 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -3,11 +3,15 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports-stable/audio/pulseaudio/Makefile,v 1.5 2009/07/20 21:26:40 marcus Exp $
+# $MCom: ports/audio/pulseaudio/Makefile,v 1.21 2009/11/28 19:08:20 marcus Exp $
+#
+# !!!NOTE!!! Any PORTVERSION update to this port must be accompanied by
+# PORTREVISION bumps to audio/gnome-media, sysutils/gnome-settings-daemon,
+# and audio/gstreamer-plugins-pulse.
#
PORTNAME= pulseaudio
-PORTVERSION= 0.9.19
+PORTVERSION= 0.9.21
CATEGORIES= audio
MASTER_SITES= http://0pointer.de/lennart/projects/${PORTNAME}/
diff --git a/audio/pulseaudio/distinfo b/audio/pulseaudio/distinfo
index c516046fca19..8529bce24ed9 100644
--- a/audio/pulseaudio/distinfo
+++ b/audio/pulseaudio/distinfo
@@ -1,3 +1,3 @@
-MD5 (pulseaudio-0.9.19.tar.gz) = 02adc2b99252675f0271db3b9edd432e
-SHA256 (pulseaudio-0.9.19.tar.gz) = e47e27083deb79571fb2b9215874ddc26d77c3dec2a7dc8de5ecec9058e4b806
-SIZE (pulseaudio-0.9.19.tar.gz) = 2029090
+MD5 (pulseaudio-0.9.21.tar.gz) = 76e623c4c72e2258bc8bdeb1599bad74
+SHA256 (pulseaudio-0.9.21.tar.gz) = 94e22356ac70ee95388ae58da90d88c6b3186d1938618d21671627ff56cee254
+SIZE (pulseaudio-0.9.21.tar.gz) = 2056896
diff --git a/audio/pulseaudio/files/patch-configure b/audio/pulseaudio/files/patch-configure
index 5130810053df..21a97d9124cc 100644
--- a/audio/pulseaudio/files/patch-configure
+++ b/audio/pulseaudio/files/patch-configure
@@ -1,27 +1,23 @@
---- configure.orig 2008-07-26 15:15:12.000000000 -0400
-+++ configure 2008-07-26 15:15:35.000000000 -0400
-@@ -25321,6 +25321,7 @@ $as_echo_n "checking whether to check fo
+--- configure.orig 2009-11-24 16:31:47.000000000 +0100
++++ configure 2009-11-24 16:32:35.000000000 +0100
+@@ -13586,6 +13586,7 @@
check_inconsistencies=yes
case "${host_cpu}-${host_os}" in
*-darwin*) check_inconsistencies=no ;;
+ *-freebsd*) check_inconsistencies=no ;;
esac
if test x"$GCC" != xyes -o "x$check_inconsistencies" != xyes ; then
- { $as_echo "$as_me:$LINENO: result: no" >&5
-@@ -32654,9 +32655,9 @@ _ACEOF
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+@@ -18007,7 +18008,7 @@
else
-- { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
--$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-- { (exit 1); exit 1; }; }
-+# { { $as_echo "$as_me:$LINENO: error: *** libatomic-ops headers not found" >&5
-+#$as_echo "$as_me: error: *** libatomic-ops headers not found" >&2;}
-+# { (exit 1); exit 1; }; }
+- as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
++# as_fn_error "*** libatomic-ops headers not found" "$LINENO" 5
fi
-@@ -32664,9 +32665,9 @@ done
+@@ -18015,9 +18016,9 @@
# Win32 does not need the lib and breaks horribly if we try to include it
@@ -32,5 +28,5 @@
+# LIBS="$LIBS -latomic_ops"
+# fi
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
diff --git a/audio/pulseaudio/files/patch-src_pulsecore_shm.c b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
index 549091ccc487..4dfa3a3a9392 100644
--- a/audio/pulseaudio/files/patch-src_pulsecore_shm.c
+++ b/audio/pulseaudio/files/patch-src_pulsecore_shm.c
@@ -1,7 +1,7 @@
---- src/pulsecore/shm.c.orig 2007-10-28 15:13:53.000000000 -0400
-+++ src/pulsecore/shm.c 2008-01-01 16:19:19.000000000 -0500
-@@ -80,7 +80,7 @@ struct shm_marker {
- };
+--- src/pulsecore/shm.c.orig 2009-08-19 10:17:06.000000000 +0800
++++ src/pulsecore/shm.c 2009-11-11 21:25:03.000000000 +0800
+@@ -91,7 +91,7 @@
+ #define SHM_MARKER_SIZE PA_ALIGN(sizeof(struct shm_marker))
static char *segment_name(char *fn, size_t l, unsigned id) {
- pa_snprintf(fn, l, "/pulse-shm-%u", id);
@@ -9,3 +9,12 @@
return fn;
}
+@@ -142,7 +142,7 @@
+ pa_random(&m->id, sizeof(m->id));
+ segment_name(fn, sizeof(fn), m->id);
+
+- if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0444)) < 0) {
++ if ((fd = shm_open(fn, O_RDWR|O_CREAT|O_EXCL, mode & 0644)) < 0) {
+ pa_log("shm_open() failed: %s", pa_cstrerror(errno));
+ goto fail;
+ }
diff --git a/audio/pulseaudio/files/patch-src_tests_rtstutter.c b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
new file mode 100644
index 000000000000..c80737b1946f
--- /dev/null
+++ b/audio/pulseaudio/files/patch-src_tests_rtstutter.c
@@ -0,0 +1,27 @@
+--- src/tests/rtstutter.c.orig 2009-07-23 15:40:47.000000000 +0200
++++ src/tests/rtstutter.c 2009-11-24 16:26:36.000000000 +0100
+@@ -31,6 +31,11 @@
+ #include <string.h>
+ #include <pthread.h>
+
++#ifdef HAVE_PTHREAD_SETAFFINITY_NP
++#include <sys/param.h>
++#include <sys/cpuset.h>
++#endif
++
+ #include <pulse/timeval.h>
+ #include <pulse/gccmacro.h>
+
+@@ -44,8 +49,12 @@
+
+ static void* work(void *p) {
+ #ifdef HAVE_PTHREAD_SETAFFINITY_NP
++#ifdef __FreeBSD__
++ cpuset_t mask;
++#else
+ cpu_set_t mask;
+ #endif
++#endif
+ struct sched_param param;
+
+ pa_log_notice("CPU%i: Created thread.", PA_PTR_TO_UINT(p));
diff --git a/audio/pulseaudio/pkg-plist b/audio/pulseaudio/pkg-plist
index b42a03710b05..8be11434795d 100644
--- a/audio/pulseaudio/pkg-plist
+++ b/audio/pulseaudio/pkg-plist
@@ -11,6 +11,7 @@ bin/parecord
bin/pasuspender
bin/pax11publish
bin/pulseaudio
+bin/start-pulseaudio-kde
bin/start-pulseaudio-x11
etc/dbus-1/system.d/pulseaudio-system.conf
@unexec if cmp -s %D/etc/pulse/client.conf %D/etc/pulse/client.conf-dist; then rm -f %D/etc/pulse/client.conf; fi
@@ -26,12 +27,14 @@ etc/pulse/default.pa-dist
etc/pulse/system.pa-dist
@exec [ -f %B/system.pa ] || cp %B/%f %B/system.pa
etc/xdg/autostart/pulseaudio.desktop
+etc/xdg/autostart/pulseaudio-kde.desktop
%%AVAHI%%include/pulse/browser.h
include/pulse/cdecl.h
include/pulse/channelmap.h
include/pulse/context.h
include/pulse/def.h
include/pulse/error.h
+include/pulse/ext-device-manager.h
include/pulse/ext-stream-restore.h
include/pulse/gccmacro.h
include/pulse/glib-mainloop.h
@@ -81,6 +84,8 @@ lib/libpulsedsp.a
lib/libpulsedsp.so
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.a
%%AVAHI%%lib/pulse-%%PULSE_VERSION%%/modules/libavahi-wrap.so
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.a
+lib/pulse-%%PULSE_VERSION%%/modules/module-device-manager.so
lib/pulse-%%PULSE_VERSION%%/modules/libcli.a
lib/pulse-%%PULSE_VERSION%%/modules/libcli.so
lib/pulse-%%PULSE_VERSION%%/modules/liboss-util.a
@@ -230,6 +235,7 @@ share/locale/fi/LC_MESSAGES/pulseaudio.mo
share/locale/fr/LC_MESSAGES/pulseaudio.mo
share/locale/gu/LC_MESSAGES/pulseaudio.mo
share/locale/hi/LC_MESSAGES/pulseaudio.mo
+share/locale/hu/LC_MESSAGES/pulseaudio.mo
share/locale/it/LC_MESSAGES/pulseaudio.mo
share/locale/ja/LC_MESSAGES/pulseaudio.mo
share/locale/kn/LC_MESSAGES/pulseaudio.mo
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 37cc23244101..94b1c4f3879b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,11 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/rhythmbox/Makefile,v 1.97 2009/04/09 03:24:06 mezz Exp $
+# $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $
#
PORTNAME= rhythmbox
PORTVERSION= 0.12.6
+PORTREVISION= 1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -23,7 +24,7 @@ LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
sexy.2:${PORTSDIR}/x11-toolkits/libsexy \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
- brasero-media.1:${PORTSDIR}/sysutils/brasero
+ brasero-media.2:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 058f98d97d9b..e918f875668b 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,12 +3,11 @@
# Whom: Alexander Nedotsukov <bland@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/audio/sound-juicer/Makefile,v 1.91 2009/03/18 04:24:29 marcus Exp $
+# $MCom: ports/audio/sound-juicer/Makefile,v 1.96 2009/11/26 08:20:43 marcus Exp $
#
PORTNAME= sound-juicer
-PORTVERSION= 2.26.1
-PORTREVISION= 2
+PORTVERSION= 2.28.1
CATEGORIES= audio gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -19,11 +18,11 @@ COMMENT= Clean, mean and lean CD ripper for GNOME2
LIB_DEPENDS= musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
gnome-media-profiles.0:${PORTSDIR}/audio/gnome-media \
- cdio.12:${PORTSDIR}/sysutils/libcdio \
+ cdio.8:${PORTSDIR}/sysutils/libcdio \
tag.6:${PORTSDIR}/audio/taglib \
canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
- brasero-media.1:${PORTSDIR}/sysutils/brasero
+ brasero-media.2:${PORTSDIR}/sysutils/brasero
USE_BZIP2= yes
USE_GETTEXT= yes
diff --git a/audio/sound-juicer/distinfo b/audio/sound-juicer/distinfo
index 7c4e36f21280..6433beb16e83 100644
--- a/audio/sound-juicer/distinfo
+++ b/audio/sound-juicer/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/sound-juicer-2.26.1.tar.bz2) = 68d085cb577af88553f2dcaf3a0fc2a1
-SHA256 (gnome2/sound-juicer-2.26.1.tar.bz2) = 5e6220158270b5f76e6a9f74f597837b41000c695e4ae81254dd945024c0c9e5
-SIZE (gnome2/sound-juicer-2.26.1.tar.bz2) = 1993986
+MD5 (gnome2/sound-juicer-2.28.1.tar.bz2) = 680c036ca9b062fe198fada30edbf534
+SHA256 (gnome2/sound-juicer-2.28.1.tar.bz2) = 3142cce899812c6fb8c7145d52323f07d6ecfd6ca0503f4c7a32a12c00b8910c
+SIZE (gnome2/sound-juicer-2.28.1.tar.bz2) = 2159961
diff --git a/audio/sound-juicer/pkg-plist b/audio/sound-juicer/pkg-plist
index 14faef6de523..db0061e36e6c 100644
--- a/audio/sound-juicer/pkg-plist
+++ b/audio/sound-juicer/pkg-plist
@@ -12,6 +12,10 @@ share/gnome/help/sound-juicer/ca/figures/prefs.png
share/gnome/help/sound-juicer/ca/figures/startup.png
share/gnome/help/sound-juicer/ca/legal.xml
share/gnome/help/sound-juicer/ca/sound-juicer.xml
+share/gnome/help/sound-juicer/cs/figures/prefs.png
+share/gnome/help/sound-juicer/cs/figures/startup.png
+share/gnome/help/sound-juicer/cs/legal.xml
+share/gnome/help/sound-juicer/cs/sound-juicer.xml
share/gnome/help/sound-juicer/de/figures/prefs.png
share/gnome/help/sound-juicer/de/figures/startup.png
share/gnome/help/sound-juicer/de/legal.xml
@@ -80,6 +84,7 @@ share/locale/bn/LC_MESSAGES/sound-juicer.mo
share/locale/bn_IN/LC_MESSAGES/sound-juicer.mo
share/locale/br/LC_MESSAGES/sound-juicer.mo
share/locale/ca/LC_MESSAGES/sound-juicer.mo
+share/locale/ca@valencia/LC_MESSAGES/sound-juicer.mo
share/locale/cs/LC_MESSAGES/sound-juicer.mo
share/locale/cy/LC_MESSAGES/sound-juicer.mo
share/locale/da/LC_MESSAGES/sound-juicer.mo
@@ -88,12 +93,14 @@ share/locale/dz/LC_MESSAGES/sound-juicer.mo
share/locale/el/LC_MESSAGES/sound-juicer.mo
share/locale/en_CA/LC_MESSAGES/sound-juicer.mo
share/locale/en_GB/LC_MESSAGES/sound-juicer.mo
+share/locale/en@shaw/LC_MESSAGES/sound-juicer.mo
share/locale/es/LC_MESSAGES/sound-juicer.mo
share/locale/et/LC_MESSAGES/sound-juicer.mo
share/locale/eu/LC_MESSAGES/sound-juicer.mo
share/locale/fa/LC_MESSAGES/sound-juicer.mo
share/locale/fi/LC_MESSAGES/sound-juicer.mo
share/locale/fr/LC_MESSAGES/sound-juicer.mo
+share/locale/ga/LC_MESSAGES/sound-juicer.mo
share/locale/gl/LC_MESSAGES/sound-juicer.mo
share/locale/gu/LC_MESSAGES/sound-juicer.mo
share/locale/he/LC_MESSAGES/sound-juicer.mo
@@ -109,6 +116,7 @@ share/locale/ko/LC_MESSAGES/sound-juicer.mo
share/locale/ku/LC_MESSAGES/sound-juicer.mo
share/locale/lt/LC_MESSAGES/sound-juicer.mo
share/locale/lv/LC_MESSAGES/sound-juicer.mo
+share/locale/mai/LC_MESSAGES/sound-juicer.mo
share/locale/mk/LC_MESSAGES/sound-juicer.mo
share/locale/ml/LC_MESSAGES/sound-juicer.mo
share/locale/mn/LC_MESSAGES/sound-juicer.mo
@@ -148,6 +156,7 @@ share/locale/zh_TW/LC_MESSAGES/sound-juicer.mo
share/omf/sound-juicer/sound-juicer-C.omf
share/omf/sound-juicer/sound-juicer-ar.omf
share/omf/sound-juicer/sound-juicer-ca.omf
+share/omf/sound-juicer/sound-juicer-cs.omf
share/omf/sound-juicer/sound-juicer-de.omf
share/omf/sound-juicer/sound-juicer-el.omf
share/omf/sound-juicer/sound-juicer-en_GB.omf
@@ -190,6 +199,8 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrm share/gnome/help/sound-juicer/el
@dirrm share/gnome/help/sound-juicer/de/figures
@dirrm share/gnome/help/sound-juicer/de
+@dirrm share/gnome/help/sound-juicer/cs/figures
+@dirrm share/gnome/help/sound-juicer/cs
@dirrm share/gnome/help/sound-juicer/ca/figures
@dirrm share/gnome/help/sound-juicer/ca
@dirrm share/gnome/help/sound-juicer/ar/figures
@@ -218,10 +229,16 @@ share/omf/sound-juicer/sound-juicer-uk.omf
@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
@dirrmtry share/locale/ku/LC_MESSAGES
@dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
@dirrmtry share/locale/dz/LC_MESSAGES
@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
@dirrmtry share/locale/bn_IN/LC_MESSAGES
@dirrmtry share/locale/bn_IN
@dirrmtry share/locale/be@latin/LC_MESSAGES