5 files changed, 30 insertions, 57 deletions

diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index e8ebb1b69d2c..c74e120069d0 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	swfdec
-PORTVERSION=	0.4.5
+PORTVERSION=	0.5.0
 CATEGORIES=	graphics
-MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.4/
+MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.5/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flash Rendering Library
@@ -19,23 +19,15 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 		oil-0.3.1:${PORTSDIR}/devel/liboil
 
 USE_XLIB=	yes
-USE_SDL=	sdl
 USE_GNOME=	gnomehack gtk20 gnomevfs2
 USE_GSTREAMER=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-Wl,-Bsymbolic -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-mozilla-plugin \
-		--with-audio=none
+CONFIGURE_ARGS=	--with-audio=none
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c
-	@${REINPLACE_CMD} -e 's|plugin||g' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG:T}|g" \
-		${WRKSRC}/configure
-
 .include <bsd.port.mk>
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
index e65e7cfb0715..fa1e465da8c3 100644
--- a/graphics/swfdec/distinfo
+++ b/graphics/swfdec/distinfo
@@ -1,3 +1,3 @@
-MD5 (swfdec-0.4.5.tar.gz) = 13830b93346ff5d15b2de6a5c55bf54a
-SHA256 (swfdec-0.4.5.tar.gz) = 90dd3493c40bc570a584f7aa0a32491faa4bbe071c4492fe9fd65260223ec35f
-SIZE (swfdec-0.4.5.tar.gz) = 2014531
+MD5 (swfdec-0.5.0.tar.gz) = 53c9dd7f87ec9a73277ceb4d7c033a3c
+SHA256 (swfdec-0.5.0.tar.gz) = a444902750c32cf4947a0ff28ad8dcaf0d0f97d17935179157ce25d3cd457345
+SIZE (swfdec-0.5.0.tar.gz) = 1408135
diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist
index 33683dc5b49b..5002fa7eb7d1 100644
--- a/graphics/swfdec/pkg-plist
+++ b/graphics/swfdec/pkg-plist
@@ -3,6 +3,10 @@ include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_loader.h
 include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_player.h
 include/swfdec-%%VERSION%%/libswfdec-gtk/swfdec_gtk_widget.h
 include/swfdec-%%VERSION%%/libswfdec/swfdec.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_as_context.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_as_frame.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_as_object.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_as_types.h
 include/swfdec-%%VERSION%%/libswfdec/swfdec_audio.h
 include/swfdec-%%VERSION%%/libswfdec/swfdec_buffer.h
 include/swfdec-%%VERSION%%/libswfdec/swfdec_enums.h
@@ -11,13 +15,14 @@ include/swfdec-%%VERSION%%/libswfdec/swfdec_player.h
 lib/libswfdec-%%VERSION%%.a
 lib/libswfdec-%%VERSION%%.la
 lib/libswfdec-%%VERSION%%.so
-lib/libswfdec-%%VERSION%%.so.3
+lib/libswfdec-%%VERSION%%.so.0
 lib/libswfdec-gtk-%%VERSION%%.a
 lib/libswfdec-gtk-%%VERSION%%.la
 lib/libswfdec-gtk-%%VERSION%%.so
-lib/libswfdec-gtk-%%VERSION%%.so.3
+lib/libswfdec-gtk-%%VERSION%%.so.0
 libdata/pkgconfig/swfdec-%%VERSION%%.pc
 libdata/pkgconfig/swfdec-gtk-%%VERSION%%.pc
+share/gtk-doc/html/swfdec/SwfdecAsContext.html
 share/gtk-doc/html/swfdec/SwfdecAudio.html
 share/gtk-doc/html/swfdec/SwfdecGtkLoader.html
 share/gtk-doc/html/swfdec/SwfdecGtkPlayer.html
@@ -26,6 +31,7 @@ share/gtk-doc/html/swfdec/SwfdecLoader.html
 share/gtk-doc/html/swfdec/SwfdecPlayer.html
 share/gtk-doc/html/swfdec/ch01.html
 share/gtk-doc/html/swfdec/ch02.html
