Stagify Gstreamer ports.

Fix build of gstreamer and gstreamer1 with glib 2.38.x [1].
Update gstreamer and gstreamer-plugins to new rules, USES=gmake pathfix,
new LIB_DEPENDS syntax.
Only pull in flex if base version is too old.
Be more selective for which OSVERSIONS we need gcc due to the clang bug.

Obtained from:	Gstreamer upstream [1]

55 files changed, 161 insertions, 149 deletions

diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 110023c42426..15b64a49db78 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -58,7 +58,6 @@ CFLAGS+=		-msse
 
 CONFIGURE_ARGS+=	--with-ffmpeg-extra-configure="${FFMPEG_CONFIG}"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900033
diff --git a/multimedia/gstreamer-plugins-all/Makefile b/multimedia/gstreamer-plugins-all/Makefile
index e6a9e9afb133..300df0ddddd3 100644
--- a/multimedia/gstreamer-plugins-all/Makefile
+++ b/multimedia/gstreamer-plugins-all/Makefile
@@ -15,8 +15,10 @@ COMMENT=	Meta-port of all gstreamer plugins with options
 
 .MAKE.FreeBSD_UL=	yes
 NO_BUILD=	yes
+NO_INSTALL=	yes
+NO_MTREE=	yes
 USE_GSTREAMER=	yes
-NO_STAGE=	yes
+
 .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
 
 .for all in ${_GSTREAMER_PLUGINS}
@@ -45,6 +47,4 @@ USE_GSTREAMER+=	${f:L}
 .endif
 .endfor
 
