5 files changed, 193 insertions, 275 deletions

diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile
index 4597e658d73f..323361123823 100644
--- a/graphics/gnash/Makefile
+++ b/graphics/gnash/Makefile
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	gnash
-PORTVERSION=	0.8.7
-PORTREVISION=	4
+PORTVERSION=	0.8.8
 CATEGORIES=	graphics
-# getgnash.org is slow
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		http://mirror.amdmi3.ru/distfiles/ \
-		http://getgnash.org/packages/releases/
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	GNU/${PORTNAME}/${PORTVERSION}/ \
+		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GNU Flash movie player
@@ -21,7 +17,8 @@ COMMENT=	GNU Flash movie player
 LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		curl.6:${PORTSDIR}/ftp/curl \
-		ungif.5:${PORTSDIR}/graphics/libungif
+		ungif.5:${PORTSDIR}/graphics/libungif \
+		speex.1:${PORTSDIR}/audio/speex
 
 CONFLICTS=	gnash-devel-[0-9]*
 
@@ -33,16 +30,19 @@ WANT_GNOME=	yes
 USE_GCC=	4.2+	# triggers compiler error on gcc 3.4
 WANT_GSTREAMER=	yes
 USE_GNOME=	pkgconfig libxml2
-USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm
+USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm xv
 USE_AUTOTOOLS=	libltdl:22
 MAKE_JOBS_SAFE=	yes
 
+# jemalloc leads to infinite recursion on FreeBSD
+# --enable-avm2 doesn't build (but consider for future)
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--disable-testsuite --enable-avm2 \
+		--disable-testsuite --disable-avm2 \
 		--with-plugins-install=system \
 		--sysconfdir="${WRKDIR}/etc" \
-		--disable-jemalloc # leads to infinite recursion on FreeBSD
+		--disable-jemalloc \
+		--disable-silent-rules
 
 GNASHVER=	${PORTVERSION}
 CONFIG_FILES=	gnashpluginrc gnashrc
@@ -52,7 +52,7 @@ PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-MAN1=		cygnal.1 dumpshm.1 findmicrophones.1 findwebcams.1 \
+MAN1=		cygnal.1 findmicrophones.1 findwebcams.1 \
 		flvdumper.1 gnash.1 gprocessor.1 gtk-gnash.1 kde4-gnash.1 \
 		rtmpget.1 soldumper.1
 
@@ -65,8 +65,7 @@ OPTIONS=	PLUGIN		"Enable browser plugin" on \
 		OPENGL		"Renderer: OpenGL (broken)" off \
 		CAIRO		"Renderer: Cairo (experimental)" off \
 		FFMPEG		"Media handler: ffmpeg (+SDL sound output)" on \
-		GSTREAMER	"Media handler: GStreamer" off \
-		SPEEX		"Speex codec support" on
+		GSTREAMER	"Media handler: GStreamer" off
 
 .include <bsd.port.options.mk>
 
@@ -145,6 +144,7 @@ GNASH_GUIS+=	kde4
 PLIST_SUB+=	KDE4=""
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build
+QT_NONSTANDARD=	yes
 USE_KDE4=	kdehier kdelibs
 CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
 .	if exists(${LOCALBASE}/lib/libkdeui.so)
@@ -162,36 +162,40 @@ IGNORE=		KDE and KDE4 GUIs are mutually exclusive. Please rerun 'make config' an
 IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or KDE4
 .endif
 
-CONFIGURE_ARGS+=	--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
+CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
 
 #
 # Renderer options processing
 #
-.if defined(WITH_AGG) && !defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+GNASH_RENDERERS=
+
+.if defined(WITH_AGG)
 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
+GNASH_RENDERERS+=	agg
+.endif
+
+.if defined(WITH_OPENGL)
 USE_GL=			yes
+GNASH_RENDERERS+=	ogl
 .	if !defined(WITHOUT_GTK)
 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 "
+.endif
+
+.if defined(WITH_CAIRO)
 .	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
 LIB_DEPENDS+=		cairo.2:${PORTSDIR}/graphics/cairo
