Rename gstreamer, gst-plugins and gst-plugins-* to gstreamer0.8,

gst-plugins0.8 and gst-plugins0.8-* respectively.  This is to leave room
for gstreamer 0.10 (which will be added with versioned names too, to avoid
annoying renames in the future).

While here, do some changes:
- Make gstreamer0.8 use the alternatives system to provide the unversioned
  gst-* utilities.
- Rename all internal variables to have 0.8 in them to make it clear which
  package they belong to.

60 files changed, 301 insertions, 289 deletions

diff --git a/multimedia/Makefile b/multimedia/Makefile
index 7a38ec03f6a..a56c0fe5d04 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2006/01/11 18:36:53 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2006/01/18 12:44:00 jmmv Exp $
 #
 
 COMMENT=	Multimedia utilities
@@ -19,14 +19,14 @@ SUBDIR+=	gmencoder
 SUBDIR+=	gmplayer
 SUBDIR+=	gnome2-media
 SUBDIR+=	gopchop
-SUBDIR+=	gst-plugins
-SUBDIR+=	gst-plugins-dvdnav
-SUBDIR+=	gst-plugins-dvdread
-SUBDIR+=	gst-plugins-mpeg2dec
-SUBDIR+=	gst-plugins-ogg
-SUBDIR+=	gst-plugins-theora
-SUBDIR+=	gst-plugins-xvid
-SUBDIR+=	gstreamer
+SUBDIR+=	gst-plugins0.8
+SUBDIR+=	gst-plugins0.8-dvdnav
+SUBDIR+=	gst-plugins0.8-dvdread
+SUBDIR+=	gst-plugins0.8-mpeg2dec
+SUBDIR+=	gst-plugins0.8-ogg
+SUBDIR+=	gst-plugins0.8-theora
+SUBDIR+=	gst-plugins0.8-xvid
+SUBDIR+=	gstreamer0.8
 SUBDIR+=	gxine
 SUBDIR+=	kdemultimedia3
 SUBDIR+=	kmplayer