-do-install:	# empty
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins-annodex/Makefile b/multimedia/gstreamer-plugins-annodex/Makefile
index 0f8a69779502..25d6328fec78 100644
--- a/multimedia/gstreamer-plugins-annodex/Makefile
+++ b/multimedia/gstreamer-plugins-annodex/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	annodex
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index b11e5dab1123..def1dfa4e455 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -22,7 +22,6 @@ PLIST_SUB=	VERSION="${GST_VERSION}"
 NO_GSTREAMER_COMMON=	yes
 PLIST=	${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${BAD_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer-plugins-buzztard/Makefile b/multimedia/gstreamer-plugins-buzztard/Makefile
index 29b2575b1770..8d18036682a9 100644
--- a/multimedia/gstreamer-plugins-buzztard/Makefile
+++ b/multimedia/gstreamer-plugins-buzztard/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	gst-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Buzztard gstreamer plugins
 
-LIB_DEPENDS=	fluidsynth.1:${PORTSDIR}/audio/fluidsynth
+LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
 
 USES=		pkgconfig
 USE_AUTOTOOLS=	libtool
@@ -20,7 +20,6 @@ USE_GNOME=	gnomehack ltverhack
 USE_LDCONFIG=	yes
 PLIST_SUB=	GST_VERSION="${GST_VERSION}"
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \
 		${WRKSRC}/configure
diff --git a/multimedia/gstreamer-plugins-bz2/Makefile b/multimedia/gstreamer-plugins-bz2/Makefile
index 1e86cf918ae6..f9a6450114e2 100644
--- a/multimedia/gstreamer-plugins-bz2/Makefile
+++ b/multimedia/gstreamer-plugins-bz2/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	bz2
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-core/Makefile b/multimedia/gstreamer-plugins-core/Makefile
index b797c36063a8..34701e1c93a8 100644
--- a/multimedia/gstreamer-plugins-core/Makefile
+++ b/multimedia/gstreamer-plugins-core/Makefile
@@ -14,12 +14,12 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Core set of typical audio and video gstreamer-plugins
 
 NO_BUILD=	yes
+NO_MTREE=	yes
 GST_DIR=	lib/gstreamer-${PORTVERSION}
 PLIST_FILES=	${GST_DIR}/.gstreamer-plugins-core.keep
 
 WANT_GSTREAMER=	yes
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 # Audio plugins
diff --git a/multimedia/gstreamer-plugins-dts/Makefile b/multimedia/gstreamer-plugins-dts/Makefile
index 7cce2c69be6b..c458b3d966f0 100644
--- a/multimedia/gstreamer-plugins-dts/Makefile
+++ b/multimedia/gstreamer-plugins-dts/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	dts
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dv/Makefile b/multimedia/gstreamer-plugins-dv/Makefile
index 1d25cb46780b..d23efc39d49d 100644
--- a/multimedia/gstreamer-plugins-dv/Makefile
+++ b/multimedia/gstreamer-plugins-dv/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	dv
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-dvd/Makefile b/multimedia/gstreamer-plugins-dvd/Makefile
index 23fe30190557..5b447d3fd81e 100644
--- a/multimedia/gstreamer-plugins-dvd/Makefile
+++ b/multimedia/gstreamer-plugins-dvd/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	dvd
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
index 4c08b4fad8e1..7437aca831b8 100644
--- a/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
+++ b/multimedia/gstreamer-plugins-fluendo-mpegdemux/Makefile
@@ -20,5 +20,4 @@ GNU_CONFIGURE=	yes
 PLIST_FILES=	lib/gstreamer-0.10/libgstflumpegdemux.la \
 		lib/gstreamer-0.10/libgstflumpegdemux.so
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/multimedia/gstreamer-plugins-gnonlin/Makefile b/multimedia/gstreamer-plugins-gnonlin/Makefile
index fc08fe41b9e4..ba022ba4ec20 100644
--- a/multimedia/gstreamer-plugins-gnonlin/Makefile
+++ b/multimedia/gstreamer-plugins-gnonlin/Makefile
@@ -20,7 +20,6 @@ USE_GSTREAMER=	yes
 PLIST_FILES=	lib/gstreamer-0.10/libgnl.la \
 		lib/gstreamer-0.10/libgnl.so
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' ${WRKSRC}/configure
 
diff --git a/multimedia/gstreamer-plugins-good/Makefile b/multimedia/gstreamer-plugins-good/Makefile
index b9d6cf67a5d8..6efe20972e45 100644
--- a/multimedia/gstreamer-plugins-good/Makefile
+++ b/multimedia/gstreamer-plugins-good/Makefile
@@ -24,7 +24,6 @@ FILESDIR=${.CURDIR}/files
 PATCHDIR=${.CURDIR}/files
 NO_GSTREAMER_COMMON=	yes
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${GOOD_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer-plugins-mpeg2dec/Makefile b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
index fcbffd0a9d4d..6f64b1b9b5e6 100644
--- a/multimedia/gstreamer-plugins-mpeg2dec/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2dec/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	mpeg2dec
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index f177e90cab93..becfea2e4b81 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	mpeg2enc
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-resindvd/Makefile b/multimedia/gstreamer-plugins-resindvd/Makefile
index 1dfbe2d7420f..72c6e35196e7 100644
--- a/multimedia/gstreamer-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer-plugins-resindvd/Makefile
@@ -10,5 +10,4 @@ GST_PLUGIN=	resindvd
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-schroedinger/Makefile b/multimedia/gstreamer-plugins-schroedinger/Makefile
index 3395f29e6076..22bd7246701b 100644
--- a/multimedia/gstreamer-plugins-schroedinger/Makefile
+++ b/multimedia/gstreamer-plugins-schroedinger/Makefile
@@ -10,5 +10,4 @@ GST_PLUGIN=	schroedinger
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile
index 2065d1bc6b9e..b7832efae873 100644
--- a/multimedia/gstreamer-plugins-theora/Makefile
+++ b/multimedia/gstreamer-plugins-theora/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	theora
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index ca4dcb6d941f..ac304acfaa71 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -21,7 +21,6 @@ PLIST_SUB=	VERSION="${GST_VERSION}"
 NO_GSTREAMER_COMMON=	yes
 PLIST=	${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${UGLY_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer-plugins-v4l2/Makefile b/multimedia/gstreamer-plugins-v4l2/Makefile
index d5cb6d4425c5..32cfece4d79a 100644
--- a/multimedia/gstreamer-plugins-v4l2/Makefile
+++ b/multimedia/gstreamer-plugins-v4l2/Makefile
@@ -11,5 +11,4 @@ PKGNAMESUFFIX?=	-plugins-v4l2
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-vdpau/Makefile b/multimedia/gstreamer-plugins-vdpau/Makefile
index 32f6d3bbb2d6..768b6398385a 100644
--- a/multimedia/gstreamer-plugins-vdpau/Makefile
+++ b/multimedia/gstreamer-plugins-vdpau/Makefile
@@ -10,5 +10,4 @@ GST_PLUGIN=	vdpau
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-vp8/Makefile b/multimedia/gstreamer-plugins-vp8/Makefile
index 2b93c7ddf373..24f5468a2af1 100644
--- a/multimedia/gstreamer-plugins-vp8/Makefile
+++ b/multimedia/gstreamer-plugins-vp8/Makefile
@@ -10,5 +10,4 @@ GST_PLUGIN=	vp8
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index b70b5d4918f6..4a6b3028c07b 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	x264
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins-xvid/Makefile b/multimedia/gstreamer-plugins-xvid/Makefile
index 9c1d8ed2b90b..665346ab386e 100644
--- a/multimedia/gstreamer-plugins-xvid/Makefile
+++ b/multimedia/gstreamer-plugins-xvid/Makefile
@@ -11,5 +11,4 @@ GST_PLUGIN=	xvid
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 768505db33a1..de1f58467317 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -21,8 +21,8 @@ COMMENT?=	GStreamer written collection of plugins handling several media types
 BUILD_DEPENDS+=	v4l_compat>=1.0.20110720:${PORTSDIR}/multimedia/v4l_compat \
 		gstreamer>=0.10.36:${PORTSDIR}/multimedia/gstreamer \
 		orc>=0.4.14:${PORTSDIR}/devel/orc
-LIB_DEPENDS+=	gstreamer-0.10:${PORTSDIR}/multimedia/gstreamer \
-		orc-0.4:${PORTSDIR}/devel/orc
+LIB_DEPENDS+=	libgstreamer-0.10.so:${PORTSDIR}/multimedia/gstreamer \
+		liborc-0.4.so:${PORTSDIR}/devel/orc
 
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
 
@@ -44,24 +44,19 @@ SHLIB_VERSION=	1
 VERSION=	${GST_VERSION}
 WANT_GSTREAMER=	yes
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME+=	gnomehack ltverhack ltasneededhack
-USES=		pkgconfig gettext
+USE_GNOME+=	ltverhack ltasneededhack
+USES=		gettext gmake pathfix pkgconfig shebangfix
 USE_AUTOTOOLS=	libtool
 GST_PLUGIN?=	base
 
 CONFIGURE_ARGS=	--disable-option-checking
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS}
 CFLAGS+=	-I${LOCALBASE}/include
 
-# workaround a crash in clang 3.3 crash llvm bug # 15840
-USE_GCC=	any
-
 DEFAULT_AUDIOSINK?=	osssink
 DEFAULT_AUDIOSRC?=	osssrc
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH}=="i386"
@@ -75,9 +70,9 @@ gst_base_DIST=	base
 NO_GSTREAMER_COMMON=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xv xext videoproto xextproto
-MAN1=		gst-visualise-0.10.1
 PLIST_SUB+=	VERSION="${VERSION}" \
 		SHLIB_VERSION="${SHLIB_VERSION}"
+SHEBANG_FILES=	tools/gst-visualise-m.m
 .else
 USE_GSTREAMER=	yes
 .endif
@@ -168,4 +163,16 @@ post-patch:
 		${WRKSRC}/../gnome-libtool
 .endif
 
+# workaround a crash in clang 3.3 crash llvm bug # 15840
+.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \
+     (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056))
+USE_GCC=	any
+.endif
+
+post-install:
+.if ${GST_PLUGIN}==base
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*.so.0
+.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-0.10/lib*.so
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d276cc02c7a7..7d42042acaa2 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -170,19 +170,19 @@ GST_LIB_DIR=		lib/gstreamer-${VERSION}
 PLIST=		${NONEXISTENT}
 
 # a52dec
-gst_a52dec_LIB_DEPENDS+=	a52.0:${PORTSDIR}/audio/liba52
+gst_a52dec_LIB_DEPENDS+=	liba52.so:${PORTSDIR}/audio/liba52
 gst_a52dec_PLIST_FILES=	${GST_LIB_DIR}/libgsta52dec.la \
 		${GST_LIB_DIR}/libgsta52dec.so
 gst_a52dec_DIST=	ugly
 
 # aalib
-gst_aalib_LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
+gst_aalib_LIB_DEPENDS+=	libaa.so:${PORTSDIR}/graphics/aalib
 gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so \
 		${GST_LIB_DIR}/libgstaasink.la
 
 # amrnb
 gst_amrnb_BUILD_DEPENDS+=opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore-amr
-gst_amrnb_LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
+gst_amrnb_LIB_DEPENDS+=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
 gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.la \
 			${GST_LIB_DIR}/libgstamrnb.so \
 			share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
@@ -192,14 +192,14 @@ gst_amrnb_DIST=		ugly
 
 # amrwbdec
 gst_amrwbdec_BUILD_DEPENDS+=	opencore-amr>=0.1.3:${PORTSDIR}/audio/opencore-amr
-gst_amrwbdec_LIB_DEPENDS+=	opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
+gst_amrwbdec_LIB_DEPENDS+=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
 gst_amrwbdec_CONFIGURE_ARGS+=	--enable-amrwb
 gst_amrwbdec_PLIST_FILES=	${GST_LIB_DIR}/libgstamrwbdec.la \
 				${GST_LIB_DIR}/libgstamrwbdec.so
 gst_amrwbdec_DIST=	ugly
 
 # annodex
-gst_annodex_LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+gst_annodex_USE_GNOME=		libxml2
 gst_annodex_PLIST_FILES=	${GST_LIB_DIR}/libgstannodex.la \
 				${GST_LIB_DIR}/libgstannodex.so
 
@@ -209,43 +209,43 @@ gst_bz2_PLIST_FILES=	${GST_LIB_DIR}/libgstbz2.la \
 gst_bz2_DIST=		bad
 
 # cairo
-gst_cairo_LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+gst_cairo_USE_GNOME=		cairo
 gst_cairo_PLIST_FILES=		${GST_LIB_DIR}/libgstcairo.la \
 				${GST_LIB_DIR}/libgstcairo.so
 
 # cdaudio
-gst_cdaudio_LIB_DEPENDS+=cdaudio.1:${PORTSDIR}/audio/libcdaudio
+gst_cdaudio_LIB_DEPENDS+=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio
 gst_cdaudio_PLIST_FILES=	${GST_LIB_DIR}/libgstcdaudio.la \
 		${GST_LIB_DIR}/libgstcdaudio.so
 gst_cdaudio_DIST=	bad
 
 # cdparanoia
-gst_cdparanoia_LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+gst_cdparanoia_LIB_DEPENDS+=	libcdda_interface.so:${PORTSDIR}/audio/cdparanoia
 gst_cdparanoia_EXTRA_LIBS+=	-lgstcdda-${VERSION}
 gst_cdparanoia_PLIST_FILES=	${GST_LIB_DIR}/libgstcdparanoia.la \
 		${GST_LIB_DIR}/libgstcdparanoia.so
 gst_cdparanoia_DIST=	base
 
 # cdio
-gst_cdio_LIB_DEPENDS+=	cdio.13:${PORTSDIR}/sysutils/libcdio
+gst_cdio_LIB_DEPENDS+=	libcdio.so:${PORTSDIR}/sysutils/libcdio
 gst_cdio_PLIST_FILES=	${GST_LIB_DIR}/libgstcdio.la \
 		${GST_LIB_DIR}/libgstcdio.so
 gst_cdio_DIST=		ugly
 
 # dts
-gst_dts_LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
+gst_dts_LIB_DEPENDS+=	libdca.so:${PORTSDIR}/multimedia/libdca
 gst_dts_PLIST_FILES=	${GST_LIB_DIR}/libgstdtsdec.la \
 		${GST_LIB_DIR}/libgstdtsdec.so
 gst_dts_EXTRA_LIBS+=	-ldca
 gst_dts_DIST=	bad
 
 # dv
-gst_dv_LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
+gst_dv_LIB_DEPENDS+=	libdv.so:${PORTSDIR}/multimedia/libdv
 gst_dv_PLIST_FILES=	${GST_LIB_DIR}/libgstdv.la \
 			${GST_LIB_DIR}/libgstdv.so
 
 # dvd
-gst_dvd_LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+gst_dvd_LIB_DEPENDS+=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 gst_dvd_GST_PLUGIN_DIR=	ext/dvdread
 gst_dvd_PLIST_FILES=	${GST_LIB_DIR}/libgstdvdread.la \
 		${GST_LIB_DIR}/libgstdvdread.so
@@ -262,31 +262,31 @@ gst_esound_PLIST_FILES=	${GST_LIB_DIR}/libgstesd.so \
 
 # exif
 # hmm not a real plugin, seems to be part of metadata?
-#gst_exif_LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
+#gst_exif_LIB_DEPENDS+=	libexif.so:${PORTSDIR}/graphics/libexif
 #gst_exif_PLIST_FILES=	${GST_LIB_DIR}/libgstexif.la \
 #			${GST_LIB_DIR}/libgstexif.so
 #gst_exif_DIST=	bad
 
 # faac
-gst_faac_LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+gst_faac_LIB_DEPENDS+=	libfaac.so:${PORTSDIR}/audio/faac
 gst_faac_PLIST_FILES=	${GST_LIB_DIR}/libgstfaac.la \
 	${GST_LIB_DIR}/libgstfaac.so
 gst_faac_DIST=	bad
 
 # faad
 gst_faad_USE_GSTREAMER+=	bad
-gst_faad_LIB_DEPENDS+=	faad.2:${PORTSDIR}/audio/faad
+gst_faad_LIB_DEPENDS+=	libfaad.so:${PORTSDIR}/audio/faad
 gst_faad_PLIST_FILES=	${GST_LIB_DIR}/libgstfaad.la \
 		${GST_LIB_DIR}/libgstfaad.so
 gst_faad_DIST=	bad
 
 # flac
-gst_flac_LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
+gst_flac_LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 gst_flac_PLIST_FILES=	${GST_LIB_DIR}/libgstflac.la \
 			${GST_LIB_DIR}/libgstflac.so
 
 # flite
-gst_flite_LIB_DEPENDS+=	flite.1:${PORTSDIR}/audio/flite
+gst_flite_LIB_DEPENDS+=	libflite.so:${PORTSDIR}/audio/flite
 gst_flite_PLIST_FILES=	${GST_LIB_DIR}/libgstflite.la \
 			${GST_LIB_DIR}/libgstflite.so
 gst_flite_DIST=		bad
@@ -313,7 +313,7 @@ gst_gio_PLIST_FILES=	${GST_LIB_DIR}/libgstgio.la \
 gst_gio_DIST=	base
 
 # gme
-gst_gme_LIB_DEPENDS+=   gme.0:${PORTSDIR}/audio/libgme
+gst_gme_LIB_DEPENDS+=   libgme.so:${PORTSDIR}/audio/libgme
 gst_gme_PLIST_FILES=    ${GST_LIB_DIR}/libgstgme.la \
 		${GST_LIB_DIR}/libgstgme.so
 gst_gme_DIST=           bad
@@ -326,116 +326,116 @@ gst_gnomevfs_PLIST_FILES=	${GST_LIB_DIR}/libgstgnomevfs.la \
 gst_gnomevfs_DIST=	base
 
 # gsm
-gst_gsm_LIB_DEPENDS+=	gsm.1:${PORTSDIR}/audio/gsm
+gst_gsm_LIB_DEPENDS+=	libgsm.so:${PORTSDIR}/audio/gsm
 gst_gsm_PLIST_FILES=	${GST_LIB_DIR}/libgstgsm.la \
 		${GST_LIB_DIR}/libgstgsm.so
 gst_gsm_DIST=	bad
 
 # hal
-gst_hal_LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+gst_hal_LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal
 gst_hal_PLIST_FILES=	${GST_LIB_DIR}/libgsthalelements.la \
 		${GST_LIB_DIR}/libgsthalelements.so
 
 # jack
-gst_jack_LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+gst_jack_LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack
 gst_jack_PLIST_FILES=	${GST_LIB_DIR}/libgstjack.la \
 		${GST_LIB_DIR}/libgstjack.so
 gst_jack_DIST=	good
 
 # jpeg
-gst_jpeg_LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg
+gst_jpeg_LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 gst_jpeg_PLIST_FILES=	${GST_LIB_DIR}/libgstjpeg.la \
 			${GST_LIB_DIR}/libgstjpeg.so
 
 # ladspa
 gst_ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
-gst_ladspa_LIB_DEPENDS+=	lrdf:${PORTSDIR}/textproc/liblrdf
+gst_ladspa_LIB_DEPENDS+=	liblrdf.so:${PORTSDIR}/textproc/liblrdf
 gst_ladspa_PLIST_FILES=		${GST_LIB_DIR}/libgstladspa.la \
 				${GST_LIB_DIR}/libgstladspa.so
 gst_ladspa_DIST=	bad
 
 # lame
-gst_lame_LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
+gst_lame_LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 gst_lame_PLIST_FILES=	${GST_LIB_DIR}/libgstlame.la \
 		${GST_LIB_DIR}/libgstlame.so
 gst_lame_DIST=	ugly
 
 # libcaca
-gst_libcaca_LIB_DEPENDS+=	caca.0:${PORTSDIR}/graphics/libcaca
+gst_libcaca_LIB_DEPENDS+=	libcaca.so:${PORTSDIR}/graphics/libcaca
 gst_libcaca_PLIST_FILES=	${GST_LIB_DIR}/libgstcacasink.so \
 		${GST_LIB_DIR}/libgstcacasink.la
 
 # libmms
-gst_libmms_LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
+gst_libmms_LIB_DEPENDS+=	libmms.so:${PORTSDIR}/net/libmms
 gst_libmms_PLIST_FILES=	${GST_LIB_DIR}/libgstmms.so \
 		${GST_LIB_DIR}/libgstmms.la
 gst_libmms_DIST=	bad
 
 # libpng and the snapshot plugin
-gst_libpng_LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
+gst_libpng_LIB_DEPENDS+=	libpng15.so:${PORTSDIR}/graphics/png
 gst_libpng_GST_PLUGIN_DIR=	ext/libpng
 gst_libpng_PLIST_FILES=	${GST_LIB_DIR}/libgstpng.so \
 		${GST_LIB_DIR}/libgstpng.la
 
 # libvisual
-gst_libvisual_LIB_DEPENDS+=	visual-0.4:${PORTSDIR}/graphics/libvisual04
+gst_libvisual_LIB_DEPENDS+=	libvisual-0.4.so:${PORTSDIR}/graphics/libvisual04
 gst_libvisual_PLIST_FILES=	${GST_LIB_DIR}/libgstlibvisual.la \
 		${GST_LIB_DIR}/libgstlibvisual.so
 gst_libvisual_DIST=	base
 
 # mad
-gst_mad_LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \
-		id3tag.0:${PORTSDIR}/audio/libid3tag
+gst_mad_LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/libmad \
+			libid3tag.so:${PORTSDIR}/audio/libid3tag
 gst_mad_PLIST_FILES=	${GST_LIB_DIR}/libgstmad.la \
 		${GST_LIB_DIR}/libgstmad.so
 gst_mad_DIST=	ugly
 
 # mpeg2enc
-gst_mpeg2enc_LIB_DEPENDS+=	mjpegutils-2.0.0:${PORTSDIR}/multimedia/mjpegtools
+gst_mpeg2enc_LIB_DEPENDS+=	libmjpegutils-2.0.so:${PORTSDIR}/multimedia/mjpegtools
 gst_mpeg2enc_PLIST_FILES=	${GST_LIB_DIR}/libgstmpeg2enc.la \
 		${GST_LIB_DIR}/libgstmpeg2enc.so
 gst_mpeg2enc_DIST=	bad
 
 # mpeg2dec
-gst_mpeg2dec_LIB_DEPENDS+=	mpeg2.0:${PORTSDIR}/multimedia/libmpeg2
+gst_mpeg2dec_LIB_DEPENDS+=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
 gst_mpeg2dec_PLIST_FILES=	${GST_LIB_DIR}/libgstmpeg2dec.la \
 		${GST_LIB_DIR}/libgstmpeg2dec.so
 gst_mpeg2dec_DIST=	ugly
 
 # musepack
-gst_musepack_LIB_DEPENDS+=	mpcdec.7:${PORTSDIR}/audio/musepack
+gst_musepack_LIB_DEPENDS+=	libmpcdec.so:${PORTSDIR}/audio/musepack
 gst_musepack_PLIST_FILES=	${GST_LIB_DIR}/libgstmusepack.la \
 		${GST_LIB_DIR}/libgstmusepack.so
 gst_musepack_DIST=	bad
 
 # nas
-gst_nas_LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+gst_nas_LIB_DEPENDS+=	libaudio.so:${PORTSDIR}/audio/nas
 gst_nas_DIST=	bad
 gst_nas_PLIST_FILES=	${GST_LIB_DIR}/libgstnassink.la \
 		${GST_LIB_DIR}/libgstnassink.so
 
 # neon
-gst_neon_LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
+gst_neon_LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
 gst_neon_CONFIGURE_ENV+=	NEON_CFLAGS="-I${LOCALBASE}/include/neon"
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.la \
 			${GST_LIB_DIR}/libgstneonhttpsrc.so
 gst_neon_DIST=		bad
 
 # ogg
-gst_ogg_LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
+gst_ogg_LIB_DEPENDS+=	libogg.so:${PORTSDIR}/audio/libogg
 gst_ogg_EXTRA_LIBS+=	-lgstriff-${VERSION}
 gst_ogg_PLIST_FILES=	${GST_LIB_DIR}/libgstogg.la \
 		${GST_LIB_DIR}/libgstogg.so
 gst_ogg_DIST=	base
 
 # opencv
-gst_opencv_LIB_DEPENDS+=opencv_highgui.2:${PORTSDIR}/graphics/opencv
+gst_opencv_LIB_DEPENDS+=libopencv_highgui.so:${PORTSDIR}/graphics/opencv
 gst_opencv_PLIST_FILES= ${GST_LIB_DIR}/libgstopencv.la \
 			${GST_LIB_DIR}/libgstopencv.so
 gst_opencv_DIST=	bad
 
 # opus
-gst_opus_LIB_DEPENDS+=	opus:${PORTSDIR}/audio/opus
+gst_opus_LIB_DEPENDS+=	libopus.so:${PORTSDIR}/audio/opus
 gst_opus_PLIST_FILES=	${GST_LIB_DIR}/libgstopus.la \
 			${GST_LIB_DIR}/libgstopus.so
 gst_opus_DIST=		bad
@@ -447,7 +447,7 @@ gst_pango_PLIST_FILES=	${GST_LIB_DIR}/libgstpango.la \
 gst_pango_DIST=	base
 
 # pulse
-gst_pulse_LIB_DEPENDS=	pulse.0:${PORTSDIR}/audio/pulseaudio
+gst_pulse_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
 gst_pulse_PLIST_FILES=	${GST_LIB_DIR}/libgstpulse.la \
 		${GST_LIB_DIR}/libgstpulse.so
 gst_pulse_DIST=	good
@@ -466,75 +466,75 @@ gst_sdl_PLIST_FILES=	${GST_LIB_DIR}/libgstsdl.la \
 gst_sdl_DIST=	bad
 
 # shout2
-gst_shout2_LIB_DEPENDS+=	shout.5:${PORTSDIR}/audio/libshout2
+gst_shout2_LIB_DEPENDS+=	libshout.so.5:${PORTSDIR}/audio/libshout2
 gst_shout2_PLIST_FILES=		${GST_LIB_DIR}/libgstshout2.la \
 				${GST_LIB_DIR}/libgstshout2.so
 
 # sidplay
-gst_sidplay_LIB_DEPENDS+=	sidplay.1:${PORTSDIR}/audio/libsidplay
+gst_sidplay_LIB_DEPENDS+=	libsidplay.so:${PORTSDIR}/audio/libsidplay
 gst_sidplay_PLIST_FILES=	${GST_LIB_DIR}/libgstsid.so \
 		${GST_LIB_DIR}/libgstsid.la
 gst_sidplay_DIST=	ugly
 
 # sndfile
-gst_sndfile_LIB_DEPENDS+=	sndfile.1:${PORTSDIR}/audio/libsndfile
+gst_sndfile_LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
 gst_sndfile_PLIST_FILES=	${GST_LIB_DIR}/libgstsndfile.la \
 		${GST_LIB_DIR}/libgstsndfile.so
 gst_sndfile_DIST=	bad
 
 # soundtouch
-gst_soundtouch_LIB_DEPENDS+=	SoundTouch.0:${PORTSDIR}/audio/soundtouch
+gst_soundtouch_LIB_DEPENDS+=	libSoundTouch.so:${PORTSDIR}/audio/soundtouch
 gst_soundtouch_PLIST_FILES=	${GST_LIB_DIR}/libgstsoundtouch.la \
 		${GST_LIB_DIR}/libgstsoundtouch.so
 gst_soundtouch_DIST=	bad
 
 # souphttpsrc
-gst_soup_LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+gst_soup_LIB_DEPENDS+=	libsoup-2.4.so:${PORTSDIR}/devel/libsoup
 gst_soup_GST_PLUGIN_DIR=ext/soup
 gst_soup_PLIST_FILES=	${GST_LIB_DIR}/libgstsouphttpsrc.la \
 			${GST_LIB_DIR}/libgstsouphttpsrc.so
 
 # spc
-gst_spc_LIB_DEPENDS+=	openspc.0:${PORTSDIR}/audio/libopenspc
+gst_spc_LIB_DEPENDS+=	libopenspc.so:${PORTSDIR}/audio/libopenspc
 gst_spc_PLIST_FILES=	${GST_LIB_DIR}/libgstspc.la \
 		${GST_LIB_DIR}/libgstspc.so
 gst_spc_DIST=		bad
 
 # speex
-gst_speex_LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+gst_speex_LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 gst_speex_PLIST_FILES=	${GST_LIB_DIR}/libgstspeex.la \
 			${GST_LIB_DIR}/libgstspeex.so
 
 # schro(edinger)
-gst_schroedinger_LIB_DEPENDS+=	schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
+gst_schroedinger_LIB_DEPENDS+=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
 gst_schroedinger_CONFIGURE_ARGS+=--enable-schro
 gst_schroedinger_PLIST_FILES=	${GST_LIB_DIR}/libgstschro.la \
 				${GST_LIB_DIR}/libgstschro.so
 gst_schroedinger_DIST=		bad
 
 # swfdec
-gst_swfdec_LIB_DEPENDS+=swfdec-0.4.1:${PORTSDIR}/graphics/swfdec
+gst_swfdec_LIB_DEPENDS+=libswfdec-0.4.so:${PORTSDIR}/graphics/swfdec
 gst_swfdec_DIST=	bad
 
 # taglib
-gst_taglib_LIB_DEPENDS+=	tag.1:${PORTSDIR}/audio/taglib
+gst_taglib_LIB_DEPENDS+=	libtag.so:${PORTSDIR}/audio/taglib
 gst_taglib_PLIST_FILES=		${GST_LIB_DIR}/libgsttaglib.la \
 				${GST_LIB_DIR}/libgsttaglib.so
 
 # theora
-gst_theora_LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
+gst_theora_LIB_DEPENDS+=	libtheora.so:${PORTSDIR}/multimedia/libtheora
 gst_theora_PLIST_FILES=		${GST_LIB_DIR}/libgsttheora.la \
 		${GST_LIB_DIR}/libgsttheora.so
 gst_theora_DIST=	base
 
 # twolame
-gst_twolame_LIB_DEPENDS+=	twolame.0:${PORTSDIR}/audio/twolame
+gst_twolame_LIB_DEPENDS+=	libtwolame.so:${PORTSDIR}/audio/twolame
 gst_twolame_PLIST_FILES=	${GST_LIB_DIR}/libgsttwolame.la \
 				${GST_LIB_DIR}/libgsttwolame.so
 gst_twolame_DIST=		ugly
 
 # gst_v4l2
-gst_gst_v4l2_LIB_DEPENDS+=	v4l2.0:${PORTSDIR}/multimedia/libv4l
+gst_gst_v4l2_LIB_DEPENDS+=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 .if ${OSVERSION} >= 800000
 gst_gst_v4l2_RUN_DEPENDS+=	webcamd:${PORTSDIR}/multimedia/webcamd
 .endif
@@ -545,7 +545,7 @@ gst_gst_v4l2_GST_PLUGIN_DIR=sys/v4l2
 gst_gst_v4l2_DIST=	good
 
 # vdpau
-gst_vdpau_LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/multimedia/libvdpau
+gst_vdpau_LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
 gst_vdpau_GST_PLUGIN_DIR=sys/vdpau
 gst_vdpau_PLIST_FILES=	${GST_INC_DIR}/gst/vdpau/gstvdp.h \
 			${GST_INC_DIR}/gst/vdpau/gstvdpbuffer.h \
@@ -569,20 +569,20 @@ gst_vdpau_DIST=		bad
 
 # vorbis
 gst_vorbis_USE_GSTREAMER+=	ogg
-gst_vorbis_LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
+gst_vorbis_LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 gst_vorbis_EXTRA_LIBS+=	-lgsttag-${VERSION} -lgstaudio-${VERSION}
 gst_vorbis_PLIST_FILES=	${GST_LIB_DIR}/libgstvorbis.la \
 		${GST_LIB_DIR}/libgstvorbis.so
 gst_vorbis_DIST=	base
 
 # vp8
-gst_vp8_LIB_DEPENDS+=	vpx.1:${PORTSDIR}/multimedia/libvpx
+gst_vp8_LIB_DEPENDS+=	libvpx.so:${PORTSDIR}/multimedia/libvpx
 gst_vp8_PLIST_FILES=	${GST_LIB_DIR}/libgstvp8.la \
 			${GST_LIB_DIR}/libgstvp8.so
 gst_vp8_DIST=		bad
 
 # x264
-gst_x264_LIB_DEPENDS+=	x264:${PORTSDIR}/multimedia/x264
+gst_x264_LIB_DEPENDS+=	libx264.so:${PORTSDIR}/multimedia/x264
 gst_x264_PLIST_FILES=	${GST_LIB_DIR}/libgstx264.la \
 		${GST_LIB_DIR}/libgstx264.so \
 		share/gstreamer-${VERSION}/presets/GstX264Enc.prs
@@ -591,13 +591,13 @@ gst_x264_PLIST_DIRSTRY=	share/gstreamer-${VERSION}/presets \
 gst_x264_DIST=	ugly
 
 # xvid
-gst_xvid_LIB_DEPENDS+=	xvidcore.4:${PORTSDIR}/multimedia/xvid
+gst_xvid_LIB_DEPENDS+=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 gst_xvid_PLIST_FILES=	${GST_LIB_DIR}/libgstxvid.la \
 		${GST_LIB_DIR}/libgstxvid.so
 gst_xvid_DIST=	bad
 
 # wavpack
-gst_wavpack_LIB_DEPENDS+=	wavpack.2:${PORTSDIR}/audio/wavpack
+gst_wavpack_LIB_DEPENDS+=	libwavpack.so:${PORTSDIR}/audio/wavpack
 gst_wavpack_PLIST_FILES=	${GST_LIB_DIR}/libgstwavpack.la \
 				${GST_LIB_DIR}/libgstwavpack.so
 
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index f1b098961ab1..02852131c2f7 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -200,6 +200,7 @@ libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc
+man/man1/gst-visualise-0.10.1.gz
 share/gir-1.0/GstApp-%%VERSION%%.gir
 share/gir-1.0/GstAudio-%%VERSION%%.gir
 share/gir-1.0/GstFft-%%VERSION%%.gir
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index cd90c87c262d..f3d64e980c0b 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -10,19 +10,13 @@ MASTER_SITES=	http://gstreamer.freedesktop.org/src/gstreamer/
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Development framework for creating media applications
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
-		gobject-introspection>=0.9.12:${PORTSDIR}/devel/gobject-introspection
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
+
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
-USES=		bison pathfix pkgconfig gettext
-# workaround a crash in clang 3.3 crash llvm bug # 15840
-USE_GCC=	any
+USES=		bison gettext gmake pathfix pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_GNOME=	glib20 libxml2 ltverhack ltasneededhack
+USE_GNOME=	glib20 introspection libxml2 ltverhack ltasneededhack
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-tests \
 		--disable-examples \
@@ -30,33 +24,41 @@ CONFIGURE_ARGS=	--disable-tests \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	ac_cv_func_register_printf_function="no" \
-		FLEX_PATH="${LOCALBASE}/bin/flex"
+CONFIGURE_ENV=	ac_cv_func_register_printf_function="no"
 PLIST_SUB=	VERSION="${GST_VERSION}"
 USE_LDCONFIG=	yes
 GST_VERSION=	0.10
 
-MAN1=	gst-feedback-${GST_VERSION}.1 gst-inspect-${GST_VERSION}.1 \
-	gst-launch-${GST_VERSION}.1 \
-	gst-typefind-${GST_VERSION}.1 gst-xmlinspect-${GST_VERSION}.1 \
-	gst-xmllaunch-${GST_VERSION}.1
-
 OPTIONS_DEFINE=	LIBCHECK
 LIBCHECK_DESC=	Unit tests support
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MLIBCHECK}
-LIB_DEPENDS+=	check:${PORTSDIR}/devel/libcheck
+LIB_DEPENDS+=	libcheck.so:${PORTSDIR}/devel/libcheck
 PLIST_SUB+=	CHECK=""
 .else
 CONFIGURE_ARGS+=--disable-check
 PLIST_SUB+=	CHECK="@comment "
 .endif
 
+# workaround a crash in clang 3.3 crash llvm bug # 15840
+.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \
+     (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056))
+USE_GCC=	any
+.endif
+
+.if ${OSVERSION} < 1000033
+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
+CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*.so*
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-0.10/libgst*.so
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer/files/patch-gst_gstdatetime.c b/multimedia/gstreamer/files/patch-gst_gstdatetime.c
new file mode 100644
index 000000000000..8eac4d8c76d4
--- /dev/null
+++ b/multimedia/gstreamer/files/patch-gst_gstdatetime.c
@@ -0,0 +1,12 @@
+--- gst/gstdatetime.c.orig	2013-10-20 16:05:12.000000000 +0200
++++ gst/gstdatetime.c	2013-10-20 16:05:24.000000000 +0200
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include "gstvalue.h"
+ #include <glib.h>
diff --git a/multimedia/gstreamer/pkg-plist b/multimedia/gstreamer/pkg-plist
index 50bd60265d69..a78167eaf032 100644
--- a/multimedia/gstreamer/pkg-plist
+++ b/multimedia/gstreamer/pkg-plist
@@ -135,6 +135,12 @@ libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-dataprotocol-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
 libexec/gstreamer-%%VERSION%%/gst-plugin-scanner
