* Update to 0.6.0

* Fix audiofile detection
* Small CC safeness fixes
* Add Hermes support

This work is the product of colaboration between lioux and myself.

Approved by:	maintainer

16 files changed, 648 insertions, 502 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index a3c9aafd341..84d52e942e6 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.2
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,12 +18,13 @@ MAINTAINER=	lioux@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
+		gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
@@ -43,6 +44,9 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
+PLIST_SUB=	\
+		VERSION="${PORTVERSION:C/..$//}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
 # for esound detection
@@ -54,28 +58,19 @@ PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
 XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 
+# library minor number
+SHLIB_VERSION=  0
+
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
 	@${REINPLACE_CMD} -E -e \
 		's|^#define.*LRINT.*$$||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# remove version number from include dir name
-	@${REINPLACE_CMD} -E -e \
-		's|-@VERSION@||' \
-		${WRKSRC}/gstreamer-libs.pc.in \
-		${WRKSRC}/gstreamer-play.pc.in
-# remove version number from include dir name
 # respect CFLAGS
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \
-		s,-O(2|3),,; \
+		's,-O(2|3),,; \
 		s|-mcpu=i486||'
-# gconf is not working in this release
-	@${REINPLACE_CMD} -E -e \
-		's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/gst-libs/gst/Makefile.in
 # mcopidl takes the file as the last argument
 	@${REINPLACE_CMD} -E -e \
 		's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
@@ -90,6 +85,19 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|malloc.h|stdlib.h|; \
 		s|stdint.h|inttypes.h|'
