- Update gstreamer to 0.10

- Move all old gstreamer 0.8 ports to gstreamer*80 [1]
- Chase all ports with new gstreamer or gstreaemer moves

Repocopied by:  marcus [1]

44 files changed, 161 insertions, 93 deletions

diff --git a/audio/Makefile b/audio/Makefile
index 0b76450aa060..bafc9f5fbe8a 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -191,34 +191,63 @@
     SUBDIR += gspeakers
     SUBDIR += gstreamer-monkeysaudio
     SUBDIR += gstreamer-plugins-a52dec
+    SUBDIR += gstreamer-plugins-a52dec80
     SUBDIR += gstreamer-plugins-artsd
+    SUBDIR += gstreamer-plugins-artsd80
     SUBDIR += gstreamer-plugins-audiofile
+    SUBDIR += gstreamer-plugins-audiofile80
     SUBDIR += gstreamer-plugins-cdaudio
+    SUBDIR += gstreamer-plugins-cdaudio80
     SUBDIR += gstreamer-plugins-cdparanoia
+    SUBDIR += gstreamer-plugins-cdparanoia80
     SUBDIR += gstreamer-plugins-esound
+    SUBDIR += gstreamer-plugins-esound80
     SUBDIR += gstreamer-plugins-faac
+    SUBDIR += gstreamer-plugins-faac80
     SUBDIR += gstreamer-plugins-faad
+    SUBDIR += gstreamer-plugins-faad80
     SUBDIR += gstreamer-plugins-flac
+    SUBDIR += gstreamer-plugins-flac80
     SUBDIR += gstreamer-plugins-gsm
+    SUBDIR += gstreamer-plugins-gsm80
     SUBDIR += gstreamer-plugins-ivorbis
+    SUBDIR += gstreamer-plugins-ivorbis80
     SUBDIR += gstreamer-plugins-jack
+    SUBDIR += gstreamer-plugins-jack80
     SUBDIR += gstreamer-plugins-ladspa
+    SUBDIR += gstreamer-plugins-ladspa80
     SUBDIR += gstreamer-plugins-lame
+    SUBDIR += gstreamer-plugins-lame80
     SUBDIR += gstreamer-plugins-mad
+    SUBDIR += gstreamer-plugins-mad80
     SUBDIR += gstreamer-plugins-mikmod
+    SUBDIR += gstreamer-plugins-mikmod80
     SUBDIR += gstreamer-plugins-musepack
+    SUBDIR += gstreamer-plugins-musepack80
     SUBDIR += gstreamer-plugins-musicbrainz
+    SUBDIR += gstreamer-plugins-musicbrainz80
     SUBDIR += gstreamer-plugins-nas
+    SUBDIR += gstreamer-plugins-nas80
     SUBDIR += gstreamer-plugins-ogg
+    SUBDIR += gstreamer-plugins-ogg80
     SUBDIR += gstreamer-plugins-polyp
+    SUBDIR += gstreamer-plugins-polyp80
     SUBDIR += gstreamer-plugins-shout
     SUBDIR += gstreamer-plugins-shout2
+    SUBDIR += gstreamer-plugins-shout280
+    SUBDIR += gstreamer-plugins-shout80
     SUBDIR += gstreamer-plugins-sidplay
+    SUBDIR += gstreamer-plugins-sidplay80
     SUBDIR += gstreamer-plugins-smoothwave
+    SUBDIR += gstreamer-plugins-smoothwave80
     SUBDIR += gstreamer-plugins-sndfile
+    SUBDIR += gstreamer-plugins-sndfile80
     SUBDIR += gstreamer-plugins-speex
+    SUBDIR += gstreamer-plugins-speex80
     SUBDIR += gstreamer-plugins-vorbis
+    SUBDIR += gstreamer-plugins-vorbis80
     SUBDIR += gstreamer-plugins-wavpack
+    SUBDIR += gstreamer-plugins-wavpack80
     SUBDIR += gtick
     SUBDIR += gtkgep
     SUBDIR += gtkguitune
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
index 6074dfd50a04..0aaa6c27b973 100644
--- a/audio/goobox/Makefile
+++ b/audio/goobox/Makefile
@@ -3,6 +3,7 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/goobox/Makefile,v 1.15 2006/04/13 07:52:30 bland Exp $
 #
 
 PORTNAME=	goobox