-CONFIGURE_ARGS+=	--enable-renderer=cairo
-.else
-IGNORE=			can't be built with multiple or without renderers enabled. Please rerun 'make config' and select exactly one renderer (agg|opengl|cairo)
+GNASH_RENDERERS+=	cairo
 .endif
 
+.if ${GNASH_RENDERERS} == ""
+IGNORE=			needs at least one renderer enabled. Please rerun 'make config' and enable AGG, OPENGL or CAIRO
+.endif
+
+CONFIGURE_ARGS+=	--enable-renderer=`${ECHO} ${GNASH_RENDERERS} | ${TR} ' ' ,`
+
 #
 # Media handler options processing
 #
@@ -215,16 +219,6 @@ PLIST_SUB+=		GSTREAMER=""
 PLIST_SUB+=		GSTREAMER="@comment "
 .endif
 
-#
-# Other options
-#
-.if !defined(WITHOUT_SPEEX)
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
-CONFIGURE_ARGS+=	--enable-speex
-.else
-CONFIGURE_ARGS+=	--disable-speex
-.endif
-
 .include <bsd.port.pre.mk>
 
 pre-everything::
diff --git a/graphics/gnash/distinfo b/graphics/gnash/distinfo
index 82ad84a4b195..5cf30a65e6d4 100644
--- a/graphics/gnash/distinfo
+++ b/graphics/gnash/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-0.8.7.tar.bz2) = 039533fec46e46b94ac6b04e33d58f3a
-SHA256 (gnash-0.8.7.tar.bz2) = 73b8a7c788511e453add26fd68cebd5818b39f9da21cc7c78e9cef8bc837e896
-SIZE (gnash-0.8.7.tar.bz2) = 3617298
+MD5 (gnash-0.8.8.tar.bz2) = ce57f66e222f7eb1adf7f7b4a1274612
+SHA256 (gnash-0.8.8.tar.bz2) = dcac4b81f81ecd6cc7c5422d7c731fc5c2a7be7fb18b5570a7e6f8fb5fc6e220
+SIZE (gnash-0.8.8.tar.bz2) = 3850383
diff --git a/graphics/gnash/files/patch-plugin-npapi-Makefile.in b/graphics/gnash/files/patch-plugin-npapi-Makefile.in
new file mode 100644
index 000000000000..475b813923a2
--- /dev/null
+++ b/graphics/gnash/files/patch-plugin-npapi-Makefile.in
@@ -0,0 +1,11 @@
+--- plugin/npapi/Makefile.in.orig	2010-08-21 22:04:45.000000000 +0400
++++ plugin/npapi/Makefile.in	2010-08-25 05:43:40.000000000 +0400
+@@ -637,7 +637,7 @@
+ 	-I$(top_srcdir)/libcore/parser -I$(top_srcdir)/libbase \
+ 	-I$(top_srcdir)/librender -I$(srcdir)/mozilla-sdk \
+ 	-I$(srcdir)/mozilla-sdk/include $(GLIB_CFLAGS) $(NULL) \
+-	$(am__append_1) $(am__append_2)
++	$(am__append_1) $(am__append_2) $(BOOST_CFLAGS)
+ 
+ # AM_CXXFLAGS = $(AM_CPPFLAGS)
+ noinst_HEADERS = plugin.h mozilla-sdk/pluginbase.h \
diff --git a/graphics/gnash/files/patch-utilities-dumpshm.cpp b/graphics/gnash/files/patch-utilities-dumpshm.cpp
deleted file mode 100644
index 75ce12a240e2..000000000000
--- a/graphics/gnash/files/patch-utilities-dumpshm.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- utilities/dumpshm.cpp.orig	2010-02-11 02:20:23.000000000 +0300
-+++ utilities/dumpshm.cpp	2010-02-18 22:26:30.000000000 +0300
-@@ -316,12 +316,12 @@
-         }
- #ifdef IPC_PERM_KEY
-         if (shmseg.shm_segsz == 64528) {
--            log_debug(_("Found it! \"set LCShmKey %s\" in your ~/.gnashrc",
-+            log_debug(_("Found it! \"set LCShmKey %s\" in your ~/.gnashrc"),
-                         boost::io::group(hex, showbase,
--                            shmseg.shm_perm.IPC_PERM_KEY)));
--            log_debug(_("Last changed on: %s", ctime(&shmseg.shm_ctime)));
--            log_debug(_("Last attached on: %s", ctime(&shmseg.shm_atime)));
--            log_debug(_("Last detached on: %s", ctime(&shmseg.shm_dtime)));
-+                            shmseg.shm_perm.IPC_PERM_KEY));
-+            log_debug(_("Last changed on: %s"), ctime(&shmseg.shm_ctime));
-+            log_debug(_("Last attached on: %s"), ctime(&shmseg.shm_atime));
-+            log_debug(_("Last detached on: %s"), ctime(&shmseg.shm_dtime));
-             return shmseg.shm_perm.IPC_PERM_KEY;
-         }
- #endif    // end of IPC_PERM_KEY
diff --git a/graphics/gnash/pkg-plist b/graphics/gnash/pkg-plist
index 2586d9334b58..f91edfe8aa98 100644
--- a/graphics/gnash/pkg-plist
+++ b/graphics/gnash/pkg-plist
@@ -1,260 +1,190 @@
-bin/dumpshm
-%%GSTREAMER%%bin/findmicrophones
-%%GSTREAMER%%bin/findwebcams
-bin/flvdumper
 bin/gnash