diff --git a/multimedia/gst-plugins-dvdnav/Makefile b/multimedia/gst-plugins-dvdnav/Makefile
deleted file mode 100644
index 5475d50007a..00000000000
--- a/multimedia/gst-plugins-dvdnav/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2005/12/31 12:32:42 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	dvdnav
-GST_PLUGINS_DIR=	ext/dvdnav
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-PKGREVISION=		1
-
-.include "../../multimedia/libdvdnav/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-dvdnav/PLIST b/multimedia/gst-plugins-dvdnav/PLIST
deleted file mode 100644
index 31c793d2ff0..00000000000
--- a/multimedia/gst-plugins-dvdnav/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstdvdnavsrc.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-dvdread/Makefile b/multimedia/gst-plugins-dvdread/Makefile
deleted file mode 100644
index 70bf17ddaab..00000000000
--- a/multimedia/gst-plugins-dvdread/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 12:32:43 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	dvdread
-GST_PLUGINS_DIR=	ext/dvdread
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-PKGREVISION=		1
-
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-dvdread/PLIST b/multimedia/gst-plugins-dvdread/PLIST
deleted file mode 100644
index f5f7924ec1b..00000000000
--- a/multimedia/gst-plugins-dvdread/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstdvdreadsrc.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-mpeg2dec/Makefile b/multimedia/gst-plugins-mpeg2dec/Makefile
deleted file mode 100644
index 434e81dcf2c..00000000000
--- a/multimedia/gst-plugins-mpeg2dec/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# $NetBSD: Makefile,v 1.6 2005/12/31 12:32:43 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	mpeg2dec
-GST_PLUGINS_DIR=	ext/mpeg2dec
-PKGREVISION=		2
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-
-.include "../../multimedia/libmpeg2/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-mpeg2dec/PLIST b/multimedia/gst-plugins-mpeg2dec/PLIST
deleted file mode 100644
index 3da1fbf88c4..00000000000
--- a/multimedia/gst-plugins-mpeg2dec/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:44 jlam Exp $
-lib/gstreamer-0.8/libgstmpeg2dec.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-ogg/Makefile b/multimedia/gst-plugins-ogg/Makefile
deleted file mode 100644
index 5aad5afe3ba..00000000000
--- a/multimedia/gst-plugins-ogg/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 12:32:43 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	ogg
-GST_PLUGINS_DIR=	ext/ogg
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-PKGREVISION=		1
-
-.include "../../multimedia/libogg/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-ogg/PLIST b/multimedia/gst-plugins-ogg/PLIST
deleted file mode 100644
index 7b6140d655a..00000000000
--- a/multimedia/gst-plugins-ogg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-lib/gstreamer-0.8/libgstogg.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-theora/Makefile b/multimedia/gst-plugins-theora/Makefile
deleted file mode 100644
index e6fddbeca65..00000000000
--- a/multimedia/gst-plugins-theora/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2005/12/31 12:32:43 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	theora
-GST_PLUGINS_DIR=	ext/theora
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-PKGREVISION=		1
-
-DEPENDS+=		gst-plugins-ogg>=0.8.1:../../multimedia/gst-plugins-ogg
-
-.include "../../multimedia/libtheora/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-theora/PLIST b/multimedia/gst-plugins-theora/PLIST
deleted file mode 100644
index 53658f4e70b..00000000000
--- a/multimedia/gst-plugins-theora/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:45 jlam Exp $
-lib/gstreamer-0.8/libgsttheora.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-xvid/Makefile b/multimedia/gst-plugins-xvid/Makefile
deleted file mode 100644
index eb77bda5f3c..00000000000
--- a/multimedia/gst-plugins-xvid/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2005/12/31 12:32:43 wiz Exp $
-#
-
-GST_PLUGINS_NAME=	xvid
-GST_PLUGINS_DIR=	ext/xvid
-
-BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
-
-.include "../../multimedia/gst-plugins/Makefile.common"
-PKGREVISION=		1
-
-.include "../../multimedia/xvidcore/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins-xvid/PLIST b/multimedia/gst-plugins-xvid/PLIST
deleted file mode 100644
index d7639aac139..00000000000
--- a/multimedia/gst-plugins-xvid/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/21 07:42:39 xtraeme Exp $
-lib/gstreamer-0.8/libgstxvid.la
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins/buildlink3.mk b/multimedia/gst-plugins/buildlink3.mk
deleted file mode 100644
index 293a50ef10f..00000000000
--- a/multimedia/gst-plugins/buildlink3.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.7 2005/12/31 12:32:42 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GST_PLUGINS_BUILDLINK3_MK:=	${GST_PLUGINS_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gst-plugins
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins}
-BUILDLINK_PACKAGES+=	gst-plugins
-
-.if !empty(GST_PLUGINS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.8.0nb2
-BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.8.4nb1
-BUILDLINK_RECOMMENDED.gst-plugins?=	gst-plugins>=0.8.11
-BUILDLINK_PKGSRCDIR.gst-plugins?=	../../multimedia/gst-plugins
-.endif	# GST_PLUGINS_BUILDLINK3_MK
-
-.include "../../converters/libiconv/buildlink3.mk"
-.include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gst-plugins-dvdnav/DESCR b/multimedia/gst-plugins0.8-dvdnav/DESCR
index e14b25c5991..f92c591b391 100644
--- a/multimedia/gst-plugins-dvdnav/DESCR
+++ b/multimedia/gst-plugins0.8-dvdnav/DESCR
@@ -8,4 +8,4 @@ simple plugin with a clean, generic interface.
 
 This package provides the dvdnav plugin for GStreamer, which allows navigation
 of menus contained in DVDs.  You'll probably want to install the dvdread plugin
-(from the gst-plugins-dvdread package), too.
+(from the gst-plugins0.8-dvdread package), too.
diff --git a/multimedia/gst-plugins0.8-dvdnav/Makefile b/multimedia/gst-plugins0.8-dvdnav/Makefile
new file mode 100644
index 00000000000..4e22f913b05
--- /dev/null
+++ b/multimedia/gst-plugins0.8-dvdnav/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	dvdnav
+GST_PLUGINS0.8_DIR=	ext/dvdnav
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+.include "../../multimedia/libdvdnav/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-dvdnav/PLIST b/multimedia/gst-plugins0.8-dvdnav/PLIST
new file mode 100644
index 00000000000..d7fe52cfb0f
--- /dev/null
+++ b/multimedia/gst-plugins0.8-dvdnav/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgstdvdnavsrc.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-dvdread/DESCR b/multimedia/gst-plugins0.8-dvdread/DESCR
index 74423d39f9a..ead40fb987a 100644
--- a/multimedia/gst-plugins-dvdread/DESCR
+++ b/multimedia/gst-plugins0.8-dvdread/DESCR
@@ -8,4 +8,4 @@ simple plugin with a clean, generic interface.
 
 This package provides the dvdread plugin for GStreamer, which allows reading
 of DVD disks.  You'll probably want to install the dvdnav plugin (from the
-gst-plugins-dvdnav package), too.
+gst-plugins0.8-dvdnav package), too.
diff --git a/multimedia/gst-plugins0.8-dvdread/Makefile b/multimedia/gst-plugins0.8-dvdread/Makefile
new file mode 100644
index 00000000000..120f1108b35
--- /dev/null
+++ b/multimedia/gst-plugins0.8-dvdread/Makefile
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	dvdread
+GST_PLUGINS0.8_DIR=	ext/dvdread
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-dvdread/PLIST b/multimedia/gst-plugins0.8-dvdread/PLIST
new file mode 100644
index 00000000000..d926048c050
--- /dev/null
+++ b/multimedia/gst-plugins0.8-dvdread/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgstdvdreadsrc.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-mpeg2dec/DESCR b/multimedia/gst-plugins0.8-mpeg2dec/DESCR
index e88d24721d0..e88d24721d0 100644
--- a/multimedia/gst-plugins-mpeg2dec/DESCR
+++ b/multimedia/gst-plugins0.8-mpeg2dec/DESCR
diff --git a/multimedia/gst-plugins0.8-mpeg2dec/Makefile b/multimedia/gst-plugins0.8-mpeg2dec/Makefile
new file mode 100644
index 00000000000..e2d6f083a70
--- /dev/null
+++ b/multimedia/gst-plugins0.8-mpeg2dec/Makefile
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	mpeg2dec
+GST_PLUGINS0.8_DIR=	ext/mpeg2dec
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+.include "../../multimedia/libmpeg2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-mpeg2dec/PLIST b/multimedia/gst-plugins0.8-mpeg2dec/PLIST
new file mode 100644
index 00000000000..3e013fa766a
--- /dev/null
+++ b/multimedia/gst-plugins0.8-mpeg2dec/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgstmpeg2dec.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-ogg/DESCR b/multimedia/gst-plugins0.8-ogg/DESCR
index 4f96a46b70c..7bbf6413cb5 100644
--- a/multimedia/gst-plugins-ogg/DESCR
+++ b/multimedia/gst-plugins0.8-ogg/DESCR
@@ -7,6 +7,6 @@ transparently.  Developers can add new codecs and filters by writing a
 simple plugin with a clean, generic interface.
 
 This package provides the ogg plugin for GStreamer, which lets it handle
-OGG media containers.  You'll probably want to install gst-plugins-vorbis
-and gst-plugins-theora too, which provide its respective audio and video
+OGG media containers.  You'll probably want to install gst-plugins0.8-vorbis
+and gst-plugins0.8-theora too, which provide its respective audio and video
 codecs.
diff --git a/multimedia/gst-plugins0.8-ogg/Makefile b/multimedia/gst-plugins0.8-ogg/Makefile
new file mode 100644
index 00000000000..82344989f36
--- /dev/null
+++ b/multimedia/gst-plugins0.8-ogg/Makefile
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	ogg
+GST_PLUGINS0.8_DIR=	ext/ogg
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+.include "../../multimedia/libogg/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-ogg/PLIST b/multimedia/gst-plugins0.8-ogg/PLIST
new file mode 100644
index 00000000000..61218747938
--- /dev/null
+++ b/multimedia/gst-plugins0.8-ogg/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgstogg.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-theora/DESCR b/multimedia/gst-plugins0.8-theora/DESCR
index af2e2630e0d..af2e2630e0d 100644
--- a/multimedia/gst-plugins-theora/DESCR
+++ b/multimedia/gst-plugins0.8-theora/DESCR
diff --git a/multimedia/gst-plugins0.8-theora/Makefile b/multimedia/gst-plugins0.8-theora/Makefile
new file mode 100644
index 00000000000..02b218d196c
--- /dev/null
+++ b/multimedia/gst-plugins0.8-theora/Makefile
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	theora
+GST_PLUGINS0.8_DIR=	ext/theora
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+DEPENDS+=		gst-plugins0.8-ogg>=0.8.1:../../multimedia/gst-plugins0.8-ogg
+
+.include "../../multimedia/libtheora/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-theora/PLIST b/multimedia/gst-plugins0.8-theora/PLIST
new file mode 100644
index 00000000000..bd141f0413a
--- /dev/null
+++ b/multimedia/gst-plugins0.8-theora/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgsttheora.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins-xvid/DESCR b/multimedia/gst-plugins0.8-xvid/DESCR
index 5f20c49d01c..5f20c49d01c 100644
--- a/multimedia/gst-plugins-xvid/DESCR
+++ b/multimedia/gst-plugins0.8-xvid/DESCR
diff --git a/multimedia/gst-plugins0.8-xvid/Makefile b/multimedia/gst-plugins0.8-xvid/Makefile
new file mode 100644
index 00000000000..c058ec5e875
--- /dev/null
+++ b/multimedia/gst-plugins0.8-xvid/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+#
+
+GST_PLUGINS0.8_NAME=	xvid
+GST_PLUGINS0.8_DIR=	ext/xvid
+
+BUILDLINK_DEPENDS.xvidcore+=	xvidcore>=1.0.3nb1
+
+.include "../../multimedia/gst-plugins0.8/Makefile.common"
+
+.include "../../multimedia/xvidcore/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins0.8-xvid/PLIST b/multimedia/gst-plugins0.8-xvid/PLIST
new file mode 100644
index 00000000000..645e950a786
--- /dev/null
+++ b/multimedia/gst-plugins0.8-xvid/PLIST
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+lib/gstreamer-0.8/libgstxvid.la
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
diff --git a/multimedia/gst-plugins/DESCR b/multimedia/gst-plugins0.8/DESCR
index b8abf75cf79..b8abf75cf79 100644
--- a/multimedia/gst-plugins/DESCR
+++ b/multimedia/gst-plugins0.8/DESCR
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins0.8/Makefile
index adfd6bee134..5f9151b8066 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins0.8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/12 21:54:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=	--enable-gconftool
 CONFIGURE_ARGS+=	--enable-x
 CONFIGURE_ARGS+=	--enable-xshm
 CONFIGURE_ARGS+=	--enable-xvideo
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/gst-plugins
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/gst-plugins-0.8
 
 GCONF2_SCHEMAS=		gstreamer-0.8.schemas
 
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins0.8/Makefile.common
index 444a3160753..5ce3a309afc 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins0.8/Makefile.common
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:41 rillig Exp $
+# $NetBSD: Makefile.common,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.11
+PKGNAME=		${DISTNAME:S/plugins/plugins0.8/}
 CATEGORIES=		multimedia gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/} \
 			http://gstreamer.freedesktop.org/src/gst-plugins/
@@ -9,11 +10,13 @@ EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gstreamer.net/
-COMMENT=		GStreamer -
+COMMENT=		Open source multimedia framework -
 
-DISTINFO_FILE=		${.CURDIR}/../../multimedia/gst-plugins/distinfo
-FILESDIR=		${.CURDIR}/../../multimedia/gst-plugins/files
-PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
+DISTINFO_FILE=		${.CURDIR}/../../multimedia/gst-plugins0.8/distinfo
+FILESDIR=		${.CURDIR}/../../multimedia/gst-plugins0.8/files
+PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins0.8/patches
+
+CONFLICTS+=		gst-plugins-[0-9]*
 
 BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
 
@@ -130,40 +133,39 @@ CONFIGURE_ENV+=		have_func=no
 CONFIGURE_ARGS+=	--disable-${driver}
 .endfor
 
-# A package building a single plugin of gst-plugins has to include this
+# A package building a single plugin of gst-plugins0.8 has to include this
 # file and define the following variables:
-#    GST_PLUGINS_NAME - The name of the plugin, to be added to the package
-#                       name and the comment.
-#    GST_PLUGINS_DIR  - The directory where the plugin resides; a relative
-#                       path from WRKSRC.
-#    GST_PLUGINS_FLAG - The name of the flag used to enable the plugin.
-#                       Defaults to GST_PLUGINS_NAME.
-.if defined(GST_PLUGINS_NAME) && !empty(GST_PLUGINS_NAME)
-PKGNAME=		${DISTNAME:S/plugins/plugins-${GST_PLUGINS_NAME}/}
-COMMENT+=		${GST_PLUGINS_NAME} plugin
+#    GST_PLUGINS0.8_NAME - The name of the plugin, to be added to the package
+#                          name and the comment.
+#    GST_PLUGINS0.8_DIR  - The directory where the plugin resides; a relative
+#                          path from WRKSRC.
+#    GST_PLUGINS0.8_FLAG - The name of the flag used to enable the plugin.
+#                          Defaults to GST_PLUGINS0.8_NAME.
+.if defined(GST_PLUGINS0.8_NAME) && !empty(GST_PLUGINS0.8_NAME)
+PKGNAME:=	${PKGNAME:S/plugins0.8/plugins0.8-${GST_PLUGINS0.8_NAME}/}
+COMMENT+=	${GST_PLUGINS0.8_NAME} plugin
 
-GST_PLUGINS_FLAG?=	${GST_PLUGINS_NAME}
-GST_PLUGINS_DIR?=	non-existent
+GST_PLUGINS0.8_FLAG?=	${GST_PLUGINS0.8_NAME}
+GST_PLUGINS0.8_DIR?=	non-existent
 
-CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GST_PLUGINS_FLAG}/--enable-${GST_PLUGINS_FLAG}/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GST_PLUGINS0.8_FLAG}/--enable-${GST_PLUGINS0.8_FLAG}/}
 
-BUILD_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
-INSTALL_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
+BUILD_DIRS=		${WRKSRC}/${GST_PLUGINS0.8_DIR}
+INSTALL_DIRS=		${WRKSRC}/${GST_PLUGINS0.8_DIR}
 
-# Fix paths to already installed libraries (by the gst-plugins package).
+# Fix paths to already installed libraries (by the gst-plugins0.8 package).
 SUBST_CLASSES+=		libs
 SUBST_MESSAGE.libs=	"Fixing path to dependent libraries."
 SUBST_STAGE.libs=	pre-configure
-SUBST_FILES.libs=	${GST_PLUGINS_DIR}/Makefile.in
-SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.gst-plugins}/lib/libgst|g'
+SUBST_FILES.libs=	${GST_PLUGINS0.8_DIR}/Makefile.in
+SUBST_SED.libs=		-e 's|$$(top_builddir)/gst-libs/gst/libgst|${BUILDLINK_PREFIX.gst-plugins0.8}/lib/libgst|g'
 
-BUILDLINK_DEPENDS.gst-plugins+=	gst-plugins>=0.8.11
-.include "../../multimedia/gst-plugins/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
 .endif
 
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.11
+BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../multimedia/gstreamer/plugins.mk"
+.include "../../multimedia/gstreamer0.8/plugins.mk"
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins0.8/PLIST
index 71d601e7b93..fee7b4aa89f 100644
--- a/multimedia/gst-plugins/PLIST
+++ b/multimedia/gst-plugins0.8/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2005/10/12 21:54:04 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 bin/gst-launch-ext-0.8
 bin/gst-visualise-0.8
 include/gstreamer-0.8/gst/audio/audio.h
@@ -164,7 +164,7 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gst-plugins-0.8.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gst-plugins-0.8.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gst-plugins-0.8.mo
 @comment in GConf2: @dirrm share/gconf/schemas
-@comment in gstreamer: @dirrm lib/gstreamer-0.8
+@comment in gstreamer0.8: @dirrm lib/gstreamer-0.8
 @dirrm include/gstreamer-0.8/gst/xwindowlistener
 @dirrm include/gstreamer-0.8/gst/xoverlay
 @dirrm include/gstreamer-0.8/gst/video
@@ -182,4 +182,4 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gst-plugins-0.8.mo
 @dirrm include/gstreamer-0.8/gst/floatcast
 @dirrm include/gstreamer-0.8/gst/colorbalance
 @dirrm include/gstreamer-0.8/gst/audio
-@comment in gstreamer: @dirrm include/gstreamer-0.8/gst
+@comment in gstreamer0.8: @dirrm include/gstreamer-0.8/gst
diff --git a/multimedia/gst-plugins0.8/buildlink3.mk b/multimedia/gst-plugins0.8/buildlink3.mk
new file mode 100644
index 00000000000..97cae5809f7
--- /dev/null
+++ b/multimedia/gst-plugins0.8/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2006/01/18 12:44:03 jmmv Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GST_PLUGINS0.8_BUILDLINK3_MK:=	${GST_PLUGINS0.8_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gst-plugins0.8
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngst-plugins0.8}
+BUILDLINK_PACKAGES+=	gst-plugins0.8
+
+.if !empty(GST_PLUGINS0.8_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gst-plugins0.8+=	gst-plugins0.8>=0.8.11
+BUILDLINK_PKGSRCDIR.gst-plugins0.8?=	../../multimedia/gst-plugins0.8
+.endif	# GST_PLUGINS0.8_BUILDLINK3_MK
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gst-plugins/distinfo b/multimedia/gst-plugins0.8/distinfo
index 5c1d956f144..2bff4d7b244 100644
--- a/multimedia/gst-plugins/distinfo
+++ b/multimedia/gst-plugins0.8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.31 2006/01/05 15:01:31 joerg Exp $
+$NetBSD: distinfo,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 SHA1 (gst-plugins-0.8.11.tar.bz2) = 4a9be6b62dd0e8a73616e8e93f7a3ace8aec8c59
 RMD160 (gst-plugins-0.8.11.tar.bz2) = 833aec123a52cd0f36ec883c349cc8d69090d749
diff --git a/multimedia/gst-plugins/patches/patch-aa b/multimedia/gst-plugins0.8/patches/patch-aa
index 74b09aa4905..3cc3a2e6554 100644
--- a/multimedia/gst-plugins/patches/patch-aa
+++ b/multimedia/gst-plugins0.8/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2005/10/12 21:54:04 jmmv Exp $
+$NetBSD: patch-aa,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- configure.orig	2005-09-04 14:21:34.000000000 +0200
 +++ configure
diff --git a/multimedia/gst-plugins/patches/patch-ab b/multimedia/gst-plugins0.8/patches/patch-ab
index 72ed06e10aa..a9ac30e68fa 100644
--- a/multimedia/gst-plugins/patches/patch-ab
+++ b/multimedia/gst-plugins0.8/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.10 2005/11/02 15:09:07 joerg Exp $
+$NetBSD: patch-ab,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- gst/librfb/gstrfbsrc.c.orig	2005-05-17 08:41:44.000000000 +0000
 +++ gst/librfb/gstrfbsrc.c
diff --git a/multimedia/gst-plugins/patches/patch-ac b/multimedia/gst-plugins0.8/patches/patch-ac
index c1d57cd3f6f..571a5ebcfbe 100644
--- a/multimedia/gst-plugins/patches/patch-ac
+++ b/multimedia/gst-plugins0.8/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.10 2005/10/12 21:54:04 jmmv Exp $
+$NetBSD: patch-ac,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- sys/ximage/ximagesrc.c.orig	2005-08-29 13:50:51.000000000 +0200
 +++ sys/ximage/ximagesrc.c
diff --git a/multimedia/gst-plugins/patches/patch-ae b/multimedia/gst-plugins0.8/patches/patch-ae
index 7844cb1a266..3000b1d6c4d 100644
--- a/multimedia/gst-plugins/patches/patch-ae
+++ b/multimedia/gst-plugins0.8/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.4 2005/03/22 16:16:33 jmmv Exp $
+$NetBSD: patch-ae,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- ext/artsd/Makefile.in.orig	2005-03-07 17:41:49.000000000 +0100
 +++ ext/artsd/Makefile.in
diff --git a/multimedia/gst-plugins/patches/patch-ag b/multimedia/gst-plugins0.8/patches/patch-ag
index bfbe21197b7..f7d756ccc93 100644
--- a/multimedia/gst-plugins/patches/patch-ag
+++ b/multimedia/gst-plugins0.8/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2005/08/21 11:27:54 jmmv Exp $
+$NetBSD: patch-ag,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 Removed the #define directive from the inside of a macro expansion.
 Needed for gcc-2.95 and possibly others.
diff --git a/multimedia/gst-plugins/patches/patch-ah b/multimedia/gst-plugins0.8/patches/patch-ah
index 07ca8505efa..3e0dcbd7a5d 100644
--- a/multimedia/gst-plugins/patches/patch-ah
+++ b/multimedia/gst-plugins0.8/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2005/10/21 07:44:08 xtraeme Exp $
+$NetBSD: patch-ah,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- ext/xvid/gstxviddec.c.orig	2005-10-21 08:44:45.000000000 +0200
 +++ ext/xvid/gstxviddec.c	2005-10-21 08:45:00.000000000 +0200
diff --git a/multimedia/gst-plugins/patches/patch-ai b/multimedia/gst-plugins0.8/patches/patch-ai
index 6faa9fa6e59..5d9209812de 100644
--- a/multimedia/gst-plugins/patches/patch-ai
+++ b/multimedia/gst-plugins0.8/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2005/12/18 22:31:56 rillig Exp $
+$NetBSD: patch-ai,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 Keywords: c90
 
diff --git a/multimedia/gst-plugins/patches/patch-aj b/multimedia/gst-plugins0.8/patches/patch-aj
index 214f7d7520c..d93231a0cbd 100644
--- a/multimedia/gst-plugins/patches/patch-aj
+++ b/multimedia/gst-plugins0.8/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2005/12/18 22:54:57 rillig Exp $
+$NetBSD: patch-aj,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- ext/ogg/gstoggparse.c.orig	Mon Aug 29 13:46:41 2005
 +++ ext/ogg/gstoggparse.c	Sun Dec 18 23:51:21 2005
diff --git a/multimedia/gst-plugins/patches/patch-ak b/multimedia/gst-plugins0.8/patches/patch-ak
index 7a5799aa2b6..40229907fca 100644
--- a/multimedia/gst-plugins/patches/patch-ak
+++ b/multimedia/gst-plugins0.8/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1 2006/01/05 15:01:31 joerg Exp $
+$NetBSD: patch-ak,v 1.1 2006/01/18 12:44:03 jmmv Exp $
 
 --- ext/cdparanoia/gstcdparanoia.c.orig	2006-01-05 14:39:04.000000000 +0000
 +++ ext/cdparanoia/gstcdparanoia.c
diff --git a/multimedia/gstreamer/buildlink3.mk b/multimedia/gstreamer/buildlink3.mk
deleted file mode 100644
index 2ef4c30dc2a..00000000000
--- a/multimedia/gstreamer/buildlink3.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.9 2005/12/31 12:32:43 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-GSTREAMER_BUILDLINK3_MK:=	${GSTREAMER_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	gstreamer
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer}
-BUILDLINK_PACKAGES+=	gstreamer
-
-.if !empty(GSTREAMER_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.0nb1
-BUILDLINK_RECOMMENDED.gstreamer+=	gstreamer>=0.8.11nb1
-BUILDLINK_PKGSRCDIR.gstreamer?=	../../multimedia/gstreamer
-
-PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
-				{ print "@comment in gstreamer: " $$0; next; }
-.endif	# GSTREAMER_BUILDLINK3_MK
-
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gstreamer/files/plugins.tmpl b/multimedia/gstreamer/files/plugins.tmpl
deleted file mode 100644
index db60367b239..00000000000
--- a/multimedia/gstreamer/files/plugins.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: plugins.tmpl,v 1.2 2005/01/06 11:23:44 jmmv Exp $
-#
-# Handle registration of GStreamer plugins into the global plugin registry.
-#
-
-GST_COMPPREP="@GST_COMPPREP@"
-GST_REGISTER="@GST_REGISTER@"
-GST_DBDIR="@GST_DBDIR@"
-
-case ${STAGE} in
-POST-INSTALL)
-	${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
-	${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml >/dev/null
-	;;
-DEINSTALL)
-	if [ "${PKGBASE}" = gstreamer ]; then
-		${RM} -f ${GST_DBDIR}/compreg.xml ${GST_DBDIR}/registry.xml
-	fi
-	;;
-POST-DEINSTALL)
-	if [ "${PKGBASE}" != gstreamer ]; then
-		${GST_REGISTER} --gst-registry=${GST_DBDIR}/registry.xml \
-			>/dev/null
-		${GST_COMPPREP} --gst-registry=${GST_DBDIR}/registry.xml \
-			>/dev/null
-	fi
-	;;
-*)
-	;;
-esac
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
deleted file mode 100644
index 15bfb067d44..00000000000
--- a/multimedia/gstreamer/plugins.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: plugins.mk,v 1.7 2005/12/29 06:21:56 jlam Exp $
-#
-# This Makefile fragment is intended to be included by packages that install
-# GStreamer modules.  It takes care of rebuilding the corresponding databases
-# at (de)installation time.
-#
-
-.if !defined(GSTREAMER_PLUGINS_MK)
-GSTREAMER_PLUGINS_MK=	# defined
-
-GST_DBDIR=		${BUILDLINK_PREFIX.gstreamer}/libdata/gstreamer-0.8
-GST_COMPPREP=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-compprep
-GST_REGISTER=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-register
-
-FILES_SUBST+=		GST_DBDIR=${GST_DBDIR:Q}
-FILES_SUBST+=		GST_COMPPREP=${GST_COMPPREP:Q}
-FILES_SUBST+=		GST_REGISTER=${GST_REGISTER:Q}
-INSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
-DEINSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
-
-PRINT_PLIST_AWK+=	/^libdata\/gstreamer-0.8/ { next; }
-PRINT_PLIST_AWK+=	/^@dirrm libdata\/gstreamer-0.8/ { next; }
-
-.if defined(_GSTREAMER_NO_DEPEND)
-BUILDLINK_PREFIX.gstreamer=	${LOCALBASE}
-.else
-BUILDLINK_DEPENDS.gstreamer+=	gstreamer>=0.8.1
-.  include "../../multimedia/gstreamer/buildlink3.mk"
-.endif
-
-.endif			# GSTREAMER_PLUGINS_MK
diff --git a/multimedia/gstreamer0.8/ALTERNATIVES b/multimedia/gstreamer0.8/ALTERNATIVES
new file mode 100644
index 00000000000..2fd0052adf0
--- /dev/null
+++ b/multimedia/gstreamer0.8/ALTERNATIVES
@@ -0,0 +1,10 @@
+bin/gst-complete @PREFIX@/bin/gst-complete-0.8
+bin/gst-compprep @PREFIX@/bin/gst-compprep-0.8
+bin/gst-feedback @PREFIX@/bin/gst-feedback-0.8
+bin/gst-inspect @PREFIX@/bin/gst-inspect-0.8
+bin/gst-launch @PREFIX@/bin/gst-launch-0.8
+bin/gst-md5sum @PREFIX@/bin/gst-md5sum-0.8
+bin/gst-register @PREFIX@/bin/gst-register-0.8
+bin/gst-typefind @PREFIX@/bin/gst-typefind-0.8
+bin/gst-xmlinspect @PREFIX@/bin/gst-xmlinspect-0.8
+bin/gst-xmllaunch @PREFIX@/bin/gst-xmllaunch-0.8
diff --git a/multimedia/gstreamer/DESCR b/multimedia/gstreamer0.8/DESCR
index c24228a771d..c24228a771d 100644
--- a/multimedia/gstreamer/DESCR
+++ b/multimedia/gstreamer0.8/DESCR
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer0.8/Makefile
index 9003f4e2a29..e974eb50ccb 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer0.8/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.34 2005/12/31 12:32:43 wiz Exp $
+# $NetBSD: Makefile,v 1.1 2006/01/18 12:44:04 jmmv Exp $
 #
 
 DISTNAME=		gstreamer-0.8.11