@@ -10,7 +11,7 @@ PORTVERSION=	0.9.93
 PORTREVISION=	2
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -24,7 +25,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \
 		gnomedocutils
-USE_GSTREAMER=	cdparanoia gconf
+USE_GSTREAMER80=	cdparanoia gconf
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
index 7db3667c159f..de7431682c43 100644
--- a/audio/gstreamer-monkeysaudio/Makefile
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst${PKGNAMESUFFIX}/
 PKGNAMESUFFIX=	-monkeysaudio
 DISTNAME=	gst${PKGNAMESUFFIX}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GStreamer plugin for monkeysaudio files
 
 USE_X_PREFIX=	yes
@@ -21,7 +21,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	lthack gnomehack gnomeprefix
-USE_GSTREAMER=	yes
+USE_GSTREAMER80=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 PLIST_SUB=	VERSION="${GST_VERSION}"
diff --git a/audio/gstreamer-monkeysaudio/distinfo b/audio/gstreamer-monkeysaudio/distinfo
index e1657c4f5546..9b86060bb366 100644
--- a/audio/gstreamer-monkeysaudio/distinfo
+++ b/audio/gstreamer-monkeysaudio/distinfo
@@ -1,3 +1,2 @@
 MD5 (gst-monkeysaudio-0.8.0.tar.bz2) = cda60097072e9f48316a76ef2e4d9925
-SHA256 (gst-monkeysaudio-0.8.0.tar.bz2) = 4fb12f1d2e845c9028e547aa7945aacd217e3f1602cf6ccae383ddb04de895b3
 SIZE (gst-monkeysaudio-0.8.0.tar.bz2) = 249562
diff --git a/audio/gstreamer-monkeysaudio/pkg-plist b/audio/gstreamer-monkeysaudio/pkg-plist
index ca496033f788..ff4e18f86e63 100644
--- a/audio/gstreamer-monkeysaudio/pkg-plist
+++ b/audio/gstreamer-monkeysaudio/pkg-plist
@@ -3,5 +3,5 @@ lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.la
 lib/gstreamer-%%VERSION%%/libgstmonkeysaudio.so
 %%PORTDOCS%%%%DOCSDIR%%/GStreamer-monkeysaudio-permit
 @exec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-%%PORTDOCS%%@unexec /bin/rmdir %D/%%DOCSDIR%% 2>/dev/null || true
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @unexec %%X11BASE%%/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/audio/gstreamer-plugins-a52dec80/Makefile b/audio/gstreamer-plugins-a52dec80/Makefile
index ccd726bbfef8..6b120f102e17 100644
--- a/audio/gstreamer-plugins-a52dec80/Makefile
+++ b/audio/gstreamer-plugins-a52dec80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-a52dec80/Makefile,v 1.2 2006/02/23 18:05:29 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
 
 GST_PLUGIN=	a52dec
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-artsd80/Makefile b/audio/gstreamer-plugins-artsd80/Makefile
index 253c9b2b155c..abd05910e787 100644
--- a/audio/gstreamer-plugins-artsd80/Makefile
+++ b/audio/gstreamer-plugins-artsd80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-artsd80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer kde audio system plugin
 
 GST_PLUGIN=	artsd
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-audiofile80/Makefile b/audio/gstreamer-plugins-audiofile80/Makefile
index c0b205a6b78f..586ab04d2702 100644
--- a/audio/gstreamer-plugins-audiofile80/Makefile
+++ b/audio/gstreamer-plugins-audiofile80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-audiofile80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer SGI audio file plugin
 
 GST_PLUGIN=	audiofile
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdaudio80/Makefile b/audio/gstreamer-plugins-cdaudio80/Makefile
index bed8a12956c3..6a1b5b45dad3 100644
--- a/audio/gstreamer-plugins-cdaudio80/Makefile
+++ b/audio/gstreamer-plugins-cdaudio80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-cdaudio80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer audio cd playing plugin
 
 GST_PLUGIN=	cdaudio
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdparanoia80/Makefile b/audio/gstreamer-plugins-cdparanoia80/Makefile
index b7b9beef3624..48ddd76337a0 100644
--- a/audio/gstreamer-plugins-cdparanoia80/Makefile
+++ b/audio/gstreamer-plugins-cdparanoia80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-cdparanoia80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
 
 GST_PLUGIN=	cdparanoia
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-esound80/Makefile b/audio/gstreamer-plugins-esound80/Makefile
index 591c6e0250d7..f8667471add0 100644
--- a/audio/gstreamer-plugins-esound80/Makefile
+++ b/audio/gstreamer-plugins-esound80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-esound80/Makefile,v 1.2 2006/02/23 18:05:30 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer enlightenment sound library plugin
 
 GST_PLUGIN=	esound
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faac80/Makefile b/audio/gstreamer-plugins-faac80/Makefile
index 1cd3027acf2b..4345bfe033c4 100644
--- a/audio/gstreamer-plugins-faac80/Makefile
+++ b/audio/gstreamer-plugins-faac80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-faac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
 
 GST_PLUGIN=	faac
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faad80/Makefile b/audio/gstreamer-plugins-faad80/Makefile
index cf29a1d52fde..99c7e5b1a8aa 100644
--- a/audio/gstreamer-plugins-faad80/Makefile
+++ b/audio/gstreamer-plugins-faad80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-faad80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer MPEG-2 and MPEG-4 ACC decoder plugin
 
 GST_PLUGIN=	faad
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-flac80/Makefile b/audio/gstreamer-plugins-flac80/Makefile
index f7e86b3f19d8..bc63673717d1 100644
--- a/audio/gstreamer-plugins-flac80/Makefile
+++ b/audio/gstreamer-plugins-flac80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-flac80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
 
 GST_PLUGIN=	flac
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-gsm80/Makefile b/audio/gstreamer-plugins-gsm80/Makefile
index 9e830feb1dc9..7e8816d5d98c 100644
--- a/audio/gstreamer-plugins-gsm80/Makefile
+++ b/audio/gstreamer-plugins-gsm80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-gsm80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer gsm encoding/decoding plugin
 
 GST_PLUGIN=	gsm
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ivorbis80/Makefile b/audio/gstreamer-plugins-ivorbis80/Makefile
index 06dc5c879cfd..6eaf94b8d249 100644
--- a/audio/gstreamer-plugins-ivorbis80/Makefile
+++ b/audio/gstreamer-plugins-ivorbis80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-ivorbis80/Makefile,v 1.2 2006/02/23 18:05:31 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer integer only Ogg Vorbis decoder plugin
 
 GST_PLUGIN=	ivorbis
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-jack80/Makefile b/audio/gstreamer-plugins-jack80/Makefile
index 959ac287a1bb..7fa4079bd846 100644
--- a/audio/gstreamer-plugins-jack80/Makefile
+++ b/audio/gstreamer-plugins-jack80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-jack80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer low-latency audio server plugin
 
 GST_PLUGIN=	jack
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ladspa80/Makefile b/audio/gstreamer-plugins-ladspa80/Makefile
index be29246a0db1..54229141307a 100644
--- a/audio/gstreamer-plugins-ladspa80/Makefile
+++ b/audio/gstreamer-plugins-ladspa80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-ladspa80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
 
 GST_PLUGIN=	ladspa
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-lame80/Makefile b/audio/gstreamer-plugins-lame80/Makefile
index db266a62a352..a690653dcd2d 100644
--- a/audio/gstreamer-plugins-lame80/Makefile
+++ b/audio/gstreamer-plugins-lame80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-lame80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer mp3 encode plugin
 
 GST_PLUGIN=	lame
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mad80/Makefile b/audio/gstreamer-plugins-mad80/Makefile
index e95837582370..87a42f92306f 100644
--- a/audio/gstreamer-plugins-mad80/Makefile
+++ b/audio/gstreamer-plugins-mad80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-mad80/Makefile,v 1.2 2006/02/23 18:05:32 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Gstreamer mp3 decoder plugin
 
 GST_PLUGIN=	mad
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mikmod80/Makefile b/audio/gstreamer-plugins-mikmod80/Makefile
index 59669433aad1..749b23a3e662 100644
--- a/audio/gstreamer-plugins-mikmod80/Makefile
+++ b/audio/gstreamer-plugins-mikmod80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-mikmod80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer mikmod sound plugin
 
 GST_PLUGIN=	mikmod
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musepack80/Makefile b/audio/gstreamer-plugins-musepack80/Makefile
index e3f0c687c3d0..8d77e5fb0cc2 100644
--- a/audio/gstreamer-plugins-musepack80/Makefile
+++ b/audio/gstreamer-plugins-musepack80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-musepack80/Makefile,v 1.1 2006/01/20 02:55:53 ahze Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	3
+PORTREVISION=	2
 
 COMMENT=	Gstreamer musepack mpc encoder/decoder plugin
 
 GST_PLUGIN=	musepack
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musicbrainz80/Makefile b/audio/gstreamer-plugins-musicbrainz80/Makefile
index 5e5e50d4145e..ed6ade7f44cb 100644
--- a/audio/gstreamer-plugins-musicbrainz80/Makefile
+++ b/audio/gstreamer-plugins-musicbrainz80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-musicbrainz80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer CD index/audio metadata plugin
 
 GST_PLUGIN=	musicbrainz
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-nas80/Makefile b/audio/gstreamer-plugins-nas80/Makefile
index cd1f2e6d7829..d70318a7f9c8 100644
--- a/audio/gstreamer-plugins-nas80/Makefile
+++ b/audio/gstreamer-plugins-nas80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-nas80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GStreamer NAS (Network Audio System) plugin
 
 GST_PLUGIN=	nas
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ogg80/Makefile b/audio/gstreamer-plugins-ogg80/Makefile
index 743ac2781296..6dda5292e0cd 100644
--- a/audio/gstreamer-plugins-ogg80/Makefile
+++ b/audio/gstreamer-plugins-ogg80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-ogg80/Makefile,v 1.2 2006/02/23 18:05:33 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer Ogg bitstream plugin
 
 GST_PLUGIN=	ogg
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-polyp80/Makefile b/audio/gstreamer-plugins-polyp80/Makefile
index 5c61725e6c68..37f6121797f7 100644
--- a/audio/gstreamer-plugins-polyp80/Makefile
+++ b/audio/gstreamer-plugins-polyp80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-polyp80/Makefile,v 1.3 2006/04/22 03:46:50 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Gstreamer polypaudio sound server plugin
 
 GST_PLUGIN=	polyp
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout280/Makefile b/audio/gstreamer-plugins-shout280/Makefile
index 64f3f51162ed..48b78523be63 100644
--- a/audio/gstreamer-plugins-shout280/Makefile
+++ b/audio/gstreamer-plugins-shout280/Makefile
@@ -3,6 +3,7 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-shout280/Makefile,v 1.1 2006/01/20 02:55:54 ahze Exp $
 #
 
 CATEGORIES=	audio
