Update to 0.8.0nb2:

- Do not install nor build any plugins that require external libraries.
  This keeps this package small, makes it modular and will avoid the need
  of "fee-based-commercial-use" licenses while building GNOME.
- Split the Makefile and make it easy to create packages for individual
  plugins by using Makefile.common.
- Use gstreamer/plugins.mk to automatically register installed plugins in
  the plugins database.
- Fix the regex used to export symbols to something that matches better
  the original one.
- As a result of the update of gstreamer to 0.8.0nb1 (which requires a
  glib2 with the RTLD_GLOBAL fix), plugins work fine now.

7 files changed, 179 insertions, 162 deletions

diff --git a/multimedia/gst-plugins/DESCR b/multimedia/gst-plugins/DESCR
index 168d6c2e8b2..b8abf75cf79 100644
--- a/multimedia/gst-plugins/DESCR
+++ b/multimedia/gst-plugins/DESCR
@@ -1,2 +1,10 @@
-  This package contains a set of multimedia plugins for gstreamer, a
-framework for streaming media.
+GStreamer is a library that allows the construction of graphs of
+media-handling components, ranging from simple mp3 playback to complex
+audio (mixing) and video (non-linear editing) processing.
+
+Applications can take advantage of advances in codec and filter technology
+transparently.  Developers can add new codecs and filters by writing a
+simple plugin with a clean, generic interface.
+
+This package is part of gst-plugins, which contains a set of multimedia
+plugins for GStreamer.
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 7f8b0af0ef1..3bfad9dcefb 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,72 +1,23 @@
-# $NetBSD: Makefile,v 1.16 2004/04/03 21:36:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/04/06 09:36:28 jmmv Exp $
 #
 
-DISTNAME=		gst-plugins-0.8.0
-PKGREVISION=		1
-CATEGORIES=		multimedia gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/}
-EXTRACT_SUFX=		.tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=		rh@NetBSD.org
-HOMEPAGE=		http://www.gstreamer.net/
-COMMENT=		gstreamer plugins
+PKGREVISION=		2
 
-BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
-BUILDLINK_DEPENDS.png+=png>=1.2.5nb3	# requires libpng12.pc in 1.2.5nb3+
+COMMENT+=		base plugins
 
-USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
-USE_X11=		yes
-USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-gconf.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-interfaces.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-media-info.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-libs.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-play.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-plugins.pc.in
-GNU_CONFIGURE=		yes
 
-CPPFLAGS+=		-I${PREFIX}/include/cdparanoia
-CONFIGURE_ARGS+=	--disable-arts
-CONFIGURE_ARGS+=	--disable-artsc
-CONFIGURE_ARGS+=	--disable-ffmpeg
-CONFIGURE_ARGS+=	--disable-mpeg2dec
-CONFIGURE_ARGS+=	--disable-qcam
-CONFIGURE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
-MAKE_ENV+=		GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gconf/--enable-gconf/}
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-gconftool/--enable-gconftool/}
 
 GCONF2_SCHEMAS=		gstreamer-0.8.schemas
 