-bin/gprocessor
-bin/soldumper
 %%GTK%%bin/gtk-gnash
 %%KDE%%bin/kde3-gnash
 %%KDE4%%bin/kde4-gnash
+bin/gprocessor
+bin/rtmpget
+%%GSTREAMER%%bin/findmicrophones
+%%GSTREAMER%%bin/findwebcams
 %%CYGNAL%%bin/cygnal
+@comment %%CYGNAL%%bin/dumpshm
+%%CYGNAL%%bin/flvdumper
+%%CYGNAL%%bin/soldumper
 %%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
 @comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
 %%KPARTS%%share/apps/klash/pluginsinfo
 %%KPARTS%%share/apps/klash/klashpartui.rc
 @comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
 %%KPARTS%%share/services/klash_part.desktop
-include/gnash/AVM1Movie_as.h
-include/gnash/AccessibilityProperties_as.h
-include/gnash/Accessibility_as.h
-include/gnash/ActionScriptVersion_as.h
-include/gnash/ActivityEvent_as.h
-include/gnash/AntiAliasType_as.h
-include/gnash/ApplicationDomain_as.h
-include/gnash/Array_as.h
-include/gnash/AsyncErrorEvent_as.h
+include/gnash/AMF.h
 include/gnash/BevelFilter_as.h
-include/gnash/BitmapDataChannel_as.h
+include/gnash/BitmapData_as.h
 include/gnash/BitmapFilterQuality_as.h
 include/gnash/BitmapFilterType_as.h
 include/gnash/BitmapFilter_as.h
-include/gnash/BitmapInfo.h
-include/gnash/Bitmap_as.h
-include/gnash/BlendMode_as.h
+include/gnash/BitsReader.h
 include/gnash/BlurFilter_as.h
-include/gnash/ByteArray_as.h
-include/gnash/CSMSettings_as.h
-include/gnash/CallStack.h
-include/gnash/Camera_as.h
-include/gnash/Capabilities_as.h
-include/gnash/CapsStyle_as.h
-include/gnash/CharacterProxy.h
-include/gnash/ClipboardFormats_as.h
-include/gnash/ClipboardTransferMode_as.h
-include/gnash/Clipboard_as.h
+include/gnash/CachedBitmap.h
+include/gnash/ClockTime.h
 include/gnash/ColorMatrixFilter_as.h
 include/gnash/ColorTransform_as.h
