8 files changed, 58 insertions, 59 deletions

diff --git a/graphics/swfdec/Makefile b/graphics/swfdec/Makefile
index fb0b2043cb8d..69ea1ff981c0 100644
--- a/graphics/swfdec/Makefile
+++ b/graphics/swfdec/Makefile
@@ -7,33 +7,30 @@
 #
 
 PORTNAME=	swfdec
-PORTVERSION=	0.2.2
-PORTREVISION=	6
+PORTVERSION=	0.3.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://www.schleef.org/swfdec/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	Flash Rendering Library
 
-LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPENDS=	mad.2:${PORTSDIR}/audio/libmad \
+		oil-0.2.0:${PORTSDIR}/devel/liboil
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_SDL=	sdl
 USE_GNOME=	gnomehack gtk20 libartlgpl2
 USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_SHLIB=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
-
-.include <bsd.port.pre.mk>
+PLIST_SUB=	VERSION=${PORTVERSION:R}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG:T}|g" ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/libswfdec/jpeg/sl_types.h
+	@${REINPLACE_CMD} -e "s,int16_t,__int16_t," ${WRKSRC}/libswfdec/swfdec_shape.c
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/swfdec/distinfo b/graphics/swfdec/distinfo
index 13f036ce4f8f..70846f748b9c 100644
--- a/graphics/swfdec/distinfo
+++ b/graphics/swfdec/distinfo
@@ -1,2 +1,2 @@
-MD5 (swfdec-0.2.2.tar.gz) = 08c60d18f350c68c4b938dc29e9b1191
-SIZE (swfdec-0.2.2.tar.gz) = 332280
+MD5 (swfdec-0.3.2.tar.gz) = 8732cd3b96ab803ceb3e723b6dbf0493
+SIZE (swfdec-0.3.2.tar.gz) = 489855
diff --git a/graphics/swfdec/files/patch-clipconv_f32_s16.h b/graphics/swfdec/files/patch-clipconv_f32_s16.h
deleted file mode 100644
index 548f5f575070..000000000000
--- a/graphics/swfdec/files/patch-clipconv_f32_s16.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libswfdec/mpglib/clipconv_f32_s16.h.orig	Sat Apr  5 15:54:30 2003
-+++ libswfdec/mpglib/clipconv_f32_s16.h	Sat Apr  5 15:57:36 2003
-@@ -34,7 +34,7 @@
- //#include <sl_altivec.h>
- #define f32 float
- #define s16 short
--#define HAVE_IEEE754_H
-+#undef HAVE_IEEE754_H
- 
- 
- /* storage class */
diff --git a/graphics/swfdec/files/patch-ltmain.sh b/graphics/swfdec/files/patch-ltmain.sh
index af1fdc325897..b3c8af1df8e6 100644
--- a/graphics/swfdec/files/patch-ltmain.sh
+++ b/graphics/swfdec/files/patch-ltmain.sh
@@ -1,15 +1,6 @@
---- ltmain.sh.orig	Thu Feb  6 05:37:40 2003
-+++ ltmain.sh	Tue May 13 06:48:33 2003
-@@ -1072,7 +1072,7 @@
- 	  esac
- 	 elif test "X$arg" = "X-lc_r"; then
- 	  case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd*)
- 	    # Do not include libc_r directly, use -pthread flag.
- 	    continue
- 	    ;;
-@@ -4325,10 +4325,12 @@
+--- ltmain.sh.orig	Wed Nov 24 17:28:43 2004
++++ ltmain.sh	Wed Nov 24 17:28:55 2004
+@@ -5551,10 +5551,12 @@
  	fi
  
  	# Install the pseudo-library for information purposes.
diff --git a/graphics/swfdec/files/patch-player-swf_play.c b/graphics/swfdec/files/patch-player-swf_play.c
deleted file mode 100644
index 7e87a9d67da7..000000000000
--- a/graphics/swfdec/files/patch-player-swf_play.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- player/swf_play.c.orig	Thu Apr  3 23:11:57 2003
-+++ player/swf_play.c	Fri Apr  2 13:34:32 2004
-@@ -390,7 +390,7 @@
- static gboolean input(GIOChannel *chan, GIOCondition cond, gpointer ignored)
- {
- 	char *data;
--	int bytes_read;
-+	gsize bytes_read;
- 	GError *error = NULL;
- 	int ret;
- 
diff --git a/graphics/swfdec/files/patch-test_render.c b/graphics/swfdec/files/patch-test_render.c
new file mode 100644
index 000000000000..5a78efee07ca
--- /dev/null
+++ b/graphics/swfdec/files/patch-test_render.c
@@ -0,0 +1,10 @@
+--- test/render.c.orig	Wed Dec 15 12:04:53 2004
++++ test/render.c	Wed Dec 15 12:42:01 2004
+@@ -12,6 +12,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-descr b/graphics/swfdec/pkg-descr
index 9f7dc5ee1ba5..7e094c545d9c 100644
--- a/graphics/swfdec/pkg-descr
+++ b/graphics/swfdec/pkg-descr
@@ -3,4 +3,4 @@ originally designed as a basis library for creating Flash plugins for
 GStreamer, but it is a fully standalone library which only use the
 libart library for drawing.
 
-WWW: http://swfdec.sourceforge.net/
+WWW: http://www.schleef.org/swfdec/
diff --git a/graphics/swfdec/pkg-plist b/graphics/swfdec/pkg-plist
index eaf3971a07a0..7aa0031ba118 100644
--- a/graphics/swfdec/pkg-plist
+++ b/graphics/swfdec/pkg-plist
@@ -1,10 +1,33 @@
-bin/swf_play
-include/swfdec/swf.h
-include/swfdec/swfdec.h
+include/swfdec-%%VERSION%%/art.h
+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_bits.h
+include/swfdec-%%VERSION%%/swfdec_buffer.h
+include/swfdec-%%VERSION%%/swfdec_button.h
+include/swfdec-%%VERSION%%/swfdec_debug.h
+include/swfdec-%%VERSION%%/swfdec_decoder.h
+include/swfdec-%%VERSION%%/swfdec_display.h
+include/swfdec-%%VERSION%%/swfdec_font.h
+include/swfdec-%%VERSION%%/swfdec_image.h
+include/swfdec-%%VERSION%%/swfdec_internal.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_render_libart.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
+@dirrm include/swfdec-%%VERSION%%
 lib/gtk-2.0/2.4.0/loaders/swf_loader.a
 lib/gtk-2.0/2.4.0/loaders/swf_loader.so
-lib/libswfdec.a
-lib/libswfdec.so
-lib/libswfdec.so.0
-libdata/pkgconfig/swfdec.pc
-@dirrm include/swfdec
+lib/libswfdec-%%VERSION%%.a
+lib/libswfdec-%%VERSION%%.so
+lib/libswfdec-%%VERSION%%.so.0
+libdata/pkgconfig/swfdec-%%VERSION%%.pc