+man/man1/gst-feedback-0.10.1.gz
+man/man1/gst-inspect-0.10.1.gz
+man/man1/gst-launch-0.10.1.gz
+man/man1/gst-typefind-0.10.1.gz
+man/man1/gst-xmlinspect-0.10.1.gz
+man/man1/gst-xmllaunch-0.10.1.gz
 share/aclocal/gst-element-check-%%VERSION%%.m4
 share/gir-1.0/Gst-%%VERSION%%.gir
 share/gir-1.0/GstBase-%%VERSION%%.gir
diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile
index 35df9d0f4a5d..fca69f20b508 100644
--- a/multimedia/gstreamer1-libav/Makefile
+++ b/multimedia/gstreamer1-libav/Makefile
@@ -51,7 +51,6 @@ CFLAGS+=		-msse
 
 CONFIGURE_ARGS+=	--with-libav-extra-configure="${LIBAV_CONFIG}"
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900033
diff --git a/multimedia/gstreamer1-plugins-all/Makefile b/multimedia/gstreamer1-plugins-all/Makefile
index 89fa3a426612..05e97afcf3c9 100644
--- a/multimedia/gstreamer1-plugins-all/Makefile
+++ b/multimedia/gstreamer1-plugins-all/Makefile
@@ -16,7 +16,6 @@ COMMENT=	Meta-port of all gstreamer 1.x plugins with options
 NO_BUILD=	yes
 USE_GSTREAMER1=	yes
 