-PKGREVISION=		1
-CATEGORIES=		multimedia gnome
+PKGNAME=		${DISTNAME:S/gstreamer/gstreamer0.8/}
+CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gstreamer/0.8/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		rh@NetBSD.org
 HOMEPAGE=		http://www.gstreamer.net/
-COMMENT=		GNOME multimedia streamer library
+COMMENT=		Open source multimedia framework
+
+CONFLICTS+=		gstreamer-[0-9]*
 
 BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
@@ -19,7 +21,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake perl pkg-config
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
-CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
+CONFIGURE_ARGS+=	--localstatedir=${GST0.8_DBDIR}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ENV+=		ac_cv_path_PYTHON=${PYTHONBIN:Q}
 CONFIGURE_ARGS+=	HAVE_GTK_DOC=no
@@ -27,7 +29,7 @@ CONFIGURE_ARGS+=	HAVE_GTK_DOC=no
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-control.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer.pc.in
 
-REQD_DIRS+=		${GST_DBDIR}
+REQD_DIRS+=		${GST0.8_DBDIR}
 
 PYTHON_VERSIONS_ACCEPTED=	24 23 22
 
@@ -44,8 +46,8 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.4.0nb1
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../lang/python/application.mk"
-_GSTREAMER_NO_DEPEND=		# defined
-.include "../../multimedia/gstreamer/plugins.mk"
+_GSTREAMER0.8_NO_DEPEND=	# defined
+.include "../../multimedia/gstreamer0.8/plugins.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/multimedia/gstreamer/PLIST b/multimedia/gstreamer0.8/PLIST
index 380e3b46498..c2ad2ea6c93 100644
--- a/multimedia/gstreamer/PLIST
+++ b/multimedia/gstreamer0.8/PLIST
@@ -1,23 +1,13 @@
-@comment $NetBSD: PLIST,v 1.14 2005/10/12 21:53:42 jmmv Exp $
-bin/gst-complete
+@comment $NetBSD: PLIST,v 1.1 2006/01/18 12:44:04 jmmv Exp $
 bin/gst-complete-0.8