@@ -12,6 +13,6 @@ COMMENT=	Gstreamer icecast plugin
 
 GST_PLUGIN=	shout2
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout80/Makefile b/audio/gstreamer-plugins-shout80/Makefile
index 8c9aa2f40190..61d77594fe64 100644
--- a/audio/gstreamer-plugins-shout80/Makefile
+++ b/audio/gstreamer-plugins-shout80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-shout80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer icecast plugin
 
 GST_PLUGIN=	shout
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sidplay80/Makefile b/audio/gstreamer-plugins-sidplay80/Makefile
index 0740d5f5332d..a94af677c190 100644
--- a/audio/gstreamer-plugins-sidplay80/Makefile
+++ b/audio/gstreamer-plugins-sidplay80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-sidplay80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer Commodore SID decoder plugin
 
 GST_PLUGIN=	sidplay
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-smoothwave80/Makefile b/audio/gstreamer-plugins-smoothwave80/Makefile
index baf393cfc4c7..ccee8240240a 100644
--- a/audio/gstreamer-plugins-smoothwave80/Makefile
+++ b/audio/gstreamer-plugins-smoothwave80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-smoothwave80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer visualisation plugin
 
 GST_PLUGIN=	smoothwave
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sndfile80/Makefile b/audio/gstreamer-plugins-sndfile80/Makefile
index e07dea1fbcea..4d74c32f6067 100644
--- a/audio/gstreamer-plugins-sndfile80/Makefile
+++ b/audio/gstreamer-plugins-sndfile80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-sndfile80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer sndfile plugin
 
 GST_PLUGIN=	sndfile
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-speex80/Makefile b/audio/gstreamer-plugins-speex80/Makefile
index e7a9302017ee..48a09089118e 100644
--- a/audio/gstreamer-plugins-speex80/Makefile
+++ b/audio/gstreamer-plugins-speex80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-speex80/Makefile,v 1.2 2006/02/23 18:05:34 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer speex voice plugin
 
 GST_PLUGIN=	speex
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-vorbis80/Makefile b/audio/gstreamer-plugins-vorbis80/Makefile
index c8589f8050cf..4e2752bb8298 100644
--- a/audio/gstreamer-plugins-vorbis80/Makefile
+++ b/audio/gstreamer-plugins-vorbis80/Makefile
@@ -3,15 +3,16 @@
 # Whom:				Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-vorbis80/Makefile,v 1.2 2006/02/23 18:05:35 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	Gstreamer vorbis encoder/decoder plugin
 
 GST_PLUGIN=	vorbis
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-wavpack80/Makefile b/audio/gstreamer-plugins-wavpack80/Makefile
index 2d41ba2ffa64..ede6ce26ec28 100644
--- a/audio/gstreamer-plugins-wavpack80/Makefile
+++ b/audio/gstreamer-plugins-wavpack80/Makefile
@@ -3,13 +3,14 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/audio/gstreamer-plugins-wavpack80/Makefile,v 1.2 2006/02/23 18:05:35 marcus Exp $
 #
 
 CATEGORIES=	audio
-PORTREVISION=	1
+PORTREVISION=	2
 
 GST_PLUGIN=	wavpack
 
-MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
 
 .include "${MASTERDIR}/Makefile"
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
index 3bba05bc33f3..cf3714c98175 100644
--- a/audio/jamboree/Makefile
+++ b/audio/jamboree/Makefile
@@ -20,13 +20,13 @@ LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libglade2
-USE_GSTREAMER=	vorbis mad gconf
-GNU_CONFIGURE=  yes
+USE_GSTREAMER80=	vorbis mad gconf
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+		GST_INSPECT="${X11BASE}/bin/gst-inspect-0.8"
 GCONF_SCHEMAS=	jamboree.schemas
-USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(@GCONF_SCHEMAS_INSTALL_TRUE@\)        |\1	|' \
diff --git a/audio/jamboree/distinfo b/audio/jamboree/distinfo
index 1157a6d88053..b0043bb13076 100644
--- a/audio/jamboree/distinfo
+++ b/audio/jamboree/distinfo
@@ -1,3 +1,2 @@
 MD5 (jamboree-0.5.tar.bz2) = 23a0b5e3eda5e73bf838af66ba4b3180
-SHA256 (jamboree-0.5.tar.bz2) = 09d0f302668f9e56ad5dcb47cd7de64b72a0c2eae20329be64bf3c7e3f45a4f0
 SIZE (jamboree-0.5.tar.bz2) = 430659
diff --git a/audio/jamboree/files/patch-src_Makefile.in b/audio/jamboree/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..d77847729c28
--- /dev/null
+++ b/audio/jamboree/files/patch-src_Makefile.in
@@ -0,0 +1,12 @@
+--- src/Makefile.in.orig	Tue Sep 28 05:07:49 2004
++++ src/Makefile.in	Sat Jan 28 01:02:06 2006
+@@ -279,8 +279,7 @@
+ target_alias = @target_alias@
+ INCLUDES = @JAMBOREE_CFLAGS@ \
+         -DDATADIR=\""$(datadir)"\" \
+-	-DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
+-	$(WARN_CFLAGS)
++	-DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $(WARN_CFLAGS)
+ 
+ @HAVE_DBUS_TRUE@dbus_sources = dbus.c dbus.h
+ jamboree_built_headers = jamboree-marshal.h
diff --git a/audio/klira/Makefile b/audio/klira/Makefile
index d781b36e998e..3020fa2785b5 100644
--- a/audio/klira/Makefile
+++ b/audio/klira/Makefile
@@ -19,9 +19,8 @@ DEPENDS=	${PORTSDIR}/misc/kdehier
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
-USE_GSTREAMER=	yes
+USE_GSTREAMER80=	yes
 USE_KDELIBS_VER=3
-USE_REINPLACE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
 
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
index 75136826a455..28441e7be43c 100644
--- a/audio/lindele/Makefile
+++ b/audio/lindele/Makefile
@@ -19,9 +19,8 @@ LIB_DEPENDS=		vorbis:${PORTSDIR}/audio/libvorbis \
 			tag:${PORTSDIR}/audio/taglib
 
 USE_X_PREFIX=		yes
-USE_REINPLACE=		yes
 USE_GNOME=		gnomehack gnomeprefix libgnomeui
-USE_GSTREAMER=		gconf
+USE_GSTREAMER80=		gconf
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/audio/lindele/distinfo b/audio/lindele/distinfo
index fc1da08c6d84..d066bd939936 100644
--- a/audio/lindele/distinfo
+++ b/audio/lindele/distinfo
@@ -1,3 +1,2 @@
 MD5 (lindele-0.1.1.tar.gz) = 6d5387fd607fe0516bcc3ddd84dc4a77