-include/gnash/ContextMenuBuiltInItems_as.h
-include/gnash/ContextMenuEvent_as.h
-include/gnash/ContextMenuItem_as.h
-include/gnash/ContextMenu_as.h
-include/gnash/ControlTag.h
 include/gnash/ConvolutionFilter_as.h
-include/gnash/DataEvent_as.h
-include/gnash/DefinitionTag.h
-include/gnash/DeleteObjectSample_as.h
-include/gnash/Dictionary_as.h
 include/gnash/DisplacementMapFilterMode_as.h
 include/gnash/DisplacementMapFilter_as.h
-include/gnash/DisplayList.h
-include/gnash/DisplayObject.h
-include/gnash/DisplayObjectContainer.h
-include/gnash/DisplayObjectContainer_as.h
-include/gnash/DisplayObject_as.h
 include/gnash/DropShadowFilter_as.h
-include/gnash/DynamicShape.h
-include/gnash/EOFError_as.h
-include/gnash/Endian_as.h
-include/gnash/ErrorEvent_as.h
-include/gnash/EventDispatcher_as.h
-include/gnash/EventPhase_as.h
-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
-include/gnash/Font_as.h
-include/gnash/FrameLabel_as.h
-include/gnash/FullScreenEvent_as.h
 include/gnash/GC.h
-include/gnash/Geometry.h
 include/gnash/GlowFilter_as.h
+include/gnash/GnashAlgorithm.h
 include/gnash/GnashException.h
+include/gnash/GnashFactory.h
+include/gnash/GnashFileUtilities.h
 include/gnash/GnashImage.h
 include/gnash/GnashImageJpeg.h
-include/gnash/GnashKey.h
+include/gnash/GnashNumeric.h
+include/gnash/GnashSleep.h
+include/gnash/GnashSystemFDHeaders.h
+include/gnash/GnashSystemIOHeaders.h
+include/gnash/GnashSystemNetHeaders.h
 include/gnash/GradientBevelFilter_as.h
 include/gnash/GradientGlowFilter_as.h
-include/gnash/GradientType_as.h
-include/gnash/Graphics_as.h
-include/gnash/GridFitType_as.h
-include/gnash/HTTPStatusEvent_as.h
-include/gnash/IBitmapDrawable_as.h
-include/gnash/ID3Info_as.h
-include/gnash/IDataInput_as.h
-include/gnash/IDataOutput_as.h
-include/gnash/IDynamicPropertyOutput_as.h
-include/gnash/IDynamicPropertyWriter_as.h
-include/gnash/IEventDispatcher_as.h
-include/gnash/IExternalizable_as.h
-include/gnash/IMEConversionMode_as.h
-include/gnash/IMEEvent_as.h
-include/gnash/IME_as.h
-include/gnash/IOErrorEvent_as.h
-include/gnash/IOError_as.h
-include/gnash/IllegalOperationError_as.h
-include/gnash/InteractiveObject.h
-include/gnash/InteractiveObject_as.h
-include/gnash/InterpolationMethod_as.h
-include/gnash/InvalidSWFError_as.h
-include/gnash/JointStyle_as.h
-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
-include/gnash/LocalConnection_as.h
-include/gnash/Machine.h
+include/gnash/IOChannel.h
 include/gnash/Matrix_as.h
-include/gnash/MemoryError_as.h
-include/gnash/Microphone_as.h
-include/gnash/MorphShape_as.h
-include/gnash/MouseButtonState.h
-include/gnash/MouseEvent_as.h
-include/gnash/Mouse_as.h
-include/gnash/Movie.h
-include/gnash/MovieClip.h
-include/gnash/MovieClip_as.h
-include/gnash/MovieFactory.h
 include/gnash/NamingPolicy.h
