- Update to 0.9.0

PR:		134288
Submitted by:	Ports Fury

5 files changed, 24 insertions, 58 deletions

diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile
index 74a7b6c9d344..ea15c75268e5 100644
--- a/graphics/swftools/Makefile
+++ b/graphics/swftools/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	swftools
-PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTVERSION=	0.9.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.swftools.org/
 
@@ -18,21 +17,27 @@ COMMENT=	SWF manipulation and generation utilities
 LIB_DEPENDS=	t1.5:${PORTSDIR}/devel/t1lib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		ungif.5:${PORTSDIR}/graphics/libungif \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_GNOME=	gnometarget pkgconfig
+OPTIONS=	LAME "LAME MP3 audio encoder support" off
+
+USE_GNOME=	pkgconfig
+USE_GL=		glut
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=		font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 png2swf.1 \
-		swfbbox.1 swfc.1 swfcombine.1 swfdump.1 swfextract.1 \
-		swfstrings.1 wav2swf.1
+MAN1=		as3compile.1 font2swf.1 gif2swf.1 jpeg2swf.1 pdf2swf.1 \
+		png2swf.1 swfbbox.1 swfc.1 swfcombine.1 swfdump.1 \
+		swfextract.1 swfrender.1 swfstrings.1 wav2swf.1
 
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib
 
-.if defined(WITH_LAME) || exists(${LOCALBASE}/lib/libmp3lame.a)
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_LAME)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 .else
 CONFIGURE_ARGS+=	--disable-lame
@@ -40,7 +45,10 @@ CONFIGURE_ARGS+=	--disable-lame
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| -O | |g ; \
+		 s|/usr/include/fontconfig|${LOCALBASE}/include/fontconfig|g ; \
 		 s|/usr/local/include|${LOCALBASE}/include|g ; \
 		 s|/usr/local/lib|${LOCALBASE}/lib|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/python/d ; \
+		 /avi2swf/d' ${WRKSRC}/Makefile.in
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/graphics/swftools/distinfo b/graphics/swftools/distinfo
index b3856c9af661..50c84943bf8b 100644
--- a/graphics/swftools/distinfo
+++ b/graphics/swftools/distinfo
@@ -1,3 +1,3 @@
-MD5 (swftools-0.8.1.tar.gz) = 932f4e5fce551ed70c0390fdc0eb1af6
-SHA256 (swftools-0.8.1.tar.gz) = 54b067fe8f644be7bc6d2b037d10679166d7c2cee1c2876d7a4434bee260e550
-SIZE (swftools-0.8.1.tar.gz) = 1743477
+MD5 (swftools-0.9.0.tar.gz) = 518e94894a6b1be584ba79b6ab1b2a1a
+SHA256 (swftools-0.9.0.tar.gz) = f875df4546f0ed1753ad9bb6e0c71e1390189e93a0e17ad6156d178cf1a212ea
+SIZE (swftools-0.9.0.tar.gz) = 2654046
diff --git a/graphics/swftools/files/patch-Makefile.in b/graphics/swftools/files/patch-Makefile.in
deleted file mode 100644
index c8609a1842a3..000000000000
--- a/graphics/swftools/files/patch-Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.in.orig	Mon Jan 22 06:12:53 2007
-+++ Makefile.in	Mon Jan 22 12:51:20 2007
-@@ -8,14 +8,10 @@
- 	cd m4;$(MAKE) $@
- 	@echo making $@ in lib...
- 	cd lib;$(MAKE) $@
--	@echo making $@ in lib/python...
--	cd lib/python;$(MAKE) $@
- 	@echo making $@ in src...
- 	cd src;$(MAKE) $@
- 	@echo making $@ in pdf2swf...
- 	cd pdf2swf/fonts;$(MAKE) $@
--	@echo making $@ in avi2swf...
--	cd avi2swf;$(MAKE) $@
- 	@echo making $@ in swfs...
- 	cd swfs;$(MAKE) $@
- 	@$(MAKE) $@-local
diff --git a/graphics/swftools/pkg-descr b/graphics/swftools/pkg-descr
index 9fce073a5dc7..0d76143cb5e3 100644
--- a/graphics/swftools/pkg-descr
+++ b/graphics/swftools/pkg-descr
@@ -15,5 +15,7 @@ At the moment, this includes:
    - SWFC : A tool for creating SWF files from simple script files.
    - SWFExtract : Allows to extract Movieclips, Sounds, Images etc. from SWF
      files.
+   - AS3Compile : A standalone ActionScript 3.0 compiler. Mostly compatible
+     with Flex. 
 
 WWW: http://www.swftools.org/
diff --git a/graphics/swftools/pkg-plist b/graphics/swftools/pkg-plist
index fe0574cb9c05..1ce058e8b940 100644
--- a/graphics/swftools/pkg-plist
+++ b/graphics/swftools/pkg-plist
@@ -1,3 +1,4 @@
+bin/as3compile
 bin/font2swf
 bin/gif2swf
 bin/jpeg2swf
@@ -8,36 +9,9 @@ bin/swfc
 bin/swfcombine
 bin/swfdump
 bin/swfextract
+bin/swfrender
 bin/swfstrings
 bin/wav2swf
-%%DATADIR%%/fonts/d050000l.afm
-%%DATADIR%%/fonts/d050000l.pfb
-%%DATADIR%%/fonts/n019003l.afm
-%%DATADIR%%/fonts/n019003l.pfb
-%%DATADIR%%/fonts/n019004l.afm
-%%DATADIR%%/fonts/n019004l.pfb
-%%DATADIR%%/fonts/n019023l.afm
-%%DATADIR%%/fonts/n019023l.pfb
-%%DATADIR%%/fonts/n019024l.afm
-%%DATADIR%%/fonts/n019024l.pfb
-%%DATADIR%%/fonts/n021003l.afm
-%%DATADIR%%/fonts/n021003l.pfb
-%%DATADIR%%/fonts/n021004l.afm
-%%DATADIR%%/fonts/n021004l.pfb
-%%DATADIR%%/fonts/n021023l.afm
-%%DATADIR%%/fonts/n021023l.pfb
-%%DATADIR%%/fonts/n021024l.afm
-%%DATADIR%%/fonts/n021024l.pfb
-%%DATADIR%%/fonts/n022003l.afm
-%%DATADIR%%/fonts/n022003l.pfb
-%%DATADIR%%/fonts/n022004l.afm
-%%DATADIR%%/fonts/n022004l.pfb
-%%DATADIR%%/fonts/n022023l.afm
-%%DATADIR%%/fonts/n022023l.pfb
-%%DATADIR%%/fonts/n022024l.afm
-%%DATADIR%%/fonts/n022024l.pfb
-%%DATADIR%%/fonts/s050000l.afm
-%%DATADIR%%/fonts/s050000l.pfb
 %%DATADIR%%/swfs/PreLoaderTemplate.swf
 %%DATADIR%%/swfs/default_loader.swf
 %%DATADIR%%/swfs/default_viewer.swf
@@ -46,5 +20,4 @@ bin/wav2swf
 %%DATADIR%%/swfs/swft_loader.swf
 %%DATADIR%%/swfs/tessel_loader.swf
 @dirrm %%DATADIR%%/swfs
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%