+share/gtk-doc/html/swfdec/ch03.html
 share/gtk-doc/html/swfdec/home.png
 share/gtk-doc/html/swfdec/index.html
 share/gtk-doc/html/swfdec/index.sgml
@@ -33,6 +39,12 @@ share/gtk-doc/html/swfdec/left.png
 share/gtk-doc/html/swfdec/right.png
 share/gtk-doc/html/swfdec/style.css
 share/gtk-doc/html/swfdec/swfdec-Enumerations.html
+share/gtk-doc/html/swfdec/swfdec-Internals.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsArray.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsFrame.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsFunction.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsObject.html
+share/gtk-doc/html/swfdec/swfdec-SwfdecAsValue.html
 share/gtk-doc/html/swfdec/swfdec-SwfdecBuffer.html
 share/gtk-doc/html/swfdec/swfdec.devhelp
 share/gtk-doc/html/swfdec/swfdec.devhelp2
diff --git a/www/swfdec-plugin/Makefile b/www/swfdec-plugin/Makefile
index f79f07a78b63..232823d620a0 100644
--- a/www/swfdec-plugin/Makefile
+++ b/www/swfdec-plugin/Makefile
@@ -6,52 +6,21 @@
 #
 
 PORTNAME=	swfdec-plugin
-PORTVERSION=	0.4.5
+PORTVERSION=	0.5.0
 CATEGORIES=	www
-MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.4/
+MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.5/
 DISTNAME=	swfdec-mozilla-${PORTVERSION}
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	Flash rendering plugin
 
-LIB_DEPENDS=	swfdec-0.4:${PORTSDIR}/graphics/swfdec
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/firefox-plugin.pc:${PORTSDIR}/www/firefox
-.else
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/mozilla-plugin${HEADERS_SUFX}.pc:${PORTSDIR}/www/mozilla${HEADERS_SUFX}
-.endif
+BUILD_DEPENDS=	swfdec>=0.5:${PORTSDIR}/graphics/swfdec
+RUN_DEPENDS=	swfdec>=0.5:${PORTSDIR}/graphics/swfdec
 
-USE_SDL=	sdl
-USE_GNOME=	gnomehack gtk20
 USE_GETOPT_LONG=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ARGS=	--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
-		--with-audio=none
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
-.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="firefox"
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${LOCALBASE}/bin/firefox-config"
-.else
-CONFIGURE_ENV+=	MOZILLA_CONFIG="${LOCALBASE}/lib/mozilla/mozilla-config"
-.endif
+CONFIGURE_ARGS=	--with-plugin-dir="$(PREFIX)/lib/browser_plugins"
 
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	VERSION=${PORTVERSION:R}
-
-OPTIONS=	GSTREAMER "Support for video playback using GStreamer" on
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|plugindir =.*|plugindir = $(PREFIX)/lib/browser_plugins|g" ${WRKSRC}/src/Makefile.in
-
-.include <bsd.port.pre.mk>
-.if !defined(WITHOUT_GSTREAMER)
-USE_GSTREAMER=	yes
-CONFIGURE_ARGS+=	--enable-gstreamer
-.else
-CONFIGURE_ARGS+=	--disable-gstreamer
-.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/swfdec-plugin/distinfo b/www/swfdec-plugin/distinfo
index b213e1638b1e..b52eff24ffed 100644
--- a/www/swfdec-plugin/distinfo
+++ b/www/swfdec-plugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (swfdec-mozilla-0.4.5.tar.gz) = d13f90417ca909d174accd32253fe342
-SHA256 (swfdec-mozilla-0.4.5.tar.gz) = 07bb6bd79a6330c6d70f63a2a7637c8ec817476bda80579bb512d02d8a967c9d
-SIZE (swfdec-mozilla-0.4.5.tar.gz) = 389041
+MD5 (swfdec-mozilla-0.5.0.tar.gz) = 81f5d05c2677995611eac1742f025e2d
+SHA256 (swfdec-mozilla-0.5.0.tar.gz) = cdf843d26135a346197a020035f1600cd56ffbb02e18293b679e515c368a9c9b
+SIZE (swfdec-mozilla-0.5.0.tar.gz) = 391470