-include/gnash/NativeFunction.h
-include/gnash/NetConnection_as.h
-include/gnash/NetStatusEvent_as.h
-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
-include/gnash/PrintJobOptions_as.h
-include/gnash/PrintJobOrientation_as.h
-include/gnash/PrintJob_as.h
-include/gnash/ProgressEvent_as.h
-include/gnash/PropFlags.h
-include/gnash/Property.h
-include/gnash/PropertyList.h
-include/gnash/Proxy_as.h
-include/gnash/RGBA.h
+include/gnash/RTMP.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
-include/gnash/Scene_as.h
-include/gnash/ScriptTimeoutError_as.h
-include/gnash/SecurityDomain_as.h
-include/gnash/SecurityErrorEvent_as.h
-include/gnash/SecurityPanel_as.h
-include/gnash/Security_as.h
-include/gnash/ShapeRecord.h
-include/gnash/Shape_as.h
-include/gnash/SharedObjectFlushStatus_as.h
-include/gnash/SharedObject_as.h
-include/gnash/SimpleButton_as.h
-include/gnash/Socket_as.h
-include/gnash/SoundChannel_as.h
-include/gnash/SoundLoaderContext_as.h
-include/gnash/SoundMixer_as.h
-include/gnash/SoundTransform_as.h
-include/gnash/Sound_as.h
-include/gnash/SpreadMethod_as.h
-include/gnash/Sprite_as.h
-include/gnash/StackFrame_as.h
-include/gnash/StackOverflowError_as.h
-include/gnash/StageAlign_as.h
-include/gnash/StageDisplayState_as.h
-include/gnash/StageQuality_as.h
-include/gnash/StageScaleMode_as.h
-include/gnash/Stage_as.h
-include/gnash/StaticText_as.h
-include/gnash/StatusEvent_as.h
-include/gnash/StreamProvider.h
+include/gnash/SharedMem.h
+include/gnash/SimpleBuffer.h
+include/gnash/Socket.h
 include/gnash/StringPredicates.h
-include/gnash/StyleSheet_as.h
-include/gnash/SyncEvent_as.h
-include/gnash/System_as.h
-include/gnash/TagLoadersTable.h
-include/gnash/TextColorType_as.h
-include/gnash/TextDisplayMode_as.h
-include/gnash/TextEvent_as.h
-include/gnash/TextFieldAutoSize_as.h
-include/gnash/TextFieldType_as.h
-include/gnash/TextField_as.h
-include/gnash/TextFormatAlign_as.h
-include/gnash/TextFormat_as.h
-include/gnash/TextLineMetrics_as.h
-include/gnash/TextSnapshot_as.h
-include/gnash/TimerEvent_as.h
-include/gnash/Timer_as.h
 include/gnash/Transform_as.h
 include/gnash/URL.h
