3 files changed, 21 insertions, 11 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index ea6466894853..9315b07a4f1c 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnash
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.8.7
 CATEGORIES=	graphics
 # getgnash.org is slow
 MASTER_SITES=	${MASTER_SITE_GNU} \
@@ -39,7 +38,7 @@ MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--disable-testsuite \
+		--disable-testsuite --enable-avm2 \
 		--with-plugins-install=system \
 		--sysconfdir="${WRKDIR}/etc" \
 		--disable-jemalloc # leads to infinite recursion on FreeBSD
@@ -52,7 +51,9 @@ PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-MAN1=		cygnal.1 dumpshm.1 flvdumper.1 gnash.1 gprocessor.1 soldumper.1 rtmpget.1
+MAN1=		cygnal.1 dumpshm.1 findmicrophones.1 findwebcams.1 \
+		flvdumper.1 gnash.1 gprocessor.1 gtk-gnash.1 kde4-gnash.1 \
+		rtmpget.1 soldumper.1
 
 OPTIONS=	PLUGIN		"Enable browser plugin" on \
 		CYGNAL		"Enable Cygnal media server" off \
@@ -168,7 +169,9 @@ CONFIGURE_ARGS+=	--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
 .if defined(WITH_AGG) && !defined(WITH_OPENGL) && !defined(WITH_CAIRO)
 LIB_DEPENDS+=		agg.2:${PORTSDIR}/graphics/agg
 CONFIGURE_ARGS+=	--enable-renderer=agg
+PLIST_SUB+=		AGG=""
 .elif !defined(WITH_AGG) && defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+PLIST_SUB+=		AGG="@comment "
 .	if defined(WITH_KDE4)
 IGNORE=			doesn't support OpenGL renderer with KDE4 gui yet. Please rerun 'make config' and select different renderer or disable KDE4 GUI
 .	endif
@@ -178,6 +181,7 @@ LIB_DEPENDS+=		gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext
 .	endif
 CONFIGURE_ARGS+=	--enable-renderer=ogl
 .elif !defined(WITH_AGG) && !defined(WITH_OPENGL) && defined(WITH_CAIRO)
+PLIST_SUB+=		AGG="@comment "
 .	if defined(WITH_KDE) || defined(WITH_KDE4)
 IGNORE=			doesn't support Cairo renderer with KDE/KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE/KDE4 GUIs
 .	endif
@@ -239,6 +243,8 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^man1dir =/ s|=.*|= ${MAN1PREFIX}/man/man1|' \
+		${WRKSRC}/doc/C/Makefile.in
 
 post-install:
 .for conf in ${CONFIG_FILES}
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index 2063168c9fa8..82ad84a4b195 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-0.8.6.tar.bz2) = 913bcbffd37c9603b84486227c65dce7
-SHA256 (gnash-0.8.6.tar.bz2) = 05f4b75eb2a5bc543fcd743641825147ce5e1b0bf675896e01401556a85332ea
-SIZE (gnash-0.8.6.tar.bz2) = 3571055
+MD5 (gnash-0.8.7.tar.bz2) = 039533fec46e46b94ac6b04e33d58f3a
+SHA256 (gnash-0.8.7.tar.bz2) = 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
+SIZE (gnash-0.8.7.tar.bz2) = 3617298
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index f0e497245f35..2586d9334b58 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -73,6 +73,7 @@ include/gnash/Event_as.h
 include/gnash/ExportableResource.h
 include/gnash/ExternalInterface_as.h
 include/gnash/FileFilter_as.h
+include/gnash/FileTypes.h
 include/gnash/FocusEvent_as.h
 include/gnash/FontStyle_as.h
 include/gnash/FontType_as.h
@@ -115,6 +116,7 @@ include/gnash/KeyLocation_as.h
 include/gnash/KeyboardEvent_as.h
 include/gnash/Keyboard_as.h
 include/gnash/LineScaleMode_as.h
+include/gnash/LineStyle.h
 include/gnash/LoaderContext_as.h
 include/gnash/LoaderInfo_as.h
 include/gnash/Loader_as.h
@@ -139,6 +141,7 @@ include/gnash/NetStream_as.h
 include/gnash/NetworkAdapter.h
 include/gnash/NewObjectSample_as.h
 include/gnash/ObjectEncoding_as.h
+include/gnash/ObjectURI.h
 include/gnash/PixelSnapping_as.h
 include/gnash/Point2d.h
 include/gnash/Point_as.h
@@ -153,10 +156,12 @@ include/gnash/Proxy_as.h
 include/gnash/RGBA.h
 include/gnash/Range2d.h
 include/gnash/Rectangle_as.h
+include/gnash/Relay.h
 include/gnash/Responder_as.h
 include/gnash/RunResources.h
 include/gnash/SWF.h
 include/gnash/SWFMatrix.h
+include/gnash/SWFRect.h
 include/gnash/SWFVersion_as.h
 include/gnash/SafeStack.h
 include/gnash/Sample_as.h
@@ -221,8 +226,6 @@ include/gnash/Video_as.h
 include/gnash/XMLDocument_as.h
 include/gnash/XMLNode_as.h
 include/gnash/XMLSocket_as.h
-include/gnash/asClass.h
-include/gnash/asNamespace.h
 include/gnash/as_environment.h
 include/gnash/as_function.h
 include/gnash/as_object.h
@@ -246,12 +249,10 @@ include/gnash/movie_root.h
 include/gnash/namedStrings.h
 include/gnash/net_pkg.h
 include/gnash/rc.h
-include/gnash/rect.h
 include/gnash/ref_counted.h
 include/gnash/smart_ptr.h
 include/gnash/snappingrange.h
 include/gnash/string_table.h
-include/gnash/styles.h
 include/gnash/text_pkg.h
 include/gnash/utility.h
 %%KPARTS%%lib/kde3/libklashpart.so
@@ -275,6 +276,9 @@ etc/gnashrc.dist
 lib/gnash/libgnashamf-%%GNASHVER%%.so
 lib/gnash/libgnashamf.la
 lib/gnash/libgnashamf.so
+%%AGG%%lib/gnash/libgnashagg.la
+%%AGG%%lib/gnash/libgnashagg.so
+%%AGG%%lib/gnash/libgnashagg.so.0
 lib/gnash/libgnashbase-%%GNASHVER%%.so
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashbase.so