-SHA256 (lindele-0.1.1.tar.gz) = d0aaa1b3a5be06711c5bac5dda6669c3056b510e01ccc355659a3d931f8ec363
 SIZE (lindele-0.1.1.tar.gz) = 168572
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
index a7ae2048d170..bafd9cdcdcb1 100644
--- a/audio/marlin/Makefile
+++ b/audio/marlin/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	marlin
 PORTVERSION=	0.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,7 +20,7 @@ LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
-USE_GSTREAMER=	flac gconf mad vorbis
+USE_GSTREAMER80=	flac gconf mad vorbis
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index 410b311a8bc6..3d81fd0268a3 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.40 2005/10/28 08:03:53 jylefort Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.9.4.1
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
 		dbus-1.2:${PORTSDIR}/devel/dbus \
 		sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
@@ -31,7 +32,7 @@ USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
 WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--enable-nautilus-menu
+CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@@ -65,12 +66,12 @@ USE_GSTREAMER+=		faad
 .endif
 
 .if defined(WITH_DAAP)
-CONFIGURE_ARGS+=	--enable-daap  --with-mdns=howl
+CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		soup-2.2.8:${PORTSDIR}/devel/libsoup \
-			howl.0:${PORTSDIR}/net/howl
+			avahi-client:${PORTSDIR}/net/avahi
 .else
-.if exists(${LOCALBASE}/lib/libhowl.a)
-LIB_DEPENDS+=		howl.0:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a)
+LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi
 .endif
 CONFIGURE_ARGS+=	--disable-daap
 .endif
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 410b311a8bc6..3d81fd0268a3 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.40 2005/10/28 08:03:53 jylefort Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.54 2006/04/25 17:52:32 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
 PORTVERSION=	0.9.4.1
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
@@ -18,7 +19,7 @@ COMMENT=	Audio player for the Gnome 2 desktop environment
 
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer \
+		totem-plparser.2:${PORTSDIR}/multimedia/totem-gstreamer \
 		dbus-1.2:${PORTSDIR}/devel/dbus \
 		sexy.1:${PORTSDIR}/x11-toolkits/libsexy \
 		gnome-media-profiles.0:${PORTSDIR}/audio/gnomemedia2
@@ -31,7 +32,7 @@ USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
 WANT_GNOME=	yes
 USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--enable-nautilus-menu
+CONFIGURE_ARGS=	--enable-nautilus-menu --with-playback=gstreamer-0-10
 CONFIGURE_ENV=	LIBS="-lm" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include"
@@ -65,12 +66,12 @@ USE_GSTREAMER+=		faad
 .endif
 
 .if defined(WITH_DAAP)
-CONFIGURE_ARGS+=	--enable-daap  --with-mdns=howl
+CONFIGURE_ARGS+=	--enable-daap  --with-mdns=avahi
 LIB_DEPENDS+=		soup-2.2.8:${PORTSDIR}/devel/libsoup \
-			howl.0:${PORTSDIR}/net/howl
+			avahi-client:${PORTSDIR}/net/avahi
 .else
-.if exists(${LOCALBASE}/lib/libhowl.a)
-LIB_DEPENDS+=		howl.0:${PORTSDIR}/net/howl
+.if exists(${LOCALBASE}/lib/libavahi-client.a)
+LIB_DEPENDS+=		avahi-client:${PORTSDIR}/net/avahi
 .endif
 CONFIGURE_ARGS+=	--disable-daap
 .endif
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 7a584f313038..d2621c6e3e26 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@ahze.net>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/audio/tunesbrowser/Makefile,v 1.7 2006/04/29 10:51:51 pav Exp $
 
 PORTNAME=	tunesbrowser
 PORTVERSION=	0.3.0
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
 WANT_GNOME=	yes
-USE_GSTREAMER=	mad
+USE_GSTREAMER80=	mad
 GNU_CONFIGURE=	yes
 
 MAN1=		tunesbrowser.1
@@ -30,7 +30,7 @@ OPTIONS=	FAAD "Enable AAC/MP4 Audio output" Off
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_FAAD)
-USE_GSTREAMER+=	faad
+USE_GSTREAMER80+=	faad
 .endif
 
 .if ${HAVE_GNOME:Mlibgnome}!=""