-include/gnash/URLLoaderDataFormat_as.h
-include/gnash/URLLoader_as.h
-include/gnash/URLRequestHeader_as.h
-include/gnash/URLRequestMethod_as.h
-include/gnash/URLRequest_as.h
-include/gnash/URLStream_as.h
-include/gnash/URLVariables_as.h
-include/gnash/VM.h
-include/gnash/Video.h
-include/gnash/Video_as.h
-include/gnash/XMLDocument_as.h
-include/gnash/XMLNode_as.h
-include/gnash/XMLSocket_as.h
-include/gnash/as_environment.h
-include/gnash/as_function.h
-include/gnash/as_object.h
-include/gnash/as_value.h
-include/gnash/builtin_function.h
-include/gnash/cxform.h
+include/gnash/WallClockTimer.h
+include/gnash/arg_parser.h
+include/gnash/asobj/AMFConverter.h
+include/gnash/asobj/Accessibility_as.h
+include/gnash/asobj/Array_as.h
+include/gnash/asobj/AsBroadcaster.h
+include/gnash/asobj/Boolean_as.h
+include/gnash/asobj/Camera_as.h
+include/gnash/asobj/CharacterProxy.h
+include/gnash/asobj/Color_as.h
+include/gnash/asobj/ContextMenuItem_as.h
+include/gnash/asobj/ContextMenu_as.h
+include/gnash/asobj/ControlTag.h
+include/gnash/asobj/CustomActions.h
+include/gnash/asobj/Date_as.h
+include/gnash/asobj/DefinitionTag.h
+include/gnash/asobj/DisplayList.h
+include/gnash/asobj/DisplayObject.h
+include/gnash/asobj/DisplayObjectContainer.h
+include/gnash/asobj/DynamicShape.h
+include/gnash/asobj/Error_as.h
+include/gnash/asobj/FillStyle.h
+include/gnash/asobj/Geometry.h
+include/gnash/asobj/Global_as.h
+include/gnash/asobj/Globals.h
+include/gnash/asobj/GnashKey.h
+include/gnash/asobj/InteractiveObject.h
+include/gnash/asobj/Key_as.h
+include/gnash/asobj/LineStyle.h
+include/gnash/asobj/LoadVars_as.h
+include/gnash/asobj/LoadableObject.h
+include/gnash/asobj/LocalConnection_as.h
+include/gnash/asobj/Math_as.h
+include/gnash/asobj/Microphone_as.h
+include/gnash/asobj/MouseButtonState.h
+include/gnash/asobj/Mouse_as.h
+include/gnash/asobj/Movie.h
+include/gnash/asobj/MovieClip.h
+include/gnash/asobj/MovieClipLoader.h
+include/gnash/asobj/MovieClip_as.h
+include/gnash/asobj/MovieFactory.h
+include/gnash/asobj/NativeFunction.h
+include/gnash/asobj/NetConnection_as.h
+include/gnash/asobj/NetStream_as.h
+include/gnash/asobj/Number_as.h
+include/gnash/asobj/Object.h
+include/gnash/asobj/ObjectURI.h
+include/gnash/asobj/PlayHead.h
+include/gnash/asobj/PropFlags.h
+include/gnash/asobj/Property.h
+include/gnash/asobj/PropertyList.h
+include/gnash/asobj/RGBA.h
+include/gnash/asobj/Relay.h
+include/gnash/asobj/RunResources.h
+include/gnash/asobj/SWF.h
+include/gnash/asobj/SWFMatrix.h
+include/gnash/asobj/SWFRect.h
+include/gnash/asobj/Selection_as.h
+include/gnash/asobj/ShapeRecord.h
+include/gnash/asobj/SharedObject_as.h
+include/gnash/asobj/Sound_as.h
+include/gnash/asobj/Stage_as.h
+include/gnash/asobj/StreamProvider.h
+include/gnash/asobj/String_as.h
+include/gnash/asobj/System_as.h
+include/gnash/asobj/TagLoadersTable.h
+include/gnash/asobj/TextField_as.h
+include/gnash/asobj/TextFormat_as.h
+include/gnash/asobj/TextSnapshot_as.h
+include/gnash/asobj/UserFunction.h
+include/gnash/asobj/Video.h
+include/gnash/asobj/XMLNode_as.h
+include/gnash/asobj/XMLSocket_as.h
+include/gnash/asobj/XML_as.h
+include/gnash/asobj/as_environment.h
+include/gnash/asobj/as_function.h
+include/gnash/asobj/as_object.h
+include/gnash/asobj/as_value.h
+include/gnash/asobj/builtin_function.h
+include/gnash/asobj/cxform.h
+include/gnash/asobj/drag_state.h
+include/gnash/asobj/event_id.h
+include/gnash/asobj/gnash.h
+include/gnash/asobj/movie_root.h
+include/gnash/asobj/namedStrings.h
 include/gnash/display_pkg.h
-include/gnash/drag_state.h
 include/gnash/dsodefs.h
-include/gnash/event_id.h
+include/gnash/extension.h
 include/gnash/external_pkg.h
-include/gnash/fill_style.h
 include/gnash/filters_pkg.h
-include/gnash/fn_call.h
 include/gnash/geom_pkg.h
+include/gnash/getclocktime.hpp
 include/gnash/gettext.h
-include/gnash/gnash.h
+include/gnash/gmemory.h
+include/gnash/jemtree.h
 include/gnash/log.h