-NO_STAGE=	yes
 .include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
 
 .for all in ${_GSTREAMER_PLUGINS}
diff --git a/multimedia/gstreamer1-plugins-assrender/Makefile b/multimedia/gstreamer1-plugins-assrender/Makefile
index 37040af7160b..86ab0ad29761 100644
--- a/multimedia/gstreamer1-plugins-assrender/Makefile
+++ b/multimedia/gstreamer1-plugins-assrender/Makefile
@@ -10,5 +10,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-bad/Makefile b/multimedia/gstreamer1-plugins-bad/Makefile
index 894149a00d35..d5b6514b84b6 100644
--- a/multimedia/gstreamer1-plugins-bad/Makefile
+++ b/multimedia/gstreamer1-plugins-bad/Makefile
@@ -21,7 +21,6 @@ BAD_GST_DIRS=	gst-libs sys gst po pkgconfig
 NO_GSTREAMER_COMMON=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${BAD_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer1-plugins-core/Makefile b/multimedia/gstreamer1-plugins-core/Makefile
index 960dd9b4d577..fdb7635c41f8 100644
--- a/multimedia/gstreamer1-plugins-core/Makefile
+++ b/multimedia/gstreamer1-plugins-core/Makefile
@@ -23,7 +23,6 @@ OPTIONS_DEFINE=	DVD
 OPTIONS_DEFAULT=DVD
 DVD_DESC=	Include DVD related plugins
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 # Audio plugins
diff --git a/multimedia/gstreamer1-plugins-dts/Makefile b/multimedia/gstreamer1-plugins-dts/Makefile
index c4b121c870c8..db1d89f16a0b 100644
--- a/multimedia/gstreamer1-plugins-dts/Makefile
+++ b/multimedia/gstreamer1-plugins-dts/Makefile
@@ -10,5 +10,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-dv/Makefile b/multimedia/gstreamer1-plugins-dv/Makefile
index fcbc155ace45..20af99fb7309 100644
--- a/multimedia/gstreamer1-plugins-dv/Makefile
+++ b/multimedia/gstreamer1-plugins-dv/Makefile
@@ -11,5 +11,4 @@ DIST=		good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-dvdread/Makefile b/multimedia/gstreamer1-plugins-dvdread/Makefile
index 9d95ffa5a439..ca439dffa2ce 100644
--- a/multimedia/gstreamer1-plugins-dvdread/Makefile
+++ b/multimedia/gstreamer1-plugins-dvdread/Makefile
@@ -10,5 +10,4 @@ DIST=		ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-good/Makefile b/multimedia/gstreamer1-plugins-good/Makefile
index 065da52a5faa..fb00a9188416 100644
--- a/multimedia/gstreamer1-plugins-good/Makefile
+++ b/multimedia/gstreamer1-plugins-good/Makefile
@@ -25,7 +25,6 @@ FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 NO_GSTREAMER_COMMON=	yes
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${GOOD_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer1-plugins-mpeg2dec/Makefile b/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
index c8f5e6ca2429..b0190dc9a4b0 100644
--- a/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
+++ b/multimedia/gstreamer1-plugins-mpeg2dec/Makefile
@@ -10,5 +10,4 @@ DIST=		ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
index bd22031d8598..ef5d5e6b98e6 100644
--- a/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer1-plugins-mpeg2enc/Makefile
@@ -10,5 +10,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-resindvd/Makefile b/multimedia/gstreamer1-plugins-resindvd/Makefile
index 1d2b33db1efe..c40882dc955e 100644
--- a/multimedia/gstreamer1-plugins-resindvd/Makefile
+++ b/multimedia/gstreamer1-plugins-resindvd/Makefile
@@ -10,5 +10,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-rtmp/Makefile b/multimedia/gstreamer1-plugins-rtmp/Makefile
index 726560e47c0e..2c3cf6ecd6d4 100644
--- a/multimedia/gstreamer1-plugins-rtmp/Makefile
+++ b/multimedia/gstreamer1-plugins-rtmp/Makefile
@@ -10,5 +10,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-schroedinger/Makefile b/multimedia/gstreamer1-plugins-schroedinger/Makefile
index b2075d947cc3..fd71d23b8256 100644
--- a/multimedia/gstreamer1-plugins-schroedinger/Makefile
+++ b/multimedia/gstreamer1-plugins-schroedinger/Makefile
@@ -11,5 +11,4 @@ DIST=		bad
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-theora/Makefile b/multimedia/gstreamer1-plugins-theora/Makefile
index 7bdb79cdb707..ba9b21525d56 100644
--- a/multimedia/gstreamer1-plugins-theora/Makefile
+++ b/multimedia/gstreamer1-plugins-theora/Makefile
@@ -10,5 +10,4 @@ DIST=		base
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-ugly/Makefile b/multimedia/gstreamer1-plugins-ugly/Makefile
index c90f06014b91..4387d8ae4bf8 100644
--- a/multimedia/gstreamer1-plugins-ugly/Makefile
+++ b/multimedia/gstreamer1-plugins-ugly/Makefile
@@ -20,7 +20,6 @@ UGLY_GST_DIRS=	gst po gst-libs
 NO_GSTREAMER_COMMON=	yes
 PLIST=	${.CURDIR}/pkg-plist
 
-NO_STAGE=	yes
 do-build:
 .for dir in ${UGLY_GST_DIRS}
 	@(cd ${BUILD_WRKSRC}/${dir}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
diff --git a/multimedia/gstreamer1-plugins-v4l2/Makefile b/multimedia/gstreamer1-plugins-v4l2/Makefile
index f315c1aeed94..b0a3d7486e40 100644
--- a/multimedia/gstreamer1-plugins-v4l2/Makefile
+++ b/multimedia/gstreamer1-plugins-v4l2/Makefile
@@ -11,5 +11,4 @@ DIST=		good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile
index 8fdc8ada4e6e..379ee383b963 100644
--- a/multimedia/gstreamer1-plugins-vpx/Makefile
+++ b/multimedia/gstreamer1-plugins-vpx/Makefile
@@ -10,5 +10,4 @@ DIST=		good
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins-x264/Makefile b/multimedia/gstreamer1-plugins-x264/Makefile
index cb082771459a..bbdf10e0afcc 100644
--- a/multimedia/gstreamer1-plugins-x264/Makefile
+++ b/multimedia/gstreamer1-plugins-x264/Makefile
@@ -10,5 +10,4 @@ DIST=		ugly
 
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer1-plugins
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index 13a22db66bd7..8b90f879cabb 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -57,9 +57,6 @@ CFLAGS:=	${CFLAGS} -O2 -Wno-format
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${EXTRA_LIBS} ${PTHREAD_LIBS}
 
-# workaround a clang crash with clang 3.3, llvm bug # 15840
-USE_GCC=	any
-
 DEFAULT_AUDIOSINK?=	osssink
 DEFAULT_AUDIOSRC?=	osssrc
 
@@ -67,7 +64,6 @@ DEFAULT_AUDIOSRC?=	osssrc
 IGNORE=		DIST not specified
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH}=="i386"
@@ -79,7 +75,6 @@ PLIST_SUB+=	I386="@comment "
 .if ${GST_PLUGIN} == "base"
 DIST=	base
 NO_GSTREAMER_COMMON=	yes
-MAN1=		gst-discoverer-1.0.1
 .else
 BUILD_DEPENDS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
 RUN_DEPEDNS+=	gstreamer1-plugins>=${GST1_VERSION}${GST1_MINIMAL_VERSION}:${PORTSDIR}/multimedia/gstreamer1-plugins
@@ -171,4 +166,16 @@ post-patch:
 		${WRKSRC}/../gnome-libtool
 .endif
 
+# workaround a crash in clang 3.3 crash llvm bug # 15840
+.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \
+     (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056))
+USE_GCC=	any
+.endif
+
+post-install:
+.if ${GST_PLUGIN}==base
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*.so.0
+.endif
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgst*.so
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer1-plugins/pkg-plist b/multimedia/gstreamer1-plugins/pkg-plist
index bc5ec0d46d08..0e8516a74e19 100644
--- a/multimedia/gstreamer1-plugins/pkg-plist
+++ b/multimedia/gstreamer1-plugins/pkg-plist
@@ -173,6 +173,7 @@ libdata/pkgconfig/gstreamer-rtsp-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc
+man/man1/gst-discoverer-1.0.1.gz
 share/gir-1.0/GstApp-%%VERSION%%.gir
 share/gir-1.0/GstAudio-%%VERSION%%.gir
 share/gir-1.0/GstFft-%%VERSION%%.gir
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index 2563620ee20b..d4da8794686f 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -17,8 +17,6 @@ PORTSCOUT=	limitw:1,even
 
 CFLAGS:=	${CFLAGS} -O2 -Wno-format
 USES=		bison gettext gmake pathfix pkgconfig
-# workaround a crash in clang 3.3, llvm bug # 15840
-USE_GCC=	any
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehier introspection:build ltverhack:0 ltasneededhack
 USE_AUTOTOOLS=	libtool
@@ -35,15 +33,17 @@ PLIST_SUB=	VERSION=${GST10_VERSION}
 USE_LDCONFIG=	yes
 GST10_VERSION=	${PORTVERSION:R}
 
-MAN1=	gst-inspect-${GST10_VERSION}.1 gst-launch-${GST10_VERSION}.1 \
-	gst-typefind-${GST10_VERSION}.1
-
 OPTIONS_DEFINE=	LIBCHECK
 LIBCHECK_DESC=	Unit tests support
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
+# workaround a crash in clang 3.3 crash llvm bug # 15840
+.if ((${OSVERSION} >= 901504 && ${OSVERSION} < 902502) || \
+     (${OSVERSION} >= 1000037 && ${OSVERSION} < 1000056))
+USE_GCC=	any
+.endif
+
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 CONFIGURE_ENV+=	FLEX_PATH="${LOCALBASE}/bin/flex"
@@ -62,4 +62,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 		${WRKSRC}/configure
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*-1.0.so.0
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgst*.so
+
 .include <bsd.port.mk>
+
diff --git a/multimedia/gstreamer1/files/patch-gst_gstdatetime.c b/multimedia/gstreamer1/files/patch-gst_gstdatetime.c
new file mode 100644
index 000000000000..8eac4d8c76d4
--- /dev/null
+++ b/multimedia/gstreamer1/files/patch-gst_gstdatetime.c
@@ -0,0 +1,12 @@
+--- gst/gstdatetime.c.orig	2013-10-20 16:05:12.000000000 +0200
++++ gst/gstdatetime.c	2013-10-20 16:05:24.000000000 +0200
+@@ -21,8 +21,8 @@
+ #include "config.h"
+ #endif
+ 
+-#include "glib-compat-private.h"
+ #include "gst_private.h"
++#include "glib-compat-private.h"
+ #include "gstdatetime.h"
+ #include "gstvalue.h"
+ #include <glib.h>
diff --git a/multimedia/gstreamer1/pkg-plist b/multimedia/gstreamer1/pkg-plist
index 154475fda01d..398249d75c87 100644
--- a/multimedia/gstreamer1/pkg-plist
+++ b/multimedia/gstreamer1/pkg-plist
@@ -122,6 +122,9 @@ libdata/pkgconfig/gstreamer-base-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-controller-%%VERSION%%.pc
 libdata/pkgconfig/gstreamer-net-%%VERSION%%.pc
 libexec/gstreamer-%%VERSION%%/gst-plugin-scanner
+man/man1/gst-inspect-1.0.1.gz
+man/man1/gst-launch-1.0.1.gz
+man/man1/gst-typefind-1.0.1.gz
 share/aclocal/gst-element-check-%%VERSION%%.m4
 share/gir-1.0/Gst-%%VERSION%%.gir
 share/gir-1.0/GstBase-%%VERSION%%.gir
diff --git a/multimedia/gstreamermm/Makefile b/multimedia/gstreamermm/Makefile
index 46a5be6b56d8..2d2dbadb3806 100644
--- a/multimedia/gstreamermm/Makefile
+++ b/multimedia/gstreamermm/Makefile
@@ -12,19 +12,16 @@ COMMENT=	C++ wrapper library for the multimedia library GStreamer
 
 LICENSE=	LGPL21
 
-LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
-
 USES=		pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GSTREAMER=	theora vorbis cdparanoia gio pango
-USE_GNOME=	gnomeprefix gnomehack
+USE_GNOME=	gnomeprefix gnomehack gtkmm24
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-documentation
 USE_LDCONFIG=	yes
 PLIST_SUB=	GST_VERSION="${GST_VERSION}"
 
-NO_STAGE=	yes
 post-patch:
 # Fix the build with clang
 	@${REINPLACE_CMD} -e 's|GREP "\\-L"|GREP "conftest\\.$$objext"|g' \