5 files changed, 14 insertions, 7 deletions

diff --git a/multimedia/gstreamer-plugins-theora/Makefile b/multimedia/gstreamer-plugins-theora/Makefile
index cdc822324da4..49999ebc7791 100644
--- a/multimedia/gstreamer-plugins-theora/Makefile
+++ b/multimedia/gstreamer-plugins-theora/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-theora/Makefile,v 1.4 2008/03/21 04:01:32 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer theora plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 0fd6ada123a9..f734c4122359 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION?=	${BASE_PORTVERSION}
-PORTREVISION?=	2
+PORTREVISION?=	0
 PORTEPOCH=	3
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-plugins-base/:base \
@@ -31,7 +31,7 @@ LIB_DEPENDS+=	gstreamer-0.10.0:${PORTSDIR}/multimedia/gstreamer \
 
 CFLAGS:=	${CFLAGS} -O2
 
-BASE_PORTVERSION=	0.10.20
+BASE_PORTVERSION=	0.10.21
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
 BAD_PORTVERSION=	0.10.8
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 3937bb6b6554..4c8cc640cd7a 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -160,7 +160,8 @@ gst_cdparanoia_EXTRA_LIBS+=	-lgstcdda-${VERSION}
 gst_cdparanoia_DIST=	base
 
 # cdio
-gst_cdio_LIB_DEPENDS+=	cdio.7:${PORTSDIR}/sysutils/libcdio
+gst_cdio_LIB_DEPENDS+=	cdio.8:${PORTSDIR}/sysutils/libcdio
+gst_cdio_DIST=		ugly
 
 # dts
 gst_dts_LIB_DEPENDS+=	dca.0:${PORTSDIR}/multimedia/libdca
@@ -318,7 +319,11 @@ gst_nas_PLIST_FILES=	${GST_LIB_DIR}/libgstnassink.a \
 		${GST_LIB_DIR}/libgstnassink.so
 
 # neon
+.if exists(${LOCALBASE}/lib/libneon.so.26)
 gst_neon_LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
+.else
+gst_neon_LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+.endif
 gst_neon_CONFIGURE_ENV+=	NEON_CFLAGS="-I${LOCALBASE}/include/neon"
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.a \
 			${GST_LIB_DIR}/libgstneonhttpsrc.la \
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 8ceecb193d61..3738298bd519 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,6 +1,6 @@
-MD5 (gst-plugins-base-0.10.20.tar.bz2) = 180dd3452438b31fba732d2216e55eb6
-SHA256 (gst-plugins-base-0.10.20.tar.bz2) = aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff
-SIZE (gst-plugins-base-0.10.20.tar.bz2) = 1986182
+MD5 (gst-plugins-base-0.10.21.tar.bz2) = 0e0cd485311502ad1c0c028148e3186a
+SHA256 (gst-plugins-base-0.10.21.tar.bz2) = 673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
+SIZE (gst-plugins-base-0.10.21.tar.bz2) = 1982446
 MD5 (gst-plugins-bad-0.10.8.tar.bz2) = ddc8f92dab0081f131650ad6c95908b8
 SHA256 (gst-plugins-bad-0.10.8.tar.bz2) = da4d8b06d3cb3d35940c2313b9c4b52e24d46eb94d3e8b346f0c144362b612a4
 SIZE (gst-plugins-bad-0.10.8.tar.bz2) = 2044602
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index 58cb122a0f08..9c03d0e59634 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -198,12 +198,14 @@ share/locale/es/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/id/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/lt/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/nb/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/nl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/sq/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
 share/locale/sr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo