3 files changed, 28 insertions, 9 deletions

diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 0f90ef27f608..fbbeb75ca403 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gstreamer
-PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTVERSION=	0.6.2
 CATEGORIES=	multimedia audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+#MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://gstreamer.net/releases/${PORTVERSION}/src/
 PKGNAMESUFFIX=	-plugins
 DISTNAME=	gst-plugins-${PORTVERSION}
 
@@ -18,7 +18,7 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	GStreamer written collection of plugins handling several media types
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	gstreamer-0.6.0:${PORTSDIR}/multimedia/gstreamer \
+LIB_DEPENDS=	gstreamer-0.6.1:${PORTSDIR}/multimedia/gstreamer \
 		popt.0:${PORTSDIR}/devel/popt \
 
 USE_X_PREFIX=	yes
@@ -57,7 +57,7 @@ SDL_CONFIG?="${LOCALBASE}/bin/sdl11-config"
 XMMS_CONFIG?="${LOCALBASE}/bin/xmms-config"
 
 # library minor number
-SHLIB_VERSION=  0
+SHLIB_VERSION=  1
 
 post-patch:
 # as of this writing, FreeBSD does not support lrint* C99 math functions
@@ -138,6 +138,11 @@ WITH_ARTS=yes
 WITH_AVIFILE=yes
 .endif
 
+# cdparanoia
+.if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
+WITH_CDPARANOIA=yes
+.endif
+
 # esound
 .if (${HAVE_GNOME:Mesound}!="")
 WITH_ESOUND=yes
@@ -304,6 +309,16 @@ LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
 PLIST_SUB+=	AVIFILE=""
 .endif
 
+# cdparanoia
+.ifndef(WITH_CDPARANOIA)
+CONFIGURE_ARGS+=	--disable-cdparanoia
+PLIST_SUB+=	CDPARANOIA="@comment "
+.else
+LIB_DEPENDS+=	cdda_interface.0:${PORTSDIR}/audio/cdparanoia
+
+PLIST_SUB+=	CDPARANOIA=""
+.endif
+
 # esound
 .ifndef(WITH_ESOUND)
 CONFIGURE_ARGS+=	--disable-esd \
@@ -605,6 +620,10 @@ pre-everything::
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_AVIFILE to enable avifile Video plugin'
 .endif
+.ifndef(WITH_CDPARANOIA)
+	@${ECHO_MSG} '===>'
+	@${ECHO_MSG} '===> Define WITH_CDPARANOIA to enable cdparanoia Audio plugin'
+.endif
 .ifndef(WITH_ESOUND)
 	@${ECHO_MSG} '===>'
 	@${ECHO_MSG} '===> Define WITH_ESOUND to enable esound Audio plugin'
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index b7ef389b6be7..a6d06ee91e34 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1 +1 @@
-MD5 (gst-plugins-0.6.1.tar.gz) = 0d3cc17cafc57f145d80b880af47f99f
+MD5 (gst-plugins-0.6.2.tar.gz) = ef7b6ce20e32e9abae22aeb2169f4055
diff --git a/multimedia/gstreamer-plugins/pkg-plist b/multimedia/gstreamer-plugins/pkg-plist
index c530bc804e10..b7c7fb09c62f 100644
--- a/multimedia/gstreamer-plugins/pkg-plist
+++ b/multimedia/gstreamer-plugins/pkg-plist
@@ -22,6 +22,7 @@ lib/gstreamer-%%VERSION%%/libgstaudioscale.so
 lib/gstreamer-%%VERSION%%/libgstauparse.so
 lib/gstreamer-%%VERSION%%/libgstavidemux.so
 lib/gstreamer-%%VERSION%%/libgstavimux.so
+%%CDPARANOIA%%lib/gstreamer-%%VERSION%%/libgstcdparanoia.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
 lib/gstreamer-%%VERSION%%/libgstchart.so
 %%HERMES%%lib/gstreamer-%%VERSION%%/libgstcolorspace.so
@@ -54,7 +55,6 @@ lib/gstreamer-%%VERSION%%/libgstlevel.so
 %%LIBMAD%%lib/gstreamer-%%VERSION%%/libgstmad.so
 lib/gstreamer-%%VERSION%%/libgstmedian.so
 %%LIBMIKMOD%%lib/gstreamer-%%VERSION%%/libgstmikmod.so
-lib/gstreamer-%%VERSION%%/libgstmodplug.so
 lib/gstreamer-%%VERSION%%/libgstmono2stereo.so
 lib/gstreamer-%%VERSION%%/libgstmonoscope.so
 lib/gstreamer-%%VERSION%%/libgstmp1videoparse.so
@@ -117,7 +117,7 @@ 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/libgstmedia-info-%%VERSION%%.so.0
 lib/libgstplay-%%VERSION%%.a
 lib/libgstplay-%%VERSION%%.so
 lib/libgstplay-%%VERSION%%.so.%%SHLIB_VERSION%%