-bin/gst-compprep
 bin/gst-compprep-0.8
-bin/gst-feedback
 bin/gst-feedback-0.8
-bin/gst-inspect
 bin/gst-inspect-0.8
-bin/gst-launch
 bin/gst-launch-0.8
-bin/gst-md5sum
 bin/gst-md5sum-0.8
-bin/gst-register
 bin/gst-register-0.8
-bin/gst-typefind
 bin/gst-typefind-0.8
-bin/gst-xmlinspect
 bin/gst-xmlinspect-0.8
-bin/gst-xmllaunch
 bin/gst-xmllaunch-0.8
 include/gstreamer-0.8/gst/bytestream/adapter.h
 include/gstreamer-0.8/gst/bytestream/bytestream.h
@@ -206,13 +196,13 @@ ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gstreamer-0.8.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gstreamer-0.8.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gstreamer-0.8.mo
 @dirrm share/doc/gstreamer-libs-0.8
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/pwg
-@dirrm share/doc/${PKGNAME}/pwg
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/manual
-@dirrm share/doc/${PKGNAME}/manual
-@exec ${MKDIR} %D/share/doc/${PKGNAME}/faq
-@dirrm share/doc/${PKGNAME}/faq
-@dirrm share/doc/${PKGNAME}
+@exec ${MKDIR} %D/share/doc/gstreamer-${PKGVERSION}/pwg
+@dirrm share/doc/gstreamer-${PKGVERSION}/pwg
+@exec ${MKDIR} %D/share/doc/gstreamer-${PKGVERSION}/manual
+@dirrm share/doc/gstreamer-${PKGVERSION}/manual
+@exec ${MKDIR} %D/share/doc/gstreamer-${PKGVERSION}/faq
+@dirrm share/doc/gstreamer-${PKGVERSION}/faq
+@dirrm share/doc/gstreamer-${PKGVERSION}
 @dirrm share/doc/gstreamer-0.8
 @dirrm lib/gstreamer-0.8
 @dirrm include/gstreamer-0.8/gst/getbits