-SUBST_CLASSES+=		devoss
-SUBST_MESSAGE.devoss=	"Fixing path to OSS audio device."
-SUBST_STAGE.devoss=	pre-configure
-SUBST_FILES.devoss=	sys/oss/*.c
-SUBST_SED.devoss=	-e 's|/dev/dsp|${DEVOSSAUDIO}|g'
-
-.include "../../audio/cdparanoia/buildlink3.mk"
-.include "../../audio/flac/buildlink3.mk"
-.include "../../audio/gsm/buildlink3.mk"
-.include "../../audio/libid3tag/buildlink3.mk"
-.include "../../audio/lame/buildlink3.mk"
-.include "../../audio/liba52/buildlink3.mk"
-.include "../../audio/libmikmod/buildlink3.mk"
-.include "../../audio/libsidplay/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
-.include "../../audio/libvorbis/buildlink3.mk"
-.include "../../audio/libmad/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/pkgconfig/buildlink3.mk"
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/hermes/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/swfdec/buildlink3.mk"
-.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/gstreamer/buildlink3.mk"
-.include "../../multimedia/mjpegtools/buildlink3.mk"
-.include "../../multimedia/openquicktime/buildlink3.mk"
-.include "../../www/libghttp/buildlink3.mk"
-.include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
new file mode 100644
index 00000000000..b059ed08b63
--- /dev/null
+++ b/multimedia/gst-plugins/Makefile.common
@@ -0,0 +1,149 @@
+# $NetBSD: Makefile.common,v 1.1 2004/04/06 09:36:28 jmmv Exp $
+#
+
+DISTNAME=		gst-plugins-0.8.0
+CATEGORIES=		multimedia gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gst-plugins/0.8/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		rh@NetBSD.org
+HOMEPAGE=		http://www.gstreamer.net/
+COMMENT=		GStreamer -
+
+DISTINFO_FILE=		${.CURDIR}/../../multimedia/gst-plugins/distinfo
+FILESDIR=		${.CURDIR}/../../multimedia/gst-plugins/files
+PATCHDIR=		${.CURDIR}/../../multimedia/gst-plugins/patches
+
+BUILD_DEPENDS+=		nasm>=0.98.38:../../devel/nasm
+
+GNU_CONFIGURE=		yes
+USE_BUILDLINK3=		yes
+USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+
+CONFIGURE_ARGS+=	--disable-gconf
+CONFIGURE_ARGS+=	--disable-gconftool
+CONFIGURE_ARGS+=	--disable-examples
+CONFIGURE_ARGS+=	--disable-tests
+
+# Disable all drivers by default.
+.for driver in	a52dec \
+		aalib \
+		aalibtest \
+		alsa \
+		arts \
+		artsc \
+		artstest \
+		audiofile \
+		cdparanoia \
+		cdrom \
+		divx \
+		dvdnav \
+		dvdread \
+		dxr3 \
+		esd \
+		esdtest \
+		faac \
+		faad \
+		flac \
+		freetypetest \
+		gdk_pixbuf \
+		gnome_vfs \
+		gsm \
+		hermes \
+		ivorbis \
+		jack \
+		jpeg \
+		ladspa \
+		lame \
+		lcs \
+		libcaca \
+		libdv \
+		libfame \
+		libfametest \
+		libmikmodtest \
+		libpng \
+		libpng \
+		librfb \
+		mad \
+		mikmod \
+		mpeg2dec \
+		mpeg2enc \
+		mplex \
+		musicbrainz \
+		nas \
+		ogg \
+		oggtest \
+		oss \
+		pango \
+		qcam \
+		raw1394 \
+		sdl \
+		sdltest \
+		shout \
+		shout2 \
+		shout2test \
+		sidplay \
+		smoothwave \
+		sndfile \
+		speex \
+		swfdec \
+		tarkin \
+		theora \
+		v4l \
+		v4l2 \
+		vcd \
+		vorbis \
+		vorbistest \
+		x \
+		xshm \
+		xvid \
+		xvideo
+CONFIGURE_ARGS+=	--disable-${driver}
+.endfor
+.undef driver
+
+# A package building a single plugin of gst-plugins 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_PLUGINS_FLAG?=	${GST_PLUGINS_NAME}
+GST_PLUGINS_DIR?=	non-existent
+
+CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${GST_PLUGINS_FLAG}/--enable-${GST_PLUGINS_FLAG}/}
+
+BUILD_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
+INSTALL_DIRS=		${WRKSRC}/${GST_PLUGINS_DIR}
+
+# Generate a description automatically.
+DESCR_SRC=		${.CURDIR}/../../multimedia/gst-plugins/DESCR
+DESCR_SRC+=		${WRKDIR}/.gen_descr
+
+# Fix paths to already installed libraries (by the gst-plugins 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'
+
+post-build:
+	@${ECHO} "" >${WRKDIR}/.gen_descr
+	@${ECHO} "This package provides the ${GST_PLUGINS_NAME} plugin for GStreamer." >>${WRKDIR}/.gen_descr
+
+.include "../../multimedia/gst-plugins/buildlink3.mk"
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../multimedia/gstreamer/plugins.mk"
diff --git a/multimedia/gst-plugins/PLIST b/multimedia/gst-plugins/PLIST
index 3206178854e..d3df12befd6 100644
--- a/multimedia/gst-plugins/PLIST
+++ b/multimedia/gst-plugins/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/04/03 11:53:33 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/06 09:36:28 jmmv Exp $
 bin/gst-launch-ext-0.8
 bin/gst-visualise-0.8
 include/gstreamer-0.8/gst/audio/audio.h
@@ -29,14 +29,6 @@ include/gstreamer-0.8/gst/tuner/tunerchannel.h
 include/gstreamer-0.8/gst/tuner/tunernorm.h
 include/gstreamer-0.8/gst/video/video.h
 include/gstreamer-0.8/gst/video/videosink.h
-include/gstreamer-0.8/gst/xoverlay/xoverlay.h
-include/gstreamer-0.8/gst/xwindowlistener/xwindowlistener.h
-lib/gstreamer-0.8/libgsta52dec.a
-lib/gstreamer-0.8/libgsta52dec.la
-lib/gstreamer-0.8/libgsta52dec.so
-lib/gstreamer-0.8/libgstaasink.a
-lib/gstreamer-0.8/libgstaasink.la
-lib/gstreamer-0.8/libgstaasink.so
 lib/gstreamer-0.8/libgstac3parse.a
 lib/gstreamer-0.8/libgstac3parse.la
 lib/gstreamer-0.8/libgstac3parse.so
@@ -55,9 +47,6 @@ lib/gstreamer-0.8/libgstaudio.so
 lib/gstreamer-0.8/libgstaudioconvert.a
 lib/gstreamer-0.8/libgstaudioconvert.la
 lib/gstreamer-0.8/libgstaudioconvert.so
-lib/gstreamer-0.8/libgstaudiofile.a
-lib/gstreamer-0.8/libgstaudiofile.la
-lib/gstreamer-0.8/libgstaudiofile.so
 lib/gstreamer-0.8/libgstaudiofilter.a
 lib/gstreamer-0.8/libgstaudiofilter.la
 lib/gstreamer-0.8/libgstaudiofilter.so
@@ -70,12 +59,6 @@ lib/gstreamer-0.8/libgstauparse.so
 lib/gstreamer-0.8/libgstavi.a
 lib/gstreamer-0.8/libgstavi.la
 lib/gstreamer-0.8/libgstavi.so
-lib/gstreamer-0.8/libgstcdparanoia.a
-lib/gstreamer-0.8/libgstcdparanoia.la
-lib/gstreamer-0.8/libgstcdparanoia.so
-lib/gstreamer-0.8/libgstcdplayer.a
-lib/gstreamer-0.8/libgstcdplayer.la
-lib/gstreamer-0.8/libgstcdplayer.so
 lib/gstreamer-0.8/libgstcdxaparse.a
 lib/gstreamer-0.8/libgstcdxaparse.la
 lib/gstreamer-0.8/libgstcdxaparse.so
@@ -91,18 +74,12 @@ lib/gstreamer-0.8/libgstcutter.so
 lib/gstreamer-0.8/libgstdeinterlace.a
 lib/gstreamer-0.8/libgstdeinterlace.la
 lib/gstreamer-0.8/libgstdeinterlace.so
-lib/gstreamer-0.8/libgstdvdreadsrc.a
-lib/gstreamer-0.8/libgstdvdreadsrc.la
-lib/gstreamer-0.8/libgstdvdreadsrc.so
 lib/gstreamer-0.8/libgstefence.a
 lib/gstreamer-0.8/libgstefence.la
 lib/gstreamer-0.8/libgstefence.so
 lib/gstreamer-0.8/libgsteffectv.a
 lib/gstreamer-0.8/libgsteffectv.la
 lib/gstreamer-0.8/libgsteffectv.so
-lib/gstreamer-0.8/libgstesd.a
-lib/gstreamer-0.8/libgstesd.la
-lib/gstreamer-0.8/libgstesd.so
 lib/gstreamer-0.8/libgstfestival.a
 lib/gstreamer-0.8/libgstfestival.la
 lib/gstreamer-0.8/libgstfestival.so
@@ -112,57 +89,30 @@ lib/gstreamer-0.8/libgstffmpegcolorspace.so
 lib/gstreamer-0.8/libgstfilter.a
 lib/gstreamer-0.8/libgstfilter.la
 lib/gstreamer-0.8/libgstfilter.so
-lib/gstreamer-0.8/libgstflac.a
-lib/gstreamer-0.8/libgstflac.la
-lib/gstreamer-0.8/libgstflac.so
 lib/gstreamer-0.8/libgstflxdec.a
 lib/gstreamer-0.8/libgstflxdec.la
 lib/gstreamer-0.8/libgstflxdec.so
 lib/gstreamer-0.8/libgstgamma.a
 lib/gstreamer-0.8/libgstgamma.la
 lib/gstreamer-0.8/libgstgamma.so
-lib/gstreamer-0.8/libgstgdkpixbuf.a
-lib/gstreamer-0.8/libgstgdkpixbuf.la
-lib/gstreamer-0.8/libgstgdkpixbuf.so
-lib/gstreamer-0.8/libgstgnomevfs.a
-lib/gstreamer-0.8/libgstgnomevfs.la
-lib/gstreamer-0.8/libgstgnomevfs.so
 lib/gstreamer-0.8/libgstgoom.a
 lib/gstreamer-0.8/libgstgoom.la
 lib/gstreamer-0.8/libgstgoom.so
-lib/gstreamer-0.8/libgstgsm.a
-lib/gstreamer-0.8/libgstgsm.la
-lib/gstreamer-0.8/libgstgsm.so
-lib/gstreamer-0.8/libgsthermescolorspace.a
-lib/gstreamer-0.8/libgsthermescolorspace.la
-lib/gstreamer-0.8/libgsthermescolorspace.so
 lib/gstreamer-0.8/libgstidct.a
 lib/gstreamer-0.8/libgstidct.la
 lib/gstreamer-0.8/libgstidct.so
 lib/gstreamer-0.8/libgstinterleave.a
 lib/gstreamer-0.8/libgstinterleave.la
 lib/gstreamer-0.8/libgstinterleave.so
-lib/gstreamer-0.8/libgstjpeg.a
-lib/gstreamer-0.8/libgstjpeg.la
-lib/gstreamer-0.8/libgstjpeg.so
-lib/gstreamer-0.8/libgstlame.a
-lib/gstreamer-0.8/libgstlame.la
-lib/gstreamer-0.8/libgstlame.so
 lib/gstreamer-0.8/libgstlevel.a
 lib/gstreamer-0.8/libgstlevel.la
 lib/gstreamer-0.8/libgstlevel.so
-lib/gstreamer-0.8/libgstmad.a
-lib/gstreamer-0.8/libgstmad.la
-lib/gstreamer-0.8/libgstmad.so
 lib/gstreamer-0.8/libgstmatroska.a
 lib/gstreamer-0.8/libgstmatroska.la
 lib/gstreamer-0.8/libgstmatroska.so
 lib/gstreamer-0.8/libgstmedian.a
 lib/gstreamer-0.8/libgstmedian.la
 lib/gstreamer-0.8/libgstmedian.so
-lib/gstreamer-0.8/libgstmikmod.a
-lib/gstreamer-0.8/libgstmikmod.la
-lib/gstreamer-0.8/libgstmikmod.so
 lib/gstreamer-0.8/libgstmixmatrix.a
 lib/gstreamer-0.8/libgstmixmatrix.la
 lib/gstreamer-0.8/libgstmixmatrix.so
@@ -196,12 +146,6 @@ lib/gstreamer-0.8/libgstmulaw.so
 lib/gstreamer-0.8/libgstnavigationtest.a
 lib/gstreamer-0.8/libgstnavigationtest.la
 lib/gstreamer-0.8/libgstnavigationtest.so
-lib/gstreamer-0.8/libgstogg.a
-lib/gstreamer-0.8/libgstogg.la
-lib/gstreamer-0.8/libgstogg.so
-lib/gstreamer-0.8/libgstossaudio.a
-lib/gstreamer-0.8/libgstossaudio.la
-lib/gstreamer-0.8/libgstossaudio.so
 lib/gstreamer-0.8/libgstoverlay.a
 lib/gstreamer-0.8/libgstoverlay.la
 lib/gstreamer-0.8/libgstoverlay.so
@@ -211,9 +155,6 @@ lib/gstreamer-0.8/libgstpassthrough.so
 lib/gstreamer-0.8/libgstplayondemand.a
 lib/gstreamer-0.8/libgstplayondemand.la
 lib/gstreamer-0.8/libgstplayondemand.so
-lib/gstreamer-0.8/libgstpng.a
-lib/gstreamer-0.8/libgstpng.la
-lib/gstreamer-0.8/libgstpng.so
 lib/gstreamer-0.8/libgstqtdemux.a
 lib/gstreamer-0.8/libgstqtdemux.la
 lib/gstreamer-0.8/libgstqtdemux.so
@@ -232,12 +173,6 @@ lib/gstreamer-0.8/libgstrtjpeg.so
 lib/gstreamer-0.8/libgstrtp.a
 lib/gstreamer-0.8/libgstrtp.la
 lib/gstreamer-0.8/libgstrtp.so
-lib/gstreamer-0.8/libgstsdlvideosink.a
-lib/gstreamer-0.8/libgstsdlvideosink.la
-lib/gstreamer-0.8/libgstsdlvideosink.so
-lib/gstreamer-0.8/libgstsid.a
-lib/gstreamer-0.8/libgstsid.la
-lib/gstreamer-0.8/libgstsid.so
 lib/gstreamer-0.8/libgstsilence.a
 lib/gstreamer-0.8/libgstsilence.la
 lib/gstreamer-0.8/libgstsilence.so
@@ -247,18 +182,9 @@ lib/gstreamer-0.8/libgstsinesrc.so
 lib/gstreamer-0.8/libgstsmooth.a
 lib/gstreamer-0.8/libgstsmooth.la
 lib/gstreamer-0.8/libgstsmooth.so
-lib/gstreamer-0.8/libgstsmoothwave.a
-lib/gstreamer-0.8/libgstsmoothwave.la
-lib/gstreamer-0.8/libgstsmoothwave.so
 lib/gstreamer-0.8/libgstsmpte.a
 lib/gstreamer-0.8/libgstsmpte.la
 lib/gstreamer-0.8/libgstsmpte.so
-lib/gstreamer-0.8/libgstsnapshot.a
-lib/gstreamer-0.8/libgstsnapshot.la
-lib/gstreamer-0.8/libgstsnapshot.so
-lib/gstreamer-0.8/libgstsndfile.a
-lib/gstreamer-0.8/libgstsndfile.la
-lib/gstreamer-0.8/libgstsndfile.so
 lib/gstreamer-0.8/libgstspectrum.a
 lib/gstreamer-0.8/libgstspectrum.la
 lib/gstreamer-0.8/libgstspectrum.so
@@ -268,9 +194,6 @@ lib/gstreamer-0.8/libgstspeed.so
 lib/gstreamer-0.8/libgststereo.a
 lib/gstreamer-0.8/libgststereo.la
 lib/gstreamer-0.8/libgststereo.so
-lib/gstreamer-0.8/libgstswfdec.a
-lib/gstreamer-0.8/libgstswfdec.la
-lib/gstreamer-0.8/libgstswfdec.so
 lib/gstreamer-0.8/libgstswitch.a
 lib/gstreamer-0.8/libgstswitch.la
 lib/gstreamer-0.8/libgstswitch.so
@@ -283,12 +206,6 @@ lib/gstreamer-0.8/libgsttagedit.so
 lib/gstreamer-0.8/libgsttcp.a
 lib/gstreamer-0.8/libgsttcp.la
 lib/gstreamer-0.8/libgsttcp.so
-lib/gstreamer-0.8/libgsttextoverlay.a
-lib/gstreamer-0.8/libgsttextoverlay.la
-lib/gstreamer-0.8/libgsttextoverlay.so
-lib/gstreamer-0.8/libgsttimeoverlay.a
-lib/gstreamer-0.8/libgsttimeoverlay.la
-lib/gstreamer-0.8/libgsttimeoverlay.so
 lib/gstreamer-0.8/libgsttypefindfunctions.a
 lib/gstreamer-0.8/libgsttypefindfunctions.la
 lib/gstreamer-0.8/libgsttypefindfunctions.so
@@ -328,24 +245,12 @@ lib/gstreamer-0.8/libgstvolenv.so
 lib/gstreamer-0.8/libgstvolume.a
 lib/gstreamer-0.8/libgstvolume.la
 lib/gstreamer-0.8/libgstvolume.so
-lib/gstreamer-0.8/libgstvorbis.a
-lib/gstreamer-0.8/libgstvorbis.la
-lib/gstreamer-0.8/libgstvorbis.so
 lib/gstreamer-0.8/libgstwavenc.a
 lib/gstreamer-0.8/libgstwavenc.la
 lib/gstreamer-0.8/libgstwavenc.so
 lib/gstreamer-0.8/libgstwavparse.a
 lib/gstreamer-0.8/libgstwavparse.la
 lib/gstreamer-0.8/libgstwavparse.so
-lib/gstreamer-0.8/libgstximagesink.a
-lib/gstreamer-0.8/libgstximagesink.la
-lib/gstreamer-0.8/libgstximagesink.so
-lib/gstreamer-0.8/libgstxvimagesink.a
-lib/gstreamer-0.8/libgstxvimagesink.la
-lib/gstreamer-0.8/libgstxvimagesink.so
-lib/gstreamer-0.8/libgstxwindowlistener.a
-lib/gstreamer-0.8/libgstxwindowlistener.la
-lib/gstreamer-0.8/libgstxwindowlistener.so
 lib/gstreamer-0.8/libgsty4menc.a
 lib/gstreamer-0.8/libgsty4menc.la
 lib/gstreamer-0.8/libgsty4menc.so
@@ -382,8 +287,6 @@ ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gst-plugins-0.8.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gst-plugins-0.8.mo
 @comment in GConf2: @dirrm share/gconf/schemas
 @comment in gstreamer: @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
 @dirrm include/gstreamer-0.8/gst/tuner
 @dirrm include/gstreamer-0.8/gst/tag
@@ -399,4 +302,4 @@ ${PKGLOCALEDIR}/locale/sr/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
-@dirrm include/gstreamer-0.8/gst
+@comment in gstreamer: @dirrm include/gstreamer-0.8/gst
diff --git a/multimedia/gst-plugins/buildlink3.mk b/multimedia/gst-plugins/buildlink3.mk
index b4727cefcec..74833aebab3 100644
--- a/multimedia/gst-plugins/buildlink3.mk
+++ b/multimedia/gst-plugins/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 19:06:38 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/06 09:36:28 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GST_PLUGINS_BUILDLINK3_MK:=	${GST_PLUGINS_BUILDLINK3_MK}+
@@ -11,8 +11,14 @@ 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.0
+BUILDLINK_DEPENDS.gst-plugins+=		gst-plugins>=0.8.0nb2
 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/distinfo b/multimedia/gst-plugins/distinfo
index 3df78cfb023..d25027e4ea3 100644
--- a/multimedia/gst-plugins/distinfo
+++ b/multimedia/gst-plugins/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2004/04/03 21:36:23 jmmv Exp $
+$NetBSD: distinfo,v 1.4 2004/04/06 09:36:28 jmmv Exp $
 
 SHA1 (gst-plugins-0.8.0.tar.bz2) = 283770761c4f479367ebdb68f936b9f9a74bbf6a
 Size (gst-plugins-0.8.0.tar.bz2) = 1751685 bytes
-SHA1 (patch-aa) = 0f7c9f904c3881f0bd1e4954ecba114e7b4654c0
+SHA1 (patch-aa) = 09588da88c74496b981f6130bd61d7d08cae37ad
diff --git a/multimedia/gst-plugins/patches/patch-aa b/multimedia/gst-plugins/patches/patch-aa
index c52e7b56c05..e8d5d012fac 100644
--- a/multimedia/gst-plugins/patches/patch-aa
+++ b/multimedia/gst-plugins/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2004/04/03 21:36:23 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2004/04/06 09:36:28 jmmv Exp $
 
 --- configure.orig	2004-03-16 12:55:09.000000000 +0100
 +++ configure	2004-04-03 15:19:00.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2004/04/03 21:36:23 jmmv Exp $
  
  
 -GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex _*{gst_,Gst,GST_}.*'
-+GST_PLUGIN_LDFLAGS='-module -avoid-version -export-symbols-regex _*[Gg][Ss][Tt].*'
++GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '_*(gst_|Gst|GST_).*'"
  
  
  GST_PLUGINS_ALL="\