- split multimedia/gstreamer-plugins in to individual ports per

gstreamer plugin (52 new ports). - Chase changes to ports that used USE_GNOME=gstreamerplugisn to use new USE_GSTREAMER= macro, Bump PORTREVISION's -- Examples of new USE_GSTREAMER macro: USE_GSTREAMER= dvd lame flac .include <bsd.port.mk> If you want to use USE_GSTREAMER after <bsd.port.pre.mk> you must follow one of the examples listed below WANT_GSTREAMER= yes .include <bsd.port.pre.mk> .if defined(WITH_VORBIS) USE_GSTREAMER+= vorbis .endif or USE_GSTREAMER= yes .include <bsd.port.pre.mk> .if defined(WITH_FAAD) USE_GSTREAMER+= faad .endif Note: USE_GSTREAMER=yes will always add a dependency to ports/multimedia/gstreamer-plugins -- Thanks to krion for runing this on pointyhat Thanks to kwm for helping with this, and many bug fixes , and updates.
author: Michael Johnson <ahze@FreeBSD.org> 2005-02-28 22:16:10 +0000
committer: Michael Johnson <ahze@FreeBSD.org> 2005-02-28 22:16:10 +0000
commit: daf4cc81e4d055f630943b557402293b79680953 (patch)
tree: 8478681967016f816092cb7e0ded4578aa26bd4e /multimedia
parent: Fix compilation on i386-4. (diff)
48 files changed, 1544 insertions, 2465 deletions
diff --git a/multimedia/Makefile b/multimedia/Makefile
index f1d73d19ced9..6928a36645ff 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -38,6 +38,18 @@
     SUBDIR += gstreamer-editor
     SUBDIR += gstreamer-ffmpeg
     SUBDIR += gstreamer-plugins
+    SUBDIR += gstreamer-plugins-core
+    SUBDIR += gstreamer-plugins-dirac
+    SUBDIR += gstreamer-plugins-dts
+    SUBDIR += gstreamer-plugins-dv
+    SUBDIR += gstreamer-plugins-dvd
+    SUBDIR += gstreamer-plugins-libfame
+    SUBDIR += gstreamer-plugins-mpeg2dec
+    SUBDIR += gstreamer-plugins-mpeg2enc
+    SUBDIR += gstreamer-plugins-mplex
+    SUBDIR += gstreamer-plugins-theora
+    SUBDIR += gstreamer-plugins-xine
+    SUBDIR += gstreamer-plugins-xvid
     SUBDIR += gsubedit
     SUBDIR += gtksubtitler
     SUBDIR += gxanim
diff --git a/multimedia/cupid/Makefile b/multimedia/cupid/Makefile
index 46a7082b17fd..1f06c9207848 100644
--- a/multimedia/cupid/Makefile
+++ b/multimedia/cupid/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cupid
 PORTVERSION=	0.0.1
+PORTREVISION=	1
 CATEGORIES=	multimedia audio gnome
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-recorder/
 DIST_SUBDIR=    gnome2
@@ -14,13 +15,13 @@ DIST_SUBDIR=    gnome2
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GNOME Gstreamer based video/audio capture solution
 
+USE_GSTREAMER=	core
 USE_GNOME=	\
 		gnomehack \
 		gnomehier \
 		gnomeprefix \
 		gconf2 \
 		gnomevfs2 \
-		gstreamerplugins \
 		gtk20 \
 		intlhack \
 		intltool \
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
new file mode 100644
index 000000000000..c02906679221
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	gstreamer-plugins-core
+# Date created:		2004-11-15
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gstreamer-plugins-core
+PORTVERSION=	0.8
+PORTREVISION=	1
+CATEGORIES=	multimedia audio
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Core set of typical audio and video gstreamer-plugins
+
+USE_X_PREFIX=	yes
+NO_BUILD=	yes
+
+GST_DIR=	lib/gstreamer-${PORTVERSION}
+PLIST_FILES=	${GST_DIR}/.gstreamer-plugins-core.keep
+
+# Audio plugins
+USE_GSTREAMER+=	a52dec mad vorbis
+
+# Graphics plugins
+USE_GSTREAMER+=	libpng
+
+# Multimedia plugins
+USE_GSTREAMER+=	ffmpeg dts dvd xvid
+
+do-install:
+	if [ ! -d ${PREFIX}/${GST_DIR} ]; then \
+		${MKDIR} ${PREFIX}/${GST_DIR} ; \
+	fi
+	${TOUCH} -f ${PREFIX}/${GST_DIR}/.gstreamer-plugins-core.keep
+
+.include <bsd.port.mk>
diff --git a/multimedia/gstreamer-plugins-core/pkg-descr b/multimedia/gstreamer-plugins-core/pkg-descr
new file mode 100644
index 000000000000..90895a218dc8
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core/pkg-descr
@@ -0,0 +1,3 @@
+Meta-port to core "typical" gstreamer-plugins
+
+WWW:	http://gstreamer.net
diff --git a/multimedia/gstreamer-plugins-core80/Makefile b/multimedia/gstreamer-plugins-core80/Makefile
new file mode 100644
index 000000000000..c02906679221
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core80/Makefile
@@ -0,0 +1,40 @@
+# New ports collection makefile for:	gstreamer-plugins-core
+# Date created:		2004-11-15
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gstreamer-plugins-core
+PORTVERSION=	0.8
+PORTREVISION=	1
+CATEGORIES=	multimedia audio
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Core set of typical audio and video gstreamer-plugins
+
+USE_X_PREFIX=	yes
+NO_BUILD=	yes
+
+GST_DIR=	lib/gstreamer-${PORTVERSION}
+PLIST_FILES=	${GST_DIR}/.gstreamer-plugins-core.keep
+
+# Audio plugins
+USE_GSTREAMER+=	a52dec mad vorbis
+
+# Graphics plugins
+USE_GSTREAMER+=	libpng
+
+# Multimedia plugins
+USE_GSTREAMER+=	ffmpeg dts dvd xvid
+
+do-install:
+	if [ ! -d ${PREFIX}/${GST_DIR} ]; then \
+		${MKDIR} ${PREFIX}/${GST_DIR} ; \
+	fi
+	${TOUCH} -f ${PREFIX}/${GST_DIR}/.gstreamer-plugins-core.keep
+
+.include <bsd.port.mk>
diff --git a/multimedia/gstreamer-plugins-core80/pkg-descr b/multimedia/gstreamer-plugins-core80/pkg-descr
new file mode 100644
index 000000000000..90895a218dc8
--- /dev/null
+++ b/multimedia/gstreamer-plugins-core80/pkg-descr
@@ -0,0 +1,3 @@
+Meta-port to core "typical" gstreamer-plugins
+
+WWW:	http://gstreamer.net
diff --git a/multimedia/gstreamer-plugins-dirac/Makefile b/multimedia/gstreamer-plugins-dirac/Makefile
new file mode 100644
index 000000000000..f2ce5086eb95
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dirac/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-dirac
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	dirac
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dirac80/Makefile b/multimedia/gstreamer-plugins-dirac80/Makefile
new file mode 100644
index 000000000000..f2ce5086eb95
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dirac80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-dirac
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	dirac
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile
new file mode 100644
index 000000000000..cdd5fc83962a
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dts/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-dts
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	dts
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile
new file mode 100644
index 000000000000..db7efb12ea3f
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dv/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-dv
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	dv
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dv80/Makefile b/multimedia/gstreamer-plugins-dv80/Makefile
new file mode 100644
index 000000000000..db7efb12ea3f
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dv80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-dv
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	dv
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
new file mode 100644
index 000000000000..d1840f02841c
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	gstreamer-plugins-dvd
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	2
+
+GST_PLUGIN=	dvd
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dvd80/Makefile b/multimedia/gstreamer-plugins-dvd80/Makefile
new file mode 100644
index 000000000000..d1840f02841c
--- /dev/null
+++ b/multimedia/gstreamer-plugins-dvd80/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	gstreamer-plugins-dvd
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	2
+
+GST_PLUGIN=	dvd
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-libfame/Makefile b/multimedia/gstreamer-plugins-libfame/Makefile
new file mode 100644
index 000000000000..6a3fbd386aa8
--- /dev/null
+++ b/multimedia/gstreamer-plugins-libfame/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-libfame
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	libfame
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-libfame80/Makefile b/multimedia/gstreamer-plugins-libfame80/Makefile
new file mode 100644
index 000000000000..6a3fbd386aa8
--- /dev/null
+++ b/multimedia/gstreamer-plugins-libfame80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-libfame
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	libfame
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2dec/Makefile b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
new file mode 100644
index 000000000000..44c0659e1ce2
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mpeg2dec
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mpeg2dec
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2dec80/Makefile b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
new file mode 100644
index 000000000000..44c0659e1ce2
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mpeg2dec80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mpeg2dec
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mpeg2dec
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
new file mode 100644
index 000000000000..5da0a2fb7389
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mpeg2enc
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mpeg2enc
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2enc80/Makefile b/multimedia/gstreamer-plugins-mpeg2enc80/Makefile
new file mode 100644
index 000000000000..5da0a2fb7389
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mpeg2enc80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mpeg2enc
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mpeg2enc
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mplex/Makefile b/multimedia/gstreamer-plugins-mplex/Makefile
new file mode 100644
index 000000000000..03f3d0b70a16
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mplex/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mplex
+# Date created:			7 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mplex
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mplex80/Makefile b/multimedia/gstreamer-plugins-mplex80/Makefile
new file mode 100644
index 000000000000..03f3d0b70a16
--- /dev/null
+++ b/multimedia/gstreamer-plugins-mplex80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-mplex
+# Date created:			7 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	mplex
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile
new file mode 100644
index 000000000000..19fc354caa50
--- /dev/null
+++ b/multimedia/gstreamer-plugins-theora/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	gstreamer-plugins-theora
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	2
+
+GST_PLUGIN=	theora
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-theora80/Makefile b/multimedia/gstreamer-plugins-theora80/Makefile
new file mode 100644
index 000000000000..19fc354caa50
--- /dev/null
+++ b/multimedia/gstreamer-plugins-theora80/Makefile
@@ -0,0 +1,14 @@
+# New ports collection makefile for:	gstreamer-plugins-theora
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTREVISION=	2
+
+GST_PLUGIN=	theora
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-xine/Makefile b/multimedia/gstreamer-plugins-xine/Makefile
new file mode 100644
index 000000000000..6588ebe23e56
--- /dev/null
+++ b/multimedia/gstreamer-plugins-xine/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-xine
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	xine
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-xvid/Makefile b/multimedia/gstreamer-plugins-xvid/Makefile
new file mode 100644
index 000000000000..bdea9fbf1940
--- /dev/null
+++ b/multimedia/gstreamer-plugins-xvid/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-xvid
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	xvid
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-xvid80/Makefile b/multimedia/gstreamer-plugins-xvid80/Makefile
new file mode 100644
index 000000000000..bdea9fbf1940
--- /dev/null
+++ b/multimedia/gstreamer-plugins-xvid80/Makefile
@@ -0,0 +1,12 @@
+# New ports collection makefile for:	gstreamer-plugins-xvid
+# Date created:			3 Oct 2004
+# Whom:				Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+GST_PLUGIN=	xvid
+
+MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 5dbd2ac8f694..72c1c1c517f6 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -7,80 +7,52 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.7
-PORTREVISION=	1
-CATEGORIES=	multimedia audio
-MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins/ \
-		${MASTER_SITE_GNOME}
+PORTREVISION?=	1
+CATEGORIES?=	multimedia audio
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://gstreamer.freedesktop.org/src/gst-plugins/
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.8
-PKGNAMESUFFIX=	-plugins
+PKGNAMESUFFIX=	-plugins${GST_PLUGIN_SUFFIX}
 DISTNAME=	gst-plugins-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	GStreamer written collection of plugins handling several media types
+COMMENT?=	GStreamer written collection of plugins handling several media types
 
-LIB_DEPENDS=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
+SHLIB_VERSION=	1
+VERSION=	0.8
+
+WANT_GSTREAMER=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack \
-		gnomehier \
+USE_GNOME+=	gnomehack \
 		gnomeprefix \
 		pkgconfig \
 		gconf2
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
-GCONF_SCHEMAS=	gstreamer-${GST_VERSION}.schemas
-CONFIGURE_ARGS=	--disable-tests \
-		--disable-alsa \
-		--enable-cdrom \
-		--disable-divx \
-		--disable-dxr3 \
-		--disable-http \
-		--disable-qcam \
-		--disable-raw1394 \
-		--disable-v4l2 \
-		--disable-v4l \
-		--disable-osx_audio \
-		--disable-sunaudio \
-		--disable-dependency-tracking \
-		--enable-xshm \
-		--enable-x \
-		--enable-xvideo \
-		--enable-static
-
-# list of plugins that need some work in one way or the other to work
-# probable the lib needs to be ported, disable them for now.
-CONFIGURE_ARGS+=\
-		--disable-tarkin \
-		--disable-lcs \
-		--disable-shout2 \
-		--disable-dirac \
-		--disable-librfb
+GST_PLUGIN?=	base
 
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
-CONFIGURE_TARGET=
-PLIST_SUB=	\
-		VERSION="${GST_VERSION}" \
-		SHLIB_VERSION="${SHLIB_VERSION}"
-INSTALLS_SHLIB=	yes
+		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}"
+
+.include <bsd.port.pre.mk>
 
-# for various GNOME-related component detection
-WANT_GNOME=	yes
+.if ${GST_PLUGIN} == "base"
+GCONF_SCHEMAS=	gstreamer-0.8.schemas
 
-MAN1=	gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1
+INSTALLS_SHLIB=	yes
 
-PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
-GST_VERSION=${PORTVERSION:C/..$//}
+PLIST_SUB=	VERSION="${VERSION}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 
-# library minor number
-SHLIB_VERSION=	1
+MAN1=		gst-launch-ext-0.8.1 gst-visualise-0.8.1
 
 ## Additional directories which should be both built and installed
 ## but configure neglected to correctly identify them
@@ -88,385 +60,6 @@ SHLIB_VERSION=	1
 EXTRA_BUILD_DIR+=	sys/vcd
 # modplug
 EXTRA_BUILD_DIR+=	gst/modplug
-
-post-extract:
-# for cdrom/vcd support
-# taken from mplayer distfile
-# MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
-	@${CP} ${FILESDIR}/bsdi_dvd.h ${WRKSRC}/sys/vcd/
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
-# Fix gst-register when using -O -march=athlon-xp
-	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
-		${WRKSRC}/gst/modplug/Makefile.in \
-		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
-.endif
-# as of this writing, FreeBSD does not support lrint* C99 math functions
-	@${REINPLACE_CMD} -E -e \
-		's|^#define.*LRINT.*$$||' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# respect CFLAGS
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
-		's,-O(2|3),,; \
-		s|-mcpu=i486||'
-# mcopidl takes the file as the last argument
-	@${REINPLACE_CMD} -E -e \
-		's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
-		${WRKSRC}/ext/arts/Makefile.in
-# malloc.h was deprecated in favor of stdlib.h
-# inttypes.h not stdint.h
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|; \
-		s|stdint\.h|inttypes.h|'
-# force libaudiofile detection
-	@${REINPLACE_CMD} -E -e \
-		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# cdrom default device
-	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/ext/cdparanoia/gstcdparanoia.c \
-		${WRKSRC}/sys/cdrom/gstcdplayer.c \
-		${WRKSRC}/sys/vcd/vcdsrc.c
-# dvd default device
-	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
-		${WRKSRC}/ext/dvdnav/dvdnavsrc.c \
-		${WRKSRC}/ext/dvdread/dvdreadsrc.c
-# cdrom/vcd support
-	@${REINPLACE_CMD} -e 's|<linux/cdrom.h>|"bsdi_dvd.h"|' \
-		${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
-		${WRKSRC}/sys/vcd/vcdsrc.c \
-		${WRKSRC}/sys/vcd/vcdsrc.h
-
-# hermes is required for gstreamer-player to work
-# since it is currently the only colorspace plugin available
-# XXX However, it currently does not work on sparc64.
-.if ${ARCH} != "sparc64"
-WITH_HERMES=	yes
-.endif
-# gnomevfs is required for gstreamer-player to work
-WITH_GNOMEVFS=	yes
-# Add default MAD support.  This is required for rhythmbox to work.
-WITH_MAD=	yes
-
-##
-## auto detect possible plugins
-##
-
-# aalib
-.if exists(${LOCALBASE}/lib/libaa.a)
-WITH_AALIB=yes
-.endif
-
-# arts
-.if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS)
-WITH_ARTS=yes
-.endif
-
-# cairo
-.if exists(${LOCALBASE}/lib/libcairo.a)
-WITH_CAIRO=yes
-.endif
-
-# cdparanoia
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=yes
-.endif
-
-# dts
-.if exists(${LOCALBASE}/lib/libdts_pic.a)
-WITH_DTS=yes
-.endif
-
-# faac
-.if exists(${LOCALBASE}/lib/libfaac.a)
-WITH_FAAC=yes
-.endif
-
-# esound
-.if (${HAVE_GNOME:Mesound}!="")
-WITH_ESOUND=yes
-.endif
-
-# faad
-.if exists(${LOCALBASE}/lib/libfaad.a)
-WITH_FAAD=yes
-.endif
-
-# flac
-.if exists(${LOCALBASE}/lib/libFLAC.a)
-WITH_FLAC=yes
-.endif
-
-# freetype
-.if exists(${LOCALBASE}/lib/libfreetype.a)
-WITH_FREETYPE=yes
-.endif
-
-# gdkpixbuf
-.if ${HAVE_GNOME:Mgtk20}!=""
-WITH_GDKPIXBUF=yes
-.endif
-
-# lame
-.if exists(${LOCALBASE}/lib/libmp3lame.a)
-WITH_LAME=yes
-.endif
-
-# gnomevfs
-.if ${HAVE_GNOME:Mgnomevfs2}!=""
-WITH_GNOMEVFS=yes
-.endif
-
-# jack
-.if exists(${LOCALBASE}/lib/libjack.so.0)
-WITH_JACK=YES
-.endif
-
-# libcaca
-.if exists(${LOCALBASE}/lib/libcaca.a)
-WITH_LIBCACA=yes
-.endif
-
-# libmng
-.if exists(${LOCALBASE}/lib/libmng.a)
-WITH_MNG=yes
-.endif
-
-# libmms
-.if exists(${LOCALBASE}/lib/libmms.a)
-WITH_MMS=yes
-.endif
-
-# gsm
-.if exists(${LOCALBASE}/lib/libgsm.a)
-WITH_GSM=yes
-.endif
-
-# Hermes
-.if exists (${LOCALBASE}/lib/libHermes.a)
-WITH_HERMES=yes
-.endif
-
-# jpeg
-.if exists(${LOCALBASE}/lib/libjpeg.a)
-WITH_JPEG=yes
-.endif
-
-# ladspa
-.if exists(${LOCALBASE}/include/ladspa.h)
-WITH_LADSPA=yes
-.endif
-
-# liba52
-.if exists(${LOCALBASE}/lib/liba52.a)
-WITH_LIBA52=yes
-.endif
-
-# libaudiofile
-.if exists(${LOCALBASE}/lib/libaudiofile.a)
-WITH_LIBAUDIOFILE=yes
-.endif
-
-# libcdaudio
-.if exists(${LOCALBASE}/lib/libcdaudio.a)
-WITH_LIBCDAUDIO=yes
-.endif
-
-# libdv
-.if exists(${LOCALBASE}/lib/libdv.a)
-WITH_LIBDV=yes
-.endif
-
-# libdvdnav
-.if exists(${LOCALBASE}/lib/libdvdnav.so)
-WITH_LIBDVDNAV=yes
-.endif
-
-# libdvdread
-.if exists(${LOCALBASE}/lib/libdvdread.a)
-WITH_LIBDVDREAD=yes
-.endif
-
-# libfame
-.if exists(${LOCALBASE}/lib/libfame.a)
-WITH_LIBFAME=yes
-.endif
-
-# libmikmod
-.if exists(${LOCALBASE}/lib/libmikmod.a)
-WITH_LIBMIKMOD=yes
-.endif
-
-# libmpeg2
-.if exists(${LOCALBASE}/lib/libmpeg2.a)
-WITH_LIBMPEG2=yes
-.endif
-
-# libmusicbrainz
-.if exists(${LOCALBASE}/lib/libmusicbrainz.a)
-WITH_LIBMUSICBRAINZ=yes
-.endif
-
-# libshout
-.if exists(${LOCALBASE}/lib/libshout.so.2)
-WITH_LIBSHOUT=yes
-.endif
-
-# libsidplay
-.if exists(${LOCALBASE}/lib/libsidplay.a)
-WITH_LIBSIDPLAY=yes
-.endif
-
-# libsndfile
-.if exists(${LOCALBASE}/lib/libsndfile.a)
-WITH_LIBSNDFILE=yes
-.endif
-
-# libtheora
-.if exists(${LOCALBASE}/lib/libtheora.a)
-WITH_LIBTHEORA=yes
-.endif
-
-# libvisual
-.if exists(${LOCALBASE}/lib/libvisual.a)
-WITH_LIBVISUAL=yes
-.endif
-
-# mad
-.if exists(${LOCALBASE}/lib/libmad.a)
-WITH_MAD=yes
-.endif
-
-# mjpegtools
-.if exists(${LOCALBASE}/lib/libmjpegutils.a)
-WITH_MJPEGTOOLS=yes
-.endif
-
-# musepack
-.if exists(${LOCALBASE}/lib/libmusepack.a)
-WITH_MUSEPACK=yes
-.endif
-
-# nas
-.if exists(${X11BASE}/lib/libaudio.a)
-WITH_NAS=YES
-.endif
-
-# ogg
-.if exists(${LOCALBASE}/lib/libogg.a)
-WITH_OGG=yes
-.endif
-
-# pango
-.if exists(${X11BASE}/lib/libpangoft2-1.0.a)
-WITH_PANGO=yes
-.endif
-
-# png
-.if exists(${LOCALBASE}/lib/libpng.a)
-WITH_PNG=yes
-.endif
-
-# polypaudio
-.if exists(${LOCALBASE}/lib/libpolyp-0.7.a)
-WITH_POLYPAUDIO=yes
-.endif
-
-# sdl
-.if exists(${LOCALBASE}/lib/libSDL-1.1.a)
-WITH_SDL=yes
-.endif
-
-# smoothwave
-.if exists(${X11BASE}/lib/libgtk-x11-2.0.a)
-WITH_SMOOTHWAVE=yes
-.endif
-
-# speex
-.if exists(${LOCALBASE}/lib/libspeex.a)
-WITH_SPEEX=yes
-.endif
-
-# swfdec
-.if exists(${X11BASE}/lib/libswfdec-0.3.a)
-WITH_SWFDEC=yes
-.endif
-
-# vorbis
-.if exists(${LOCALBASE}/lib/libvorbis.a)
-WITH_VORBIS=yes
-.endif
-
-# vorbisidec
-.if exists(${LOCALBASE}/lib/libvorbisidec.a)
-WITH_VORBISIDEC=yes
-.endif
-
-# xine
-# this plugins is meant to support plugins that gstreamer doesn't have (yet)
-.if exists(${X11BASE}/lib/libxine.so.12)
-WITH_XINE=yes
-.endif
-
-# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
-WITH_XVID=yes
-.endif
-
-##
-## control CONFIGURE options
-##
-
-# aalib
-.ifndef(WITH_AALIB)
-CONFIGURE_ARGS+=	--disable-aalib \
-			--disable-aalibtest
-PLIST_SUB+=	AALIB="@comment "
-.else
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-
-CONFIGURE_ARGS+=	--with-aalib-prefix=${LOCALBASE}  \
-			--with-aalib-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	AALIB=""
-.endif
-
-# arts
-.ifndef(WITH_ARTS)
-CONFIGURE_ARGS+=	--disable-arts \
-			--disable-artsc \
-			--disable-artstest
-PLIST_SUB+=	ARTS="@comment "
-.else
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-
-CONFIGURE_ARGS+=	--with-arts-prefix=${LOCALBASE} \
-			--with-arts-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	ARTS=""
-.endif
-
-# cairo
-.ifndef(WITH_CAIRO)
-CONFIGURE_ARGS+=	--disable-cairo
-PLIST_SUB+=	CAIRO="@comment "
-.else
-LIB_DEPENDS+=	cairo.1:${PORTSDIR}/graphics/cairo
-
-PLIST_SUB+=	CAIRO=""
-.endif
-
-# cdparanoia
-.ifndef(WITH_CDPARANOIA)
-CONFIGURE_ARGS+=	--disable-cdparanoia
-PLIST_SUB+=	CDPARANOIA="@comment "
-.else
-LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-
-PLIST_SUB+=	CDPARANOIA=""
 .endif
 
 # cdrom default device
@@ -480,16 +73,6 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 . endif
 .endif
 
-# dts
-.ifndef(WITH_DTS)
-CONFIGURE_ARGS+=	--disable-dts
-PLIST_SUB+=	DTS="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-RUN_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-PLIST_SUB+=	DTS=""
-.endif
-
 # dvd default device
 .ifdef(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
@@ -501,497 +84,46 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 . endif
 .endif
 
-# esound
-.ifndef(WITH_ESOUND)
-CONFIGURE_ARGS+=	--disable-esd \
-			--disable-esdtest
-PLIST_SUB+=	ESOUND="@comment "
-.else
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
-			--with-esd-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	ESOUND=""
-.endif
-
-# faac
-.ifndef(WITH_FAAC)
-CONFIGURE_ARGS+=	--disable-faac
-PLIST_SUB+=	FAAC="@comment "
-.else
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-PLIST_SUB+=	FAAC=""
-.endif
-
-# faad
-.ifndef(WITH_FAAD)
-CONFIGURE_ARGS+=	--disable-faad
-PLIST_SUB+=	FAAD="@comment "
-.else
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-PLIST_SUB+=	FAAD=""
-.endif
-
-# flac
-.ifndef(WITH_FLAC)
-CONFIGURE_ARGS+=	--disable-flac
-PLIST_SUB+=	FLAC="@comment "
-.else
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
-
-PLIST_SUB+=	FLAC=""
-.endif
-
-# freetype
-.ifndef(WITH_FREETYPE)
-CONFIGURE_ARGS+=	--disable-freetypetest
-PLIST_SUB+=	FREETYPE="@comment "
-.else
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-
-CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE}  \
-			--with-ft-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	FREETYPE=""
-.endif
-
-# gdkpixbuf
-.ifndef(WITH_GDKPIXBUF)
-CONFIGURE_ARGS+=	--disable-gdk_pixbuf
-PLIST_SUB+=	GDKPIXBUF="@comment "
-.else
-USE_GNOME+=	gtk20
-PLIST_SUB+=	GDKPIXBUF=""
-.endif
-
-# gnomevfs
-.ifndef(WITH_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome_vfs
-PLIST_SUB+=	GNOMEVFS="@comment "
-.else
-USE_GNOME+=	gnomevfs2
-PLIST_SUB+=	GNOMEVFS=""
-.endif
-
-# gsm
-.ifndef(WITH_GSM)
-CONFIGURE_ARGS+=	--disable-gsm
-PLIST_SUB+=	GSM="@comment "
-.else
-LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
-
-PLIST_SUB+=	GSM=""
-.endif
-
-# jack
-.ifndef(WITH_JACK)
-CONFIGURE_ARGS+=	--disable-jack
-PLIST_SUB+=	JACK="@comment "
-.else
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
-PLIST_SUB+=	JACK=""
-.endif
-
-# Hermes
-.ifndef(WITH_HERMES)
-CONFIGURE_ARGS+=	--disable-hermes
-PLIST_SUB+=	HERMES="@comment "
-.else
-LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_SUB+=	HERMES=""
-.endif
-
-# jpeg
-.ifndef(WITH_JPEG)
-CONFIGURE_ARGS+=	--disable-jpeg
-PLIST_SUB+=	JPEG="@comment "
-.else
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-PLIST_SUB+=	JPEG=""
-.endif
-
-# ladspa
-.ifndef(WITH_LADSPA)
-CONFIGURE_ARGS+=	--disable-ladspa
-PLIST_SUB+=	LADSPA="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-
-PLIST_SUB+=	LADSPA=""
-.endif
-
-# lame
-.ifndef(WITH_LAME)
-CONFIGURE_ARGS+=	--disable-lame
-PLIST_SUB+=	LAME="@comment "
-.else
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-
-PLIST_SUB+=	LAME=""
-.endif
-
-# liba52
-.ifndef(WITH_LIBA52)
-CONFIGURE_ARGS+=	--disable-a52dec
-PLIST_SUB+=	LIBA52="@comment "
-.else
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-
-CONFIGURE_ARGS+=	--with-a52dec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBA52=""
-.endif
-
-# libaudiofile
-.ifndef(WITH_LIBAUDIOFILE)
-CONFIGURE_ARGS+=	--disable-audiofile
-PLIST_SUB+=	LIBAUDIOFILE="@comment "
-.else
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
-
-PLIST_SUB+=	LIBAUDIOFILE=""
-.endif
-
-# libcaca
-.ifndef(WITH_LIBCACA)
-CONFIGURE_ARGS+=	--disable-libcaca
-PLIST_SUB+=	LIBCACA="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_SUB+=	LIBCACA=""
-.endif
-
-# libcdaudio
-.ifndef(WITH_LIBCDAUDIO)
-CONFIGURE_ARGS+=	--disable-cdaudio
-PLIST_SUB+=	LIBCDAUDIO="@comment "
-.else
-LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
-
-PLIST_SUB+=	LIBCDAUDIO=""
-.endif
-
-# libdv
-.ifndef(WITH_LIBDV)
-CONFIGURE_ARGS+=	--disable-libdv
-PLIST_SUB+=	LIBDV="@comment "
-.else
-LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-
-PLIST_SUB+=	LIBDV=""
-.endif
-
-# libdvdnav
-.ifndef(WITH_LIBDVDNAV)
-CONFIGURE_ARGS+=	--disable-dvdnav
-PLIST_SUB+=	LIBDVDNAV="@comment "
-.else
-LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
-
-PLIST_SUB+=	LIBDVDNAV=""
-.endif
-
-# libdvdread
-.ifndef(WITH_LIBDVDREAD)
-CONFIGURE_ARGS+=	--disable-dvdread
-PLIST_SUB+=	LIBDVDREAD="@comment "
-.else
-LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
-
-PLIST_SUB+=	LIBDVDREAD=""
-.endif
-
-# libfame
-.ifndef(WITH_LIBFAME)
-CONFIGURE_ARGS+=	--disable-libfame \
-			--disable-libfametest
-PLIST_SUB+=	LIBFAME="@comment "
-.else
-LIB_DEPENDS+=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
-
-CONFIGURE_ARGS+=	--with-libfame-prefix=${LOCALBASE} \
-			--with-libfame-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBFAME=""
-.endif
-
-# libmikmod
-.ifndef(WITH_LIBMIKMOD)
-CONFIGURE_ARGS+=	--disable-libmikmodtest \
-			--disable-mikmod
-PLIST_SUB+=	LIBMIKMOD="@comment "
-.else
-LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
-
-CONFIGURE_ARGS+=	--with-libmikmod-prefix=${LOCALBASE} \
-			--with-libmikmod-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBMIKMOD=""
-.endif
-
-# libmpeg2
-.ifndef(WITH_LIBMPEG2)
-CONFIGURE_ARGS+=	--disable-mpeg2dec
-PLIST_SUB+=	LIBMPEG2="@comment "
-.else
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-
-PLIST_SUB+=	LIBMPEG2=""
-.endif
-
-# libmusicbrainz
-.ifndef(WITH_LIBMUSICBRAINZ)
-CONFIGURE_ARGS+=	--disable-musicbrainz
-PLIST_SUB+=	LIBMUSICBRAINZ="@comment "
-.else
-LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_SUB+=	LIBMUSICBRAINZ=""
-.endif
-
-# libshout
-.ifndef(WITH_LIBSHOUT)
-CONFIGURE_ARGS+=	--disable-shout
-PLIST_SUB+=	LIBSHOUT="@comment "
-.else
-LIB_DEPENDS+=	shout.2:${PORTSDIR}/audio/libshout
-
-PLIST_SUB+=	LIBSHOUT=""
-.endif
-
-# libsidplay
-.ifndef(WITH_LIBSIDPLAY)
-CONFIGURE_ARGS+=	--disable-sidplay
-PLIST_SUB+=	LIBSIDPLAY="@comment "
-.else
-LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
-
-PLIST_SUB+=	LIBSIDPLAY=""
-.endif
-
-# libsndfile
-.ifndef(WITH_LIBSNDFILE)
-CONFIGURE_ARGS+=	--disable-sndfile
-PLIST_SUB+=	LIBSNDFILE="@comment "
-.else
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
-PLIST_SUB+=	LIBSNDFILE=""
-.endif
-
-# libtheora
-.ifndef(WITH_LIBTHEORA)
-CONFIGURE_ARGS+=	--disable-theora
-PLIST_SUB+=	LIBTHEORA="@comment "
-.else
-LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
-PLIST_SUB+=	LIBTHEORA=""
-.endif
-
-# libvisual
-.ifndef(WITH_LIBVISUAL)
-CONFIGURE_ARGS+=	--disable-libvisual
-PLIST_SUB+=	LIBVISUAL="@comment "
-.else
-LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-
-PLIST_SUB+=	LIBVISUAL=""
-.endif
-
-# mad
-.ifndef(WITH_MAD)
-CONFIGURE_ARGS+=	--disable-mad
-PLIST_SUB+=	LIBMAD="@comment "
-.else
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		id3tag.2:${PORTSDIR}/audio/libid3tag
-
-PLIST_SUB+=	LIBMAD=""
-.endif
-
-# mjpegtools
-.ifndef(WITH_MJPEGTOOLS)
-CONFIGURE_ARGS+=	--disable-mpeg2enc --disable-mplex
-PLIST_SUB+=	MJPEGTOOLS="@comment "
-.else
-LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
-
-EXTRA_BUILD_DIR+=	ext/mpeg2enc
-# XXX - make sure CONFIGURE works with mpeg2enc even with "ccache
-# c++" ... weird but necessary
-CONFIGURE_ENV+=	HAVE_CXX=yes
-
-PLIST_SUB+=	MJPEGTOOLS=""
-.endif
-
-# musepack
-.ifndef(WITH_MUSEPACK)
-CONFIGURE_ARGS+=	--disable-musepack
-PLIST_SUB+=	MUSEPACK="@comment "
-.else
-LIB_DEPENDS+=	musepack.1:${PORTSDIR}/audio/libmusepack
-
-PLIST_SUB+=	MUSEPACK=""
-.endif
-
-# nas
-.ifndef(WITH_NAS)
-CONFIGURE_ARGS+=	--disable-nas
-PLIST_SUB+=	NAS="@comment "
-.else
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-
-PLIST_SUB+=	NAS=""
-.endif
-
-# ogg
-.ifndef(WITH_OGG)
-CONFIGURE_ARGS+=	--disable-ogg \
-			--disable-oggtest
-PLIST_SUB+=	OGG="@comment "
-.else
-LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-PLIST_SUB+=	OGG=""
-.endif
-
-# oss
-.ifdef(WITHOUT_OSS)
-CONFIGURE_ARGS+=	--disable-oss
-PLIST_SUB+=	OSS="@comment "
-.else
-PLIST_SUB+=	OSS=""
-.endif
-
-# pango
-.ifndef(WITH_PANGO)
-CONFIGURE_ARGS+=	--disable-pango
-PLIST_SUB+=	PANGO="@comment "
-.else
-USE_GNOME+=	pango
-PLIST_SUB+=	PANGO=""
-.endif
-
-# mng
-.ifndef(WITH_MNG)
-CONFIGURE_ARGS+=	--disable-libmng
-PLIST_SUB+=	MNG="@comment "
-.else
-LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
-PLIST_SUB+=	MNG=""
-.endif
-
-# mms
-.ifndef(WITH_MMS)
-CONFIGURE_ARGS+=	--disable-libmms
-PLIST_SUB+=	MMS="@comment "
-.else
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
-PLIST_SUB+=	MMS=""
-.endif
-
-# png
-.ifndef(WITH_PNG)
-CONFIGURE_ARGS+=	--disable-libpng
-PLIST_SUB+=	PNG="@comment "
-.else
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-
-PLIST_SUB+=	PNG=""
-.endif
-
-# polypaudio
-.ifndef(WITH_POLYPAUDIO)
-CONFIGURE_ARGS+=	--disable-polyp
-PLIST_SUB+=	POLYPAUDIO="@comment "
-.else
-LIB_DEPENDS+=	polyp-0.7.0:${PORTSDIR}/audio/polypaudio
-
-PLIST_SUB+=	POLYPAUDIO=""
-.endif
-
-# sdl
-.ifndef(WITH_SDL)
-CONFIGURE_ARGS+=	--disable-sdl \
-			--disable-sdltest
-PLIST_SUB+=	SDL="@comment "
-.else
-USE_SDL=	sdl
-
-CONFIGURE_ARGS+=	--with-sdl-prefix=${LOCALBASE}  \
-			--with-sdl-exec-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
-PLIST_SUB+=	SDL=""
-.endif
-
-# smoothwave
-.ifndef(WITH_SMOOTHWAVE)
-CONFIGURE_ARGS+=	--disable-smoothwave
-PLIST_SUB+=	SMOOTHWAVE="@comment "
-.else
-USE_GNOME+=	gtk20
-PLIST_SUB+=	SMOOTHWAVE=""
-.endif
-
-# speex
-.ifndef(WITH_SPEEX)
-CONFIGURE_ARGS+=	--disable-speex
-PLIST_SUB+=	SPEEX="@comment "
-.else
-LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
-PLIST_SUB+=	SPEEX=""
-.endif
-
-# swfdec
-.ifndef(WITH_SWFDEC)
-CONFIGURE_ARGS+=	--disable-swfdec
-PLIST_SUB+=	SWFDEC="@comment "
-.else
-LIB_DEPENDS+=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
-
-CONFIGURE_ARGS+=	--enable-swfdec
-PLIST_SUB+=	SWFDEC=""
-.endif
-
-# vorbis
-.ifndef(WITH_VORBIS)
-CONFIGURE_ARGS+=	--disable-vorbis \
-			--disable-vorbistest
-PLIST_SUB+=	VORBIS="@comment "
-.else
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-
-CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
-			--with-vorbis-libraries=${LOCALBASE}/lib \
-			--with-vorbis-includes=${LOCALBASE}/include
-PLIST_SUB+=	VORBIS=""
-.endif
-
-# vorbisidec
-.ifndef(WITH_VORBISIDEC)
-CONFIGURE_ARGS+=	--disable-ivorbis
-PLIST_SUB+=	IVORBIS="@comment "
-.else
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-PLIST_SUB+=	IVORBIS=""
-.endif
-
-# xine
-.ifndef(WITH_XINE)
-CONFIGURE_ARGS+=	--disable-xine
-PLIST_SUB+=	XINE="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-xine
-LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
-
-PLIST_SUB+=	XINE=""
-.endif
+post-extract:
+# for cdrom/vcd support
+# taken from mplayer distfile
+# MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
+	@${CP} ${FILESDIR}/bsdi_dvd.h ${WRKSRC}/sys/vcd/
 
-# xvid
-.ifndef(WITH_XVID)
-CONFIGURE_ARGS+=	--disable-xvid
-PLIST_SUB+=	XVID="@comment "
-.else
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
-PLIST_SUB+=	XVID=""
+post-patch:
+	@${FIND} ${WRKSRC} -type f | \
+	${XARGS} -n 10 ${REINPLACE_CMD} -e \
+	's|malloc\.h|stdlib.h|; \
+	 s|stdint\.h|inttypes.h|; \
+	 s|%%VERSION%%|${VERSION}|'
+# cdrom default device
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
+		${WRKSRC}/ext/cdparanoia/gstcdparanoia.c \
+		${WRKSRC}/sys/cdrom/gstcdplayer.c \
+		${WRKSRC}/sys/vcd/vcdsrc.c
+# dvd default device
+	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+		${WRKSRC}/ext/dvdnav/dvdnavsrc.c \
+		${WRKSRC}/ext/dvdread/dvdreadsrc.c
+# cdrom/vcd support
+	@${REINPLACE_CMD} -e 's|<linux/cdrom.h>|"bsdi_dvd.h"|' \
+		${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
+		${WRKSRC}/sys/vcd/vcdsrc.c \
+		${WRKSRC}/sys/vcd/vcdsrc.h
+# mplex fix -- gst configure does not use mjpegtool's config to find include.
+	@${REINPLACE_CMD} -E \
+		-e 's|PFLAGS@|PFLAGS@ -I${LOCALBASE}/include/mjpegtools -I${LOCALBASE}/include/mjpegtools/mplex|' \
+		${WRKSRC}/ext/mplex/Makefile.in
+.if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
+# Fix gst-register when using -O -march=athlon-xp
+	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
+		${WRKSRC}/gst/modplug/Makefile.in \
+		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
 .endif
 
 pre-build:
-# This port cannot be CFLAGS safe, using p4 optimizations
-# break the mod plugin
+# This port cannot be CFLAGS safe, when using p4 optimizations
+# because it breaks the mod plugin
 	@${REINPLACE_CMD} -E \
 		-e 's|(-march=pentiu)m4|\1m3|g' \
 		-e 's|(-mcpu=pentiu)m4|\1m3|g' \
@@ -1005,6 +137,9 @@ post-build:
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 . endfor
 .endif
+#	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gst-register-${GST_VERSION} \
+#		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml \
+#		>> ${TMPPLIST}"
 
 post-install:
 .ifdef(EXTRA_BUILD_DIR)
@@ -1016,225 +151,5 @@ post-install:
 	-@${X11BASE}/bin/gst-register-${GST_VERSION} \
 		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
 
-pre-everything::
-.ifndef(WITH_AALIB)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_AALIB to enable aalib Video plugin'
-.endif
-.ifdef(WITH_ARTS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITHOUT_ARTS to disable aRts Audio plugin'
-.else
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin'
-.endif
-.ifndef(WITH_CAIRO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cairo textoverlay plugin'
-.endif
-.ifndef(WITH_CDPARANOIA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin'
-.endif
-.ifndef(WITH_CDROM_DEVICE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}'
-	@${ECHO_MSG} '===> Define WITH_CDROM_DEVICE if you want to change the default'
-	@${ECHO_MSG} '===> For example, make WITH_CDROM_DEVICE="/dev/somedevice"'
-.endif
-.ifndef(WITH_DTS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_DTS to enable DTS decoding support'
-.endif
-.ifndef(WITH_DVD_DEVICE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> The default DVD device is ${DEFAULT_DVD_DEVICE}'
-	@${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default'
-	@${ECHO_MSG} '===> For example, make WITH_DVD_DEVICE="/dev/somedevice"'
-.endif
-.ifndef(WITH_ESOUND)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
-.endif
-.ifndef(WITH_FAAC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FAAC to enable faac Audio plugin'
-.endif
-.ifndef(WITH_FAAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin'
-.endif
-.ifndef(WITH_FLAC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin'
-.endif
-.ifndef(WITH_FREETYPE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support'
-.endif
-.ifndef(WITH_GDKPIXBUF)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin'
-.endif
-.ifndef(WITH_GSM)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin'
-.endif
-.ifndef(WITH_GNOMEVFS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin'
-.endif
-.ifndef(WITH_JACK)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin'
-.endif
-.ifndef(WITH_HERMES)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin'
-.endif
-.ifndef(WITH_JPEG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_JPEG to enable jpeg Video plugin'
-.endif
-.ifndef(WITH_LADSPA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LADSPA to enable LADSPA framework Audio plugin'
-.endif
-.ifndef(WITH_LAME)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LAME to enable lame MP3 Audio plugin'
-.endif
-.ifndef(WITH_LIBA52)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBA52 to enable liba52 AC3 Audio plugin'
-.endif
-.ifndef(WITH_LIBAUDIOFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin'
-.endif
-.ifndef(WITH_LIBCACA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin'
-.endif
-.ifndef(WITH_LIBCDAUDIO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBCDAUDIO to enable libcdaudio Audio plugin'
-.endif
-.ifndef(WITH_LIBDV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin'
-.endif
-.ifndef(WITH_LIBDVDNAV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDVDNAV to enable libdvdnav Video plugin'
-.endif
-.ifndef(WITH_LIBDVDREAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDVDREAD to enable libdvdread Video plugin'
-.endif
-.ifndef(WITH_LIBFAME)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBFAME to enable libfame Video plugin'
-.endif
-.ifndef(WITH_LIBMIKMOD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMIKMOD to enable libmikmod Audio plugin'
-.endif
-.ifndef(WITH_LIBMPEG2)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin'
-.endif
-.ifndef(WITH_LIBMUSICBRAINZ)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin'
-.endif
-.ifndef(WITH_LIBSHOUT)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin'
-.endif
-.ifndef(WITH_LIBSIDPLAY)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin'
-.endif
-.ifndef(WITH_LIBSNDFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin'
-.endif
-.ifndef(WITH_LIBTHEORA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin'
-.endif
-.ifndef(WITH_LIBVISUAL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBVISUAL to enable libvisual Video plugin'
-.endif
-.ifndef(WITH_MAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
-.endif
-.ifndef(WITH_MNG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MNG to enable libmng plugin'
-.endif
-.ifndef(WITH_MMS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MMS to enable libmms network plugin'
-.endif
-.ifndef(WITH_MUSEPACK)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MUSEPACK to enable musepack Audio plugin'
-.endif
-.ifndef(WITH_NAS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin'
-.endif
-.ifndef(WITHOUT_OSS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin'
-.endif
-.ifndef(WITH_PANGO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin'
-.endif
-.ifndef(WITH_PNG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin'
-.endif
-.ifndef(WITH_POLYPAUDIO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_POLYPAUDIO to enable polypaudio audio plugin'
-.endif
-.ifndef(WITH_SDL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin'
-.endif
-.ifndef(WITH_SMOOTHWAVE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin'
-.endif
-.ifndef(WITH_SPEEX)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin'
-.endif
-.ifndef(WITH_SWFDEC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin'
-.endif
-.ifndef(WITH_VORBIS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin'
-.endif
-.ifndef(WITH_VORBISIDEC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin'
-.endif
-.ifndef(WITH_XINE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin'
-.endif
-.ifndef(WITH_XVID)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin'
-.endif
-
+.include "${MASTERDIR}/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
new file mode 100644
index 000000000000..8bb6717dd01f
--- /dev/null
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -0,0 +1,443 @@
+GST_ALL_PLUGINS= \
+		a52dec \
+		aalib \
+		aalibtest \
+		alsa \
+		arts \
+		artstest \
+		artsc \
+		audiofile \
+		cairo \
+		cdaudio \
+		cdparanoia \
+		dirac \
+		divx \
+		dts \
+		dvdnav \
+		dvdread \
+		dxr3 \
+		esd \
+		faac \
+		faad \
+		flac \
+		gdk_pixbuf \
+		gnome_vfs \
+		gsm \
+		hermes \
+		ivorbis \
+		jack \
+		jpeg \
+		ladspa \
+		lame \
+		lcs \
+		libcaca \
+		libdv \
+		libfame \
+		libfametest\
+		libmng \
+		libmms \
+		libpng \
+		librfb \
+		libvisual \
+		mad \
+		mikmod \
+		libmikmodtest \
+		mpeg2dec \
+		mpeg2enc \
+		mplex \
+		musepack \
+		musicbrainz \
+		nas \
+		ogg \
+		opengl \
+		pango \
+		polyp \
+		dv1394 \
+		qcam \
+		raw1394 \
+		sdl \
+		shout \
+		shout2 \
+		sidplay \
+		smoothwave \
+		sndfile \
+		sunaudio \
+		speex \
+		swfdec \
+		tarkin \
+		theora \
+		vcd \
+		vorbis \
+		xine \
+		xvid
+
+# Disable all plugins by default\
+.for d in ${GST_ALL_PLUGINS}
+CONFIGURE_ARGS+=	--disable-${d}
+.endfor
+
+CONFIGURE_ARGS+=--disable-tests \
+		--disable-alsa \
+		--disable-http \
+		--enable-cdrom \
+		--enable-gconf \
+		--enable-gconftool \
+		--enable-oss \
+		--disable-osx_audio \
+		--disable-osx_video \
+		--enable-static \
+		--enable-gst_v4l \
+		--enable-gst_v4l2 \
+		--enable-x \
+		--enable-xshm \
+		--enable-xvideo
+
+.if ${GST_PLUGIN}!="base"
+
+GST_PLUGIN_SUFFIX?=	-${GST_PLUGIN}
+
+COMMENT=	Gstreamer ${GST_PLUGIN} plugin
+
+# Enable the right plugin
+
+CONFIGURE_ARGS:=${CONFIGURE_ARGS:S|--disable-${p}|--enable-${p}|}
+
+# Build/Install directory. defaults to ext/${GST_PLUGIN}
+#   few plugins are in sys/
+GST_PLUGIN_DIR?=	ext/${GST_PLUGIN}
+
+#
+GST_LIB_DIR=		lib/gstreamer-${VERSION}
+
+# Auto create PLIST
+PLIST=		${NONEXISTENT}
+PLIST_FILES?=	${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so
+
+# aalib
+.if ${GST_PLUGIN}=="aalib"
+LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so
+.endif
+
+# artsd
+.if ${GST_PLUGIN}=="artsd"
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+GST_PLIST_SUFFIX=	sink
+.endif
+
+# cairo
+.if ${GST_PLUGIN}=="cairo"
+LIB_DEPENDS+=	cairo.1:${PORTSDIR}/graphics/cairo
+.endif
+
+# cdparanoia
+.if ${GST_PLUGIN}=="cdparanoia"
+LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+.endif
+
+# dirac
+.if ${GST_PLUGIN}=="dirac"
+LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
+.endif
+
+# dts
+.if ${GST_PLUGIN}=="dts"
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
+RUN_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
+GST_PLIST_SUFFIX=	dec
+.endif
+
+# esound
+.if ${GST_PLUGIN}=="esound"
+USE_GNOME+=	esound
+GST_PLUGIN_DIR=	ext/esd
+PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so
+.endif
+
+# faac
+.if ${GST_PLUGIN}=="faac"
+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+.endif
+
+# faad
+.if ${GST_PLUGIN}=="faad"
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+.endif
+
+# flac
+.if ${GST_PLUGIN}=="flac"
+LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+.endif
+
+# gdkpixbuf
+.if ${GST_PLUGIN}=="gdkpixbuf"
+USE_GNOME+=	gtk20
+GST_PLUGIN_DIR=	ext/gdk_pixbuf
+.endif
+
+# gnomevfs
+.if ${GST_PLUGIN}=="gnomevfs"
+USE_GNOME+=	gnomevfs2
+.endif
+
+# gsm
+.if ${GST_PLUGIN}=="gsm"
+LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+.endif
+
+# jack
+.if ${GST_PLUGIN}=="jack"
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.endif
+
+# libcdaudio
+.if ${GST_PLUGIN}=="cdaudio"
+LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+.endif
+
+# libvisual
+.if ${GST_PLUGIN}=="libvisual"
+LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
+.endif
+
+# musepack
+.if ${GST_PLUGIN}=="musepack"
+LIB_DEPENDS+=	musepack.1:${PORTSDIR}/audio/libmusepack
+.endif
+
+# hermes
+.if ${GST_PLUGIN}=="hermes"
+LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
+PLIST_FILES=	${GST_LIB_DIR}/libgsthermescolorspace.so
+.endif
+
+# jpeg
+.if ${GST_PLUGIN}=="jpeg"
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+CONFLICTS+=	gstreamer-plugins-jpeg-mmx-*
+.endif
+
+# jpeg-mmx
+.if ${GST_PLUGIN}=="jpeg-mmx"
+LIB_DEPEDNS+=	jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
+CONFLICTS+=	gstreamer-plugins-jpeg-*.*
+
+GST_PLUGIN_DIR= ext/jpeg
+PLIST_FILES=	${GST_LIB_DIR}/libgstjpeg.so
+.endif
+
+# ladspa
+.if ${GST_PLUGIN}=="ladspa"
+BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+.endif
+
+# lame
+.if ${GST_PLUGIN}=="lame"
+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+.endif
+
+# a52dec
+.if ${GST_PLUGIN}=="a52dec"
+LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+.endif
+
+# audiofile
+.if ${GST_PLUGIN}=="audiofile"
+LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+.endif
+
+# libcaca
+.if ${GST_PLUGIN}=="libcaca"
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so
+.endif
+
+# dv
+.if ${GST_PLUGIN}=="dv"
+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+GST_PLIST_SUFFIX=	dec
+.endif
+
+# dvd (dvdnav dvdread)
+.if ${GST_PLUGIN}=="dvd"
+EXTRA_LIBS+=	-ldvdnav
+LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
+GST_PLUGIN_DIR=	ext/dvdnav \
+		ext/dvdread
+PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnavsrc.so \
+		${GST_LIB_DIR}/libgstdvdreadsrc.so
+.endif
+
+# libfame
+.if ${GST_PLUGIN}=="libfame"
+LIB_DEPENDS+=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
+.endif
+
+# libmms
+.if ${GST_PLUGIN}=="libmms"
+LIB_DEPENDS+=   mms.0:${PORTSDIR}/multimedia/libmms
+PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so
+.endif
+
+# libmng
+.if ${GST_PLUGIN}=="libmng"
+LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
+PLIST_FILES=    ${GST_LIB_DIR}/libgstmng.so
+.endif
+
+# mikmod
+.if ${GST_PLUGIN}=="mikmod"
+LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
+.endif
+
+# mpeg2dec
+.if ${GST_PLUGIN}=="mpeg2dec"
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+.endif
+
+# mplex
+.if ${GST_PLUGIN}=="mplex"
+LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
+.endif
+
+# musicbrainz
+.if ${GST_PLUGIN}=="musicbrainz"
+LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+PLIST_FILES=	lib/gstreamer-${VERSION}/libgsttrm.so
+.endif
+
+# shout
+.if ${GST_PLUGIN}=="shout"
+LIB_DEPENDS+=	shout.2:${PORTSDIR}/audio/libshout
+.endif
+
+# sidplay
+.if ${GST_PLUGIN}=="sidplay"
+LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so
+.endif
+
+# sndfile
+.if ${GST_PLUGIN}=="sndfile"
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+.endif
+
+# theora
+.if ${GST_PLUGIN}=="theora"
+LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
+.endif
+
+# mad
+.if ${GST_PLUGIN}=="mad"
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
+.endif
+
+# mpeg2enc
+.if ${GST_PLUGIN}=="mpeg2enc"
+USE_GSTREAMER+=	mplex
+LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
+
+# XXX - make sure CONFIGURE works with mpeg2enc even with "ccache
+# c++" ... weird but necessary
+CONFIGURE_ENV+=	HAVE_CXX=yes
+.endif
+
+# nas
+.if ${GST_PLUGIN}=="nas"
+LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+GST_PLIST_SUFFIX=	sink
+.endif
+
+# ogg
+.if ${GST_PLUGIN}=="ogg"
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
+.endif
+
+# pango
+.if ${GST_PLUGIN}=="pango"
+USE_GNOME+=	pango
+PLIST_FILES=	${GST_LIB_DIR}/libgsttextoverlay.so \
+		${GST_LIB_DIR}/libgsttimeoverlay.so
+.endif
+
+# libpng
+.if ${GST_PLUGIN}=="libpng"
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+GST_PLUGIN_DIR= ext/libpng \
+                ext/snapshot
+PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
+		${GST_LIB_DIR}/libgstsnapshot.so
+.endif
+
+# polypaudio
+.if ${GST_PLUGIN}=="polypaudio"
+LIB_DEPENDS+=	polyp-0.7.0:${PORTSDIR}/audio/polypaudio
+PLIST_FILES=	${GST_LIB_DIR}/libpolypaudio.so
+GST_PLUGIN_DIR=	ext/polyp
+.endif
+
+# sdl
+.if ${GST_PLUGIN}=="sdl"
+USE_SDL+=	sdl
+GST_PLIST_SUFFIX=	videosink
+.endif
+
+# smoothwave
+.if ${GST_PLUGIN}=="smoothwave"
+USE_GNOME+=	gtk20
+.endif
+
+# speex
+.if ${GST_PLUGIN}=="speex"
+LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
+.endif
+
+# swfdec
+.if ${GST_PLUGIN}=="swfdec"
+LIB_DEPENDS+=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
+.endif
+
+# vorbis
+.if ${GST_PLUGIN}=="vorbis"
+USE_GSTREAMER+=	ogg
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+.endif
+
+# ivorbis
+.if ${GST_PLUGIN}=="ivorbis"
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+.endif
+
+# xine
+.if ${GST_PLUGIN}=="xine"
+LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
+.endif
+
+# xvid
+.if ${GST_PLUGIN}=="xvid"
+LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+.endif
+
+LIB_DEPENDS+=	gstgconf-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+PLIST_FILES+=	'@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
+PLIST_FILES+=	'@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
+
+do-build:
+.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+.endfor
+
+post-build:
+	@${ECHO_CMD} ${PREFIX}/bin/gst-register-${GST_VERSION} \
+		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml
+
+do-install:
+.for dir in ${GST_PLUGIN_DIR}
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+.endfor
+
+.endif
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_dirac_gstdiracdec.cc b/multimedia/gstreamer-plugins/files/patch-ext_dirac_gstdiracdec.cc
new file mode 100644
index 000000000000..2ad0b2caf587
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_dirac_gstdiracdec.cc
@@ -0,0 +1,22 @@
+--- ext/dirac/gstdiracdec.cc.orig	Mon Feb 28 22:04:33 2005
++++ ext/dirac/gstdiracdec.cc	Mon Feb 28 22:12:15 2005
+@@ -253,13 +253,18 @@
+ 
+       case STATE_SEQUENCE:{
+         guint8 *buf[3];
++        gint fps_num, fps_denom;
++
++        fps_num = diracdec->decoder->seq_params.frame_rate.numerator;
++  	fps_denom = diracdec->decoder->seq_params.frame_rate.denominator;
+ 
+         /* start-of-sequence - allocate buffer */
+         if (!gst_diracdec_link (diracdec,
+                 diracdec->decoder->seq_params.width,
+                 diracdec->decoder->seq_params.height,
++                (gdouble) fps_num / (gdouble) fps_denom,
+                 gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params.
+-                    chroma), diracdec->decoder->seq_params.frame_rate)) {
++                    chroma))) {
+           GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL),
+               ("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT
+                   "/%d)", diracdec->decoder->seq_params.width,
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in
new file mode 100644
index 000000000000..0ee53a92ecd6
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_libcaca_Makefile.in
@@ -0,0 +1,23 @@
+--- ext/libcaca/Makefile.in.orig	Mon Oct  4 00:07:18 2004
++++ ext/libcaca/Makefile.in	Mon Oct  4 00:07:59 2004
+@@ -76,8 +76,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
++libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgstcacasink_la_OBJECTS = libgstcacasink_la-gstcacasink.lo
+ libgstcacasink_la_OBJECTS = $(am_libgstcacasink_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -616,9 +615,7 @@
+ plugin_LTLIBRARIES = libgstcacasink.la
+ libgstcacasink_la_SOURCES = gstcacasink.c
+ libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(LIBCACA_CFLAGS)
+-libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
+-
++libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) -lgstinterfaces-%%VERSION%%
+ libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ noinst_HEADERS = gstcacasink.h
+ all: all-am
diff --git a/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in b/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in
new file mode 100644
index 000000000000..c943042ad72a
--- /dev/null
+++ b/multimedia/gstreamer-plugins/files/patch-ext_sdl_Makefile.in
@@ -0,0 +1,23 @@
+--- ext/sdl/Makefile.in.orig	Mon Oct  4 00:56:57 2004
++++ ext/sdl/Makefile.in	Mon Oct  4 00:57:47 2004
+@@ -76,8 +76,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
++libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgstsdlvideosink_la_OBJECTS =  \
+ 	libgstsdlvideosink_la-sdlvideosink.lo
+ libgstsdlvideosink_la_OBJECTS = $(am_libgstsdlvideosink_la_OBJECTS)
+@@ -617,9 +616,7 @@
+ plugin_LTLIBRARIES = libgstsdlvideosink.la
+ libgstsdlvideosink_la_SOURCES = sdlvideosink.c
+ libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS)
+-libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) \
+-		$(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
+-
++libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) -lgstinterfaces-%%VERSION%%
+ libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ noinst_HEADERS = sdlvideosink.h
+ all: all-am
diff --git a/multimedia/gstreamer-plugins/files/patch-gst_tta_gstttaparse.c b/multimedia/gstreamer-plugins/files/patch-gst_tta_gstttaparse.c
index d595b086bff5..40b567337892 100644
--- a/multimedia/gstreamer-plugins/files/patch-gst_tta_gstttaparse.c
+++ b/multimedia/gstreamer-plugins/files/patch-gst_tta_gstttaparse.c
@@ -1,6 +1,6 @@
---- gst/tta/gstttaparse.c.orig	Sun Jan  9 13:59:02 2005
-+++ gst/tta/gstttaparse.c	Sun Jan  9 14:02:25 2005
-@@ -162,11 +162,13 @@
+--- gst/tta/gstttaparse.c.orig	Sat Jan  8 13:36:26 2005
++++ gst/tta/gstttaparse.c	Sat Jan  8 13:37:08 2005
+@@ -162,11 +162,14 @@
      case GST_EVENT_SEEK:
      {
        if (GST_EVENT_SEEK_FORMAT (event) == GST_FORMAT_TIME) {
@@ -9,9 +9,10 @@
 -        guint64 time = GST_EVENT_SEEK_OFFSET (event);
 -        guint64 seek_frame = time / (FRAME_TIME * 1000000000);
 -        guint64 seekpos = ttaparse->index[seek_frame].pos;
-+        guint64 time;
-+        guint64 seek_frame;
-+        guint64 seekpos;
++	guint64 time;
++	guint64 seek_frame;
++	guint64 seekpos;
++        GST_DEBUG_OBJECT (ttaparse, "got seek event");
 +        time = GST_EVENT_SEEK_OFFSET (event);
 +        seek_frame = time / (FRAME_TIME * 1000000000);
 +        seekpos = ttaparse->index[seek_frame].pos;
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index f8ecfd06e69e..96213ced8a4c 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -1,10 +1,10 @@
 bin/gst-launch-ext-%%VERSION%%
 bin/gst-visualise-%%VERSION%%
-include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
-include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/multichannel-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/audio/multichannel.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h
@@ -33,128 +33,77 @@ include/gstreamer-%%VERSION%%/gst/video/video.h
 include/gstreamer-%%VERSION%%/gst/video/videosink.h
 include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h
 include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h
-%%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so
-%%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so
 lib/gstreamer-%%VERSION%%/libgstac3parse.so
 lib/gstreamer-%%VERSION%%/libgstadder.so
 lib/gstreamer-%%VERSION%%/libgstalaw.so
 lib/gstreamer-%%VERSION%%/libgstalpha.so
 lib/gstreamer-%%VERSION%%/libgstalphacolor.so
 lib/gstreamer-%%VERSION%%/libgstapetag.so
-%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
 lib/gstreamer-%%VERSION%%/libgstasf.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
 lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
 lib/gstreamer-%%VERSION%%/libgstaudiofilter.so
 lib/gstreamer-%%VERSION%%/libgstaudiorate.so
-lib/gstreamer-%%VERSION%%/libgstaudio.so
-%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
 lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
 lib/gstreamer-%%VERSION%%/libgstavi.so
-%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so
-%%CAIRO%%lib/gstreamer-%%VERSION%%/libgstcairo.so
-%%LIBCDAUDIO%%lib/gstreamer-%%VERSION%%/libgstcdaudio.so
-%%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so
 lib/gstreamer-%%VERSION%%/libgstcdplayer.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
-%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcolorspace.so
 lib/gstreamer-%%VERSION%%/libgstcutter.so
 lib/gstreamer-%%VERSION%%/libgstdebug.so
 lib/gstreamer-%%VERSION%%/libgstdecodebin.so
 lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
-%%DTS%%lib/gstreamer-%%VERSION%%/libgstdtsdec.so
-%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
-%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
 lib/gstreamer-%%VERSION%%/libgstefence.so
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
 lib/gstreamer-%%VERSION%%/libgstequalizer.so
-%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so
-%%FAAC%%lib/gstreamer-%%VERSION%%/libgstfaac.so
-%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so
 lib/gstreamer-%%VERSION%%/libgstfestival.so
 lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so
 lib/gstreamer-%%VERSION%%/libgstfilter.so
-%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
 lib/gstreamer-%%VERSION%%/libgstflxdec.so
 lib/gstreamer-%%VERSION%%/libgstgamma.so
-%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
-lib/gstreamer-%%VERSION%%/libgstglimagesink.so
-%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so
 lib/gstreamer-%%VERSION%%/libgstgoom.so
-%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
-%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so
 lib/gstreamer-%%VERSION%%/libgstidct.so
 lib/gstreamer-%%VERSION%%/libgstinterleave.so
-%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so
-%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.so
-%%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
-%%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
-%%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
 lib/gstreamer-%%VERSION%%/libgstlevel.so
-%%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so
-%%LIBVISUAL%%lib/gstreamer-%%VERSION%%/libgstlibvisual.so
-%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
-%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
 lib/gstreamer-%%VERSION%%/libgstmixmatrix.so
 lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
 lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
-%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
-%%MJPEGTOOLS%%lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
 lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
 lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
 lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
 lib/gstreamer-%%VERSION%%/libgstmpegstream.so
-%%MNG%%lib/gstreamer-%%VERSION%%/libgstmng.so
-%%MMS%%lib/gstreamer-%%VERSION%%/libgstmms.so
-%%MJPEGTOOLS%%lib/gstreamer-%%VERSION%%/libgstmplex.so
 lib/gstreamer-%%VERSION%%/libgstmulaw.so
 lib/gstreamer-%%VERSION%%/libgstmultifilesink.so
 lib/gstreamer-%%VERSION%%/libgstmultipart.so
-%%MUSEPACK%%lib/gstreamer-%%VERSION%%/libgstmusepack.so
-%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so
 lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
-%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so
+lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstoverlay.so
-%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstpassthrough.so
 lib/gstreamer-%%VERSION%%/libgstplaybin.so
 lib/gstreamer-%%VERSION%%/libgstplayondemand.so
-%%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so
 lib/gstreamer-%%VERSION%%/libgstqtdemux.so
 lib/gstreamer-%%VERSION%%/libgstresample.so
-lib/gstreamer-%%VERSION%%/libgstrmdemux.so
 lib/gstreamer-%%VERSION%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrmdemux.so
 lib/gstreamer-%%VERSION%%/libgstrtjpeg.so
 lib/gstreamer-%%VERSION%%/libgstrtp.so
-%%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so
-%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
 lib/gstreamer-%%VERSION%%/libgstsilence.so
 lib/gstreamer-%%VERSION%%/libgstsinesrc.so
-%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
 lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstsmpte.so
-%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
-%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
-%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
-%%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
 lib/gstreamer-%%VERSION%%/libgstswitch.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
 lib/gstreamer-%%VERSION%%/libgsttagedit.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
-lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
-%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so
-lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
-%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so
 lib/gstreamer-%%VERSION%%/libgsttta.so
 lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
 lib/gstreamer-%%VERSION%%/libgstudp.so
@@ -173,16 +122,12 @@ lib/gstreamer-%%VERSION%%/libgstvideoscale.so
 lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
 lib/gstreamer-%%VERSION%%/libgstvolenv.so
 lib/gstreamer-%%VERSION%%/libgstvolume.so
-%%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
 lib/gstreamer-%%VERSION%%/libgstwavenc.so
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
 lib/gstreamer-%%VERSION%%/libgstximagesink.so
-%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so
-%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so
 lib/gstreamer-%%VERSION%%/libgstxvimagesink.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
 lib/gstreamer-%%VERSION%%/libgsty4menc.so
-%%POLYPAUDIO%%lib/gstreamer-%%VERSION%%/libpolypaudio.so
 lib/libgstgconf-%%VERSION%%.a
 lib/libgstgconf-%%VERSION%%.so
 lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
@@ -214,7 +159,7 @@ share/locale/sq/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%
 @dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener
 @dirrm include/gstreamer-%%VERSION%%/gst/xoverlay
 @dirrm include/gstreamer-%%VERSION%%/gst/video
@@ -234,5 +179,3 @@ share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
 @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
 @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
-@exec %%X11BASE%%/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index 5dbd2ac8f694..72c1c1c517f6 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -7,80 +7,52 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.8.7
-PORTREVISION=	1
-CATEGORIES=	multimedia audio
-MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins/ \
-		${MASTER_SITE_GNOME}
+PORTREVISION?=	1
+CATEGORIES?=	multimedia audio
+MASTER_SITES=	${MASTER_SITE_GNOME} \
+		http://gstreamer.freedesktop.org/src/gst-plugins/
 MASTER_SITE_SUBDIR=	sources/gst-plugins/0.8
-PKGNAMESUFFIX=	-plugins
+PKGNAMESUFFIX=	-plugins${GST_PLUGIN_SUFFIX}
 DISTNAME=	gst-plugins-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	lioux@FreeBSD.org
-COMMENT=	GStreamer written collection of plugins handling several media types
+COMMENT?=	GStreamer written collection of plugins handling several media types
 
-LIB_DEPENDS=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS+=	gstreamer-0.8.5:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt
 
+SHLIB_VERSION=	1
+VERSION=	0.8
+
+WANT_GSTREAMER=	yes
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack \
-		gnomehier \
+USE_GNOME+=	gnomehack \
 		gnomeprefix \
 		pkgconfig \
 		gconf2
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
-GCONF_SCHEMAS=	gstreamer-${GST_VERSION}.schemas
-CONFIGURE_ARGS=	--disable-tests \
-		--disable-alsa \
-		--enable-cdrom \
-		--disable-divx \
-		--disable-dxr3 \
-		--disable-http \
-		--disable-qcam \
-		--disable-raw1394 \
-		--disable-v4l2 \
-		--disable-v4l \
-		--disable-osx_audio \
-		--disable-sunaudio \
-		--disable-dependency-tracking \
-		--enable-xshm \
-		--enable-x \
-		--enable-xvideo \
-		--enable-static
-
-# list of plugins that need some work in one way or the other to work
-# probable the lib needs to be ported, disable them for now.
-CONFIGURE_ARGS+=\
-		--disable-tarkin \
-		--disable-lcs \
-		--disable-shout2 \
-		--disable-dirac \
-		--disable-librfb
+GST_PLUGIN?=	base
 
 CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
-		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib"
-CONFIGURE_TARGET=
-PLIST_SUB=	\
-		VERSION="${GST_VERSION}" \
-		SHLIB_VERSION="${SHLIB_VERSION}"
-INSTALLS_SHLIB=	yes
+		CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}"
+
+.include <bsd.port.pre.mk>
 
-# for various GNOME-related component detection
-WANT_GNOME=	yes
+.if ${GST_PLUGIN} == "base"
+GCONF_SCHEMAS=	gstreamer-0.8.schemas
 
-MAN1=	gst-launch-ext-${GST_VERSION}.1 gst-visualise-${GST_VERSION}.1
+INSTALLS_SHLIB=	yes
 
-PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
-SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
-GST_VERSION=${PORTVERSION:C/..$//}
+PLIST_SUB=	VERSION="${VERSION}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 
-# library minor number
-SHLIB_VERSION=	1
+MAN1=		gst-launch-ext-0.8.1 gst-visualise-0.8.1
 
 ## Additional directories which should be both built and installed
 ## but configure neglected to correctly identify them
@@ -88,385 +60,6 @@ SHLIB_VERSION=	1
 EXTRA_BUILD_DIR+=	sys/vcd
 # modplug
 EXTRA_BUILD_DIR+=	gst/modplug
-
-post-extract:
-# for cdrom/vcd support
-# taken from mplayer distfile
-# MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
-	@${CP} ${FILESDIR}/bsdi_dvd.h ${WRKSRC}/sys/vcd/
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-.if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
-# Fix gst-register when using -O -march=athlon-xp
-	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
-		${WRKSRC}/gst/modplug/Makefile.in \
-		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
-.endif
-# as of this writing, FreeBSD does not support lrint* C99 math functions
-	@${REINPLACE_CMD} -E -e \
-		's|^#define.*LRINT.*$$||' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# respect CFLAGS
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
-		's,-O(2|3),,; \
-		s|-mcpu=i486||'
-# mcopidl takes the file as the last argument
-	@${REINPLACE_CMD} -E -e \
-		's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
-		${WRKSRC}/ext/arts/Makefile.in
-# malloc.h was deprecated in favor of stdlib.h
-# inttypes.h not stdint.h
-	@${FIND} ${WRKSRC} -type f | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -e \
-		's|malloc\.h|stdlib.h|; \
-		s|stdint\.h|inttypes.h|'
-# force libaudiofile detection
-	@${REINPLACE_CMD} -E -e \
-		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# cdrom default device
-	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/ext/cdparanoia/gstcdparanoia.c \
-		${WRKSRC}/sys/cdrom/gstcdplayer.c \
-		${WRKSRC}/sys/vcd/vcdsrc.c
-# dvd default device
-	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
-		${WRKSRC}/ext/dvdnav/dvdnavsrc.c \
-		${WRKSRC}/ext/dvdread/dvdreadsrc.c
-# cdrom/vcd support
-	@${REINPLACE_CMD} -e 's|<linux/cdrom.h>|"bsdi_dvd.h"|' \
-		${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
-		${WRKSRC}/sys/vcd/vcdsrc.c \
-		${WRKSRC}/sys/vcd/vcdsrc.h
-
-# hermes is required for gstreamer-player to work
-# since it is currently the only colorspace plugin available
-# XXX However, it currently does not work on sparc64.
-.if ${ARCH} != "sparc64"
-WITH_HERMES=	yes
-.endif
-# gnomevfs is required for gstreamer-player to work
-WITH_GNOMEVFS=	yes
-# Add default MAD support.  This is required for rhythmbox to work.
-WITH_MAD=	yes
-
-##
-## auto detect possible plugins
-##
-
-# aalib
-.if exists(${LOCALBASE}/lib/libaa.a)
-WITH_AALIB=yes
-.endif
-
-# arts
-.if exists(${LOCALBASE}/lib/libartsc.so.0) && !defined(WITHOUT_ARTS)
-WITH_ARTS=yes
-.endif
-
-# cairo
-.if exists(${LOCALBASE}/lib/libcairo.a)
-WITH_CAIRO=yes
-.endif
-
-# cdparanoia
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
-WITH_CDPARANOIA=yes
-.endif
-
-# dts
-.if exists(${LOCALBASE}/lib/libdts_pic.a)
-WITH_DTS=yes
-.endif
-
-# faac
-.if exists(${LOCALBASE}/lib/libfaac.a)
-WITH_FAAC=yes
-.endif
-
-# esound
-.if (${HAVE_GNOME:Mesound}!="")
-WITH_ESOUND=yes
-.endif
-
-# faad
-.if exists(${LOCALBASE}/lib/libfaad.a)
-WITH_FAAD=yes
-.endif
-
-# flac
-.if exists(${LOCALBASE}/lib/libFLAC.a)
-WITH_FLAC=yes
-.endif
-
-# freetype
-.if exists(${LOCALBASE}/lib/libfreetype.a)
-WITH_FREETYPE=yes
-.endif
-
-# gdkpixbuf
-.if ${HAVE_GNOME:Mgtk20}!=""
-WITH_GDKPIXBUF=yes
-.endif
-
-# lame
-.if exists(${LOCALBASE}/lib/libmp3lame.a)
-WITH_LAME=yes
-.endif
-
-# gnomevfs
-.if ${HAVE_GNOME:Mgnomevfs2}!=""
-WITH_GNOMEVFS=yes
-.endif
-
-# jack
-.if exists(${LOCALBASE}/lib/libjack.so.0)
-WITH_JACK=YES
-.endif
-
-# libcaca
-.if exists(${LOCALBASE}/lib/libcaca.a)
-WITH_LIBCACA=yes
-.endif
-
-# libmng
-.if exists(${LOCALBASE}/lib/libmng.a)
-WITH_MNG=yes
-.endif
-
-# libmms
-.if exists(${LOCALBASE}/lib/libmms.a)
-WITH_MMS=yes
-.endif
-
-# gsm
-.if exists(${LOCALBASE}/lib/libgsm.a)
-WITH_GSM=yes
-.endif
-
-# Hermes
-.if exists (${LOCALBASE}/lib/libHermes.a)
-WITH_HERMES=yes
-.endif
-
-# jpeg
-.if exists(${LOCALBASE}/lib/libjpeg.a)
-WITH_JPEG=yes
-.endif
-
-# ladspa
-.if exists(${LOCALBASE}/include/ladspa.h)
-WITH_LADSPA=yes
-.endif
-
-# liba52
-.if exists(${LOCALBASE}/lib/liba52.a)
-WITH_LIBA52=yes
-.endif
-
-# libaudiofile
-.if exists(${LOCALBASE}/lib/libaudiofile.a)
-WITH_LIBAUDIOFILE=yes
-.endif
-
-# libcdaudio
-.if exists(${LOCALBASE}/lib/libcdaudio.a)
-WITH_LIBCDAUDIO=yes
-.endif
-
-# libdv
-.if exists(${LOCALBASE}/lib/libdv.a)
-WITH_LIBDV=yes
-.endif
-
-# libdvdnav
-.if exists(${LOCALBASE}/lib/libdvdnav.so)
-WITH_LIBDVDNAV=yes
-.endif
-
-# libdvdread
-.if exists(${LOCALBASE}/lib/libdvdread.a)
-WITH_LIBDVDREAD=yes
-.endif
-
-# libfame
-.if exists(${LOCALBASE}/lib/libfame.a)
-WITH_LIBFAME=yes
-.endif
-
-# libmikmod
-.if exists(${LOCALBASE}/lib/libmikmod.a)
-WITH_LIBMIKMOD=yes
-.endif
-
-# libmpeg2
-.if exists(${LOCALBASE}/lib/libmpeg2.a)
-WITH_LIBMPEG2=yes
-.endif
-
-# libmusicbrainz
-.if exists(${LOCALBASE}/lib/libmusicbrainz.a)
-WITH_LIBMUSICBRAINZ=yes
-.endif
-
-# libshout
-.if exists(${LOCALBASE}/lib/libshout.so.2)
-WITH_LIBSHOUT=yes
-.endif
-
-# libsidplay
-.if exists(${LOCALBASE}/lib/libsidplay.a)
-WITH_LIBSIDPLAY=yes
-.endif
-
-# libsndfile
-.if exists(${LOCALBASE}/lib/libsndfile.a)
-WITH_LIBSNDFILE=yes
-.endif
-
-# libtheora
-.if exists(${LOCALBASE}/lib/libtheora.a)
-WITH_LIBTHEORA=yes
-.endif
-
-# libvisual
-.if exists(${LOCALBASE}/lib/libvisual.a)
-WITH_LIBVISUAL=yes
-.endif
-
-# mad
-.if exists(${LOCALBASE}/lib/libmad.a)
-WITH_MAD=yes
-.endif
-
-# mjpegtools
-.if exists(${LOCALBASE}/lib/libmjpegutils.a)
-WITH_MJPEGTOOLS=yes
-.endif
-
-# musepack
-.if exists(${LOCALBASE}/lib/libmusepack.a)
-WITH_MUSEPACK=yes
-.endif
-
-# nas
-.if exists(${X11BASE}/lib/libaudio.a)
-WITH_NAS=YES
-.endif
-
-# ogg
-.if exists(${LOCALBASE}/lib/libogg.a)
-WITH_OGG=yes
-.endif
-
-# pango
-.if exists(${X11BASE}/lib/libpangoft2-1.0.a)
-WITH_PANGO=yes
-.endif
-
-# png
-.if exists(${LOCALBASE}/lib/libpng.a)
-WITH_PNG=yes
-.endif
-
-# polypaudio
-.if exists(${LOCALBASE}/lib/libpolyp-0.7.a)
-WITH_POLYPAUDIO=yes
-.endif
-
-# sdl
-.if exists(${LOCALBASE}/lib/libSDL-1.1.a)
-WITH_SDL=yes
-.endif
-
-# smoothwave
-.if exists(${X11BASE}/lib/libgtk-x11-2.0.a)
-WITH_SMOOTHWAVE=yes
-.endif
-
-# speex
-.if exists(${LOCALBASE}/lib/libspeex.a)
-WITH_SPEEX=yes
-.endif
-
-# swfdec
-.if exists(${X11BASE}/lib/libswfdec-0.3.a)
-WITH_SWFDEC=yes
-.endif
-
-# vorbis
-.if exists(${LOCALBASE}/lib/libvorbis.a)
-WITH_VORBIS=yes
-.endif
-
-# vorbisidec
-.if exists(${LOCALBASE}/lib/libvorbisidec.a)
-WITH_VORBISIDEC=yes
-.endif
-
-# xine
-# this plugins is meant to support plugins that gstreamer doesn't have (yet)
-.if exists(${X11BASE}/lib/libxine.so.12)
-WITH_XINE=yes
-.endif
-
-# xvid
-.if exists(${LOCALBASE}/lib/libxvidcore.so.4)
-WITH_XVID=yes
-.endif
-
-##
-## control CONFIGURE options
-##
-
-# aalib
-.ifndef(WITH_AALIB)
-CONFIGURE_ARGS+=	--disable-aalib \
-			--disable-aalibtest
-PLIST_SUB+=	AALIB="@comment "
-.else
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-
-CONFIGURE_ARGS+=	--with-aalib-prefix=${LOCALBASE}  \
-			--with-aalib-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	AALIB=""
-.endif
-
-# arts
-.ifndef(WITH_ARTS)
-CONFIGURE_ARGS+=	--disable-arts \
-			--disable-artsc \
-			--disable-artstest
-PLIST_SUB+=	ARTS="@comment "
-.else
-LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-
-CONFIGURE_ARGS+=	--with-arts-prefix=${LOCALBASE} \
-			--with-arts-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	ARTS=""
-.endif
-
-# cairo
-.ifndef(WITH_CAIRO)
-CONFIGURE_ARGS+=	--disable-cairo
-PLIST_SUB+=	CAIRO="@comment "
-.else
-LIB_DEPENDS+=	cairo.1:${PORTSDIR}/graphics/cairo
-
-PLIST_SUB+=	CAIRO=""
-.endif
-
-# cdparanoia
-.ifndef(WITH_CDPARANOIA)
-CONFIGURE_ARGS+=	--disable-cdparanoia
-PLIST_SUB+=	CDPARANOIA="@comment "
-.else
-LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
-
-PLIST_SUB+=	CDPARANOIA=""
 .endif
 
 # cdrom default device
@@ -480,16 +73,6 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
 . endif
 .endif
 
-# dts
-.ifndef(WITH_DTS)
-CONFIGURE_ARGS+=	--disable-dts
-PLIST_SUB+=	DTS="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-RUN_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
-PLIST_SUB+=	DTS=""
-.endif
-
 # dvd default device
 .ifdef(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
@@ -501,497 +84,46 @@ DEFAULT_DVD_DEVICE=/dev/acd0
 . endif
 .endif
 
-# esound
-.ifndef(WITH_ESOUND)
-CONFIGURE_ARGS+=	--disable-esd \
-			--disable-esdtest
-PLIST_SUB+=	ESOUND="@comment "
-.else
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--with-esd-prefix=${LOCALBASE}  \
-			--with-esd-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	ESOUND=""
-.endif
-
-# faac
-.ifndef(WITH_FAAC)
-CONFIGURE_ARGS+=	--disable-faac
-PLIST_SUB+=	FAAC="@comment "
-.else
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-PLIST_SUB+=	FAAC=""
-.endif
-
-# faad
-.ifndef(WITH_FAAD)
-CONFIGURE_ARGS+=	--disable-faad
-PLIST_SUB+=	FAAD="@comment "
-.else
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-PLIST_SUB+=	FAAD=""
-.endif
-
-# flac
-.ifndef(WITH_FLAC)
-CONFIGURE_ARGS+=	--disable-flac
-PLIST_SUB+=	FLAC="@comment "
-.else
-LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
-
-PLIST_SUB+=	FLAC=""
-.endif
-
-# freetype
-.ifndef(WITH_FREETYPE)
-CONFIGURE_ARGS+=	--disable-freetypetest
-PLIST_SUB+=	FREETYPE="@comment "
-.else
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-
-CONFIGURE_ARGS+=	--with-ft-prefix=${LOCALBASE}  \
-			--with-ft-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	FREETYPE=""
-.endif
-
-# gdkpixbuf
-.ifndef(WITH_GDKPIXBUF)
-CONFIGURE_ARGS+=	--disable-gdk_pixbuf
-PLIST_SUB+=	GDKPIXBUF="@comment "
-.else
-USE_GNOME+=	gtk20
-PLIST_SUB+=	GDKPIXBUF=""
-.endif
-
-# gnomevfs
-.ifndef(WITH_GNOMEVFS)
-CONFIGURE_ARGS+=	--disable-gnome_vfs
-PLIST_SUB+=	GNOMEVFS="@comment "
-.else
-USE_GNOME+=	gnomevfs2
-PLIST_SUB+=	GNOMEVFS=""
-.endif
-
-# gsm
-.ifndef(WITH_GSM)
-CONFIGURE_ARGS+=	--disable-gsm
-PLIST_SUB+=	GSM="@comment "
-.else
-LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
-
-PLIST_SUB+=	GSM=""
-.endif
-
-# jack
-.ifndef(WITH_JACK)
-CONFIGURE_ARGS+=	--disable-jack
-PLIST_SUB+=	JACK="@comment "
-.else
-LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
-PLIST_SUB+=	JACK=""
-.endif
-
-# Hermes
-.ifndef(WITH_HERMES)
-CONFIGURE_ARGS+=	--disable-hermes
-PLIST_SUB+=	HERMES="@comment "
-.else
-LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
-PLIST_SUB+=	HERMES=""
-.endif
-
-# jpeg
-.ifndef(WITH_JPEG)
-CONFIGURE_ARGS+=	--disable-jpeg
-PLIST_SUB+=	JPEG="@comment "
-.else
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-
-PLIST_SUB+=	JPEG=""
-.endif
-
-# ladspa
-.ifndef(WITH_LADSPA)
-CONFIGURE_ARGS+=	--disable-ladspa
-PLIST_SUB+=	LADSPA="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-
-PLIST_SUB+=	LADSPA=""
-.endif
-
-# lame
-.ifndef(WITH_LAME)
-CONFIGURE_ARGS+=	--disable-lame
-PLIST_SUB+=	LAME="@comment "
-.else
-LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
-
-PLIST_SUB+=	LAME=""
-.endif
-
-# liba52
-.ifndef(WITH_LIBA52)
-CONFIGURE_ARGS+=	--disable-a52dec
-PLIST_SUB+=	LIBA52="@comment "
-.else
-LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
-
-CONFIGURE_ARGS+=	--with-a52dec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBA52=""
-.endif
-
-# libaudiofile
-.ifndef(WITH_LIBAUDIOFILE)
-CONFIGURE_ARGS+=	--disable-audiofile
-PLIST_SUB+=	LIBAUDIOFILE="@comment "
-.else
-LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
-
-PLIST_SUB+=	LIBAUDIOFILE=""
-.endif
-
-# libcaca
-.ifndef(WITH_LIBCACA)
-CONFIGURE_ARGS+=	--disable-libcaca
-PLIST_SUB+=	LIBCACA="@comment "
-.else
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-PLIST_SUB+=	LIBCACA=""
-.endif
-
-# libcdaudio
-.ifndef(WITH_LIBCDAUDIO)
-CONFIGURE_ARGS+=	--disable-cdaudio
-PLIST_SUB+=	LIBCDAUDIO="@comment "
-.else
-LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
-
-PLIST_SUB+=	LIBCDAUDIO=""
-.endif
-
-# libdv
-.ifndef(WITH_LIBDV)
-CONFIGURE_ARGS+=	--disable-libdv
-PLIST_SUB+=	LIBDV="@comment "
-.else
-LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-
-PLIST_SUB+=	LIBDV=""
-.endif
-
-# libdvdnav
-.ifndef(WITH_LIBDVDNAV)
-CONFIGURE_ARGS+=	--disable-dvdnav
-PLIST_SUB+=	LIBDVDNAV="@comment "
-.else
-LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
-
-PLIST_SUB+=	LIBDVDNAV=""
-.endif
-
-# libdvdread
-.ifndef(WITH_LIBDVDREAD)
-CONFIGURE_ARGS+=	--disable-dvdread
-PLIST_SUB+=	LIBDVDREAD="@comment "
-.else
-LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
-
-PLIST_SUB+=	LIBDVDREAD=""
-.endif
-
-# libfame
-.ifndef(WITH_LIBFAME)
-CONFIGURE_ARGS+=	--disable-libfame \
-			--disable-libfametest
-PLIST_SUB+=	LIBFAME="@comment "
-.else
-LIB_DEPENDS+=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
-
-CONFIGURE_ARGS+=	--with-libfame-prefix=${LOCALBASE} \
-			--with-libfame-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBFAME=""
-.endif
-
-# libmikmod
-.ifndef(WITH_LIBMIKMOD)
-CONFIGURE_ARGS+=	--disable-libmikmodtest \
-			--disable-mikmod
-PLIST_SUB+=	LIBMIKMOD="@comment "
-.else
-LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
-
-CONFIGURE_ARGS+=	--with-libmikmod-prefix=${LOCALBASE} \
-			--with-libmikmod-exec-prefix=${LOCALBASE}
-PLIST_SUB+=	LIBMIKMOD=""
-.endif
-
-# libmpeg2
-.ifndef(WITH_LIBMPEG2)
-CONFIGURE_ARGS+=	--disable-mpeg2dec
-PLIST_SUB+=	LIBMPEG2="@comment "
-.else
-LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
-
-PLIST_SUB+=	LIBMPEG2=""
-.endif
-
-# libmusicbrainz
-.ifndef(WITH_LIBMUSICBRAINZ)
-CONFIGURE_ARGS+=	--disable-musicbrainz
-PLIST_SUB+=	LIBMUSICBRAINZ="@comment "
-.else
-LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
-PLIST_SUB+=	LIBMUSICBRAINZ=""
-.endif
-
-# libshout
-.ifndef(WITH_LIBSHOUT)
-CONFIGURE_ARGS+=	--disable-shout
-PLIST_SUB+=	LIBSHOUT="@comment "
-.else
-LIB_DEPENDS+=	shout.2:${PORTSDIR}/audio/libshout
-
-PLIST_SUB+=	LIBSHOUT=""
-.endif
-
-# libsidplay
-.ifndef(WITH_LIBSIDPLAY)
-CONFIGURE_ARGS+=	--disable-sidplay
-PLIST_SUB+=	LIBSIDPLAY="@comment "
-.else
-LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
-
-PLIST_SUB+=	LIBSIDPLAY=""
-.endif
-
-# libsndfile
-.ifndef(WITH_LIBSNDFILE)
-CONFIGURE_ARGS+=	--disable-sndfile
-PLIST_SUB+=	LIBSNDFILE="@comment "
-.else
-LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
-PLIST_SUB+=	LIBSNDFILE=""
-.endif
-
-# libtheora
-.ifndef(WITH_LIBTHEORA)
-CONFIGURE_ARGS+=	--disable-theora
-PLIST_SUB+=	LIBTHEORA="@comment "
-.else
-LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
-PLIST_SUB+=	LIBTHEORA=""
-.endif
-
-# libvisual
-.ifndef(WITH_LIBVISUAL)
-CONFIGURE_ARGS+=	--disable-libvisual
-PLIST_SUB+=	LIBVISUAL="@comment "
-.else
-LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
-
-PLIST_SUB+=	LIBVISUAL=""
-.endif
-
-# mad
-.ifndef(WITH_MAD)
-CONFIGURE_ARGS+=	--disable-mad
-PLIST_SUB+=	LIBMAD="@comment "
-.else
-LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		id3tag.2:${PORTSDIR}/audio/libid3tag
-
-PLIST_SUB+=	LIBMAD=""
-.endif
-
-# mjpegtools
-.ifndef(WITH_MJPEGTOOLS)
-CONFIGURE_ARGS+=	--disable-mpeg2enc --disable-mplex
-PLIST_SUB+=	MJPEGTOOLS="@comment "
-.else
-LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
-
-EXTRA_BUILD_DIR+=	ext/mpeg2enc
-# XXX - make sure CONFIGURE works with mpeg2enc even with "ccache
-# c++" ... weird but necessary
-CONFIGURE_ENV+=	HAVE_CXX=yes
-
-PLIST_SUB+=	MJPEGTOOLS=""
-.endif
-
-# musepack
-.ifndef(WITH_MUSEPACK)
-CONFIGURE_ARGS+=	--disable-musepack
-PLIST_SUB+=	MUSEPACK="@comment "
-.else
-LIB_DEPENDS+=	musepack.1:${PORTSDIR}/audio/libmusepack
-
-PLIST_SUB+=	MUSEPACK=""
-.endif
-
-# nas
-.ifndef(WITH_NAS)
-CONFIGURE_ARGS+=	--disable-nas
-PLIST_SUB+=	NAS="@comment "
-.else
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
-
-PLIST_SUB+=	NAS=""
-.endif
-
-# ogg
-.ifndef(WITH_OGG)
-CONFIGURE_ARGS+=	--disable-ogg \
-			--disable-oggtest
-PLIST_SUB+=	OGG="@comment "
-.else
-LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
-PLIST_SUB+=	OGG=""
-.endif
-
-# oss
-.ifdef(WITHOUT_OSS)
-CONFIGURE_ARGS+=	--disable-oss
-PLIST_SUB+=	OSS="@comment "
-.else
-PLIST_SUB+=	OSS=""
-.endif
-
-# pango
-.ifndef(WITH_PANGO)
-CONFIGURE_ARGS+=	--disable-pango
-PLIST_SUB+=	PANGO="@comment "
-.else
-USE_GNOME+=	pango
-PLIST_SUB+=	PANGO=""
-.endif
-
-# mng
-.ifndef(WITH_MNG)
-CONFIGURE_ARGS+=	--disable-libmng
-PLIST_SUB+=	MNG="@comment "
-.else
-LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
-PLIST_SUB+=	MNG=""
-.endif
-
-# mms
-.ifndef(WITH_MMS)
-CONFIGURE_ARGS+=	--disable-libmms
-PLIST_SUB+=	MMS="@comment "
-.else
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
-PLIST_SUB+=	MMS=""
-.endif
-
-# png
-.ifndef(WITH_PNG)
-CONFIGURE_ARGS+=	--disable-libpng
-PLIST_SUB+=	PNG="@comment "
-.else
-LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
-
-PLIST_SUB+=	PNG=""
-.endif
-
-# polypaudio
-.ifndef(WITH_POLYPAUDIO)
-CONFIGURE_ARGS+=	--disable-polyp
-PLIST_SUB+=	POLYPAUDIO="@comment "
-.else
-LIB_DEPENDS+=	polyp-0.7.0:${PORTSDIR}/audio/polypaudio
-
-PLIST_SUB+=	POLYPAUDIO=""
-.endif
-
-# sdl
-.ifndef(WITH_SDL)
-CONFIGURE_ARGS+=	--disable-sdl \
-			--disable-sdltest
-PLIST_SUB+=	SDL="@comment "
-.else
-USE_SDL=	sdl
-
-CONFIGURE_ARGS+=	--with-sdl-prefix=${LOCALBASE}  \
-			--with-sdl-exec-prefix=${LOCALBASE}
-CONFIGURE_ENV+=		SDL_CONFIG=${SDL_CONFIG}
-PLIST_SUB+=	SDL=""
-.endif
-
-# smoothwave
-.ifndef(WITH_SMOOTHWAVE)
-CONFIGURE_ARGS+=	--disable-smoothwave
-PLIST_SUB+=	SMOOTHWAVE="@comment "
-.else
-USE_GNOME+=	gtk20
-PLIST_SUB+=	SMOOTHWAVE=""
-.endif
-
-# speex
-.ifndef(WITH_SPEEX)
-CONFIGURE_ARGS+=	--disable-speex
-PLIST_SUB+=	SPEEX="@comment "
-.else
-LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
-PLIST_SUB+=	SPEEX=""
-.endif
-
-# swfdec
-.ifndef(WITH_SWFDEC)
-CONFIGURE_ARGS+=	--disable-swfdec
-PLIST_SUB+=	SWFDEC="@comment "
-.else
-LIB_DEPENDS+=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
-
-CONFIGURE_ARGS+=	--enable-swfdec
-PLIST_SUB+=	SWFDEC=""
-.endif
-
-# vorbis
-.ifndef(WITH_VORBIS)
-CONFIGURE_ARGS+=	--disable-vorbis \
-			--disable-vorbistest
-PLIST_SUB+=	VORBIS="@comment "
-.else
-LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
-
-CONFIGURE_ARGS+=	--with-vorbis=${LOCALBASE} \
-			--with-vorbis-libraries=${LOCALBASE}/lib \
-			--with-vorbis-includes=${LOCALBASE}/include
-PLIST_SUB+=	VORBIS=""
-.endif
-
-# vorbisidec
-.ifndef(WITH_VORBISIDEC)
-CONFIGURE_ARGS+=	--disable-ivorbis
-PLIST_SUB+=	IVORBIS="@comment "
-.else
-LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-PLIST_SUB+=	IVORBIS=""
-.endif
-
-# xine
-.ifndef(WITH_XINE)
-CONFIGURE_ARGS+=	--disable-xine
-PLIST_SUB+=	XINE="@comment "
-.else
-CONFIGURE_ARGS+=	--enable-xine
-LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
-
-PLIST_SUB+=	XINE=""
-.endif
+post-extract:
+# for cdrom/vcd support
+# taken from mplayer distfile
+# MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
+	@${CP} ${FILESDIR}/bsdi_dvd.h ${WRKSRC}/sys/vcd/
 
-# xvid
-.ifndef(WITH_XVID)
-CONFIGURE_ARGS+=	--disable-xvid
-PLIST_SUB+=	XVID="@comment "
-.else
-LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
-PLIST_SUB+=	XVID=""
+post-patch:
+	@${FIND} ${WRKSRC} -type f | \
+	${XARGS} -n 10 ${REINPLACE_CMD} -e \
+	's|malloc\.h|stdlib.h|; \
+	 s|stdint\.h|inttypes.h|; \
+	 s|%%VERSION%%|${VERSION}|'
+# cdrom default device
+	@${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
+		${WRKSRC}/ext/cdparanoia/gstcdparanoia.c \
+		${WRKSRC}/sys/cdrom/gstcdplayer.c \
+		${WRKSRC}/sys/vcd/vcdsrc.c
+# dvd default device
+	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
+		${WRKSRC}/ext/dvdnav/dvdnavsrc.c \
+		${WRKSRC}/ext/dvdread/dvdreadsrc.c
+# cdrom/vcd support
+	@${REINPLACE_CMD} -e 's|<linux/cdrom.h>|"bsdi_dvd.h"|' \
+		${WRKSRC}/sys/cdrom/gstcdplayer_ioctl.c \
+		${WRKSRC}/sys/vcd/vcdsrc.c \
+		${WRKSRC}/sys/vcd/vcdsrc.h
+# mplex fix -- gst configure does not use mjpegtool's config to find include.
+	@${REINPLACE_CMD} -E \
+		-e 's|PFLAGS@|PFLAGS@ -I${LOCALBASE}/include/mjpegtools -I${LOCALBASE}/include/mjpegtools/mplex|' \
+		${WRKSRC}/ext/mplex/Makefile.in
+.if ${CXXFLAGS:M*=athlon-4} || ${CXXFLAGS:M*=athlon-mp} || ${CXXFLAGS:M*=athlon-xp}
+# Fix gst-register when using -O -march=athlon-xp
+	@${REINPLACE_CMD} -e 's|@CXXF|-fgcse @CXXF|g' \
+		${WRKSRC}/gst/modplug/Makefile.in \
+		${WRKSRC}/gst/modplug/libmodplug/Makefile.in
 .endif
 
 pre-build:
-# This port cannot be CFLAGS safe, using p4 optimizations
-# break the mod plugin
+# This port cannot be CFLAGS safe, when using p4 optimizations
+# because it breaks the mod plugin
 	@${REINPLACE_CMD} -E \
 		-e 's|(-march=pentiu)m4|\1m3|g' \
 		-e 's|(-mcpu=pentiu)m4|\1m3|g' \
@@ -1005,6 +137,9 @@ post-build:
 	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
 . endfor
 .endif
+#	@${ECHO_CMD} "@unexec ${PREFIX}/bin/gst-register-${GST_VERSION} \
+#		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml \
+#		>> ${TMPPLIST}"
 
 post-install:
 .ifdef(EXTRA_BUILD_DIR)
@@ -1016,225 +151,5 @@ post-install:
 	-@${X11BASE}/bin/gst-register-${GST_VERSION} \
 		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml 2>/dev/null
 
-pre-everything::
-.ifndef(WITH_AALIB)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_AALIB to enable aalib Video plugin'
-.endif
-.ifdef(WITH_ARTS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITHOUT_ARTS to disable aRts Audio plugin'
-.else
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_ARTS to enable aRts Audio plugin'
-.endif
-.ifndef(WITH_CAIRO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cairo textoverlay plugin'
-.endif
-.ifndef(WITH_CDPARANOIA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin'
-.endif
-.ifndef(WITH_CDROM_DEVICE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> The default CDROM device is ${DEFAULT_CDROM_DEVICE}'
-	@${ECHO_MSG} '===> Define WITH_CDROM_DEVICE if you want to change the default'
-	@${ECHO_MSG} '===> For example, make WITH_CDROM_DEVICE="/dev/somedevice"'
-.endif
-.ifndef(WITH_DTS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_DTS to enable DTS decoding support'
-.endif
-.ifndef(WITH_DVD_DEVICE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> The default DVD device is ${DEFAULT_DVD_DEVICE}'
-	@${ECHO_MSG} '===> Define WITH_DVD_DEVICE if you want to change the default'
-	@${ECHO_MSG} '===> For example, make WITH_DVD_DEVICE="/dev/somedevice"'
-.endif
-.ifndef(WITH_ESOUND)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
-.endif
-.ifndef(WITH_FAAC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FAAC to enable faac Audio plugin'
-.endif
-.ifndef(WITH_FAAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FAAD to enable faad Audio plugin'
-.endif
-.ifndef(WITH_FLAC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FLAC to enable flac Audio plugin'
-.endif
-.ifndef(WITH_FREETYPE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_FREETYPE to enable freetype support'
-.endif
-.ifndef(WITH_GDKPIXBUF)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GDKPIXBUF to enable gdk-pixbuf plugin'
-.endif
-.ifndef(WITH_GSM)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GSM to enable gsm Audio plugin'
-.endif
-.ifndef(WITH_GNOMEVFS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin'
-.endif
-.ifndef(WITH_JACK)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_JACK to enable jackd audio plugin'
-.endif
-.ifndef(WITH_HERMES)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin'
-.endif
-.ifndef(WITH_JPEG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_JPEG to enable jpeg Video plugin'
-.endif
-.ifndef(WITH_LADSPA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LADSPA to enable LADSPA framework Audio plugin'
-.endif
-.ifndef(WITH_LAME)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LAME to enable lame MP3 Audio plugin'
-.endif
-.ifndef(WITH_LIBA52)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBA52 to enable liba52 AC3 Audio plugin'
-.endif
-.ifndef(WITH_LIBAUDIOFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBAUDIOFILE to enable libaudiofile Audio plugin'
-.endif
-.ifndef(WITH_LIBCACA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBCACA to enable libcaca Video plugin'
-.endif
-.ifndef(WITH_LIBCDAUDIO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBCDAUDIO to enable libcdaudio Audio plugin'
-.endif
-.ifndef(WITH_LIBDV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDV to enable libdv Video plugin'
-.endif
-.ifndef(WITH_LIBDVDNAV)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDVDNAV to enable libdvdnav Video plugin'
-.endif
-.ifndef(WITH_LIBDVDREAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBDVDREAD to enable libdvdread Video plugin'
-.endif
-.ifndef(WITH_LIBFAME)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBFAME to enable libfame Video plugin'
-.endif
-.ifndef(WITH_LIBMIKMOD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMIKMOD to enable libmikmod Audio plugin'
-.endif
-.ifndef(WITH_LIBMPEG2)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMPEG2 to enable libmpeg2 Video plugin'
-.endif
-.ifndef(WITH_LIBMUSICBRAINZ)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBMUSICBRAINZ to enable libmusicbrainz Audio plugin'
-.endif
-.ifndef(WITH_LIBSHOUT)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSHOUT to enable libshout Audio plugin'
-.endif
-.ifndef(WITH_LIBSIDPLAY)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSIDPLAY to enable libsidplay Audio plugin'
-.endif
-.ifndef(WITH_LIBSNDFILE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBSNDFILE to enable libsndfile Audio plugin'
-.endif
-.ifndef(WITH_LIBTHEORA)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBTHEORA to enable libtheora Video plugin'
-.endif
-.ifndef(WITH_LIBVISUAL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_LIBVISUAL to enable libvisual Video plugin'
-.endif
-.ifndef(WITH_MAD)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MAD to enable mad Audio plugin'
-.endif
-.ifndef(WITH_MNG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MNG to enable libmng plugin'
-.endif
-.ifndef(WITH_MMS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MMS to enable libmms network plugin'
-.endif
-.ifndef(WITH_MUSEPACK)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_MUSEPACK to enable musepack Audio plugin'
-.endif
-.ifndef(WITH_NAS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_NAS to enable nas Audio plugin'
-.endif
-.ifndef(WITHOUT_OSS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITHOUT_OSS to disable OSS Audio plugin'
-.endif
-.ifndef(WITH_PANGO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_PANGO to enable pango textoverlay plugin'
-.endif
-.ifndef(WITH_PNG)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_PNG to enable png Video plugin'
-.endif
-.ifndef(WITH_POLYPAUDIO)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_POLYPAUDIO to enable polypaudio audio plugin'
-.endif
-.ifndef(WITH_SDL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SDL to enable SDL Video plugin'
-.endif
-.ifndef(WITH_SMOOTHWAVE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SMOOTHWAVE to enable Smoothwave Video plugin'
-.endif
-.ifndef(WITH_SPEEX)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SPEEX to enable Speex Video plugin'
-.endif
-.ifndef(WITH_SWFDEC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_SWFDEC to enable Flash Video plugin'
-.endif
-.ifndef(WITH_VORBIS)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_VORBIS to enable vorbis Audio plugin'
-.endif
-.ifndef(WITH_VORBISIDEC)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_VORBISIDEC to enable vorbisidec Audio plugin'
-.endif
-.ifndef(WITH_XINE)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XINE to enable xine plugin'
-.endif
-.ifndef(WITH_XVID)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_XVID to enable xvid Video plugin'
-.endif
-
+.include "${MASTERDIR}/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins80/Makefile.common b/multimedia/gstreamer-plugins80/Makefile.common
new file mode 100644
index 000000000000..8bb6717dd01f
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/Makefile.common
@@ -0,0 +1,443 @@
+GST_ALL_PLUGINS= \
+		a52dec \
+		aalib \
+		aalibtest \
+		alsa \
+		arts \
+		artstest \
+		artsc \
+		audiofile \
+		cairo \
+		cdaudio \
+		cdparanoia \
+		dirac \
+		divx \
+		dts \
+		dvdnav \
+		dvdread \
+		dxr3 \
+		esd \
+		faac \
+		faad \
+		flac \
+		gdk_pixbuf \
+		gnome_vfs \
+		gsm \
+		hermes \
+		ivorbis \
+		jack \
+		jpeg \
+		ladspa \
+		lame \
+		lcs \
+		libcaca \
+		libdv \
+		libfame \
+		libfametest\
+		libmng \
+		libmms \
+		libpng \
+		librfb \
+		libvisual \
+		mad \
+		mikmod \
+		libmikmodtest \
+		mpeg2dec \
+		mpeg2enc \
+		mplex \
+		musepack \
+		musicbrainz \
+		nas \
+		ogg \
+		opengl \
+		pango \
+		polyp \
+		dv1394 \
+		qcam \
+		raw1394 \
+		sdl \
+		shout \
+		shout2 \
+		sidplay \
+		smoothwave \
+		sndfile \
+		sunaudio \
+		speex \
+		swfdec \
+		tarkin \
+		theora \
+		vcd \
+		vorbis \
+		xine \
+		xvid
+
+# Disable all plugins by default\
+.for d in ${GST_ALL_PLUGINS}
+CONFIGURE_ARGS+=	--disable-${d}
+.endfor
+
+CONFIGURE_ARGS+=--disable-tests \
+		--disable-alsa \
+		--disable-http \
+		--enable-cdrom \
+		--enable-gconf \
+		--enable-gconftool \
+		--enable-oss \
+		--disable-osx_audio \
+		--disable-osx_video \
+		--enable-static \
+		--enable-gst_v4l \
+		--enable-gst_v4l2 \
+		--enable-x \
+		--enable-xshm \
+		--enable-xvideo
+
+.if ${GST_PLUGIN}!="base"
+
+GST_PLUGIN_SUFFIX?=	-${GST_PLUGIN}
+
+COMMENT=	Gstreamer ${GST_PLUGIN} plugin
+
+# Enable the right plugin
+
+CONFIGURE_ARGS:=${CONFIGURE_ARGS:S|--disable-${p}|--enable-${p}|}
+
+# Build/Install directory. defaults to ext/${GST_PLUGIN}
+#   few plugins are in sys/
+GST_PLUGIN_DIR?=	ext/${GST_PLUGIN}
+
+#
+GST_LIB_DIR=		lib/gstreamer-${VERSION}
+
+# Auto create PLIST
+PLIST=		${NONEXISTENT}
+PLIST_FILES?=	${GST_LIB_DIR}/libgst${GST_PLUGIN}${GST_PLIST_SUFFIX}.so
+
+# aalib
+.if ${GST_PLUGIN}=="aalib"
+LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so
+.endif
+
+# artsd
+.if ${GST_PLUGIN}=="artsd"
+LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
+GST_PLIST_SUFFIX=	sink
+.endif
+
+# cairo
+.if ${GST_PLUGIN}=="cairo"
+LIB_DEPENDS+=	cairo.1:${PORTSDIR}/graphics/cairo
+.endif
+
+# cdparanoia
+.if ${GST_PLUGIN}=="cdparanoia"
+LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+.endif
+
+# dirac
+.if ${GST_PLUGIN}=="dirac"
+LIB_DEPENDS+=	dirac_encoder.0:${PORTSDIR}/multimedia/dirac
+.endif
+
+# dts
+.if ${GST_PLUGIN}=="dts"
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
+RUN_DEPENDS+=	${LOCALBASE}/lib/libdts_pic.a:${PORTSDIR}/multimedia/libdts
+GST_PLIST_SUFFIX=	dec
+.endif
+
+# esound
+.if ${GST_PLUGIN}=="esound"
+USE_GNOME+=	esound
+GST_PLUGIN_DIR=	ext/esd
+PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so
+.endif
+
+# faac
+.if ${GST_PLUGIN}=="faac"
+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+.endif
+
+# faad
+.if ${GST_PLUGIN}=="faad"
+LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
+.endif
+
+# flac
+.if ${GST_PLUGIN}=="flac"
+LIB_DEPENDS+=	FLAC.5:${PORTSDIR}/audio/flac
+.endif
+
+# gdkpixbuf
+.if ${GST_PLUGIN}=="gdkpixbuf"
+USE_GNOME+=	gtk20
+GST_PLUGIN_DIR=	ext/gdk_pixbuf
+.endif
+
+# gnomevfs
+.if ${GST_PLUGIN}=="gnomevfs"
+USE_GNOME+=	gnomevfs2
+.endif
+
+# gsm
+.if ${GST_PLUGIN}=="gsm"
+LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+.endif
+
+# jack
+.if ${GST_PLUGIN}=="jack"
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.endif
+
+# libcdaudio
+.if ${GST_PLUGIN}=="cdaudio"
+LIB_DEPENDS+=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
+.endif
+
+# libvisual
+.if ${GST_PLUGIN}=="libvisual"
+LIB_DEPENDS+=	visual.0:${PORTSDIR}/graphics/libvisual
+.endif
+
+# musepack
+.if ${GST_PLUGIN}=="musepack"
+LIB_DEPENDS+=	musepack.1:${PORTSDIR}/audio/libmusepack
+.endif
+
+# hermes
+.if ${GST_PLUGIN}=="hermes"
+LIB_DEPENDS+=	Hermes.1:${PORTSDIR}/graphics/Hermes
+PLIST_FILES=	${GST_LIB_DIR}/libgsthermescolorspace.so
+.endif
+
+# jpeg
+.if ${GST_PLUGIN}=="jpeg"
+LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
+CONFLICTS+=	gstreamer-plugins-jpeg-mmx-*
+.endif
+
+# jpeg-mmx
+.if ${GST_PLUGIN}=="jpeg-mmx"
+LIB_DEPEDNS+=	jpeg-mmx.62:${PORTSDIR}/graphics/jpeg-mmx
+CONFLICTS+=	gstreamer-plugins-jpeg-*.*
+
+GST_PLUGIN_DIR= ext/jpeg
+PLIST_FILES=	${GST_LIB_DIR}/libgstjpeg.so
+.endif
+
+# ladspa
+.if ${GST_PLUGIN}=="ladspa"
+BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
+.endif
+
+# lame
+.if ${GST_PLUGIN}=="lame"
+LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+.endif
+
+# a52dec
+.if ${GST_PLUGIN}=="a52dec"
+LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+.endif
+
+# audiofile
+.if ${GST_PLUGIN}=="audiofile"
+LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+.endif
+
+# libcaca
+.if ${GST_PLUGIN}=="libcaca"
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so
+.endif
+
+# dv
+.if ${GST_PLUGIN}=="dv"
+LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+GST_PLIST_SUFFIX=	dec
+.endif
+
+# dvd (dvdnav dvdread)
+.if ${GST_PLUGIN}=="dvd"
+EXTRA_LIBS+=	-ldvdnav
+LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
+GST_PLUGIN_DIR=	ext/dvdnav \
+		ext/dvdread
+PLIST_FILES=	${GST_LIB_DIR}/libgstdvdnavsrc.so \
+		${GST_LIB_DIR}/libgstdvdreadsrc.so
+.endif
+
+# libfame
+.if ${GST_PLUGIN}=="libfame"
+LIB_DEPENDS+=	fame-0.9.1:${PORTSDIR}/multimedia/libfame
+.endif
+
+# libmms
+.if ${GST_PLUGIN}=="libmms"
+LIB_DEPENDS+=   mms.0:${PORTSDIR}/multimedia/libmms
+PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so
+.endif
+
+# libmng
+.if ${GST_PLUGIN}=="libmng"
+LIB_DEPENDS+=	mng.1:${PORTSDIR}/graphics/libmng
+PLIST_FILES=    ${GST_LIB_DIR}/libgstmng.so
+.endif
+
+# mikmod
+.if ${GST_PLUGIN}=="mikmod"
+LIB_DEPENDS+=	mikmod.2:${PORTSDIR}/audio/libmikmod
+.endif
+
+# mpeg2dec
+.if ${GST_PLUGIN}=="mpeg2dec"
+LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+.endif
+
+# mplex
+.if ${GST_PLUGIN}=="mplex"
+LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
+.endif
+
+# musicbrainz
+.if ${GST_PLUGIN}=="musicbrainz"
+LIB_DEPENDS+=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz
+PLIST_FILES=	lib/gstreamer-${VERSION}/libgsttrm.so
+.endif
+
+# shout
+.if ${GST_PLUGIN}=="shout"
+LIB_DEPENDS+=	shout.2:${PORTSDIR}/audio/libshout
+.endif
+
+# sidplay
+.if ${GST_PLUGIN}=="sidplay"
+LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so
+.endif
+
+# sndfile
+.if ${GST_PLUGIN}=="sndfile"
+LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+.endif
+
+# theora
+.if ${GST_PLUGIN}=="theora"
+LIB_DEPENDS+=	theora.1:${PORTSDIR}/multimedia/libtheora
+.endif
+
+# mad
+.if ${GST_PLUGIN}=="mad"
+LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
+		id3tag.2:${PORTSDIR}/audio/libid3tag
+.endif
+
+# mpeg2enc
+.if ${GST_PLUGIN}=="mpeg2enc"
+USE_GSTREAMER+=	mplex
+LIB_DEPENDS+=	lavjpeg-1.6.2:${PORTSDIR}/multimedia/mjpegtools
+
+# XXX - make sure CONFIGURE works with mpeg2enc even with "ccache
+# c++" ... weird but necessary
+CONFIGURE_ENV+=	HAVE_CXX=yes
+.endif
+
+# nas
+.if ${GST_PLUGIN}=="nas"
+LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+GST_PLIST_SUFFIX=	sink
+.endif
+
+# ogg
+.if ${GST_PLUGIN}=="ogg"
+LIB_DEPENDS+=	ogg.5:${PORTSDIR}/audio/libogg
+.endif
+
+# pango
+.if ${GST_PLUGIN}=="pango"
+USE_GNOME+=	pango
+PLIST_FILES=	${GST_LIB_DIR}/libgsttextoverlay.so \
+		${GST_LIB_DIR}/libgsttimeoverlay.so
+.endif
+
+# libpng
+.if ${GST_PLUGIN}=="libpng"
+LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
+GST_PLUGIN_DIR= ext/libpng \
+                ext/snapshot
+PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
+		${GST_LIB_DIR}/libgstsnapshot.so
+.endif
+
+# polypaudio
+.if ${GST_PLUGIN}=="polypaudio"
+LIB_DEPENDS+=	polyp-0.7.0:${PORTSDIR}/audio/polypaudio
+PLIST_FILES=	${GST_LIB_DIR}/libpolypaudio.so
+GST_PLUGIN_DIR=	ext/polyp
+.endif
+
+# sdl
+.if ${GST_PLUGIN}=="sdl"
+USE_SDL+=	sdl
+GST_PLIST_SUFFIX=	videosink
+.endif
+
+# smoothwave
+.if ${GST_PLUGIN}=="smoothwave"
+USE_GNOME+=	gtk20
+.endif
+
+# speex
+.if ${GST_PLUGIN}=="speex"
+LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
+.endif
+
+# swfdec
+.if ${GST_PLUGIN}=="swfdec"
+LIB_DEPENDS+=	swfdec-0.3.0:${PORTSDIR}/graphics/swfdec
+.endif
+
+# vorbis
+.if ${GST_PLUGIN}=="vorbis"
+USE_GSTREAMER+=	ogg
+LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
+.endif
+
+# ivorbis
+.if ${GST_PLUGIN}=="ivorbis"
+LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
+.endif
+
+# xine
+.if ${GST_PLUGIN}=="xine"
+LIB_DEPENDS+=	xine.12:${PORTSDIR}/multimedia/libxine
+.endif
+
+# xvid
+.if ${GST_PLUGIN}=="xvid"
+LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+.endif
+
+LIB_DEPENDS+=	gstgconf-${VERSION}.${SHLIB_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
+
+PLIST_FILES+=	'@exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
+PLIST_FILES+=	'@unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-${VERSION}/registry.xml 2>/dev/null || true'
+
+do-build:
+.for dir in ${GST_PREBUILD_DIR} ${GST_PLUGIN_DIR} ${GST_POSTBUILD_DIR}
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+.endfor
+
+post-build:
+	@${ECHO_CMD} ${PREFIX}/bin/gst-register-${GST_VERSION} \
+		--gst-registry=${PREFIX}/share/gnome/cache/gstreamer-${GST_VERSION}/registry.xml
+
+do-install:
+.for dir in ${GST_PLUGIN_DIR}
+	@cd ${WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
+.endfor
+
+.endif
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_dirac_gstdiracdec.cc b/multimedia/gstreamer-plugins80/files/patch-ext_dirac_gstdiracdec.cc
new file mode 100644
index 000000000000..2ad0b2caf587
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_dirac_gstdiracdec.cc
@@ -0,0 +1,22 @@
+--- ext/dirac/gstdiracdec.cc.orig	Mon Feb 28 22:04:33 2005
++++ ext/dirac/gstdiracdec.cc	Mon Feb 28 22:12:15 2005
+@@ -253,13 +253,18 @@
+ 
+       case STATE_SEQUENCE:{
+         guint8 *buf[3];
++        gint fps_num, fps_denom;
++
++        fps_num = diracdec->decoder->seq_params.frame_rate.numerator;
++  	fps_denom = diracdec->decoder->seq_params.frame_rate.denominator;
+ 
+         /* start-of-sequence - allocate buffer */
+         if (!gst_diracdec_link (diracdec,
+                 diracdec->decoder->seq_params.width,
+                 diracdec->decoder->seq_params.height,
++                (gdouble) fps_num / (gdouble) fps_denom,
+                 gst_diracdec_chroma_to_fourcc (diracdec->decoder->seq_params.
+-                    chroma), diracdec->decoder->seq_params.frame_rate)) {
++                    chroma))) {
+           GST_ELEMENT_ERROR (diracdec, CORE, NEGOTIATION, (NULL),
+               ("Failed to set caps to %dx%d @ %d fps (format=" GST_FOURCC_FORMAT
+                   "/%d)", diracdec->decoder->seq_params.width,
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_libcaca_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-ext_libcaca_Makefile.in
new file mode 100644
index 000000000000..0ee53a92ecd6
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_libcaca_Makefile.in
@@ -0,0 +1,23 @@
+--- ext/libcaca/Makefile.in.orig	Mon Oct  4 00:07:18 2004
++++ ext/libcaca/Makefile.in	Mon Oct  4 00:07:59 2004
+@@ -76,8 +76,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
++libgstcacasink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgstcacasink_la_OBJECTS = libgstcacasink_la-gstcacasink.lo
+ libgstcacasink_la_OBJECTS = $(am_libgstcacasink_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+@@ -616,9 +615,7 @@
+ plugin_LTLIBRARIES = libgstcacasink.la
+ libgstcacasink_la_SOURCES = gstcacasink.c
+ libgstcacasink_la_CFLAGS = $(GST_CFLAGS) $(LIBCACA_CFLAGS)
+-libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-$(GST_MAJORMINOR).la
+-
++libgstcacasink_la_LIBADD = $(LIBCACA_LIBS) -lgstinterfaces-%%VERSION%%
+ libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ noinst_HEADERS = gstcacasink.h
+ all: all-am
diff --git a/multimedia/gstreamer-plugins80/files/patch-ext_sdl_Makefile.in b/multimedia/gstreamer-plugins80/files/patch-ext_sdl_Makefile.in
new file mode 100644
index 000000000000..c943042ad72a
--- /dev/null
+++ b/multimedia/gstreamer-plugins80/files/patch-ext_sdl_Makefile.in
@@ -0,0 +1,23 @@
+--- ext/sdl/Makefile.in.orig	Mon Oct  4 00:56:57 2004
++++ ext/sdl/Makefile.in	Mon Oct  4 00:57:47 2004
+@@ -76,8 +76,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
++libgstsdlvideosink_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
+ am_libgstsdlvideosink_la_OBJECTS =  \
+ 	libgstsdlvideosink_la-sdlvideosink.lo
+ libgstsdlvideosink_la_OBJECTS = $(am_libgstsdlvideosink_la_OBJECTS)
+@@ -617,9 +616,7 @@
+ plugin_LTLIBRARIES = libgstsdlvideosink.la
+ libgstsdlvideosink_la_SOURCES = sdlvideosink.c
+ libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS)
+-libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) \
+-		$(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la
+-
++libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) -lgstinterfaces-%%VERSION%%
+ libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+ noinst_HEADERS = sdlvideosink.h
+ all: all-am
diff --git a/multimedia/gstreamer-plugins80/files/patch-gst_tta_gstttaparse.c b/multimedia/gstreamer-plugins80/files/patch-gst_tta_gstttaparse.c
index d595b086bff5..40b567337892 100644
--- a/multimedia/gstreamer-plugins80/files/patch-gst_tta_gstttaparse.c
+++ b/multimedia/gstreamer-plugins80/files/patch-gst_tta_gstttaparse.c
@@ -1,6 +1,6 @@
---- gst/tta/gstttaparse.c.orig	Sun Jan  9 13:59:02 2005
-+++ gst/tta/gstttaparse.c	Sun Jan  9 14:02:25 2005
-@@ -162,11 +162,13 @@
+--- gst/tta/gstttaparse.c.orig	Sat Jan  8 13:36:26 2005
++++ gst/tta/gstttaparse.c	Sat Jan  8 13:37:08 2005
+@@ -162,11 +162,14 @@
      case GST_EVENT_SEEK:
      {
        if (GST_EVENT_SEEK_FORMAT (event) == GST_FORMAT_TIME) {
@@ -9,9 +9,10 @@
 -        guint64 time = GST_EVENT_SEEK_OFFSET (event);
 -        guint64 seek_frame = time / (FRAME_TIME * 1000000000);
 -        guint64 seekpos = ttaparse->index[seek_frame].pos;
-+        guint64 time;
-+        guint64 seek_frame;
-+        guint64 seekpos;
++	guint64 time;
++	guint64 seek_frame;
++	guint64 seekpos;
++        GST_DEBUG_OBJECT (ttaparse, "got seek event");
 +        time = GST_EVENT_SEEK_OFFSET (event);
 +        seek_frame = time / (FRAME_TIME * 1000000000);
 +        seekpos = ttaparse->index[seek_frame].pos;
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index f8ecfd06e69e..96213ced8a4c 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -1,10 +1,10 @@
 bin/gst-launch-ext-%%VERSION%%
 bin/gst-visualise-%%VERSION%%
-include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
-include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/audio/audioclock.h
 include/gstreamer-%%VERSION%%/gst/audio/multichannel-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/audio/multichannel.h
+include/gstreamer-%%VERSION%%/gst/audio/gstaudiofilter.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance-enumtypes.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalance.h
 include/gstreamer-%%VERSION%%/gst/colorbalance/colorbalancechannel.h
@@ -33,128 +33,77 @@ include/gstreamer-%%VERSION%%/gst/video/video.h
 include/gstreamer-%%VERSION%%/gst/video/videosink.h
 include/gstreamer-%%VERSION%%/gst/xoverlay/xoverlay.h
 include/gstreamer-%%VERSION%%/gst/xwindowlistener/xwindowlistener.h
-%%LIBA52%%lib/gstreamer-%%VERSION%%/libgsta52dec.so
-%%AALIB%%lib/gstreamer-%%VERSION%%/libgstaasink.so
 lib/gstreamer-%%VERSION%%/libgstac3parse.so
 lib/gstreamer-%%VERSION%%/libgstadder.so
 lib/gstreamer-%%VERSION%%/libgstalaw.so
 lib/gstreamer-%%VERSION%%/libgstalpha.so
 lib/gstreamer-%%VERSION%%/libgstalphacolor.so
 lib/gstreamer-%%VERSION%%/libgstapetag.so
-%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
 lib/gstreamer-%%VERSION%%/libgstasf.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
 lib/gstreamer-%%VERSION%%/libgstaudioconvert.so
 lib/gstreamer-%%VERSION%%/libgstaudiofilter.so
 lib/gstreamer-%%VERSION%%/libgstaudiorate.so
-lib/gstreamer-%%VERSION%%/libgstaudio.so
-%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
 lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
 lib/gstreamer-%%VERSION%%/libgstavi.so
-%%LIBCACA%%lib/gstreamer-%%VERSION%%/libgstcacasink.so
-%%CAIRO%%lib/gstreamer-%%VERSION%%/libgstcairo.so
-%%LIBCDAUDIO%%lib/gstreamer-%%VERSION%%/libgstcdaudio.so
-%%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so
 lib/gstreamer-%%VERSION%%/libgstcdplayer.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
-%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcolorspace.so
 lib/gstreamer-%%VERSION%%/libgstcutter.so
 lib/gstreamer-%%VERSION%%/libgstdebug.so
 lib/gstreamer-%%VERSION%%/libgstdecodebin.so
 lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
-%%DTS%%lib/gstreamer-%%VERSION%%/libgstdtsdec.so
-%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
-%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
 lib/gstreamer-%%VERSION%%/libgstefence.so
 lib/gstreamer-%%VERSION%%/libgsteffectv.so
 lib/gstreamer-%%VERSION%%/libgstequalizer.so
-%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesd.so
-%%FAAC%%lib/gstreamer-%%VERSION%%/libgstfaac.so
-%%FAAD%%lib/gstreamer-%%VERSION%%/libgstfaad.so
 lib/gstreamer-%%VERSION%%/libgstfestival.so
 lib/gstreamer-%%VERSION%%/libgstffmpegcolorspace.so
 lib/gstreamer-%%VERSION%%/libgstfilter.so
-%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
 lib/gstreamer-%%VERSION%%/libgstflxdec.so
 lib/gstreamer-%%VERSION%%/libgstgamma.so
-%%GDKPIXBUF%%lib/gstreamer-%%VERSION%%/libgstgdkpixbuf.so
-lib/gstreamer-%%VERSION%%/libgstglimagesink.so
-%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfs.so
 lib/gstreamer-%%VERSION%%/libgstgoom.so
-%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
-%%HERMES%%lib/gstreamer-%%VERSION%%/libgsthermescolorspace.so
 lib/gstreamer-%%VERSION%%/libgstidct.so
 lib/gstreamer-%%VERSION%%/libgstinterleave.so
-%%IVORBIS%%lib/gstreamer-%%VERSION%%/libgstivorbis.so
-%%JACK%%lib/gstreamer-%%VERSION%%/libgstjack.so
-%%JPEG%%lib/gstreamer-%%VERSION%%/libgstjpeg.so
-%%LADSPA%%lib/gstreamer-%%VERSION%%/libgstladspa.so
-%%LAME%%lib/gstreamer-%%VERSION%%/libgstlame.so
 lib/gstreamer-%%VERSION%%/libgstlevel.so
-%%LIBFAME%%lib/gstreamer-%%VERSION%%/libgstlibfame.so
-%%LIBVISUAL%%lib/gstreamer-%%VERSION%%/libgstlibvisual.so
-%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
 lib/gstreamer-%%VERSION%%/libgstmatroska.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
-%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
 lib/gstreamer-%%VERSION%%/libgstmixmatrix.so
 lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
 lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
-%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
-%%MJPEGTOOLS%%lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
 lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
 lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
 lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
 lib/gstreamer-%%VERSION%%/libgstmpegstream.so
-%%MNG%%lib/gstreamer-%%VERSION%%/libgstmng.so
-%%MMS%%lib/gstreamer-%%VERSION%%/libgstmms.so
-%%MJPEGTOOLS%%lib/gstreamer-%%VERSION%%/libgstmplex.so
 lib/gstreamer-%%VERSION%%/libgstmulaw.so
 lib/gstreamer-%%VERSION%%/libgstmultifilesink.so
 lib/gstreamer-%%VERSION%%/libgstmultipart.so
-%%MUSEPACK%%lib/gstreamer-%%VERSION%%/libgstmusepack.so
-%%NAS%%lib/gstreamer-%%VERSION%%/libgstnassink.so
 lib/gstreamer-%%VERSION%%/libgstnavigationtest.so
-%%OGG%%lib/gstreamer-%%VERSION%%/libgstogg.so
+lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstoverlay.so
-%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
 lib/gstreamer-%%VERSION%%/libgstpassthrough.so
 lib/gstreamer-%%VERSION%%/libgstplaybin.so
 lib/gstreamer-%%VERSION%%/libgstplayondemand.so
-%%PNG%%lib/gstreamer-%%VERSION%%/libgstpng.so
 lib/gstreamer-%%VERSION%%/libgstqtdemux.so
 lib/gstreamer-%%VERSION%%/libgstresample.so
-lib/gstreamer-%%VERSION%%/libgstrmdemux.so
 lib/gstreamer-%%VERSION%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrmdemux.so
 lib/gstreamer-%%VERSION%%/libgstrtjpeg.so
 lib/gstreamer-%%VERSION%%/libgstrtp.so
-%%SDL%%lib/gstreamer-%%VERSION%%/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gstreamer-%%VERSION%%/libgstshout.so
-%%LIBSIDPLAY%%lib/gstreamer-%%VERSION%%/libgstsid.so
 lib/gstreamer-%%VERSION%%/libgstsilence.so
 lib/gstreamer-%%VERSION%%/libgstsinesrc.so
-%%SMOOTHWAVE%%lib/gstreamer-%%VERSION%%/libgstsmoothwave.so
 lib/gstreamer-%%VERSION%%/libgstsmooth.so
 lib/gstreamer-%%VERSION%%/libgstsmpte.so
-%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
-%%LIBSNDFILE%%lib/gstreamer-%%VERSION%%/libgstsndfile.so
 lib/gstreamer-%%VERSION%%/libgstspectrum.so
 lib/gstreamer-%%VERSION%%/libgstspeed.so
-%%SPEEX%%lib/gstreamer-%%VERSION%%/libgstspeex.so
 lib/gstreamer-%%VERSION%%/libgststereo.so
-%%SWFDEC%%lib/gstreamer-%%VERSION%%/libgstswfdec.so
 lib/gstreamer-%%VERSION%%/libgstswitch.so
 lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
 lib/gstreamer-%%VERSION%%/libgsttagedit.so
 lib/gstreamer-%%VERSION%%/libgsttcp.so
-lib/gstreamer-%%VERSION%%/libgsttextoverlay.so
-%%LIBTHEORA%%lib/gstreamer-%%VERSION%%/libgsttheora.so
-lib/gstreamer-%%VERSION%%/libgsttimeoverlay.so
-%%LIBMUSICBRAINZ%%lib/gstreamer-%%VERSION%%/libgsttrm.so
 lib/gstreamer-%%VERSION%%/libgsttta.so
 lib/gstreamer-%%VERSION%%/libgsttypefindfunctions.so
 lib/gstreamer-%%VERSION%%/libgstudp.so
@@ -173,16 +122,12 @@ lib/gstreamer-%%VERSION%%/libgstvideoscale.so
 lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
 lib/gstreamer-%%VERSION%%/libgstvolenv.so
 lib/gstreamer-%%VERSION%%/libgstvolume.so
-%%VORBIS%%lib/gstreamer-%%VERSION%%/libgstvorbis.so
 lib/gstreamer-%%VERSION%%/libgstwavenc.so
 lib/gstreamer-%%VERSION%%/libgstwavparse.so
 lib/gstreamer-%%VERSION%%/libgstximagesink.so
-%%XINE%%lib/gstreamer-%%VERSION%%/libgstxine.so
-%%XVID%%lib/gstreamer-%%VERSION%%/libgstxvid.so
 lib/gstreamer-%%VERSION%%/libgstxvimagesink.so
 lib/gstreamer-%%VERSION%%/libgstxwindowlistener.so
 lib/gstreamer-%%VERSION%%/libgsty4menc.so
-%%POLYPAUDIO%%lib/gstreamer-%%VERSION%%/libpolypaudio.so
 lib/libgstgconf-%%VERSION%%.a
 lib/libgstgconf-%%VERSION%%.so
 lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
@@ -214,7 +159,7 @@ share/locale/sq/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
-@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%
 @dirrm include/gstreamer-%%VERSION%%/gst/xwindowlistener
 @dirrm include/gstreamer-%%VERSION%%/gst/xoverlay
 @dirrm include/gstreamer-%%VERSION%%/gst/video
@@ -234,5 +179,3 @@ share/locale/uk/LC_MESSAGES/gst-plugins-%%VERSION%%.mo
 @dirrm include/gstreamer-%%VERSION%%/gst/audio
 @unexec rmdir %D/include/gstreamer-%%VERSION%%/gst 2>/dev/null || true
 @unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
-@exec %%X11BASE%%/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
-@unexec %%X11BASE%%/bin/gst-register-%%VERSION%% --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
diff --git a/multimedia/kmplayer-kde4/Makefile b/multimedia/kmplayer-kde4/Makefile
index f8f01c8a09c3..a99d9f71d51b 100644
--- a/multimedia/kmplayer-kde4/Makefile
+++ b/multimedia/kmplayer-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmplayer
 DISTVERSION=	0.8.4-rc5
+PORTREVISION=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
 #DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/-rc/}
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
 OPTIONS=	GSTREAMER "Enable support for video playback using gstreamer" off \
 		XINE "Enable support for video playback using libxine" off
 
-WANT_GNOME=	gstreamerplugins
+WANT_GSTREAMER=	yes
 
 ###
 ## Lib Detection
@@ -57,20 +58,12 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 ###
-## Internal Detection
-###
-# gstreamer
-.if ${HAVE_GNOME:Mgstreamerplugins}
-WITH_GSTREAMER=yes
-.endif
-
-###
 ## Support Activation
 ###
 # gstreamer
 .undef WITH_GSTREAMER
 .if defined(WITH_GSTREAMER)
-USE_GNOME+=	gstreamerplugins
+USE_GSTREAMER+=	yes
 
 PLIST_FILES+=	bin/kgstplayer
 .else
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index f8f01c8a09c3..a99d9f71d51b 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kmplayer
 DISTVERSION=	0.8.4-rc5
+PORTREVISION=	1
 CATEGORIES=	multimedia audio kde
 MASTER_SITES=	http://www.xs4all.nl/%7Ejjvrieze/
 #DISTNAME=	${PORTNAME}-${PORTVERSION:C/\.r/-rc/}
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=--with-x=${X11BASE} --disable-debug
 OPTIONS=	GSTREAMER "Enable support for video playback using gstreamer" off \
 		XINE "Enable support for video playback using libxine" off
 
-WANT_GNOME=	gstreamerplugins
+WANT_GSTREAMER=	yes
 
 ###
 ## Lib Detection
@@ -57,20 +58,12 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 ###
-## Internal Detection
-###
-# gstreamer
-.if ${HAVE_GNOME:Mgstreamerplugins}
-WITH_GSTREAMER=yes
-.endif
-
-###
 ## Support Activation
 ###
 # gstreamer
 .undef WITH_GSTREAMER
 .if defined(WITH_GSTREAMER)
-USE_GNOME+=	gstreamerplugins
+USE_GSTREAMER+=	yes
 
 PLIST_FILES+=	bin/kgstplayer
 .else
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 99c25c7bde3c..b7d4b296bafa 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nautilus-media
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.8
@@ -19,7 +20,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2 gstreamerplugins
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
+USE_GSTREAMER=	core gnomevfs
 USE_INC_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/pitivi/Makefile b/multimedia/pitivi/Makefile
index 4f9775a119e2..fe8783850680 100644
--- a/multimedia/pitivi/Makefile
+++ b/multimedia/pitivi/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Gstreamer based non-linear audio/video editor
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnometarget gnomeprefix gstreamerplugins
+USE_GNOME=	gnometarget gnomeprefix
+USE_GSTREAMER=	yes
 USE_LIBTOOL_VER=15
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index a05b423d78e1..c787ba1cd026 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -27,10 +27,10 @@ BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gstreamerplugins \
-		pygtk2 \
+USE_GNOME=	pygtk2 \
 		gnomehack \
 		pkgconfig
+USE_GSTREAMER=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
diff --git a/multimedia/py-gstreamer80/Makefile b/multimedia/py-gstreamer80/Makefile
index a05b423d78e1..c787ba1cd026 100644
--- a/multimedia/py-gstreamer80/Makefile
+++ b/multimedia/py-gstreamer80/Makefile
@@ -27,10 +27,10 @@ BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
 
 USE_PYTHON=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gstreamerplugins \
-		pygtk2 \
+USE_GNOME=	pygtk2 \
 		gnomehack \
 		pkgconfig
+USE_GSTREAMER=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
diff --git a/multimedia/ruby-gst/Makefile b/multimedia/ruby-gst/Makefile
index 9c5448537ffe..df2126bb989c 100644
--- a/multimedia/ruby-gst/Makefile
+++ b/multimedia/ruby-gst/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gst
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	multimedia devel ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -20,7 +21,7 @@ COMMENT=	Ruby bindings for the GStreamer framework
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes
-USE_GNOME=	gstreamerplugins
+USE_GSTREAMER=	core
 USE_RUBY_EXTCONF=	yes
 
 .include "${.CURDIR}/../../x11/ruby-gnome2/Makefile.common"
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 4705a4c782ae..5a7918826527 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	0.100
+PORTREVISION=	1
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION}
@@ -21,6 +22,7 @@ USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack gnomedesktop desktopfileutils
+WANT_GSTREAMER=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_OMF=	yes
@@ -39,7 +41,7 @@ CONFLICTS=	totem-gstreamer-[0-9]*
 
 .if defined(WITH_GSTREAMER)
 CONFIGURE_ARGS+=--enable-gstreamer
-USE_GNOME+=	gstreamerplugins
+USE_GSTREAMER=	gnomevfs core
 WITHOUT_DVDNAV=	yes
 PLIST_SUB=	GSTREAMER=""
 .else
author	Michael Johnson <ahze@FreeBSD.org>	2005-02-28 22:16:10 +0000
committer	Michael Johnson <ahze@FreeBSD.org>	2005-02-28 22:16:10 +0000
commit	daf4cc81e4d055f630943b557402293b79680953 (patch)
tree	8478681967016f816092cb7e0ded4578aa26bd4e /multimedia
parent	Fix compilation on i386-4. (diff)