4 files changed, 29 insertions, 67 deletions

diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index 51ce2499555d..db747b6a9f89 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -7,10 +7,9 @@
 #
 
 PORTNAME=	swfdec
-PORTVERSION=	0.3.6
-PORTREVISION=	4
+PORTVERSION=	0.4.2
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.schleef.org/swfdec/download/
+MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec/0.4/
 
 MAINTAINER=	rainer.alves@gmail.com
 COMMENT=	Flash Rendering Library
@@ -20,39 +19,20 @@ LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
 
 USE_XLIB=	yes
 USE_SDL=	sdl
-USE_GNOME=	gnomehack gtk20 libartlgpl2
+USE_GNOME=	gnomehack gtk20
 USE_GSTREAMER=	yes
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-mozilla-plugin
+CONFIGURE_ARGS=	--disable-mozilla-plugin \
+		--with-audio=none
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	VERSION=${PORTVERSION:R}
 
-.if exists(${LOCALBASE}/bin/gimp-2.2)
-WITH_GIMP=yes
-.endif
-
-.if defined(WITH_GIMP)
-LIB_DEPENDS+=	gimp-2.0.200:${PORTSDIR}/graphics/gimp
-PLIST_SUB+=	GIMP=""
-.else
-PLIST_SUB+=	GIMP="@comment "
-.endif
-
-pre-everything::
-	@${ECHO} ""
-	@${ECHO} "Define WITH_GIMP in order to build the SWF Gimp plugin"
-	@${ECHO} ""
-
 post-patch:
-.if !defined(WITH_GIMP)
-	@${REINPLACE_CMD} -e 's|gimp-loader||g' ${WRKSRC}/Makefile.in
-.endif
 	@${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c
-	@${REINPLACE_CMD} -e 's|libdir)/gimp/1.3|prefix)/libexec/gimp/2.2|g' ${WRKSRC}/gimp-loader/Makefile.in
 	@${REINPLACE_CMD} -e 's|plugin||g' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG:T}|g" ${WRKSRC}/configure
 
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
index ab85c3a16477..98ba23f1c329 100644
--- a/graphics/swfdec/distinfo
+++ b/graphics/swfdec/distinfo
@@ -1,3 +1,3 @@
-MD5 (swfdec-0.3.6.tar.gz) = bcfca3a8ce1d524ebf4d11fd511dedb8
-SHA256 (swfdec-0.3.6.tar.gz) = 6efdff894bd0833223f9ad2b7cf7ef227d0c6fa811d816dffd75e08c7654f56c
-SIZE (swfdec-0.3.6.tar.gz) = 1088131
+MD5 (swfdec-0.4.2.tar.gz) = 851b8891299b68f84dc731441188b261
+SHA256 (swfdec-0.4.2.tar.gz) = f63cc7b3fda4c236aac1c460441395550a69460202412a6bc48c2ad84e6daaa0
+SIZE (swfdec-0.4.2.tar.gz) = 1494144
diff --git a/graphics/swfdec/files/patch-test_parse.c b/graphics/swfdec/files/patch-test_parse.c
deleted file mode 100644
index dbacc9545bb6..000000000000
--- a/graphics/swfdec/files/patch-test_parse.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- test/parse.c.orig	Sat Apr 15 04:33:30 2006
-+++ test/parse.c	Sat Apr 15 04:33:48 2006
-@@ -11,6 +11,7 @@
- #include <swfdec_render.h>
- #include <swfdec_sprite.h>
- #include <swfdec_buffer.h>
-+#include <sys/signal.h>
- #include <ucontext.h>
- #include <sys/mman.h>
- 
diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist
index d563e90d6881..7b836c5eaf29 100644
--- a/graphics/swfdec/pkg-plist
+++ b/graphics/swfdec/pkg-plist
@@ -1,34 +1,26 @@
-include/swfdec-%%VERSION%%/color.h
-include/swfdec-%%VERSION%%/proto.h
-include/swfdec-%%VERSION%%/swfdec.h
-include/swfdec-%%VERSION%%/swfdec_actions.h
-include/swfdec-%%VERSION%%/swfdec_audio.h
-include/swfdec-%%VERSION%%/swfdec_bits.h
-include/swfdec-%%VERSION%%/swfdec_buffer.h
-include/swfdec-%%VERSION%%/swfdec_button.h
-include/swfdec-%%VERSION%%/swfdec_cache.h
-include/swfdec-%%VERSION%%/swfdec_debug.h
-include/swfdec-%%VERSION%%/swfdec_decoder.h
-include/swfdec-%%VERSION%%/swfdec_font.h
-include/swfdec-%%VERSION%%/swfdec_image.h
-include/swfdec-%%VERSION%%/swfdec_layer.h
-include/swfdec-%%VERSION%%/swfdec_object.h
-include/swfdec-%%VERSION%%/swfdec_rect.h
-include/swfdec-%%VERSION%%/swfdec_render.h
-include/swfdec-%%VERSION%%/swfdec_shape.h
-include/swfdec-%%VERSION%%/swfdec_sound.h
-include/swfdec-%%VERSION%%/swfdec_sprite.h
-include/swfdec-%%VERSION%%/swfdec_text.h
-include/swfdec-%%VERSION%%/swfdec_transform.h
-include/swfdec-%%VERSION%%/swfdec_types.h
-include/swfdec-%%VERSION%%/tags.h
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.a
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.la
-lib/gtk-2.0/%%GTK2_VERSION%%/loaders/swf_loader.so
+include/swfdec-%%VERSION%%/libswfdec/swfdec.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_audio.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_buffer.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_enums.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_loader.h
+include/swfdec-%%VERSION%%/libswfdec/swfdec_player.h
 lib/libswfdec-%%VERSION%%.a
 lib/libswfdec-%%VERSION%%.la
 lib/libswfdec-%%VERSION%%.so
-lib/libswfdec-%%VERSION%%.so.0
+lib/libswfdec-%%VERSION%%.so.1
 libdata/pkgconfig/swfdec-%%VERSION%%.pc
-%%GIMP%%libexec/gimp/2.2/plug-ins/swf
+share/gtk-doc/html/swfdec/SwfdecAudio.html
+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/home.png
+share/gtk-doc/html/swfdec/index.html
+share/gtk-doc/html/swfdec/index.sgml
+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-SwfdecBuffer.html
+share/gtk-doc/html/swfdec/swfdec.devhelp
+share/gtk-doc/html/swfdec/swfdec.devhelp2
+share/gtk-doc/html/swfdec/up.png
 @dirrm include/swfdec-%%VERSION%%