- Move gstreamer 0.8 stuff to gstreamer*80 in preps of gstreamer 0.10

- Add USE_GSTREAMER80 to support old gstreamer
- Add a bunch of ports that use USE_GSTREAMER80

Some stuff repo-copied by:	marcus


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5446 df743ca5-7f9a-e211-a948-0013205c9059

75 files changed, 1291 insertions, 14 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index dfbf27d47..9acae4749 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.81 2006/01/17 01:03:47 ahze Exp $
 #
 
 PORTNAME=	gnomemedia2
@@ -27,7 +27,7 @@ USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		gail nautiluscdburner
-USE_GSTREAMER=	esound cdparanoia gconf
+USE_GSTREAMER80=	esound cdparanoia gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index dfbf27d47..9acae4749 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.79 2005/09/04 21:49:55 marcus Exp $
+#   $MCom: ports/audio/gnomemedia2/Makefile,v 1.81 2006/01/17 01:03:47 ahze Exp $
 #
 
 PORTNAME=	gnomemedia2
@@ -27,7 +27,7 @@ USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		gail nautiluscdburner
-USE_GSTREAMER=	esound cdparanoia gconf
+USE_GSTREAMER80=	esound cdparanoia gconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/audio/goobox/Makefile b/audio/goobox/Makefile
new file mode 100644
index 000000000..596e5e82d
--- /dev/null
+++ b/audio/goobox/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	guikachu
+# Date created:		11 Nov 2004
+# Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	goobox
+PORTVERSION=	0.9.93
+PORTREVISION=	1
+CATEGORIES=	audio gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	CD player and ripper for GNOME Desktop environment
+
+RUN_DEPENDS=	cddb-slave2-properties:${PORTSDIR}/audio/gnomemedia2
+
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libglade2 libbonobo \
+		gnomedocutils
+USE_GSTREAMER80=	cdparanoia gconf
+USE_AUTOTOOLS=	libtool:15
+INSTALLS_OMF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	goobox.schemas
+
+.include <bsd.port.mk>
diff --git a/audio/goobox/distinfo b/audio/goobox/distinfo
new file mode 100644
index 000000000..858faf3f6
--- /dev/null
+++ b/audio/goobox/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/goobox-0.9.93.tar.bz2) = d12dcf26907935ee4803107c572a5392
+SHA256 (gnome2/goobox-0.9.93.tar.bz2) = fffecbdccf6f1dfbd53d02a2daff882ce62970a563b48e8612957015f4d2939d
+SIZE (gnome2/goobox-0.9.93.tar.bz2) = 539913
diff --git a/audio/goobox/pkg-descr b/audio/goobox/pkg-descr
new file mode 100644
index 000000000..c263704fd
--- /dev/null
+++ b/audio/goobox/pkg-descr
@@ -0,0 +1,4 @@
+Goobox is a CD player and ripper for the GNOME Desktop environment,
+it uses gstreamer to play and rip CDs and cddb-slave2 (distributed
+with gnome-media) to get and edit CD metadata such as track titles
+and album name.
diff --git a/audio/goobox/pkg-plist b/audio/goobox/pkg-plist
new file mode 100644
index 000000000..258b86715
--- /dev/null
+++ b/audio/goobox/pkg-plist
@@ -0,0 +1,47 @@
+bin/goobox
+libdata/bonobo/servers/GNOME_Goobox.server
+share/gnome/application-registry/goobox.applications
+share/gnome/applications/goobox.desktop
+share/gnome/goobox/glade/goo_cover_chooser.glade
+share/gnome/goobox/glade/goobox.glade
+share/gnome/help/goobox/C/goobox.xml
+share/gnome/help/goobox/C/legal.xml
+share/gnome/omf/goobox/goobox-C.omf
+share/gnome/pixmaps/goobox.png
+share/locale/ar/LC_MESSAGES/goobox.mo
+share/locale/bg/LC_MESSAGES/goobox.mo
+share/locale/cs/LC_MESSAGES/goobox.mo
+share/locale/da/LC_MESSAGES/goobox.mo
+share/locale/de/LC_MESSAGES/goobox.mo
+share/locale/el/LC_MESSAGES/goobox.mo
+share/locale/en_CA/LC_MESSAGES/goobox.mo
+share/locale/en_GB/LC_MESSAGES/goobox.mo
+share/locale/es/LC_MESSAGES/goobox.mo
+share/locale/eu/LC_MESSAGES/goobox.mo
+share/locale/fi/LC_MESSAGES/goobox.mo
+share/locale/fr/LC_MESSAGES/goobox.mo
+share/locale/hu/LC_MESSAGES/goobox.mo
+share/locale/it/LC_MESSAGES/goobox.mo
+share/locale/ja/LC_MESSAGES/goobox.mo
+share/locale/ko/LC_MESSAGES/goobox.mo
+share/locale/lt/LC_MESSAGES/goobox.mo
+share/locale/nb/LC_MESSAGES/goobox.mo
+share/locale/ne/LC_MESSAGES/goobox.mo
+share/locale/nl/LC_MESSAGES/goobox.mo
+share/locale/no/LC_MESSAGES/goobox.mo
+share/locale/pa/LC_MESSAGES/goobox.mo
+share/locale/pl/LC_MESSAGES/goobox.mo
+share/locale/pt/LC_MESSAGES/goobox.mo
+share/locale/pt_BR/LC_MESSAGES/goobox.mo
+share/locale/ru/LC_MESSAGES/goobox.mo
+share/locale/rw/LC_MESSAGES/goobox.mo
+share/locale/sq/LC_MESSAGES/goobox.mo
+share/locale/sv/LC_MESSAGES/goobox.mo
+share/locale/zh_CN/LC_MESSAGES/goobox.mo
+share/locale/zh_TW/LC_MESSAGES/goobox.mo
+@unexec rmdir %D/share/locale/ar 2> /dev/null || true
+@dirrm share/gnome/omf/goobox
+@dirrm share/gnome/help/goobox/C
+@dirrm share/gnome/help/goobox
+@dirrm share/gnome/goobox/glade
+@dirrm share/gnome/goobox
diff --git a/audio/gstreamer-monkeysaudio/Makefile b/audio/gstreamer-monkeysaudio/Makefile
new file mode 100644
index 000000000..ca5c46c12
--- /dev/null
+++ b/audio/gstreamer-monkeysaudio/Makefile
@@ -0,0 +1,41 @@
+# New ports collection makefile for:	gstreamer monkeysaudio
+# Date created:		Thu May 13 14:04:31 CEST 2004
+# Whom:			Koop Mast <kwm@rainbow-runner.nl>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gstreamer
+PORTVERSION=	0.8.0
+PORTREVISION=	8
+CATEGORIES=	audio
+MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst${PKGNAMESUFFIX}/
+PKGNAMESUFFIX=	-monkeysaudio
+DISTNAME=	gst${PKGNAMESUFFIX}-${PORTVERSION}
+
+MAINTAINER=	kwm@FreeBSD.org
+COMMENT=	GStreamer plugin for monkeysaudio files
+
+USE_X_PREFIX=	yes
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	libtool:13:inc
+USE_GNOME=	lthack gnomehack gnomeprefix
+USE_GSTREAMER80=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+PLIST_SUB=	VERSION="${GST_VERSION}"
+
+GST_VERSION=${PORTVERSION:C/..$//}
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/GStreamer-monkeysaudio-permit \
+		${DOCSDIR}/GStreamer-monkeysaudio-permit
+.endif
+# register plugins
+	-@${X11BASE}/bin/gst-register-${GST_VERSION} \
+		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
+
+.include <bsd.port.mk>
diff --git a/audio/gstreamer-monkeysaudio/distinfo b/audio/gstreamer-monkeysaudio/distinfo
new file mode 100644
index 000000000..9b86060bb
--- /dev/null
+++ b/audio/gstreamer-monkeysaudio/distinfo
@@ -0,0 +1,2 @@
+MD5 (gst-monkeysaudio-0.8.0.tar.bz2) = cda60097072e9f48316a76ef2e4d9925
+SIZE (gst-monkeysaudio-0.8.0.tar.bz2) = 249562
diff --git a/audio/gstreamer-monkeysaudio/pkg-descr b/audio/gstreamer-monkeysaudio/pkg-descr
new file mode 100644
index 000000000..2d66aad41
--- /dev/null
+++ b/audio/gstreamer-monkeysaudio/pkg-descr
@@ -0,0 +1,3 @@
+Gstreamer plugins for playing monkeysaudio (.ape) files.
+
+WWW: http://gstreamer.freedesktop.org
diff --git a/audio/gstreamer-monkeysaudio/pkg-plist b/audio/gstreamer-monkeysaudio/pkg-plist
new file mode 100644
index 000000000..00437553d
--- /dev/null
+++ b/audio/gstreamer-monkeysaudio/pkg-plist
@@ -0,0 +1,5 @@
+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
+@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
new file mode 100644
index 000000000..c1f032736
--- /dev/null
+++ b/audio/gstreamer-plugins-a52dec80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-faac
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer ATSC A/52 stream aka AC-3 (dvd audio) plugin
+
+GST_PLUGIN=	a52dec
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-artsd80/Makefile b/audio/gstreamer-plugins-artsd80/Makefile
new file mode 100644
index 000000000..58b172139
--- /dev/null
+++ b/audio/gstreamer-plugins-artsd80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-artsd
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer kde audio system plugin
+
+GST_PLUGIN=	artsd
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-audiofile80/Makefile b/audio/gstreamer-plugins-audiofile80/Makefile
new file mode 100644
index 000000000..0573e8022
--- /dev/null
+++ b/audio/gstreamer-plugins-audiofile80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-audiofile
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer SGI audio file plugin
+
+GST_PLUGIN=	audiofile
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdaudio80/Makefile b/audio/gstreamer-plugins-cdaudio80/Makefile
new file mode 100644
index 000000000..32d9e41ce
--- /dev/null
+++ b/audio/gstreamer-plugins-cdaudio80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-cdaudio
+# Date created:			17 Dec 2004
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer audio cd playing plugin
+
+GST_PLUGIN=	cdaudio
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-cdparanoia80/Makefile b/audio/gstreamer-plugins-cdparanoia80/Makefile
new file mode 100644
index 000000000..d7190b884
--- /dev/null
+++ b/audio/gstreamer-plugins-cdparanoia80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-cdparanoia
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	2
+
+COMMENT=	Gstreamer CDDA extraction (aka audio ripping) plugin
+
+GST_PLUGIN=	cdparanoia
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-esound80/Makefile b/audio/gstreamer-plugins-esound80/Makefile
new file mode 100644
index 000000000..99947c8db
--- /dev/null
+++ b/audio/gstreamer-plugins-esound80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-esd
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer enlightenment sound library plugin
+
+GST_PLUGIN=	esound
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faac80/Makefile b/audio/gstreamer-plugins-faac80/Makefile
new file mode 100644
index 000000000..7ed5185b1
--- /dev/null
+++ b/audio/gstreamer-plugins-faac80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-faac
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer MPEG-2 and MPEG-4 AAC encoder plugin
+
+GST_PLUGIN=	faac
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-faad80/Makefile b/audio/gstreamer-plugins-faad80/Makefile
new file mode 100644
index 000000000..0259edcff
--- /dev/null
+++ b/audio/gstreamer-plugins-faad80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-faad
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer MPEG-2 and MPEG-4 ACC decoder plugin
+
+GST_PLUGIN=	faad
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-flac80/Makefile b/audio/gstreamer-plugins-flac80/Makefile
new file mode 100644
index 000000000..3ff06973e
--- /dev/null
+++ b/audio/gstreamer-plugins-flac80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-flac
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer free lossless audio encoder/decoder plugin
+
+GST_PLUGIN=	flac
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-gsm80/Makefile b/audio/gstreamer-plugins-gsm80/Makefile
new file mode 100644
index 000000000..401d9b437
--- /dev/null
+++ b/audio/gstreamer-plugins-gsm80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-gsm
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer gsm encoding/decoding plugin
+
+GST_PLUGIN=	gsm
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ivorbis80/Makefile b/audio/gstreamer-plugins-ivorbis80/Makefile
new file mode 100644
index 000000000..61ff0816a
--- /dev/null
+++ b/audio/gstreamer-plugins-ivorbis80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-ivorbis
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer integer only Ogg Vorbis decoder plugin
+
+GST_PLUGIN=	ivorbis
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-jack80/Makefile b/audio/gstreamer-plugins-jack80/Makefile
new file mode 100644
index 000000000..34fa31b74
--- /dev/null
+++ b/audio/gstreamer-plugins-jack80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-jack
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer low-latency audio server plugin
+
+GST_PLUGIN=	jack
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ladspa80/Makefile b/audio/gstreamer-plugins-ladspa80/Makefile
new file mode 100644
index 000000000..a3f1c5939
--- /dev/null
+++ b/audio/gstreamer-plugins-ladspa80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-ladspa
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer ladspa (Linux Audio Developer's Simple Plugin API) plugin
+
+GST_PLUGIN=	ladspa
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-lame80/Makefile b/audio/gstreamer-plugins-lame80/Makefile
new file mode 100644
index 000000000..aeb7f23d6
--- /dev/null
+++ b/audio/gstreamer-plugins-lame80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-lame
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer mp3 encode plugin
+
+GST_PLUGIN=	lame
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mad80/Makefile b/audio/gstreamer-plugins-mad80/Makefile
new file mode 100644
index 000000000..188e452a6
--- /dev/null
+++ b/audio/gstreamer-plugins-mad80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-mad
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	2
+
+COMMENT=	Gstreamer mp3 decoder plugin
+
+GST_PLUGIN=	mad
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-mikmod80/Makefile b/audio/gstreamer-plugins-mikmod80/Makefile
new file mode 100644
index 000000000..dc2514e65
--- /dev/null
+++ b/audio/gstreamer-plugins-mikmod80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-mikmod
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer mikmod sound plugin
+
+GST_PLUGIN=	mikmod
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musepack80/Makefile b/audio/gstreamer-plugins-musepack80/Makefile
new file mode 100644
index 000000000..31a054cff
--- /dev/null
+++ b/audio/gstreamer-plugins-musepack80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-musepack
+# Date created:			4 Dec 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	2
+
+COMMENT=	Gstreamer musepack mpc encoder/decoder plugin
+
+GST_PLUGIN=	musepack
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-musicbrainz80/Makefile b/audio/gstreamer-plugins-musicbrainz80/Makefile
new file mode 100644
index 000000000..8cb3684a6
--- /dev/null
+++ b/audio/gstreamer-plugins-musicbrainz80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-musicbrainz
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer CD index/audio metadata plugin
+
+GST_PLUGIN=	musicbrainz
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-nas80/Makefile b/audio/gstreamer-plugins-nas80/Makefile
new file mode 100644
index 000000000..af61f61b4
--- /dev/null
+++ b/audio/gstreamer-plugins-nas80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-nas
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	GStreamer NAS (Network Audio System) plugin
+
+GST_PLUGIN=	nas
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-ogg80/Makefile b/audio/gstreamer-plugins-ogg80/Makefile
new file mode 100644
index 000000000..7649041f4
--- /dev/null
+++ b/audio/gstreamer-plugins-ogg80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-ogg
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer Ogg bitstream plugin
+
+GST_PLUGIN=	ogg
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-polyp80/Makefile b/audio/gstreamer-plugins-polyp80/Makefile
new file mode 100644
index 000000000..29ee1389f
--- /dev/null
+++ b/audio/gstreamer-plugins-polyp80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-polypaudio
+# Date created:			8 Dec 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer polypaudio sound server plugin
+
+GST_PLUGIN=	polypaudio
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-polypaudio80/Makefile b/audio/gstreamer-plugins-polypaudio80/Makefile
new file mode 100644
index 000000000..29ee1389f
--- /dev/null
+++ b/audio/gstreamer-plugins-polypaudio80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-polypaudio
+# Date created:			8 Dec 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer polypaudio sound server plugin
+
+GST_PLUGIN=	polypaudio
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout280/Makefile b/audio/gstreamer-plugins-shout280/Makefile
new file mode 100644
index 000000000..1a3572986
--- /dev/null
+++ b/audio/gstreamer-plugins-shout280/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-shout2
+# Date created:			16 Mar 2005
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	2
+
+COMMENT=	Gstreamer icecast plugin
+
+GST_PLUGIN=	shout2
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-shout80/Makefile b/audio/gstreamer-plugins-shout80/Makefile
new file mode 100644
index 000000000..2e61d462f
--- /dev/null
+++ b/audio/gstreamer-plugins-shout80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-shout
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer icecast plugin
+
+GST_PLUGIN=	shout
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sidplay80/Makefile b/audio/gstreamer-plugins-sidplay80/Makefile
new file mode 100644
index 000000000..3519ea65d
--- /dev/null
+++ b/audio/gstreamer-plugins-sidplay80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-sidplay
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer Commodore SID decoder plugin
+
+GST_PLUGIN=	sidplay
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-smoothwave80/Makefile b/audio/gstreamer-plugins-smoothwave80/Makefile
new file mode 100644
index 000000000..40cbe71be
--- /dev/null
+++ b/audio/gstreamer-plugins-smoothwave80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-smoothwave
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer visualisation plugin
+
+GST_PLUGIN=	smoothwave
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-sndfile80/Makefile b/audio/gstreamer-plugins-sndfile80/Makefile
new file mode 100644
index 000000000..dda4b31e9
--- /dev/null
+++ b/audio/gstreamer-plugins-sndfile80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-sndfile
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer sndfile plugin
+
+GST_PLUGIN=	sndfile
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-speex80/Makefile b/audio/gstreamer-plugins-speex80/Makefile
new file mode 100644
index 000000000..4f0ca7926
--- /dev/null
+++ b/audio/gstreamer-plugins-speex80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-speex
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer speex voice plugin
+
+GST_PLUGIN=	speex
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-vorbis80/Makefile b/audio/gstreamer-plugins-vorbis80/Makefile
new file mode 100644
index 000000000..2074e8626
--- /dev/null
+++ b/audio/gstreamer-plugins-vorbis80/Makefile
@@ -0,0 +1,18 @@
+# New ports collection makefile for:	gstreamer-plugins-vorbis
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+COMMENT=	Gstreamer vorbis encoder/decoder plugin
+
+GST_PLUGIN=	vorbis
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/gstreamer-plugins-wavpack80/Makefile b/audio/gstreamer-plugins-wavpack80/Makefile
new file mode 100644
index 000000000..d4b90bc05
--- /dev/null
+++ b/audio/gstreamer-plugins-wavpack80/Makefile
@@ -0,0 +1,16 @@
+# New ports collection makefile for:	gstreamer-plugins-wavpack
+# Date created:			5 July 2005
+# Whom:				Koop Mast <kwm@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom$
+#
+
+CATEGORIES=	audio
+PORTREVISION=	1
+
+GST_PLUGIN=	wavpack
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins80
+
+.include "${MASTERDIR}/Makefile"
diff --git a/audio/jamboree/Makefile b/audio/jamboree/Makefile
new file mode 100644
index 000000000..4f32300df
--- /dev/null
+++ b/audio/jamboree/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	jamboree
+# Date created:			08 Oct 2003
+# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	jamboree
+PORTVERSION=	0.5
+PORTREVISION=	5
+CATEGORIES=	audio gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
+
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT=	A simple GNOME music player
+
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libglade2
+USE_GSTREAMER80=	vorbis mad gconf
+USE_AUTOTOOLS=	libtool:15
+USE_GMAKE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+GCONF_SCHEMAS=	jamboree.schemas
+USE_REINPLACE=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|^\(@GCONF_SCHEMAS_INSTALL_TRUE@\)        |\1	|' \
+		${WRKSRC}/Makefile.in
+
+.include <bsd.port.mk>
diff --git a/audio/jamboree/distinfo b/audio/jamboree/distinfo
new file mode 100644
index 000000000..b0043bb13
--- /dev/null
+++ b/audio/jamboree/distinfo
@@ -0,0 +1,2 @@
+MD5 (jamboree-0.5.tar.bz2) = 23a0b5e3eda5e73bf838af66ba4b3180
+SIZE (jamboree-0.5.tar.bz2) = 430659
diff --git a/audio/jamboree/pkg-descr b/audio/jamboree/pkg-descr
new file mode 100644
index 000000000..14f7493e2
--- /dev/null
+++ b/audio/jamboree/pkg-descr
@@ -0,0 +1,6 @@
+Jamboree is a simple GStreamer based music player for the GNOME
+desktop.
+
+WWW: http://www.imendio.com/projects/jamboree/
+
+- Jean-Yves Lefort <jylefort@FreeBSD.org>
diff --git a/audio/jamboree/pkg-plist b/audio/jamboree/pkg-plist
new file mode 100644
index 000000000..3c3f01bcf
--- /dev/null
+++ b/audio/jamboree/pkg-plist
@@ -0,0 +1,40 @@
+bin/jamboree
+share/gnome/applications/jamboree.desktop
+share/gnome/jamboree/jamboree-next.png
+share/gnome/jamboree/jamboree-note.png
+share/gnome/jamboree/jamboree-pause.png
+share/gnome/jamboree/jamboree-play.png
+share/gnome/jamboree/jamboree-playlist-library.png
+share/gnome/jamboree/jamboree-playlist-regular.png
+share/gnome/jamboree/jamboree-playlist-smart.png
+share/gnome/jamboree/jamboree-prev.png
+share/gnome/jamboree/jamboree-random.png
+share/gnome/jamboree/jamboree-small-blank.png
+share/gnome/jamboree/jamboree-small-pause.png
+share/gnome/jamboree/jamboree-stop.png
+share/gnome/jamboree/jamboree-volume-max.png
+share/gnome/jamboree/jamboree-volume-medium.png
+share/gnome/jamboree/jamboree-volume-min.png
+share/gnome/jamboree/jamboree-volume-zero.png
+share/gnome/jamboree/jamboree.glade
+share/gnome/jamboree/smart-playlist-dialog.glade
+share/gnome/jamboree/song-properties.glade
+share/gnome/pixmaps/jamboree.png
+share/locale/az/LC_MESSAGES/jamboree.mo
+share/locale/ca/LC_MESSAGES/jamboree.mo
+share/locale/cs/LC_MESSAGES/jamboree.mo
+share/locale/de/LC_MESSAGES/jamboree.mo
+share/locale/en_CA/LC_MESSAGES/jamboree.mo
+share/locale/en_GB/LC_MESSAGES/jamboree.mo
+share/locale/es/LC_MESSAGES/jamboree.mo
+share/locale/fi/LC_MESSAGES/jamboree.mo
+share/locale/fr/LC_MESSAGES/jamboree.mo
+share/locale/hr/LC_MESSAGES/jamboree.mo
+share/locale/nl/LC_MESSAGES/jamboree.mo
+share/locale/no/LC_MESSAGES/jamboree.mo
+share/locale/pt/LC_MESSAGES/jamboree.mo
+share/locale/pt_BR/LC_MESSAGES/jamboree.mo
+share/locale/sr/LC_MESSAGES/jamboree.mo
+share/locale/sr@Latn/LC_MESSAGES/jamboree.mo
+share/locale/sv/LC_MESSAGES/jamboree.mo
+@dirrm share/gnome/jamboree
diff --git a/audio/klira/Makefile b/audio/klira/Makefile
new file mode 100644
index 000000000..4b27da536
--- /dev/null
+++ b/audio/klira/Makefile
@@ -0,0 +1,37 @@
+# New ports collection makefile for:	Klira
+# Date created:		Wed Dec 15 16:05:43 UTC 2004
+# Whom:                 Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	klira
+PORTVERSION=	0.1
+PORTREVISION=	3
+CATEGORIES=	audio kde
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	lioux@FreeBSD.org
+COMMENT=	A gstreamer based audio converter for KDE
+
+DEPENDS=	${PORTSDIR}/misc/kdehier
+LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
+
+USE_BZIP2=	yes
+USE_GSTREAMER80=	yes
+USE_KDELIBS_VER=3
+USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+
+EXTRA_PATCHES= ${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
+#EXTRA_PATCHES=  ${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
+
+post-patch:
+# disable GNU auto* tools
+	@${FIND} ${WRKSRC} -type f -name "Makefile.in" | ${XARGS} \
+		-n 10 ${REINPLACE_CMD} -E \
+		-e 's!^(ACLOCAL|AUTOCONF|AUTOMAKE|AUTOHEADER).+$$!\1=${TRUE}!'
+
+.include <bsd.port.mk>
diff --git a/audio/klira/distinfo b/audio/klira/distinfo
new file mode 100644
index 000000000..3a878dddb
--- /dev/null
+++ b/audio/klira/distinfo
@@ -0,0 +1,3 @@
+MD5 (klira-0.1.tar.bz2) = c5b38080b7593ea4cc38d32e75698f10
+SHA256 (klira-0.1.tar.bz2) = 25563c0c90f158372206efd0afa22946805699061685d426db3edd5d8e1936a5
+SIZE (klira-0.1.tar.bz2) = 416878
diff --git a/audio/klira/pkg-descr b/audio/klira/pkg-descr
new file mode 100644
index 000000000..388acb64b
--- /dev/null
+++ b/audio/klira/pkg-descr
@@ -0,0 +1,12 @@
+[ excerpt from developer's web site ]
+
+This app is an audio converter for KDE. It lets you convert to and
+from various audio file formats (at the moment: mp3, Ogg and wav),
+mantaining, when possible, all the informations attached to those
+files (title, author and so on). Its interface is thought as a
+wizard (a serie of pages navigable through back-forward buttons),
+so it should be quite simple to use, or so I hope.
+
+WWW: http://klira.sourceforge.net/
+
+-- lioux@FreeBSD.org
diff --git a/audio/klira/pkg-plist b/audio/klira/pkg-plist
new file mode 100644
index 000000000..aab2e7593
--- /dev/null
+++ b/audio/klira/pkg-plist
@@ -0,0 +1,24 @@
+bin/klira
+share/applnk/Utilities/klira.desktop
+share/apps/klira/kliraui.rc
+share/doc/HTML/en/klira/common
+share/doc/HTML/en/klira/index.cache.bz2
+share/doc/HTML/en/klira/index.docbook
+share/icons/hicolor/16x16/apps/klira.png
+share/icons/hicolor/32x32/apps/klira.png
+share/icons/hicolor/64x64/apps/klira.png
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@dirrm share/doc/HTML/en/klira
+@unexec rmdir %D/share/doc/HTML/en 2>/dev/null || true
+@unexec rmdir %D/share/doc/HTML 2>/dev/null || true
+@dirrm share/apps/klira
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applnk/Utilities 2>/dev/null || true
+@unexec rmdir %D/share/applnk 2>/dev/null || true
diff --git a/audio/lindele/Makefile b/audio/lindele/Makefile
new file mode 100644
index 000000000..c273e0d03
--- /dev/null
+++ b/audio/lindele/Makefile
@@ -0,0 +1,36 @@
+# New ports collection makefile for:	lindele
+# Date created:			26 Jul 2004
+# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
+#
+# $FreeBSD$
+#
+
+PORTNAME=		lindele
+PORTVERSION=		0.1.1
+PORTREVISION=		4
+CATEGORIES=		audio
+MASTER_SITES=		http://download.gna.org/${PORTNAME}/
+
+MAINTAINER=		jylefort@FreeBSD.org
+COMMENT=		Yet another simple GNOME music player
+
+RUN_DEPENDS=		musicbox-tag-editor:${PORTSDIR}/audio/musicbox-tag-editor
+LIB_DEPENDS=		vorbis:${PORTSDIR}/audio/libvorbis \
+			tag:${PORTSDIR}/audio/taglib
+
+USE_X_PREFIX=		yes
+USE_REINPLACE=		yes
+USE_GNOME=		gnomehack gnomeprefix libgnomeui
+USE_GSTREAMER80=		gconf
+GNU_CONFIGURE=		yes
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|musicbox|musicbox-tag-editor|g' \
+		${WRKSRC}/src/gui.c \
+		${WRKSRC}/src/lindele.c
+	@${REINPLACE_CMD} -e 's|@prefix@/share|@datadir@|' \
+		${WRKSRC}/data/lindele.glade.in
+
+.include <bsd.port.mk>
diff --git a/audio/lindele/distinfo b/audio/lindele/distinfo
new file mode 100644
index 000000000..d066bd939
--- /dev/null
+++ b/audio/lindele/distinfo
@@ -0,0 +1,2 @@
+MD5 (lindele-0.1.1.tar.gz) = 6d5387fd607fe0516bcc3ddd84dc4a77
+SIZE (lindele-0.1.1.tar.gz) = 168572
diff --git a/audio/lindele/files/patch-src::gui.c b/audio/lindele/files/patch-src::gui.c
new file mode 100644
index 000000000..794d1f856
--- /dev/null
+++ b/audio/lindele/files/patch-src::gui.c
@@ -0,0 +1,10 @@
+--- src/gui.c.orig	Tue Jan 18 02:32:02 2005
++++ src/gui.c	Tue Jan 18 02:32:04 2005
+@@ -303,7 +303,6 @@
+ 
+ gboolean on_tree_popup_menu (GtkWidget *widget)
+ {
+-    g_printf("got popup-menu signal\n");
+     popup_context_menu(widget,NULL);
+     return TRUE;
+ }
diff --git a/audio/lindele/files/patch-src::lindele.c b/audio/lindele/files/patch-src::lindele.c
new file mode 100644
index 000000000..032bb4f77
--- /dev/null
+++ b/audio/lindele/files/patch-src::lindele.c
@@ -0,0 +1,19 @@
+--- src/lindele.c.orig	Tue Jan 18 02:30:18 2005
++++ src/lindele.c	Tue Jan 18 02:30:28 2005
+@@ -82,6 +82,7 @@
+     const gchar *documenters[] = {NULL};
+     const gchar *translator_credits = NULL;
+     GdkPixbuf *logo_pixbuf = gdk_pixbuf_new_from_file(LINDELE_PNG,NULL);
++    gchar *gladepath;
+     
+     object->mmkeys = mmkeys_new();
+     object->player = init_player();
+@@ -90,7 +91,7 @@
+     object->random = FALSE;
+     object->repeat = FALSE;
+ 
+-    gchar* gladepath = g_strconcat(DATADIR,"/lindele/lindele.glade",NULL);
++    gladepath = g_strconcat(DATADIR,"/lindele/lindele.glade",NULL);
+ 	//gchar* gladepath = g_strconcat("/home/link/Hacking/lindele/lindele-head/data/lindele.glade",NULL);
+ 	
+ 	object->xml = glade_xml_new (gladepath, NULL, NULL);
diff --git a/audio/lindele/files/patch-src::main.c b/audio/lindele/files/patch-src::main.c
new file mode 100644
index 000000000..4410b1ec8
--- /dev/null
+++ b/audio/lindele/files/patch-src::main.c
@@ -0,0 +1,20 @@
+--- src/main.c.orig	Tue Jan 18 02:24:29 2005
++++ src/main.c	Tue Jan 18 02:24:53 2005
+@@ -21,6 +21,8 @@
+ int
+ main (int argc, char *argv[])
+ {
++    Lindele *lindele;
++
+     gst_init(&argc, &argv);
+     glade_init();
+     gnome_program_init ("lindele", VERSION,
+@@ -28,7 +30,7 @@
+ 		    argc, argv,
+ 		    GNOME_PARAM_APP_DATADIR, DATADIR, NULL);
+     
+-    Lindele *lindele = lindele_new();
++    lindele = lindele_new();
+     
+     gtk_main();
+     
diff --git a/audio/lindele/files/patch-src::playlist.c b/audio/lindele/files/patch-src::playlist.c
new file mode 100644
index 000000000..99cc8d200
--- /dev/null
+++ b/audio/lindele/files/patch-src::playlist.c
@@ -0,0 +1,10 @@
+--- src/playlist.c.orig	Tue Jan 18 02:25:55 2005
++++ src/playlist.c	Tue Jan 18 02:25:57 2005
+@@ -458,7 +458,6 @@
+ void
+ popup_context_menu(GtkWidget *widget, GdkEventButton *event)
+ {
+-    g_printf("entry into popup_context_menu\n");
+     GtkWidget *menu,*menuitem;
+     int button, event_time;
+     
diff --git a/audio/lindele/pkg-descr b/audio/lindele/pkg-descr
new file mode 100644
index 000000000..f7dbc0e3d
--- /dev/null
+++ b/audio/lindele/pkg-descr
@@ -0,0 +1,7 @@
+Lindele is a simple music player for the GNOME Desktop. It has basic
+playlist support, random, repeat, searching, sorting, and a
+notification area icon. It can edit ID3, Vorbis and FLAC tags via
+MusicBox.
+
+- Jean-Yves Lefort
+jylefort@FreeBSD.org
diff --git a/audio/lindele/pkg-plist b/audio/lindele/pkg-plist
new file mode 100644
index 000000000..2ca7e7d0d
--- /dev/null
+++ b/audio/lindele/pkg-plist
@@ -0,0 +1,12 @@
+bin/lindele
+share/gnome/applications/lindele.desktop
+share/gnome/lindele/lindele.glade
+share/gnome/lindele/load.png
+share/gnome/lindele/next.png
+share/gnome/lindele/pause.png
+share/gnome/lindele/play.png
+share/gnome/lindele/playing.png
+share/gnome/lindele/prev.png
+share/gnome/lindele/stop.png
+share/gnome/pixmaps/lindele.png
+@dirrm share/gnome/lindele
diff --git a/audio/marlin/Makefile b/audio/marlin/Makefile
new file mode 100644
index 000000000..b9a498979
--- /dev/null
+++ b/audio/marlin/Makefile
@@ -0,0 +1,35 @@
+# New ports collection makefile for:	marlin
+# Date created:				16 Nov 2003
+# Whom:					Pav Lucistnik <pav@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME=	marlin
+PORTVERSION=	0.9
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	pav@FreeBSD.org
+COMMENT=	Sample editor for GNOME 2 using Gstreamer backend
+
+LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
+		uuid.1:${PORTSDIR}/sysutils/e2fsprogs
+
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack gnometarget intlhack libgnomeui nautiluscdburner
+USE_GSTREAMER80=	flac gconf mad vorbis
+INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lcam"
+
+GCONF_SCHEMAS=	marlin.schemas
+
+.if !defined(PACKAGE_BUILDING) || defined(WITH_LAME)
+USE_GSTREAMER+=	lame
+.endif
+
+.include <bsd.port.mk>
diff --git a/audio/marlin/distinfo b/audio/marlin/distinfo
new file mode 100644
index 000000000..e95e5a051
--- /dev/null
+++ b/audio/marlin/distinfo
@@ -0,0 +1,3 @@
+MD5 (marlin-0.9.tar.gz) = 2b6e43f3e5cc19d677025b04376d332b
+SHA256 (marlin-0.9.tar.gz) = f7198cd69d18979b49bb736cd9e0344d0da063313a4304ab5b8c66564f1bd3e3
+SIZE (marlin-0.9.tar.gz) = 1145273
diff --git a/audio/marlin/files/patch-marlin-marlin-channel.h b/audio/marlin/files/patch-marlin-marlin-channel.h
new file mode 100644
index 000000000..a099f3cd3
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-channel.h
@@ -0,0 +1,10 @@
+--- marlin/marlin-channel.h.orig	Sat Oct 11 01:02:22 2003
++++ marlin/marlin-channel.h	Sun Nov 16 23:53:22 2003
+@@ -22,6 +22,7 @@
+ #ifndef __MARLIN_CHANNEL_H__
+ #define __MARLIN_CHANNEL_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #include <marlin/marlin-types.h>
diff --git a/audio/marlin/files/patch-marlin-marlin-sample-view.c b/audio/marlin/files/patch-marlin-marlin-sample-view.c
new file mode 100644
index 000000000..1b593f512
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-sample-view.c
@@ -0,0 +1,12 @@
+--- marlin/marlin-sample-view.c.orig	Tue Jul 12 17:57:56 2005
++++ marlin/marlin-sample-view.c	Wed Jul 13 17:51:32 2005
+@@ -179,6 +179,9 @@
+ static void scroll_to (MarlinSampleView *view,
+ 		       int x);
+ 
++void marlin_sample_view_vzoom_in (MarlinSampleView *view);
++void marlin_sample_view_vzoom_out (MarlinSampleView *view);
++
+ /* Stuff to register the coverage enum */
+ #define MARLIN_TYPE_COVERAGE (coverage_get_type ())
+ static GType
diff --git a/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
new file mode 100644
index 000000000..3d8ff6e7f
--- /dev/null
+++ b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- src/libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ src/libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/audio/marlin/files/patch-src-marlin-window.c b/audio/marlin/files/patch-src-marlin-window.c
new file mode 100644
index 000000000..81b37e3c5
--- /dev/null
+++ b/audio/marlin/files/patch-src-marlin-window.c
@@ -0,0 +1,10 @@
+--- src/marlin-window.c.orig	Wed Jul 13 13:06:02 2005
++++ src/marlin-window.c	Wed Jul 13 17:50:41 2005
+@@ -213,6 +213,7 @@
+ void marlin_window_set_edit_name (MarlinWindow *window);
+ void marlin_window_pause_sample (MarlinWindow *window);
+ void marlin_window_save_sample_as (MarlinWindow *window);
++void marlin_window_repeat_sample (MarlinWindow *window);
+ 
+ static GtkWindowClass *parent_class = NULL;
+ static guint signals[LAST_SIGNAL];
diff --git a/audio/marlin/files/patch-src_marlin-cdda-record.c b/audio/marlin/files/patch-src_marlin-cdda-record.c
new file mode 100644
index 000000000..2420b3909
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-cdda-record.c
@@ -0,0 +1,11 @@
+--- src/marlin-cdda-record.c.orig	Mon Nov 17 12:45:49 2003
++++ src/marlin-cdda-record.c	Mon Nov 17 12:46:17 2003
+@@ -506,7 +506,7 @@
+ 		if (res) {
+ 			if (i > 0) {
+ 				char *start_str, *finish_str, *length_str;
+-				gint64 length = time - time_count;;
++				gint64 length = time - time_count;
+ 				char *full;
+ 				
+ 				cdda->track_starts[i] = time;
diff --git a/audio/marlin/files/patch-src_marlin-window-menu.c b/audio/marlin/files/patch-src_marlin-window-menu.c
new file mode 100644
index 000000000..47139a1d8
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -0,0 +1,12 @@
+--- src/marlin-window-menu.c.orig	Thu Aug  5 12:47:19 2004
++++ src/marlin-window-menu.c	Wed Aug 11 22:06:41 2004
+@@ -634,8 +634,8 @@
+ 	GtkWidget *editor, *dialog;
+ 	EphyToolbarsModel *model;
+ 	Toolbar *toolbar;
+-	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 	char *xml;
++	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 
+ 	toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));
+ 	model = marlin_get_toolbars_model ();
diff --git a/audio/marlin/pkg-descr b/audio/marlin/pkg-descr
new file mode 100644
index 000000000..a9542529e
--- /dev/null
+++ b/audio/marlin/pkg-descr
@@ -0,0 +1,5 @@
+Marlin is a audio sample editor for GNOME 2. It uses Gstreamer as a backend
+to provide support for numerous file formats. Marlin can also record
+from microphone or rip audio from CD.
+
+WWW: http://marlin.sourceforge.net/
diff --git a/audio/marlin/pkg-plist b/audio/marlin/pkg-plist
new file mode 100644
index 000000000..a569d878d
--- /dev/null
+++ b/audio/marlin/pkg-plist
@@ -0,0 +1,114 @@
+bin/marlin
+include/libmarlin/marlin-a11y-helper.h
+include/libmarlin/marlin-block.h
+include/libmarlin/marlin-cross-fader.h
+include/libmarlin/marlin-cursors.h
+include/libmarlin/marlin-file.h
+include/libmarlin/marlin-file-chooser.h
+include/libmarlin/marlin-file-utils.h
+include/libmarlin/marlin-gst-extras.h
+include/libmarlin/marlin-channel.h
+include/libmarlin/marlin-level-ruler.h
+include/libmarlin/marlin-load-pipeline.h
+include/libmarlin/marlin-marker-model.h
+include/libmarlin/marlin-marker-view.h
+include/libmarlin/marlin-msgport.h
+include/libmarlin/marlin-mt.h
+include/libmarlin/marlin-object.h
+include/libmarlin/marlin-operation.h
+include/libmarlin/marlin-overview-bar.h
+include/libmarlin/marlin-pipeline.h
+include/libmarlin/marlin-play-pipeline.h
+include/libmarlin/marlin-position-spinner.h
+include/libmarlin/marlin-program.h
+include/libmarlin/marlin-read-write-lock.h
+include/libmarlin/marlin-record-pipeline.h
+include/libmarlin/marlin-sample.h
+include/libmarlin/marlin-sample-drawing.h
+include/libmarlin/marlin-sample-element.h
+include/libmarlin/marlin-sample-selection.h
+include/libmarlin/marlin-sample-view.h
+include/libmarlin/marlin-save-pipeline.h
+include/libmarlin/marlin-stock.h
+include/libmarlin/marlin-time-line.h
+include/libmarlin/marlin-types.h
+include/libmarlin/marlin-undo-manager.h
+include/libmarlin/marlin-undoable.h
+include/libmarlin/marlin-utils.h
+include/libmarlin/marlin-x-utils.h
+lib/libmarlinx.a
+lib/libmarlinx.so
+lib/libmarlinx.so.0
+lib/libmarlin.a
+lib/libmarlin.so
+lib/libmarlin.so.0
+share/gnome/applications/marlin.desktop
+share/gnome/help/marlin/C/figures/marlin-main-window.png
+share/gnome/help/marlin/C/figures/new_sample_dialog.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_cancel.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_create.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_help.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_channels.png
+share/gnome/help/marlin/C/figures/new_sample_dialog_rate.png
+share/gnome/help/marlin/C/legal.xml
+share/gnome/help/marlin/C/marlin.xml
+share/gnome/marlin/ui/marlin.xml
+share/gnome/marlin/ui/toolbars.xml
+share/gnome/marlin/ui/toolbar-popup-ui.xml
+share/gnome/omf/marlin/marlin-C.omf
+share/gnome/pixmaps/marlin/hand-open.png
+share/gnome/pixmaps/marlin/marlin-cdda-extract.png
+share/gnome/pixmaps/marlin/marlin-ffwd.png
+share/gnome/pixmaps/marlin/marlin-icon.png
+share/gnome/pixmaps/marlin/marlin-logo.png
+share/gnome/pixmaps/marlin/marlin-new-sample.png
+share/gnome/pixmaps/marlin/marlin-next.png
+share/gnome/pixmaps/marlin/marlin-paste-as-new.png
+share/gnome/pixmaps/marlin/marlin-pause.png
+share/gnome/pixmaps/marlin/marlin-play.png
+share/gnome/pixmaps/marlin/marlin-previous.png
+share/gnome/pixmaps/marlin/marlin-record.png
+share/gnome/pixmaps/marlin/marlin-repeat.png
+share/gnome/pixmaps/marlin/marlin-rewind.png
+share/gnome/pixmaps/marlin/marlin-selection-grow.png
+share/gnome/pixmaps/marlin/marlin-selection-shrink.png
+share/gnome/pixmaps/marlin/marlin-select-all.png
+share/gnome/pixmaps/marlin/marlin-select-none.png
+share/gnome/pixmaps/marlin/marlin-sound-properties.png
+share/gnome/pixmaps/marlin/marlin-stop.png
+share/gnome/pixmaps/marlin/marlin-zoom-in-h.png
+share/gnome/pixmaps/marlin/marlin-zoom-in-v.png
+share/gnome/pixmaps/marlin/marlin-zoom-out-h.png
+share/gnome/pixmaps/marlin/marlin-zoom-out-v.png
+share/locale/ca/LC_MESSAGES/marlin.mo
+share/locale/cs/LC_MESSAGES/marlin.mo
+share/locale/de/LC_MESSAGES/marlin.mo
+share/locale/el/LC_MESSAGES/marlin.mo
+share/locale/en_CA/LC_MESSAGES/marlin.mo
+share/locale/en_GB/LC_MESSAGES/marlin.mo
+share/locale/es/LC_MESSAGES/marlin.mo
+share/locale/fr/LC_MESSAGES/marlin.mo
+share/locale/ga/LC_MESSAGES/marlin.mo
+share/locale/hr/LC_MESSAGES/marlin.mo
+share/locale/it/LC_MESSAGES/marlin.mo
+share/locale/ko/LC_MESSAGES/marlin.mo
+share/locale/nb/LC_MESSAGES/marlin.mo
+share/locale/nl/LC_MESSAGES/marlin.mo
+share/locale/no/LC_MESSAGES/marlin.mo
+share/locale/pa/LC_MESSAGES/marlin.mo
+share/locale/pt/LC_MESSAGES/marlin.mo
+share/locale/pt_BR/LC_MESSAGES/marlin.mo
+share/locale/rw/LC_MESSAGES/marlin.mo
+share/locale/sr/LC_MESSAGES/marlin.mo
+share/locale/sr@Latn/LC_MESSAGES/marlin.mo
+share/locale/sv/LC_MESSAGES/marlin.mo
+share/locale/tr/LC_MESSAGES/marlin.mo
+share/locale/zh_CN/LC_MESSAGES/marlin.mo
+@dirrm share/gnome/pixmaps/marlin
+@dirrm share/gnome/omf/marlin
+@dirrm share/gnome/marlin/ui
+@dirrm share/gnome/marlin
+@dirrm share/gnome/help/marlin/C/figures
+@dirrm share/gnome/help/marlin/C
+@dirrm share/gnome/help/marlin
+@dirrm include/libmarlin
diff --git a/audio/rhythmbox-devel/Makefile b/audio/rhythmbox-devel/Makefile
index d7fc8db60..e27079397 100644
--- a/audio/rhythmbox-devel/Makefile
+++ b/audio/rhythmbox-devel/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.42 2005/12/05 00:42:42 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.43 2005/12/31 18:53:04 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
@@ -27,7 +27,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
-USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
+USE_GSTREAMER80=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-nautilus-menu
 CONFIGURE_ENV=	LIBS="-lm" \
@@ -55,13 +55,13 @@ WITH_VORBIS=	yes
 .endif
 
 .ifdef (WITH_VORBIS)
-USE_GSTREAMER+=		vorbis
+USE_GSTREAMER80+=		vorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 .endif
 
 .if defined(WITH_FAAD)
-USE_GSTREAMER+=		faad
+USE_GSTREAMER80+=		faad
 .endif
 
 .if defined(WITH_DAAP)
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index d7fc8db60..e27079397 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.42 2005/12/05 00:42:42 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.43 2005/12/31 18:53:04 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
@@ -27,7 +27,7 @@ USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner
-USE_GSTREAMER=	flac mad gnomevfs gconf jpeg
+USE_GSTREAMER80=	flac mad gnomevfs gconf jpeg
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-nautilus-menu
 CONFIGURE_ENV=	LIBS="-lm" \
@@ -55,13 +55,13 @@ WITH_VORBIS=	yes
 .endif
 
 .ifdef (WITH_VORBIS)
-USE_GSTREAMER+=		vorbis
+USE_GSTREAMER80+=		vorbis
 .else
 CONFIGURE_ARGS+=	--disable-vorbis --disable-vorbistest
 .endif
 
 .if defined(WITH_FAAD)
-USE_GSTREAMER+=		faad
+USE_GSTREAMER80+=		faad
 .endif
 
 .if defined(WITH_DAAP)
diff --git a/audio/sound-juicer/Makefile b/audio/sound-juicer/Makefile
index 4ac57f794..58a9a6306 100644
--- a/audio/sound-juicer/Makefile
+++ b/audio/sound-juicer/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Alexander Nedotsukov <bland@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/sound-juicer/Makefile,v 1.33 2005/11/19 17:21:30 marcus Exp $
+#   $MCom: ports/audio/sound-juicer/Makefile,v 1.34 2006/01/16 18:04:49 ahze Exp $
 #
 
 PORTNAME=	sound-juicer
@@ -27,7 +27,7 @@ INSTALLS_OMF=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui nautiluscdburner \
 		gnomedocutils
-USE_GSTREAMER=	cdparanoia vorbis flac gconf
+USE_GSTREAMER80=	cdparanoia vorbis flac gconf
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-ignore-missing-cd
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
new file mode 100644
index 000000000..f4fcda913
--- /dev/null
+++ b/audio/tunesbrowser/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:	tunesbrowser
+# Date created:		2004-07-27
+# Whom:			Michael Johnson <ahze@ahze.net>
+#
+# $FreeBSD$
+#    $MCom$
+
+PORTNAME=	tunesbrowser
+PORTVERSION=	0.3.0
+PORTREVISION=	2
+CATEGORIES=	audio
+MASTER_SITES=	http://craz.net/programs/itunes/files/
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Simple iTunes-like music player
+
+LIB_DEPENDS=	opendaap.0:${PORTSDIR}/devel/libopendaap
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_GNOME=	gnomehack gnomeprefix gnometarget libglade2
+WANT_GNOME=	yes
+USE_GSTREAMER80=	mad
+GNU_CONFIGURE=	yes
+
+MAN1=		tunesbrowser.1
+
+OPTIONS=	FAAD "Enable AAC/MP4 Audio output" Off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_FAAD)
+USE_GSTREAMER80+=	faad
+.endif
+
+.if ${HAVE_GNOME:Mlibgnome}!=""
+PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	libgnome
+.else
+CONFIGURE_ARGS+=	--disable-gnome
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/tunesbrowser/distinfo b/audio/tunesbrowser/distinfo
new file mode 100644
index 000000000..7de0b68f8
--- /dev/null
+++ b/audio/tunesbrowser/distinfo
@@ -0,0 +1,3 @@
+MD5 (tunesbrowser-0.3.0.tar.bz2) = dacfc3f7209c3165be9a9211dfb7bf0e
+SHA256 (tunesbrowser-0.3.0.tar.bz2) = 73f2f01f86f90618fee6756e0f039da2fecc3cc929f665e900c449e7d126dbb6
+SIZE (tunesbrowser-0.3.0.tar.bz2) = 222593
diff --git a/audio/tunesbrowser/files/patch-Makefile.in b/audio/tunesbrowser/files/patch-Makefile.in
new file mode 100644
index 000000000..229c61c3e
--- /dev/null
+++ b/audio/tunesbrowser/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	Mon May 16 14:48:28 2005
++++ Makefile.in	Mon May 16 19:39:09 2005
+@@ -144,7 +144,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = debug
+-uidir = $(datadir)
++uidir = $(pkgdatadir)
+ bin_PROGRAMS = tunesbrowser
+ tunesbrowser_SOURCES = albumlist.c artistlist.c audioplayer.c \
+                        daap.c main.c misc_ui.c songlist.c sourcelist.c \
+@@ -158,7 +158,7 @@
+ man_MANS = tunesbrowser.1
+ 
+ INCLUDES = -I$(srcdir) -I$(srcdir)/debug
+-AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(datadir)
++AM_CFLAGS = $(TB_CFLAGS) -W -Wall -DUIDIR=$(pkgdatadir)
+ 
+ ui_DATA = tunesbrowser.glade \
+           comp.blue.png comp.red.png \
diff --git a/audio/tunesbrowser/files/patch-misc_ui.c b/audio/tunesbrowser/files/patch-misc_ui.c
new file mode 100644
index 000000000..897db5181
--- /dev/null
+++ b/audio/tunesbrowser/files/patch-misc_ui.c
@@ -0,0 +1,12 @@
+--- misc_ui.c.orig	Wed Jul 28 06:41:58 2004
++++ misc_ui.c	Wed Jul 28 06:43:37 2004
+@@ -139,8 +139,8 @@
+     if (seconds >= 0)
+     {
+         int minutes = seconds / 60;
++        char bufstr[11];
+         seconds -= minutes * 60;
+-        char bufstr[11] = {0};
+ 
+         snprintf(bufstr, 10, "%i:%02i",
+                  minutes, seconds);
diff --git a/audio/tunesbrowser/pkg-descr b/audio/tunesbrowser/pkg-descr
new file mode 100644
index 000000000..2391dc443
--- /dev/null
+++ b/audio/tunesbrowser/pkg-descr
@@ -0,0 +1,8 @@
+TunesBrowser is a simple music player, capable of playing music found on
+iTunes(R) shares.  Its features are:
+
+  - Play MP3's off other computers running iTunes
+  - Discovery of hosts over Rendezvous
+  - Interface is quite similar to that of iTunes
+
+WWW:	http://craz.net/programs/itunes/tunesbrowser.html
diff --git a/audio/tunesbrowser/pkg-plist b/audio/tunesbrowser/pkg-plist
new file mode 100644
index 000000000..3cad123d0
--- /dev/null
+++ b/audio/tunesbrowser/pkg-plist
@@ -0,0 +1,9 @@
+bin/tunesbrowser
+share/gnome/tunesbrowser/comp.blue.png
+share/gnome/tunesbrowser/comp.red.png
+share/gnome/tunesbrowser/sound1.png
+share/gnome/tunesbrowser/sound2.png
+share/gnome/tunesbrowser/soundfile.png
+share/gnome/tunesbrowser/tips.txt
+share/gnome/tunesbrowser/tunesbrowser.glade
+@dirrm share/gnome/tunesbrowser