+# use GMAKE, not MAKE
+	@${REINPLACE_CMD} -E -e \
+		's|make|${GMAKE}|' \
+		${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
+# force libaudiofile detection
+	@${REINPLACE_CMD} -E -e \
+		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-configure:
+# CC safeness
+	@${ECHO_CMD} "CC=${CC}" >> \
+		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
 
 post-install:
 # register plugins
@@ -146,11 +154,21 @@ WITH_GNOMEVFS=yes
 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
@@ -228,7 +246,7 @@ WITH_VORBIS=yes
 
 # xmms
 .if exists(${X11BASE}/lib/libxmms.a)
-WITH_XMMS=yes
+#WITH_XMMS=yes
 .endif
 
 ##
@@ -326,6 +344,15 @@ LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 PLIST_SUB+=	GSM=""
 .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
+
 # http
 .ifndef(WITH_HTTP)
 CONFIGURE_ARGS+=	--disable-http
@@ -344,6 +371,16 @@ 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
@@ -574,6 +611,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin'
 .endif
+.ifndef(WITH_HERMES)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin'
+.endif
 .ifndef(WITH_HTTP)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_HTTP to enable http Network plugin'
@@ -582,6 +623,10 @@ pre-everything::
 	@${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'
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index e163a7be3b4..caeb2030329 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.4.2.tar.gz) = f2d499cf117408b5a4adc7a0d71eb095
+MD5 (gst-plugins-0.6.0.tar.gz) = c1eadcf2486577bb36d4e89cbfa2e65f
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index b9cb14fa4ee..89fefdf414d 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -1,124 +1,137 @@
 bin/gst-launch-ext
 bin/gst-visualise
 etc/gconf/schemas/gstreamer.schemas
-include/gst-plugins/gst/audio/audio.h
-include/gst-plugins/gst/floatcast/floatcast.h
-include/gst-plugins/gst/gconf/gconf.h
-include/gst-plugins/gst/idct/idct.h
-include/gst-plugins/gst/play/play.h
-include/gst-plugins/gst/resample/resample.h
-include/gst-plugins/gst/riff/riff.h
-include/gst-plugins/gst/video/video.h
-%%LIBA52%%lib/gst/libgsta52dec.so
-%%AALIB%%lib/gst/libgstaasink.so
-lib/gst/libgstac3parse.so
-lib/gst/libgstadder.so
-lib/gst/libgstalaw.so
-%%ARTS%%lib/gst/libgstartsdsink.so
-lib/gst/libgstaudio.so
-lib/gst/libgstaudioscale.so
-lib/gst/libgstauparse.so
-%%AVIFILE%%lib/gst/libgstavidemux.so
-%%AVIFILE%%lib/gst/libgstavimux.so
-lib/gst/libgstcdxaparse.so
-lib/gst/libgstchart.so
-lib/gst/libgstcutter.so
-lib/gst/libgstdeinterlace.so
-%%LIBDV%%lib/gst/libgstdvdec.so
-%%LIBDVDNAV%%lib/gst/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gst/libgstdvdreadsrc.so
-lib/gst/libgsteffectv.so
-%%ESOUND%%lib/gst/libgstesdmon.so
-%%ESOUND%%lib/gst/libgstesdsink.so
-lib/gst/libgstfestival.so
-lib/gst/libgstfilter.so
-%%FLAC%%lib/gst/libgstflac.so
-lib/gst/libgstflxdec.so
-%%GNOMEVFS%%lib/gst/libgstgnomevfssink.so
-%%GNOMEVFS%%lib/gst/libgstgnomevfssrc.so
-lib/gst/libgstgoom.so
-%%GSM%%lib/gst/libgstgsm.so
-%%HTTP%%lib/gst/libgsthttpsrc.so
-lib/gst/libgstidct.so
-lib/gst/libgstintfloat.so
-%%JPEG%%lib/gst/libgstjpeg.so
-%%LAME%%lib/gst/libgstlame.so
-lib/gst/libgstlevel.so
-%%LIBFAME%%lib/gst/libgstlibfame.so
-%%LIBMAD%%lib/gst/libgstmad.so
-lib/gst/libgstmedian.so
-%%LIBMIKMOD%%lib/gst/libgstmikmod.so
-lib/gst/libgstmodplug.so
-lib/gst/libgstmono2stereo.so
-lib/gst/libgstmonoscope.so
-lib/gst/libgstmp1videoparse.so
-lib/gst/libgstmp3types.so
-lib/gst/libgstmpeg1encoder.so
-lib/gst/libgstmpeg1systemencode.so
-lib/gst/libgstmpeg1types.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2dec.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2enc.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2subt.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2types.so
-lib/gst/libgstmpegaudio.so
-lib/gst/libgstmpegaudioparse.so
-lib/gst/libgstmpegstream.so
-lib/gst/libgstmulaw.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimedecoder.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimetypes.so
-%%OSS%%lib/gst/libgstossaudio.so
-lib/gst/libgstpassthrough.so
-lib/gst/libgstplayondemand.so
-lib/gst/libgstqtdemux.so
-lib/gst/libgstresample.so
-lib/gst/libgstriff.so
-lib/gst/libgstrtjpeg.so
-%%SDL%%lib/gst/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gst/libgstshout.so
-%%LIBSIDPLAY%%lib/gst/libgstsid.so
-lib/gst/libgstsilence.so
-lib/gst/libgstsinesrc.so
-lib/gst/libgstsmooth.so
-lib/gst/libgstsmpte.so
-%%PNG%%lib/gst/libgstsnapshot.so
-lib/gst/libgstspectrum.so
-lib/gst/libgstspeed.so
-lib/gst/libgststereo.so
-lib/gst/libgststereo2mono.so
-lib/gst/libgststereosplit.so
-lib/gst/libgstsynaesthesia.so
-lib/gst/libgstudp.so
-lib/gst/libgstvideo.so
-lib/gst/libgstvideocrop.so
-lib/gst/libgstvideoscale.so
-lib/gst/libgstvideotestsrc.so
-lib/gst/libgstvolenv.so
-lib/gst/libgstvolume.so
-%%VORBIS%%lib/gst/libgstvorbis.so
-lib/gst/libgstvumeter.so
-lib/gst/libgstwavenc.so
-lib/gst/libgstwavparse.so
-lib/gst/libgsty4menc.so
-lib/gst/libmixmatrix.so
-lib/libgstgconf-0.4.2.so.0
-lib/libgstgconf.a
-lib/libgstgconf.so
-lib/libgstplay-0.4.2.so.0
-lib/libgstplay.a
-lib/libgstplay.so
-libdata/pkgconfig/gstreamer-libs.pc
-libdata/pkgconfig/gstreamer-play.pc
-share/aclocal/gst-element-check.m4
-@dirrm include/gst-plugins/gst/video
-@dirrm include/gst-plugins/gst/riff
-@dirrm include/gst-plugins/gst/resample
-@dirrm include/gst-plugins/gst/play
-@dirrm include/gst-plugins/gst/idct
-@dirrm include/gst-plugins/gst/gconf
-@dirrm include/gst-plugins/gst/floatcast
-@dirrm include/gst-plugins/gst/audio
-@dirrm include/gst-plugins/gst
-@dirrm include/gst-plugins
+include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h
+include/gstreamer-%%VERSION%%/gst/gconf/gconf.h
+include/gstreamer-%%VERSION%%/gst/idct/idct.h
+include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
+include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/resample/resample.h
+include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/video/video.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
+%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
+%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
+lib/gstreamer-%%VERSION%%/libgstaudioscale.so
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavidemux.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavimux.so
+lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstchart.so
+%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
+%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
+%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so
+lib/gstreamer-%%VERSION%%/libgstfestival.so
+lib/gstreamer-%%VERSION%%/libgstffmpeg.so
+lib/gstreamer-%%VERSION%%/libgstffmpegall.so
+lib/gstreamer-%%VERSION%%/libgstfilter.so
+%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
+%%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
+lib/gstreamer-%%VERSION%%/libgstidct.so
+lib/gstreamer-%%VERSION%%/libgstintfloat.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
+%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
+lib/gstreamer-%%VERSION%%/libgstmedian.so
+%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
+lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
+lib/gstreamer-%%VERSION%%/libgstmonoscope.so
+lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
+lib/gstreamer-%%VERSION%%/libgstmp3types.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1types.so
+%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2types.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
+lib/gstreamer-%%VERSION%%/libgstmpegstream.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstoneton.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
+%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstpassthrough.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%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrtjpeg.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
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+lib/gstreamer-%%VERSION%%/libgstspectrum.so
+lib/gstreamer-%%VERSION%%/libgstspeed.so
+lib/gstreamer-%%VERSION%%/libgststereo.so
+lib/gstreamer-%%VERSION%%/libgststereo2mono.so
+lib/gstreamer-%%VERSION%%/libgststereosplit.so
+lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvbidec.so
+lib/gstreamer-%%VERSION%%/libgstvideo.so
+lib/gstreamer-%%VERSION%%/libgstvideocrop.so
+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%%/libgstvumeter.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
+lib/gstreamer-%%VERSION%%/libgsty4menc.so
+lib/gstreamer-%%VERSION%%/libmixmatrix.so
+lib/libgstgconf-%%VERSION%%.a
+lib/libgstgconf-%%VERSION%%.so
+lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstmedia-info-%%VERSION%%.a
+lib/libgstmedia-info-%%VERSION%%.so
+lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstplay-%%VERSION%%.a
+lib/libgstplay-%%VERSION%%.so
+lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
+share/aclocal/gst-element-check-%%VERSION%%.m4
+@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm include/gstreamer-%%VERSION%%/gst/video
+@dirrm include/gstreamer-%%VERSION%%/gst/riff
+@dirrm include/gstreamer-%%VERSION%%/gst/resample
+@dirrm include/gstreamer-%%VERSION%%/gst/play
+@dirrm include/gstreamer-%%VERSION%%/gst/media-info
+@dirrm include/gstreamer-%%VERSION%%/gst/idct
+@dirrm include/gstreamer-%%VERSION%%/gst/gconf
+@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
+@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
 @exec %%X11BASE%%/bin/gst-register 2>/dev/null
 @unexec %%X11BASE%%/bin/gst-register 2>/dev/null
diff --git a/multimedia/gstreamer-plugins80/Makefile b/multimedia/gstreamer-plugins80/Makefile
index a3c9aafd341..84d52e942e6 100644
--- a/multimedia/gstreamer-plugins80/Makefile
+++ b/multimedia/gstreamer-plugins80/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.2
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,12 +18,13 @@ MAINTAINER=	lioux@FreeBSD.org
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	glib-2.0.0:${PORTSDIR}/devel/glib20 \
 		gconf-2.5:${PORTSDIR}/devel/gconf2 \
-		gstreamer.0:${PORTSDIR}/multimedia/gstreamer \
+		gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
 		gtk-x11-2.0.0:${PORTSDIR}/x11-toolkits/gtk20 \
 		popt.0:${PORTSDIR}/devel/popt \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack \
 		gnomehier \
@@ -43,6 +44,9 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
+PLIST_SUB=	\
+		VERSION="${PORTVERSION:C/..$//}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
 # for esound detection
@@ -54,28 +58,19 @@ PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
 XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 
+# library minor number
+SHLIB_VERSION=  0
+
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
 	@${REINPLACE_CMD} -E -e \
 		's|^#define.*LRINT.*$$||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-# remove version number from include dir name
-	@${REINPLACE_CMD} -E -e \
-		's|-@VERSION@||' \
-		${WRKSRC}/gstreamer-libs.pc.in \
-		${WRKSRC}/gstreamer-play.pc.in
-# remove version number from include dir name
 # respect CFLAGS
 	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -E -e \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|; \
-		s,-O(2|3),,; \
+		's,-O(2|3),,; \
 		s|-mcpu=i486||'
-# gconf is not working in this release
-	@${REINPLACE_CMD} -E -e \
-		's,^((DIST_SUBDIRS|SUBDIRS).+)gconf,\1,' \
-		${WRKSRC}/Makefile.in \
-		${WRKSRC}/gst-libs/gst/Makefile.in
 # mcopidl takes the file as the last argument
 	@${REINPLACE_CMD} -E -e \
 		's|(mcopidl.+)(\$$<)(.+)$$|\1 \3 \2|' \
@@ -90,6 +85,19 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|malloc.h|stdlib.h|; \
 		s|stdint.h|inttypes.h|'
+# use GMAKE, not MAKE
+	@${REINPLACE_CMD} -E -e \
+		's|make|${GMAKE}|' \
+		${WRKSRC}/gst-libs/ext/ffmpeg/Makefile.in
+# force libaudiofile detection
+	@${REINPLACE_CMD} -E -e \
+		's|^.*afOpenVirtualFile[[:space:]]*\(\);|;|' \
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+
+post-configure:
+# CC safeness
+	@${ECHO_CMD} "CC=${CC}" >> \
+		${WRKSRC}/gst-libs/ext/ffmpeg/ffmpeg/config.mak
 
 post-install:
 # register plugins
@@ -146,11 +154,21 @@ WITH_GNOMEVFS=yes
 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
@@ -228,7 +246,7 @@ WITH_VORBIS=yes
 
 # xmms
 .if exists(${X11BASE}/lib/libxmms.a)
-WITH_XMMS=yes
+#WITH_XMMS=yes
 .endif
 
 ##
@@ -326,6 +344,15 @@ LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
 PLIST_SUB+=	GSM=""
 .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
+
 # http
 .ifndef(WITH_HTTP)
 CONFIGURE_ARGS+=	--disable-http
@@ -344,6 +371,16 @@ 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
@@ -574,6 +611,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_GNOMEVFS to enable gnomevfs Network plugin'
 .endif
+.ifndef(WITH_HERMES)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_HERMES to enable Hermes colorspace plugin'
+.endif
 .ifndef(WITH_HTTP)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_HTTP to enable http Network plugin'
@@ -582,6 +623,10 @@ pre-everything::
 	@${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'
diff --git a/multimedia/gstreamer-plugins80/distinfo b/multimedia/gstreamer-plugins80/distinfo
index e163a7be3b4..caeb2030329 100644
--- a/multimedia/gstreamer-plugins80/distinfo
+++ b/multimedia/gstreamer-plugins80/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.4.2.tar.gz) = f2d499cf117408b5a4adc7a0d71eb095
+MD5 (gst-plugins-0.6.0.tar.gz) = c1eadcf2486577bb36d4e89cbfa2e65f
diff --git a/multimedia/gstreamer-plugins80/pkg-plist b/multimedia/gstreamer-plugins80/pkg-plist
index b9cb14fa4ee..89fefdf414d 100644
--- a/multimedia/gstreamer-plugins80/pkg-plist
+++ b/multimedia/gstreamer-plugins80/pkg-plist
@@ -1,124 +1,137 @@
 bin/gst-launch-ext
 bin/gst-visualise
 etc/gconf/schemas/gstreamer.schemas
-include/gst-plugins/gst/audio/audio.h
-include/gst-plugins/gst/floatcast/floatcast.h
-include/gst-plugins/gst/gconf/gconf.h
-include/gst-plugins/gst/idct/idct.h
-include/gst-plugins/gst/play/play.h
-include/gst-plugins/gst/resample/resample.h
-include/gst-plugins/gst/riff/riff.h
-include/gst-plugins/gst/video/video.h
-%%LIBA52%%lib/gst/libgsta52dec.so
-%%AALIB%%lib/gst/libgstaasink.so
-lib/gst/libgstac3parse.so
-lib/gst/libgstadder.so
-lib/gst/libgstalaw.so
-%%ARTS%%lib/gst/libgstartsdsink.so
-lib/gst/libgstaudio.so
-lib/gst/libgstaudioscale.so
-lib/gst/libgstauparse.so
-%%AVIFILE%%lib/gst/libgstavidemux.so
-%%AVIFILE%%lib/gst/libgstavimux.so
-lib/gst/libgstcdxaparse.so
-lib/gst/libgstchart.so
-lib/gst/libgstcutter.so
-lib/gst/libgstdeinterlace.so
-%%LIBDV%%lib/gst/libgstdvdec.so
-%%LIBDVDNAV%%lib/gst/libgstdvdnavsrc.so
-%%LIBDVDREAD%%lib/gst/libgstdvdreadsrc.so
-lib/gst/libgsteffectv.so
-%%ESOUND%%lib/gst/libgstesdmon.so
-%%ESOUND%%lib/gst/libgstesdsink.so
-lib/gst/libgstfestival.so
-lib/gst/libgstfilter.so
-%%FLAC%%lib/gst/libgstflac.so
-lib/gst/libgstflxdec.so
-%%GNOMEVFS%%lib/gst/libgstgnomevfssink.so
-%%GNOMEVFS%%lib/gst/libgstgnomevfssrc.so
-lib/gst/libgstgoom.so
-%%GSM%%lib/gst/libgstgsm.so
-%%HTTP%%lib/gst/libgsthttpsrc.so
-lib/gst/libgstidct.so
-lib/gst/libgstintfloat.so
-%%JPEG%%lib/gst/libgstjpeg.so
-%%LAME%%lib/gst/libgstlame.so
-lib/gst/libgstlevel.so
-%%LIBFAME%%lib/gst/libgstlibfame.so
-%%LIBMAD%%lib/gst/libgstmad.so
-lib/gst/libgstmedian.so
-%%LIBMIKMOD%%lib/gst/libgstmikmod.so
-lib/gst/libgstmodplug.so
-lib/gst/libgstmono2stereo.so
-lib/gst/libgstmonoscope.so
-lib/gst/libgstmp1videoparse.so
-lib/gst/libgstmp3types.so
-lib/gst/libgstmpeg1encoder.so
-lib/gst/libgstmpeg1systemencode.so
-lib/gst/libgstmpeg1types.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2dec.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2enc.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2subt.so
-%%LIBMPEG2%%lib/gst/libgstmpeg2types.so
-lib/gst/libgstmpegaudio.so
-lib/gst/libgstmpegaudioparse.so
-lib/gst/libgstmpegstream.so
-lib/gst/libgstmulaw.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimedecoder.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimedemux.so
-%%OPENQUICKTIME%%lib/gst/libgstopenquicktimetypes.so
-%%OSS%%lib/gst/libgstossaudio.so
-lib/gst/libgstpassthrough.so
-lib/gst/libgstplayondemand.so
-lib/gst/libgstqtdemux.so
-lib/gst/libgstresample.so
-lib/gst/libgstriff.so
-lib/gst/libgstrtjpeg.so
-%%SDL%%lib/gst/libgstsdlvideosink.so
-%%LIBSHOUT%%lib/gst/libgstshout.so
-%%LIBSIDPLAY%%lib/gst/libgstsid.so
-lib/gst/libgstsilence.so
-lib/gst/libgstsinesrc.so
-lib/gst/libgstsmooth.so
-lib/gst/libgstsmpte.so
-%%PNG%%lib/gst/libgstsnapshot.so
-lib/gst/libgstspectrum.so
-lib/gst/libgstspeed.so
-lib/gst/libgststereo.so
-lib/gst/libgststereo2mono.so
-lib/gst/libgststereosplit.so
-lib/gst/libgstsynaesthesia.so
-lib/gst/libgstudp.so
-lib/gst/libgstvideo.so
-lib/gst/libgstvideocrop.so
-lib/gst/libgstvideoscale.so
-lib/gst/libgstvideotestsrc.so
-lib/gst/libgstvolenv.so
-lib/gst/libgstvolume.so
-%%VORBIS%%lib/gst/libgstvorbis.so
-lib/gst/libgstvumeter.so
-lib/gst/libgstwavenc.so
-lib/gst/libgstwavparse.so
-lib/gst/libgsty4menc.so
-lib/gst/libmixmatrix.so
-lib/libgstgconf-0.4.2.so.0
-lib/libgstgconf.a
-lib/libgstgconf.so
-lib/libgstplay-0.4.2.so.0
-lib/libgstplay.a
-lib/libgstplay.so
-libdata/pkgconfig/gstreamer-libs.pc
-libdata/pkgconfig/gstreamer-play.pc
-share/aclocal/gst-element-check.m4
-@dirrm include/gst-plugins/gst/video
-@dirrm include/gst-plugins/gst/riff
-@dirrm include/gst-plugins/gst/resample
-@dirrm include/gst-plugins/gst/play
-@dirrm include/gst-plugins/gst/idct
-@dirrm include/gst-plugins/gst/gconf
-@dirrm include/gst-plugins/gst/floatcast
-@dirrm include/gst-plugins/gst/audio
-@dirrm include/gst-plugins/gst
-@dirrm include/gst-plugins
+include/gstreamer-%%VERSION%%/gst/audio/audio.h
+include/gstreamer-%%VERSION%%/gst/floatcast/floatcast.h
+include/gstreamer-%%VERSION%%/gst/gconf/gconf.h
+include/gstreamer-%%VERSION%%/gst/idct/idct.h
+include/gstreamer-%%VERSION%%/gst/media-info/media-info.h
+include/gstreamer-%%VERSION%%/gst/play/play.h
+include/gstreamer-%%VERSION%%/gst/resample/resample.h
+include/gstreamer-%%VERSION%%/gst/riff/riff.h
+include/gstreamer-%%VERSION%%/gst/video/video.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
+%%ARTS%%lib/gstreamer-%%VERSION%%/libgstartsdsink.so
+lib/gstreamer-%%VERSION%%/libgstaudio.so
+%%LIBAUDIOFILE%%lib/gstreamer-%%VERSION%%/libgstaudiofile.so
+lib/gstreamer-%%VERSION%%/libgstaudioscale.so
+lib/gstreamer-%%VERSION%%/libgstauparse.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavidemux.so
+%%AVIFILE%%lib/gstreamer-%%VERSION%%/libgstavimux.so
+lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstchart.so
+%%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
+lib/gstreamer-%%VERSION%%/libgstcutter.so
+lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+%%LIBDV%%lib/gstreamer-%%VERSION%%/libgstdvdec.so
+%%LIBDVDNAV%%lib/gstreamer-%%VERSION%%/libgstdvdnavsrc.so
+%%LIBDVDREAD%%lib/gstreamer-%%VERSION%%/libgstdvdreadsrc.so
+lib/gstreamer-%%VERSION%%/libgsteffectv.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdmon.so
+%%ESOUND%%lib/gstreamer-%%VERSION%%/libgstesdsink.so
+lib/gstreamer-%%VERSION%%/libgstfestival.so
+lib/gstreamer-%%VERSION%%/libgstffmpeg.so
+lib/gstreamer-%%VERSION%%/libgstffmpegall.so
+lib/gstreamer-%%VERSION%%/libgstfilter.so
+%%FLAC%%lib/gstreamer-%%VERSION%%/libgstflac.so
+lib/gstreamer-%%VERSION%%/libgstflxdec.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssink.so
+%%GNOMEVFS%%lib/gstreamer-%%VERSION%%/libgstgnomevfssrc.so
+lib/gstreamer-%%VERSION%%/libgstgoom.so
+%%GSM%%lib/gstreamer-%%VERSION%%/libgstgsm.so
+%%HTTP%%lib/gstreamer-%%VERSION%%/libgsthttpsrc.so
+lib/gstreamer-%%VERSION%%/libgstidct.so
+lib/gstreamer-%%VERSION%%/libgstintfloat.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
+%%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
+lib/gstreamer-%%VERSION%%/libgstmedian.so
+%%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
+lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
+lib/gstreamer-%%VERSION%%/libgstmonoscope.so
+lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
+lib/gstreamer-%%VERSION%%/libgstmp3types.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1encoder.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1systemencode.so
+lib/gstreamer-%%VERSION%%/libgstmpeg1types.so
+%%LIBMPEG2%%lib/gstreamer-%%VERSION%%/libgstmpeg2dec.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2enc.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2subt.so
+lib/gstreamer-%%VERSION%%/libgstmpeg2types.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudio.so
+lib/gstreamer-%%VERSION%%/libgstmpegaudioparse.so
+lib/gstreamer-%%VERSION%%/libgstmpegstream.so
+lib/gstreamer-%%VERSION%%/libgstmulaw.so
+lib/gstreamer-%%VERSION%%/libgstoneton.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedecoder.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimedemux.so
+%%OPENQUICKTIME%%lib/gstreamer-%%VERSION%%/libgstopenquicktimetypes.so
+%%OSS%%lib/gstreamer-%%VERSION%%/libgstossaudio.so
+lib/gstreamer-%%VERSION%%/libgstpassthrough.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%%/libgstriff.so
+lib/gstreamer-%%VERSION%%/libgstrtjpeg.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
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
+lib/gstreamer-%%VERSION%%/libgstsmpte.so
+%%PNG%%lib/gstreamer-%%VERSION%%/libgstsnapshot.so
+lib/gstreamer-%%VERSION%%/libgstspectrum.so
+lib/gstreamer-%%VERSION%%/libgstspeed.so
+lib/gstreamer-%%VERSION%%/libgststereo.so
+lib/gstreamer-%%VERSION%%/libgststereo2mono.so
+lib/gstreamer-%%VERSION%%/libgststereosplit.so
+lib/gstreamer-%%VERSION%%/libgstsynaesthesia.so
+lib/gstreamer-%%VERSION%%/libgstudp.so
+lib/gstreamer-%%VERSION%%/libgstvbidec.so
+lib/gstreamer-%%VERSION%%/libgstvideo.so
+lib/gstreamer-%%VERSION%%/libgstvideocrop.so
+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%%/libgstvumeter.so
+lib/gstreamer-%%VERSION%%/libgstwavenc.so
+lib/gstreamer-%%VERSION%%/libgstwavparse.so
+lib/gstreamer-%%VERSION%%/libgsty4menc.so
+lib/gstreamer-%%VERSION%%/libmixmatrix.so
+lib/libgstgconf-%%VERSION%%.a
+lib/libgstgconf-%%VERSION%%.so
+lib/libgstgconf-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstmedia-info-%%VERSION%%.a
+lib/libgstmedia-info-%%VERSION%%.so
+lib/libgstmedia-info-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstplay-%%VERSION%%.a
+lib/libgstplay-%%VERSION%%.so
+lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-gconf-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-libs-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-play-%%VERSION%%.pc
+share/aclocal/gst-element-check-%%VERSION%%.m4
+@unexec rmdir %D/lib/gstreamer-%%VERSION%% 2>/dev/null || true
+@dirrm include/gstreamer-%%VERSION%%/gst/video
+@dirrm include/gstreamer-%%VERSION%%/gst/riff
+@dirrm include/gstreamer-%%VERSION%%/gst/resample
+@dirrm include/gstreamer-%%VERSION%%/gst/play
+@dirrm include/gstreamer-%%VERSION%%/gst/media-info
+@dirrm include/gstreamer-%%VERSION%%/gst/idct
+@dirrm include/gstreamer-%%VERSION%%/gst/gconf
+@dirrm include/gstreamer-%%VERSION%%/gst/floatcast
+@dirrm include/gstreamer-%%VERSION%%/gst/audio
+@unexec rmdir %D/include/gstreamer-%%VERSION%% 2>/dev/null || true
 @exec %%X11BASE%%/bin/gst-register 2>/dev/null
 @unexec %%X11BASE%%/bin/gst-register 2>/dev/null
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 5f29fdc44f5..46343f66b4a 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.2
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,6 +34,9 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
+PLIST_SUB=	\
+		VERSION="${PORTVERSION:C/..$//}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
 MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
@@ -42,26 +45,17 @@ MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 
-post-patch:
-# use proper dir
-# remove version number from include dir name
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
-# remove version number from include dir name AND
-# help dependent ports find popt.h
-	@${REINPLACE_CMD} -E -e \
-		's|-@VERSION@||; \
-		s|(-I\$${includedir})|\1 -I${LOCALBASE}/include|' \
-		${WRKSRC}/gstreamer.pc.in
-
-post-configure:
-# remove version number postfix from library names
-	@${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
-		${WRKSRC}/gst/Makefile ${WRKSRC}/libs/gst/control/Makefile
+# library minor number
+SHLIB_VERSION=	0
 
 post-install:
 # register plugins
 	@${PREFIX}/bin/gst-register 2>/dev/null
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
+LIB_DEPENDS+=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer/distinfo b/multimedia/gstreamer/distinfo
index 209ebc90fac..e747bb09183 100644
--- a/multimedia/gstreamer/distinfo
+++ b/multimedia/gstreamer/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.4.2.tar.bz2) = c9e4eed8bac71f52044e2b28356c81ef
+MD5 (gstreamer-0.6.0.tar.bz2) = 3d0dec37678b33bbcb23cb2e20a83fe4
diff --git a/multimedia/gstreamer/files/patch-configure b/multimedia/gstreamer/files/patch-configure
index 4e3e5d1953d..b3935c7cb3d 100644
--- a/multimedia/gstreamer/files/patch-configure
+++ b/multimedia/gstreamer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jul 10 16:32:49 2002
-+++ configure	Wed Jul 10 16:33:12 2002
-@@ -6620,6 +6620,7 @@
+--- configure.orig	Wed Jan 22 09:17:40 2003
++++ configure	Wed Jan 29 14:49:56 2003
+@@ -7520,6 +7520,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7712,7 +7713,7 @@
+ if test "x$COMPILER" = "xforte"; then
+   GST_ERROR=
+ else
+-  if test "x$GST_CVS"="xyes"; then
++  if test "x$GST_CVS" = "xyes"; then
+     GST_ERROR="-Wall -Werror"
+   else
+     GST_ERROR="-Wall"
diff --git a/multimedia/gstreamer/files/patch-gst::cothreads.c b/multimedia/gstreamer/files/patch-gst::cothreads.c
index aed13b1a789..3519fb0e7e0 100644
--- a/multimedia/gstreamer/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer/files/patch-gst::cothreads.c
@@ -1,6 +1,15 @@
---- gst/cothreads.c.orig	Wed Nov 13 22:59:21 2002
-+++ gst/cothreads.c	Wed Nov 13 22:59:38 2002
-@@ -41,11 +41,11 @@
+--- gst/cothreads.c.orig	Sat Feb  1 19:09:00 2003
++++ gst/cothreads.c	Mon Feb  3 10:57:44 2003
+@@ -41,12 +41,16 @@
+ #include <ucontext.h>
+ #endif
+ 
++#ifdef HAVE_MAKECONTEXT
++#include <ucontext.h>
++#endif
++
+ /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
+ #ifndef MAP_ANONYMOUS
  #define MAP_ANONYMOUS MAP_ANON
  #endif
  
@@ -9,8 +18,3 @@
  
  #define COTHREAD_MAGIC_NUMBER 0xabcdef
  
--#define COTHREAD_MAXTHREADS 16
-+#define COTHREAD_MAXTHREADS 8
- #define COTHREAD_STACKSIZE (STACK_SIZE/COTHREAD_MAXTHREADS)
- 
- static void 	cothread_destroy 	(cothread_state *thread);
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 4486c146ffd..b42f950edaa 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/bin/gst-register 2>/dev/null
+@unexec %D/bin/gst-register 2>/dev/null || true
 bin/gst-complete
 bin/gst-compprep
 bin/gst-feedback
@@ -7,86 +7,94 @@ bin/gst-launch
 bin/gst-md5sum
 bin/gst-register
 bin/gst-xmllaunch
-include/gstreamer/gst/bytestream/bytestream.h
-include/gstreamer/gst/control/control.h
-include/gstreamer/gst/control/dparam.h
-include/gstreamer/gst/control/dparam_smooth.h
-include/gstreamer/gst/control/dparamcommon.h
-include/gstreamer/gst/control/dparammanager.h
-include/gstreamer/gst/control/dplinearinterp.h
-include/gstreamer/gst/control/unitconvert.h
-include/gstreamer/gst/getbits/getbits.h
-include/gstreamer/gst/gst.h
-include/gstreamer/gst/gstatomic.h
-include/gstreamer/gst/gstautoplug.h
-include/gstreamer/gst/gstbin.h
-include/gstreamer/gst/gstbuffer.h
-include/gstreamer/gst/gstbufferpool-default.h
-include/gstreamer/gst/gstcaps.h
-include/gstreamer/gst/gstclock.h
-include/gstreamer/gst/gstconfig.h
-include/gstreamer/gst/gstcpu.h
-include/gstreamer/gst/gstdata.h
-include/gstreamer/gst/gstelement.h
-include/gstreamer/gst/gstenumtypes.h
-include/gstreamer/gst/gstevent.h
-include/gstreamer/gst/gstextratypes.h
-include/gstreamer/gst/gstformat.h
-include/gstreamer/gst/gstinfo.h
-include/gstreamer/gst/gstlog.h
-include/gstreamer/gst/gstmarshal.h
-include/gstreamer/gst/gstmemchunk.h
-include/gstreamer/gst/gstobject.h
-include/gstreamer/gst/gstpad.h
-include/gstreamer/gst/gstparse.h
-include/gstreamer/gst/gstpipeline.h
-include/gstreamer/gst/gstplugin.h
-include/gstreamer/gst/gstpluginfeature.h
-include/gstreamer/gst/gstprops.h
-include/gstreamer/gst/gstqueue.h
-include/gstreamer/gst/gstregistry.h
-include/gstreamer/gst/gstscheduler.h
-include/gstreamer/gst/gstsystemclock.h
-include/gstreamer/gst/gstthread.h
-include/gstreamer/gst/gsttimecache.h
-include/gstreamer/gst/gsttrace.h
-include/gstreamer/gst/gsttype.h
-include/gstreamer/gst/gsttypefind.h
-include/gstreamer/gst/gsttypes.h
-include/gstreamer/gst/gstutils.h
-include/gstreamer/gst/gstversion.h
-include/gstreamer/gst/gstxml.h
-include/gstreamer/gst/putbits/putbits.h
-lib/gst/libgstautoplugcache.so
-lib/gst/libgstautoplugger.so
-lib/gst/libgstbasicomegascheduler.so
-lib/gst/libgstbasicwingoscheduler.so
-lib/gst/libgstbytestream.so
-lib/gst/libgstelements.so
-lib/gst/libgstfastomegascheduler.so
-lib/gst/libgstfastwingoscheduler.so
-lib/gst/libgstgetbits.so
-lib/gst/libgstoptomegascheduler.so
-lib/gst/libgstputbits.so
-lib/gst/libgstspider.so
-lib/gst/libgststaticautoplug.so
-lib/gst/libgststaticautoplugrender.so
-lib/gst/libgsttypes.so
-lib/libgstcontrol.a
-lib/libgstcontrol.so
-lib/libgstcontrol.so.0
-lib/libgstreamer.a
-lib/libgstreamer.so
-lib/libgstreamer.so.0
-libdata/pkgconfig/gstreamer.pc
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
-@dirrm lib/gst
-@dirrm include/gstreamer/gst/putbits
-@dirrm include/gstreamer/gst/getbits
-@dirrm include/gstreamer/gst/control
-@dirrm include/gstreamer/gst/bytestream
-@dirrm include/gstreamer/gst
-@dirrm include/gstreamer
-@exec %D/bin/gst-register 2>/dev/null
-@unexec rm %D/etc/gstreamer/registry.xml 2>/dev/null || true
-@unexec rmdir %D/etc/gstreamer 2>/dev/null || echo "There are some configuration files left in ${PKG_PREFIX}/etc/gstreamer, do not forget to remove them if you are permanently removing gstreamer port."
+include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
+include/gstreamer-%%VERSION%%/gst/control/control.h
+include/gstreamer-%%VERSION%%/gst/control/dparam.h
+include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
+include/gstreamer-%%VERSION%%/gst/control/dparamcommon.h
+include/gstreamer-%%VERSION%%/gst/control/dparammanager.h
+include/gstreamer-%%VERSION%%/gst/control/dplinearinterp.h
+include/gstreamer-%%VERSION%%/gst/control/unitconvert.h
+include/gstreamer-%%VERSION%%/gst/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/gst.h
+include/gstreamer-%%VERSION%%/gst/gstatomic.h
+include/gstreamer-%%VERSION%%/gst/gstautoplug.h
+include/gstreamer-%%VERSION%%/gst/gstbin.h
+include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h
+include/gstreamer-%%VERSION%%/gst/gstcaps.h
+include/gstreamer-%%VERSION%%/gst/gstclock.h
+include/gstreamer-%%VERSION%%/gst/gstcompat.h
+include/gstreamer-%%VERSION%%/gst/gstconfig.h
+include/gstreamer-%%VERSION%%/gst/gstcpu.h
+include/gstreamer-%%VERSION%%/gst/gstdata.h
+include/gstreamer-%%VERSION%%/gst/gstelement.h
+include/gstreamer-%%VERSION%%/gst/gstenumtypes.h
+include/gstreamer-%%VERSION%%/gst/gstevent.h
+include/gstreamer-%%VERSION%%/gst/gstextratypes.h
+include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstinfo.h
+include/gstreamer-%%VERSION%%/gst/gstlog.h
+include/gstreamer-%%VERSION%%/gst/gstmacros.h
+include/gstreamer-%%VERSION%%/gst/gstmarshal.h
+include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstobject.h
+include/gstreamer-%%VERSION%%/gst/gstpad.h
+include/gstreamer-%%VERSION%%/gst/gstparse.h
+include/gstreamer-%%VERSION%%/gst/gstpipeline.h
+include/gstreamer-%%VERSION%%/gst/gstplugin.h
+include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h
+include/gstreamer-%%VERSION%%/gst/gstprobe.h
+include/gstreamer-%%VERSION%%/gst/gstprops.h
+include/gstreamer-%%VERSION%%/gst/gstquery.h
+include/gstreamer-%%VERSION%%/gst/gstqueue.h
+include/gstreamer-%%VERSION%%/gst/gstregistry.h
+include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
+include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttrace.h
+include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
+include/gstreamer-%%VERSION%%/gst/gsttype.h
+include/gstreamer-%%VERSION%%/gst/gsttypefind.h
+include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsturi.h
+include/gstreamer-%%VERSION%%/gst/gstutils.h
+include/gstreamer-%%VERSION%%/gst/gstversion.h
+include/gstreamer-%%VERSION%%/gst/gstxml.h
+include/gstreamer-%%VERSION%%/gst/putbits/putbits.h
+lib/gstreamer-%%VERSION%%/libgstautoplugcache.so
+lib/gstreamer-%%VERSION%%/libgstautoplugger.so
+lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstbytestream.so
+lib/gstreamer-%%VERSION%%/libgstelements.so
+lib/gstreamer-%%VERSION%%/libgstgetbits.so
+lib/gstreamer-%%VERSION%%/libgstindexers.so
+lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstputbits.so
+lib/gstreamer-%%VERSION%%/libgstspider.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplug.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so
+lib/gstreamer-%%VERSION%%/libgsttypes.so
+lib/libgstcontrol-%%VERSION%%.a
+lib/libgstcontrol-%%VERSION%%.so
+lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.a
+lib/libgstreamer-%%VERSION%%.so
+lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm share/gnome/cache/gstreamer-%%VERSION%%
+@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%
+@dirrm include/gstreamer-%%VERSION%%/gst/putbits
+@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+@dirrm include/gstreamer-%%VERSION%%/gst/control
+@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
+@dirrm include/gstreamer-%%VERSION%%
+@exec %D/bin/gst-register 2>/dev/null || true
diff --git a/multimedia/gstreamer80/Makefile b/multimedia/gstreamer80/Makefile
index 5f29fdc44f5..46343f66b4a 100644
--- a/multimedia/gstreamer80/Makefile
+++ b/multimedia/gstreamer80/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.4.2
+PORTVERSION=	0.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,6 +34,9 @@ CONFIGURE_ENV=	PKG_CONFIG=${PKG_CONFIG} \
 		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 CONFIGURE_TARGET=
+PLIST_SUB=	\
+		VERSION="${PORTVERSION:C/..$//}" \
+		SHLIB_VERSION="${SHLIB_VERSION}"
 INSTALLS_SHLIB=	yes
 
 MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
@@ -42,26 +45,17 @@ MAN1=	gst-complete.1 gst-compprep.1 gst-inspect.1 gst-launch.1 \
 
 PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
 
-post-patch:
-# use proper dir
-# remove version number from include dir name
-	@${FIND} ${WRKSRC} -type f -name Makefile.in | \
-		${XARGS} -n 10 ${REINPLACE_CMD} -E \
-		's|^(lib[[:alpha:]]+includedir.+)-@VERSION@|\1|'
-# remove version number from include dir name AND
-# help dependent ports find popt.h
-	@${REINPLACE_CMD} -E -e \
-		's|-@VERSION@||; \
-		s|(-I\$${includedir})|\1 -I${LOCALBASE}/include|' \
-		${WRKSRC}/gstreamer.pc.in
-
-post-configure:
-# remove version number postfix from library names
-	@${REINPLACE_CMD} -E -e 's|-release ${PORTVERSION}||' \
-		${WRKSRC}/gst/Makefile ${WRKSRC}/libs/gst/control/Makefile
+# library minor number
+SHLIB_VERSION=	0
 
 post-install:
 # register plugins
 	@${PREFIX}/bin/gst-register 2>/dev/null
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if exists(${X11BASE}/libdata/pkgconfig/libgnomeui-2.0.pc)
+LIB_DEPENDS+=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer80/distinfo b/multimedia/gstreamer80/distinfo
index 209ebc90fac..e747bb09183 100644
--- a/multimedia/gstreamer80/distinfo
+++ b/multimedia/gstreamer80/distinfo
@@ -1 +1 @@
-MD5 (gstreamer-0.4.2.tar.bz2) = c9e4eed8bac71f52044e2b28356c81ef
+MD5 (gstreamer-0.6.0.tar.bz2) = 3d0dec37678b33bbcb23cb2e20a83fe4
diff --git a/multimedia/gstreamer80/files/patch-configure b/multimedia/gstreamer80/files/patch-configure
index 4e3e5d1953d..b3935c7cb3d 100644
--- a/multimedia/gstreamer80/files/patch-configure
+++ b/multimedia/gstreamer80/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed Jul 10 16:32:49 2002
-+++ configure	Wed Jul 10 16:33:12 2002
-@@ -6620,6 +6620,7 @@
+--- configure.orig	Wed Jan 22 09:17:40 2003
++++ configure	Wed Jan 29 14:49:56 2003
+@@ -7520,6 +7520,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -8,3 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7712,7 +7713,7 @@
+ if test "x$COMPILER" = "xforte"; then
+   GST_ERROR=
+ else
+-  if test "x$GST_CVS"="xyes"; then
++  if test "x$GST_CVS" = "xyes"; then
+     GST_ERROR="-Wall -Werror"
+   else
+     GST_ERROR="-Wall"
diff --git a/multimedia/gstreamer80/files/patch-gst::cothreads.c b/multimedia/gstreamer80/files/patch-gst::cothreads.c
index aed13b1a789..3519fb0e7e0 100644
--- a/multimedia/gstreamer80/files/patch-gst::cothreads.c
+++ b/multimedia/gstreamer80/files/patch-gst::cothreads.c
@@ -1,6 +1,15 @@
---- gst/cothreads.c.orig	Wed Nov 13 22:59:21 2002
-+++ gst/cothreads.c	Wed Nov 13 22:59:38 2002
-@@ -41,11 +41,11 @@
+--- gst/cothreads.c.orig	Sat Feb  1 19:09:00 2003
++++ gst/cothreads.c	Mon Feb  3 10:57:44 2003
+@@ -41,12 +41,16 @@
+ #include <ucontext.h>
+ #endif
+ 
++#ifdef HAVE_MAKECONTEXT
++#include <ucontext.h>
++#endif
++
+ /* older glibc's have MAP_ANON instead of MAP_ANONYMOUS */
+ #ifndef MAP_ANONYMOUS
  #define MAP_ANONYMOUS MAP_ANON
  #endif
  
@@ -9,8 +18,3 @@
  
  #define COTHREAD_MAGIC_NUMBER 0xabcdef
  
--#define COTHREAD_MAXTHREADS 16
-+#define COTHREAD_MAXTHREADS 8
- #define COTHREAD_STACKSIZE (STACK_SIZE/COTHREAD_MAXTHREADS)
- 
- static void 	cothread_destroy 	(cothread_state *thread);
diff --git a/multimedia/gstreamer80/pkg-plist b/multimedia/gstreamer80/pkg-plist
index 4486c146ffd..b42f950edaa 100644
--- a/multimedia/gstreamer80/pkg-plist
+++ b/multimedia/gstreamer80/pkg-plist
@@ -1,4 +1,4 @@
-@unexec %D/bin/gst-register 2>/dev/null
+@unexec %D/bin/gst-register 2>/dev/null || true
 bin/gst-complete
 bin/gst-compprep
 bin/gst-feedback
@@ -7,86 +7,94 @@ bin/gst-launch
 bin/gst-md5sum
 bin/gst-register
 bin/gst-xmllaunch
-include/gstreamer/gst/bytestream/bytestream.h
-include/gstreamer/gst/control/control.h
-include/gstreamer/gst/control/dparam.h
-include/gstreamer/gst/control/dparam_smooth.h
-include/gstreamer/gst/control/dparamcommon.h
-include/gstreamer/gst/control/dparammanager.h
-include/gstreamer/gst/control/dplinearinterp.h
-include/gstreamer/gst/control/unitconvert.h
-include/gstreamer/gst/getbits/getbits.h
-include/gstreamer/gst/gst.h
-include/gstreamer/gst/gstatomic.h
-include/gstreamer/gst/gstautoplug.h
-include/gstreamer/gst/gstbin.h
-include/gstreamer/gst/gstbuffer.h
-include/gstreamer/gst/gstbufferpool-default.h
-include/gstreamer/gst/gstcaps.h
-include/gstreamer/gst/gstclock.h
-include/gstreamer/gst/gstconfig.h
-include/gstreamer/gst/gstcpu.h
-include/gstreamer/gst/gstdata.h
-include/gstreamer/gst/gstelement.h
-include/gstreamer/gst/gstenumtypes.h
-include/gstreamer/gst/gstevent.h
-include/gstreamer/gst/gstextratypes.h
-include/gstreamer/gst/gstformat.h
-include/gstreamer/gst/gstinfo.h
-include/gstreamer/gst/gstlog.h
-include/gstreamer/gst/gstmarshal.h
-include/gstreamer/gst/gstmemchunk.h
-include/gstreamer/gst/gstobject.h
-include/gstreamer/gst/gstpad.h
-include/gstreamer/gst/gstparse.h
-include/gstreamer/gst/gstpipeline.h
-include/gstreamer/gst/gstplugin.h
-include/gstreamer/gst/gstpluginfeature.h
-include/gstreamer/gst/gstprops.h
-include/gstreamer/gst/gstqueue.h
-include/gstreamer/gst/gstregistry.h
-include/gstreamer/gst/gstscheduler.h
-include/gstreamer/gst/gstsystemclock.h
-include/gstreamer/gst/gstthread.h
-include/gstreamer/gst/gsttimecache.h
-include/gstreamer/gst/gsttrace.h
-include/gstreamer/gst/gsttype.h
-include/gstreamer/gst/gsttypefind.h
-include/gstreamer/gst/gsttypes.h
-include/gstreamer/gst/gstutils.h
-include/gstreamer/gst/gstversion.h
-include/gstreamer/gst/gstxml.h
-include/gstreamer/gst/putbits/putbits.h
-lib/gst/libgstautoplugcache.so
-lib/gst/libgstautoplugger.so
-lib/gst/libgstbasicomegascheduler.so
-lib/gst/libgstbasicwingoscheduler.so
-lib/gst/libgstbytestream.so
-lib/gst/libgstelements.so
-lib/gst/libgstfastomegascheduler.so
-lib/gst/libgstfastwingoscheduler.so
-lib/gst/libgstgetbits.so
-lib/gst/libgstoptomegascheduler.so
-lib/gst/libgstputbits.so
-lib/gst/libgstspider.so
-lib/gst/libgststaticautoplug.so
-lib/gst/libgststaticautoplugrender.so
-lib/gst/libgsttypes.so
-lib/libgstcontrol.a
-lib/libgstcontrol.so
-lib/libgstcontrol.so.0
-lib/libgstreamer.a
-lib/libgstreamer.so
-lib/libgstreamer.so.0
-libdata/pkgconfig/gstreamer.pc
-@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
-@dirrm lib/gst
-@dirrm include/gstreamer/gst/putbits
-@dirrm include/gstreamer/gst/getbits
-@dirrm include/gstreamer/gst/control
-@dirrm include/gstreamer/gst/bytestream
-@dirrm include/gstreamer/gst
-@dirrm include/gstreamer
-@exec %D/bin/gst-register 2>/dev/null
-@unexec rm %D/etc/gstreamer/registry.xml 2>/dev/null || true
-@unexec rmdir %D/etc/gstreamer 2>/dev/null || echo "There are some configuration files left in ${PKG_PREFIX}/etc/gstreamer, do not forget to remove them if you are permanently removing gstreamer port."
+include/gstreamer-%%VERSION%%/gst/bytestream/bytestream.h
+include/gstreamer-%%VERSION%%/gst/control/control.h
+include/gstreamer-%%VERSION%%/gst/control/dparam.h
+include/gstreamer-%%VERSION%%/gst/control/dparam_smooth.h
+include/gstreamer-%%VERSION%%/gst/control/dparamcommon.h
+include/gstreamer-%%VERSION%%/gst/control/dparammanager.h
+include/gstreamer-%%VERSION%%/gst/control/dplinearinterp.h
+include/gstreamer-%%VERSION%%/gst/control/unitconvert.h
+include/gstreamer-%%VERSION%%/gst/getbits/getbits.h
+include/gstreamer-%%VERSION%%/gst/gst.h
+include/gstreamer-%%VERSION%%/gst/gstatomic.h
+include/gstreamer-%%VERSION%%/gst/gstautoplug.h
+include/gstreamer-%%VERSION%%/gst/gstbin.h
+include/gstreamer-%%VERSION%%/gst/gstbuffer.h
+include/gstreamer-%%VERSION%%/gst/gstbufferpool-default.h
+include/gstreamer-%%VERSION%%/gst/gstcaps.h
+include/gstreamer-%%VERSION%%/gst/gstclock.h
+include/gstreamer-%%VERSION%%/gst/gstcompat.h
+include/gstreamer-%%VERSION%%/gst/gstconfig.h
+include/gstreamer-%%VERSION%%/gst/gstcpu.h
+include/gstreamer-%%VERSION%%/gst/gstdata.h
+include/gstreamer-%%VERSION%%/gst/gstelement.h
+include/gstreamer-%%VERSION%%/gst/gstenumtypes.h
+include/gstreamer-%%VERSION%%/gst/gstevent.h
+include/gstreamer-%%VERSION%%/gst/gstextratypes.h
+include/gstreamer-%%VERSION%%/gst/gstformat.h
+include/gstreamer-%%VERSION%%/gst/gstindex.h
+include/gstreamer-%%VERSION%%/gst/gstinfo.h
+include/gstreamer-%%VERSION%%/gst/gstlog.h
+include/gstreamer-%%VERSION%%/gst/gstmacros.h
+include/gstreamer-%%VERSION%%/gst/gstmarshal.h
+include/gstreamer-%%VERSION%%/gst/gstmemchunk.h
+include/gstreamer-%%VERSION%%/gst/gstobject.h
+include/gstreamer-%%VERSION%%/gst/gstpad.h
+include/gstreamer-%%VERSION%%/gst/gstparse.h
+include/gstreamer-%%VERSION%%/gst/gstpipeline.h
+include/gstreamer-%%VERSION%%/gst/gstplugin.h
+include/gstreamer-%%VERSION%%/gst/gstpluginfeature.h
+include/gstreamer-%%VERSION%%/gst/gstprobe.h
+include/gstreamer-%%VERSION%%/gst/gstprops.h
+include/gstreamer-%%VERSION%%/gst/gstquery.h
+include/gstreamer-%%VERSION%%/gst/gstqueue.h
+include/gstreamer-%%VERSION%%/gst/gstregistry.h
+include/gstreamer-%%VERSION%%/gst/gstscheduler.h
+include/gstreamer-%%VERSION%%/gst/gstsystemclock.h
+include/gstreamer-%%VERSION%%/gst/gstthread.h
+include/gstreamer-%%VERSION%%/gst/gsttrace.h
+include/gstreamer-%%VERSION%%/gst/gsttrashstack.h
+include/gstreamer-%%VERSION%%/gst/gsttype.h
+include/gstreamer-%%VERSION%%/gst/gsttypefind.h
+include/gstreamer-%%VERSION%%/gst/gsttypes.h
+include/gstreamer-%%VERSION%%/gst/gsturi.h
+include/gstreamer-%%VERSION%%/gst/gstutils.h
+include/gstreamer-%%VERSION%%/gst/gstversion.h
+include/gstreamer-%%VERSION%%/gst/gstxml.h
+include/gstreamer-%%VERSION%%/gst/putbits/putbits.h
+lib/gstreamer-%%VERSION%%/libgstautoplugcache.so
+lib/gstreamer-%%VERSION%%/libgstautoplugger.so
+lib/gstreamer-%%VERSION%%/libgstbasicomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstbasicwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstbytestream.so
+lib/gstreamer-%%VERSION%%/libgstelements.so
+lib/gstreamer-%%VERSION%%/libgstgetbits.so
+lib/gstreamer-%%VERSION%%/libgstindexers.so
+lib/gstreamer-%%VERSION%%/libgstoptomegascheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptscheduler.so
+lib/gstreamer-%%VERSION%%/libgstoptwingoscheduler.so
+lib/gstreamer-%%VERSION%%/libgstputbits.so
+lib/gstreamer-%%VERSION%%/libgstspider.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplug.so
+lib/gstreamer-%%VERSION%%/libgststaticautoplugrender.so
+lib/gstreamer-%%VERSION%%/libgsttypes.so
+lib/libgstcontrol-%%VERSION%%.a
+lib/libgstcontrol-%%VERSION%%.so
+lib/libgstcontrol-%%VERSION%%.so.%%SHLIB_VERSION%%
+lib/libgstreamer-%%VERSION%%.a
+lib/libgstreamer-%%VERSION%%.so
+lib/libgstreamer-%%VERSION%%.so.%%SHLIB_VERSION%%
+libdata/pkgconfig/gstreamer-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-control-%%VERSION%%.pc
+@unexec rm %D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true
+@dirrm share/gnome/cache/gstreamer-%%VERSION%%
+@unexec rmdir %D/share/gnome/cache 2>/dev/null || true
+@dirrm lib/gstreamer-%%VERSION%%
+@dirrm include/gstreamer-%%VERSION%%/gst/putbits
+@dirrm include/gstreamer-%%VERSION%%/gst/getbits
+@dirrm include/gstreamer-%%VERSION%%/gst/control
+@dirrm include/gstreamer-%%VERSION%%/gst/bytestream
+@dirrm include/gstreamer-%%VERSION%%/gst
+@dirrm include/gstreamer-%%VERSION%%
+@exec %D/bin/gst-register 2>/dev/null || true