-include/gnash/movie_definition.h
-include/gnash/movie_root.h
-include/gnash/namedStrings.h
 include/gnash/net_pkg.h
+include/gnash/noseek_fd_adapter.h
+include/gnash/ogl.h
+include/gnash/parser/movie_definition.h
 include/gnash/rc.h
 include/gnash/ref_counted.h
+include/gnash/sharedlib.h
 include/gnash/smart_ptr.h
 include/gnash/snappingrange.h
 include/gnash/string_table.h
 include/gnash/text_pkg.h
+include/gnash/tree.hh
+include/gnash/tu_file.h
+include/gnash/tu_opengl_includes.h
+include/gnash/utf8.h
 include/gnash/utility.h
+include/gnash/vm/ASHandlers.h
+include/gnash/vm/ActionExec.h
+include/gnash/vm/CallStack.h
+include/gnash/vm/ExecutableCode.h
+include/gnash/vm/Machine.h
+include/gnash/vm/SafeStack.h
+include/gnash/vm/VM.h
+include/gnash/vm/fn_call.h
+include/gnash/zlib_adapter.h
 %%KPARTS%%lib/kde3/libklashpart.so
 %%KPARTS%%lib/kde3/libklashpart.la
 %%KPARTS4%%kde4/share/apps/klash/pluginsinfo
@@ -273,12 +203,9 @@ etc/gnashrc.dist
 @exec if [ ! -f %B/gnashrc ]; then cp -p %D/%F %B/gnashrc; fi
 %%CYGNAL%%lib/cygnal/plugins/echo.so
 %%CYGNAL%%lib/cygnal/plugins/oflaDemo.so
-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
+%%CYGNAL%%lib/gnash/libgnashamf-%%GNASHVER%%.so
+%%CYGNAL%%lib/gnash/libgnashamf.la
+%%CYGNAL%%lib/gnash/libgnashamf.so
 lib/gnash/libgnashbase-%%GNASHVER%%.so
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashbase.so
@@ -288,15 +215,18 @@ lib/gnash/libgnashcore.so
 lib/gnash/libgnashmedia-%%GNASHVER%%.so
 lib/gnash/libgnashmedia.la
 lib/gnash/libgnashmedia.so
-lib/gnash/libgnashnet.la
-lib/gnash/libgnashnet.so
-lib/gnash/libgnashnet.so.0
+%%CYGNAL%%lib/gnash/libgnashnet.la
+%%CYGNAL%%lib/gnash/libgnashnet.so
+%%CYGNAL%%lib/gnash/libgnashnet.so.0
+lib/gnash/libgnashrender.la
+lib/gnash/libgnashrender.so
+lib/gnash/libgnashrender.so.0
 lib/gnash/libgnashsound-%%GNASHVER%%.so
 lib/gnash/libgnashsound.la
 lib/gnash/libgnashsound.so
-%%NPAPI%%lib/gnash/libmozsdk.la
-%%NPAPI%%lib/gnash/libmozsdk.so
-%%NPAPI%%lib/gnash/libmozsdk.so.0
+@comment %%NPAPI%%lib/gnash/libmozsdk.la
+@comment %%NPAPI%%lib/gnash/libmozsdk.so
+@comment %%NPAPI%%lib/gnash/libmozsdk.so.0
 libdata/pkgconfig/gnash.pc
 %%DOCSDIR%%/gnashuser.html
 %%DOCSDIR%%/images/car_crash.png
@@ -317,6 +247,9 @@ share/locale/ja/LC_MESSAGES/gnash.mo
 @dirrm lib/gnash
 %%CYGNAL%%@dirrm lib/cygnal/plugins
 %%CYGNAL%%@dirrm lib/cygnal
+@dirrm include/gnash/vm
+@dirrm include/gnash/parser
+@dirrm include/gnash/asobj
 @dirrm include/gnash
 @comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
 %%KPARTS%%@dirrm share/apps/klash