diff --git a/multimedia/gstreamer0.8/buildlink3.mk b/multimedia/gstreamer0.8/buildlink3.mk
new file mode 100644
index 00000000000..b0c9266afb3
--- /dev/null
+++ b/multimedia/gstreamer0.8/buildlink3.mk
@@ -0,0 +1,27 @@
+# $NetBSD: buildlink3.mk,v 1.1 2006/01/18 12:44:04 jmmv Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+GSTREAMER0.8_BUILDLINK3_MK:=	${GSTREAMER0.8_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gstreamer0.8
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ngstreamer0.8}
+BUILDLINK_PACKAGES+=	gstreamer0.8
+
+.if !empty(GSTREAMER0.8_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.11
+BUILDLINK_PKGSRCDIR.gstreamer0.8?=	../../multimedia/gstreamer0.8
+
+PRINT_PLIST_AWK+=	/^@dirrm (include|lib)\/gstreamer-0.8(\/gst)?$$/ \
+			    { print "@comment in gstreamer0.8: " $$0; next; }
+.endif	# GSTREAMER0.8_BUILDLINK3_MK
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../textproc/libxslt/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer0.8/distinfo
index 096edeee0ae..f9e16856582 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer0.8/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/10/12 21:53:42 jmmv Exp $
+$NetBSD: distinfo,v 1.1 2006/01/18 12:44:04 jmmv Exp $
 
 SHA1 (gstreamer-0.8.11.tar.bz2) = 945b08e68f31f99621ce7c35d7ec3b7ac3e49b1e
 RMD160 (gstreamer-0.8.11.tar.bz2) = bb471ba4f4c32bacc26d29efc1cb8577825ce1e9
 Size (gstreamer-0.8.11.tar.bz2) = 1459651 bytes
 SHA1 (patch-aa) = 749f788b2639bdffb48cf937aae0520db2ba864f
+SHA1 (patch-ab) = bcde1ea5717b45904280ec0492ee3cf04222dff1
diff --git a/multimedia/gstreamer0.8/files/plugins.tmpl b/multimedia/gstreamer0.8/files/plugins.tmpl
new file mode 100644
index 00000000000..ea1d38fe4ba
--- /dev/null
+++ b/multimedia/gstreamer0.8/files/plugins.tmpl
@@ -0,0 +1,32 @@
+# $NetBSD: plugins.tmpl,v 1.1 2006/01/18 12:44:04 jmmv Exp $
+#
+# Handle registration of GStreamer plugins into the global plugin registry.
+#
+
+GST0_8_COMPPREP="@GST0.8_COMPPREP@"
+GST0_8_REGISTER="@GST0.8_REGISTER@"
+GST0_8_DBDIR="@GST0.8_DBDIR@"
+
+case ${STAGE} in
+POST-INSTALL)
+	${GST0_8_REGISTER} --gst-registry=${GST0_8_DBDIR}/registry.xml \
+		>/dev/null
+	${GST0_8_COMPPREP} --gst-registry=${GST0_8_DBDIR}/registry.xml \
+		>/dev/null
+	;;
+DEINSTALL)
+	if [ "${PKGBASE}" = gstreamer0.8 ]; then
+		${RM} -f ${GST0_8_DBDIR}/compreg.xml ${GST0_8_DBDIR}/registry.xml
+	fi
+	;;
+POST-DEINSTALL)
+	if [ "${PKGBASE}" != gstreamer0.8 ]; then
+		${GST0_8_REGISTER} --gst-registry=${GST0_8_DBDIR}/registry.xml \
+			>/dev/null
+		${GST0_8_COMPPREP} --gst-registry=${GST0_8_DBDIR}/registry.xml \
+			>/dev/null
+	fi
+	;;
+*)
+	;;
+esac
diff --git a/multimedia/gstreamer/patches/patch-aa b/multimedia/gstreamer0.8/patches/patch-aa
index 599f09951c6..8312e8ec7cc 100644
--- a/multimedia/gstreamer/patches/patch-aa
+++ b/multimedia/gstreamer0.8/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/06 09:30:01 jmmv Exp $
+$NetBSD: patch-aa,v 1.1 2006/01/18 12:44:04 jmmv Exp $
 
 --- configure.orig	2004-03-16 12:31:54.000000000 +0100
 +++ configure
diff --git a/multimedia/gstreamer0.8/patches/patch-ab b/multimedia/gstreamer0.8/patches/patch-ab
new file mode 100644
index 00000000000..ed9d2bceca0
--- /dev/null
+++ b/multimedia/gstreamer0.8/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2006/01/18 12:44:04 jmmv Exp $
+
+--- tools/Makefile.in.orig	2005-09-04 13:30:21.000000000 +0200
++++ tools/Makefile.in
+@@ -41,8 +41,7 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
+-	$(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
++bin_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_6)
+ subdir = tools
+ DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in
diff --git a/multimedia/gstreamer0.8/plugins.mk b/multimedia/gstreamer0.8/plugins.mk
new file mode 100644
index 00000000000..8682a73bec5
--- /dev/null
+++ b/multimedia/gstreamer0.8/plugins.mk
@@ -0,0 +1,31 @@
+# $NetBSD: plugins.mk,v 1.1 2006/01/18 12:44:04 jmmv Exp $
+#
+# This Makefile fragment is intended to be included by packages that install
+# GStreamer modules.  It takes care of rebuilding the corresponding databases
+# at (de)installation time.
+#
+
+.if !defined(GSTREAMER0.8_PLUGINS_MK)
+GSTREAMER0.8_PLUGINS_MK=	# defined
+
+GST0.8_DBDIR=		${BUILDLINK_PREFIX.gstreamer0.8}/libdata/gstreamer-0.8
+GST0.8_COMPPREP=	${BUILDLINK_PREFIX.gstreamer0.8}/bin/gst-compprep-0.8
+GST0.8_REGISTER=	${BUILDLINK_PREFIX.gstreamer0.8}/bin/gst-register-0.8
+
+FILES_SUBST+=		GST0.8_DBDIR=${GST0.8_DBDIR:Q}
+FILES_SUBST+=		GST0.8_COMPPREP=${GST0.8_COMPPREP:Q}
+FILES_SUBST+=		GST0.8_REGISTER=${GST0.8_REGISTER:Q}
+INSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
+DEINSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer0.8/files/plugins.tmpl
+
+PRINT_PLIST_AWK+=	/^libdata\/gstreamer-0.8/ { next; }
+PRINT_PLIST_AWK+=	/^@dirrm libdata\/gstreamer-0.8/ { next; }
+
+.if defined(_GSTREAMER0.8_NO_DEPEND)
+BUILDLINK_PREFIX.gstreamer0.8=	${LOCALBASE}
+.else
+BUILDLINK_DEPENDS.gstreamer0.8+=	gstreamer0.8>=0.8.1
+.  include "../../multimedia/gstreamer0.8/buildlink3.mk"
+.endif
+
+.endif			# GSTREAMER0.8_PLUGINS_MK