- Update to 20091129

3 files changed, 362 insertions, 79 deletions

diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile
index be91b90533a2..ce02cfcd80c0 100644
--- a/graphics/gnash-devel/Makefile
+++ b/graphics/gnash-devel/Makefile
@@ -6,15 +6,11 @@
 #
 
 PORTNAME=	gnash
-PORTVERSION=	20081208
-PORTREVISION=	4
+PORTVERSION=	20091129
 CATEGORIES=	graphics
-# gnashdev.org is slower
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
-		http://www.gnashdev.org/dev_snapshots/
+MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
 PKGNAMESUFFIX=	-devel
 DISTNAME=	${PORTNAME}-trunk-${REVISION}
-EXTRACT_SUFX=	.tar.tgz
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GNU Flash movie player
@@ -26,10 +22,9 @@ LIB_DEPENDS=	boost_thread.4:${PORTSDIR}/devel/boost-libs \
 
 CONFLICTS=	gnash-[0-9]*
 
-IGNORE=		please use graphics/gnash instead, it is currently newer
-
-REVISION=	10395
+REVISION=	11659
 
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
@@ -38,31 +33,31 @@ 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_AUTOTOOLS=	libltdl:22 libtool:22:env
+USE_AUTOTOOLS=	libltdl:22 libtool:22:env autoconf:262:env automake:110:env
 MAKE_JOBS_SAFE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-boost-incl="${LOCALBASE}/include" \
 		--with-boost-lib="${LOCALBASE}/lib" \
-		--with-npapi-plugindir="${WEBPLUGINS_DIR}" \
-		--with-kde-pluginprefix="${PREFIX}"
+		--disable-testsuite \
+		--with-plugins-install=system \
+		--sysconfdir="${WRKDIR}/etc" \
+		--disable-jemalloc # leads to infinite recursion on FreeBSD
 
 GNASHVER=	trunk
+CONFIG_FILES=	gnashpluginrc gnashrc
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GNASHVER}
 PLIST_SUB+=	GNASHVER="${GNASHVER}"
 
 USE_LDCONFIG=	${PREFIX}/lib/gnash
 
-MAN1=		cygnal.1 dumpshm.1 flvdumper.1 gnash.1 gprocessor.1 soldumper.1
+MAN1=		cygnal.1 dumpshm.1 flvdumper.1 gnash.1 gprocessor.1 soldumper.1 rtmpget.1
 
 OPTIONS=	PLUGIN		"Enable browser plugin" on \
 		CYGNAL		"Enable Cygnal media server" off \
 		GTK		"GUI: GTK (required for Mozilla/Firefox plugin)" on \
-		KDE		"GUI: KDE (required for Konqueror plugin)" off \
+		KDE		"GUI: KDE 3.x (required for Konqueror 3.x plugin)" off \
+		KDE4		"GUI: KDE 4.x (required for Konqueror 4.x plugin)" off \
 		AGG		"Renderer: AGG" on \
 		OPENGL		"Renderer: OpenGL (broken)" off \
 		CAIRO		"Renderer: Cairo (experimental)" off \
@@ -70,31 +65,13 @@ OPTIONS=	PLUGIN		"Enable browser plugin" on \
 		GSTREAMER	"Media handler: GStreamer" off \
 		SPEEX		"Speex codec support" on
 
-.include <bsd.port.pre.mk>
-
-# Plugin option processing
-.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
-USE_WEBPLUGINS=		native
-WEBPLUGINS_FILES=	libgnashplugin.so
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-PLIST_SUB+=	FFPLUGIN=""
-.else
-PLIST_SUB+=	FFPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-nsapi
-.endif
-
-.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
-PLIST_SUB+=	KONQPLUGIN=""
-USE_LDCONFIG+=	${PREFIX}/lib/kde3
-.else
-PLIST_SUB+=	KONQPLUGIN="@comment "
-CONFIGURE_ARGS+=	--disable-kparts
-.endif
+.include <bsd.port.options.mk>
 
 # Cygnal option processing
 .if defined(WITH_CYGNAL)
 PLIST_SUB+=	CYGNAL=""
 CONFIGURE_ARGS+=	--enable-cygnal
+CONFIG_FILES+=	cygnalrc
 .else
 PLIST_SUB+=	CYGNAL="@comment "
 CONFIGURE_ARGS+=	--disable-cygnal
@@ -110,6 +87,36 @@ PLIST_SUB+=	NLS="@comment "
 .endif
 
 #
+# Plugin configuration
+#
+.if !defined(WITHOUT_GTK) && !defined(WITHOUT_PLUGIN)
+USE_WEBPLUGINS=		native
+WEBPLUGINS_FILES=	libgnashplugin.so
+.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
+PLIST_SUB+=	NPAPI=""
+CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}"
+.else
+PLIST_SUB+=	NPAPI="@comment "
+CONFIGURE_ARGS+=	--disable-npapi
+.endif
+
+.if defined(WITH_KDE) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+=	KPARTS=""
+USE_LDCONFIG+=	${PREFIX}/lib/kde3
+.else
+PLIST_SUB+=	KPARTS="@comment "
+CONFIGURE_ARGS+=	--disable-kparts3
+.endif
+
+.if defined(WITH_KDE4) && !defined(WITHOUT_PLUGIN)
+PLIST_SUB+=	KPARTS4=""
+USE_LDCONFIG+=	${KDE4_PREFIX}/lib/kde4
+.else
+PLIST_SUB+=	KPARTS4="@comment "
+CONFIGURE_ARGS+=	--disable-kparts4
+.endif
+
+#
 # GUI options processing
 #
 GNASH_GUIS=
@@ -123,19 +130,33 @@ PLIST_SUB+=	GTK="@comment "
 .endif
 
 .if defined(WITH_KDE)
-GNASH_GUIS+=	kde
+GNASH_GUIS+=	kde3
 PLIST_SUB+=	KDE=""
-# We have to use this lame way to depend on kdelibs, as USE_KDELIBS_VER won't
-# work after bsd.port.pre.mk, and bsd.port.options.mk is unavailable until
-# 5.5/6.2 EOL. We could also include bsd.kde.mk here, but that's much more
-# likely to bring more trouble
-LIB_DEPENDS+=	kimproxy:${PORTSDIR}/x11/kdelibs3
+USE_KDELIBS_VER=3
 .else
 PLIST_SUB+=	KDE="@comment "
 .endif
 
+.if defined(WITH_KDE4)
+GNASH_GUIS+=	kde4
+PLIST_SUB+=	KDE4=""
+USE_QT_VER=	4
+QT_COMPONENTS=	moc_build
+USE_KDE4=	kdehier kdelibs
+CONFIGURE_ENV+=	KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config"
+.	if exists(${LOCALBASE}/lib/libkdeui.so)
+IGNORE=		KDE4 GUI can't be built when KDE3 is installed. Please rerun 'make config' and disable KDE4 GUI or deinstall kdelibs-3
+.	endif
+.else
+PLIST_SUB+=	KDE4="@comment "
+.endif
+
+.if defined(WITH_KDE) && defined defined(WITH_KDE4)
+IGNORE=		KDE and KDE4 GUIs are mutually exclusive. Please rerun 'make config' and disable one of these
+.endif
+
 .if ${GNASH_GUIS} == ""
-IGNORE=		needs at least one GUI enabled. Please rerun 'make config' and enable GTK, KDE or both GUIs
+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} ' ' ,`
@@ -147,14 +168,17 @@ CONFIGURE_ARGS+=	--enable-gui=`${ECHO} ${GNASH_GUIS} | ${TR} ' ' ,`
 LIB_DEPENDS+=		agg.2:${PORTSDIR}/graphics/agg
 CONFIGURE_ARGS+=	--enable-renderer=agg
 .elif !defined(WITH_AGG) && defined(WITH_OPENGL) && !defined(WITH_CAIRO)
+.	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
 USE_GL=			yes
 .	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)
-.	if defined(WITH_KDE)
-IGNORE=			doesn't support Cairo renderer with KDE gui. Please rerun 'make config' and select different renderer or disable KDE GUI
+.	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
@@ -167,8 +191,7 @@ IGNORE=			can't be built with multiple or without renderers enabled. Please reru
 #
 .if defined(WITH_FFMPEG) && !defined(WITH_GSTREAMER)
 LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-CONFIGURE_ARGS+=	--enable-media=ffmpeg \
-			--with-ffmpeg-incl=${LOCALBASE}/include/ffmpeg
+CONFIGURE_ARGS+=	--enable-media=ffmpeg
 USE_SDL+=		sdl
 .elif !defined(WITH_FFMPEG) && defined(WITH_GSTREAMER)
 USE_GSTREAMER=		yes
@@ -180,6 +203,12 @@ CONFIGURE_ARGS+=	--enable-media=none
 IGNORE=			can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer)
 .endif
 
+.if defined(WITH_GSTREAMER)
+PLIST_SUB+=		GSTREAMER=""
+.else
+PLIST_SUB+=		GSTREAMER="@comment "
+.endif
+
 #
 # Other options
 #
@@ -190,34 +219,42 @@ CONFIGURE_ARGS+=	--enable-speex
 CONFIGURE_ARGS+=	--disable-speex
 .endif
 
+.include <bsd.port.pre.mk>
+
 pre-everything::
 .if defined(WITH_OPENGL)
 	@${ECHO_CMD} "OpenGL support is currently broken (Gnash hangs using 100% CPU). Use at your own risk"
 	@sleep 3
 .endif
 
-post-patch:
+pre-configure:
+	@cd ${WRKSRC} && ${SH} autogen.sh
 	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
-		s|/lib64|/lib|g; s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/configure ${WRKSRC}/macros/libslist \
-		${WRKSRC}/macros/incllist
-	@${REINPLACE_CMD} -e '/sysconfDATA_INSTALL/ s|/$$$$f|&.dist|' \
-		${WRKSRC}/libbase/Makefile.in
+		s|/lib64|/lib|g; \
+		s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \
+		${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist
+	@${REINPLACE_CMD} -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \
+		${WRKSRC}/Makefile.in
+
+pre-build:
+	cat ${WRKSRC}/libbase/Makefile
 
 post-install:
-	if [ ! -f ${PREFIX}/etc/gnashrc ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/gnashrc.dist \
-			${PREFIX}/etc/gnashrc; \
-	fi
-	if [ ! -f ${PREFIX}/etc/gnashpluginrc ]; then \
-		${INSTALL_DATA} ${PREFIX}/etc/gnashpluginrc.dist \
-			${PREFIX}/etc/gnashpluginrc; \
+.for conf in ${CONFIG_FILES}
+	@${INSTALL_DATA} ${WRKDIR}/etc/${conf} ${PREFIX}/etc/${conf}.dist
+	if [ ! -f ${PREFIX}/etc/${conf} ]; then \
+		${INSTALL_DATA} ${PREFIX}/etc/${conf}.dist \
+			${PREFIX}/etc/${conf}; \
 	fi
+.endfor
 
 .if !defined(WITHOUT_PLUGIN)
 .if !defined(WITHOUT_GTK)
+	${MKDIR} ${WEBPLUGINS_DIR}
 	@cd ${INSTALL_WRKSRC}/plugin && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
 .endif
@@ -225,6 +262,10 @@ post-install:
 	@cd ${INSTALL_WRKSRC}/plugin/klash && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
 .endif
+.if defined(WITH_KDE4)
+	@cd ${INSTALL_WRKSRC}/plugin/klash4 && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin
+.endif
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/gnash-devel/distinfo b/graphics/gnash-devel/distinfo
index 98241ea85c89..1b8c1bcf6b67 100644
--- a/graphics/gnash-devel/distinfo
+++ b/graphics/gnash-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnash-trunk-10395.tar.tgz) = ee500762aaf809b53c08a3cbcfb3c0e7
-SHA256 (gnash-trunk-10395.tar.tgz) = 6b230424956beb86802e009cf6e9be28afea0116ccf1060df0380240da59f7bc
-SIZE (gnash-trunk-10395.tar.tgz) = 4167955
+MD5 (gnash-trunk-11659.tar.bz2) = 26741e1cb0f9b04c497dbea3f40efa18
+SHA256 (gnash-trunk-11659.tar.bz2) = a3dc842319883ebd0038bfd27df12c267bdec702bcdeae468c75c34b1d1d05d9
+SIZE (gnash-trunk-11659.tar.bz2) = 4376944
diff --git a/graphics/gnash-devel/pkg-plist b/graphics/gnash-devel/pkg-plist
index 4178ce302650..969ac336c012 100644
--- a/graphics/gnash-devel/pkg-plist
+++ b/graphics/gnash-devel/pkg-plist
@@ -1,29 +1,266 @@
 bin/dumpshm
+%%GSTREAMER%%bin/findmicrophones
+%%GSTREAMER%%bin/findwebcams
 bin/flvdumper
 bin/gnash
 bin/gprocessor
 bin/soldumper
 %%GTK%%bin/gtk-gnash
-%%KDE%%bin/kde-gnash
+%%KDE%%bin/kde3-gnash
+%%KDE4%%bin/kde4-gnash
 %%CYGNAL%%bin/cygnal
-%%FFPLUGIN%%%%WEBPLUGINS_DIR%%/libgnashplugin.so
-%%KONQPLUGIN%%share/apps/klash/pluginsinfo
-%%KONQPLUGIN%%share/apps/klash/klashpartui.rc
-%%KONQPLUGIN%%share/services/klash_part.desktop
-%%KONQPLUGIN%%lib/kde3/libklashpart.so
-%%KONQPLUGIN%%lib/kde3/libklashpart.la
+%%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/BevelFilter_as.h
+include/gnash/BitmapDataChannel_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/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/Class.h
+include/gnash/ClipboardFormats_as.h
+include/gnash/ClipboardTransferMode_as.h
+include/gnash/Clipboard_as.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/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/Geometry.h
+include/gnash/GlowFilter_as.h
+include/gnash/GnashKey.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/LoaderContext_as.h
+include/gnash/LoaderInfo_as.h
+include/gnash/Loader_as.h
+include/gnash/LocalConnection_as.h
+include/gnash/Machine.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/Namespace.h
+include/gnash/NativeFunction.h
+include/gnash/NetConnection_as.h
+include/gnash/NetStatusEvent_as.h
+include/gnash/NetStream_as.h
+include/gnash/NewObjectSample_as.h
+include/gnash/ObjectEncoding_as.h
+include/gnash/PixelSnapping_as.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/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/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/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/display_pkg.h
+include/gnash/drag_state.h
+include/gnash/event_id.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/gnash.h
+include/gnash/movie_definition.h
+include/gnash/movie_root.h
+include/gnash/namedStrings.h
+include/gnash/net_pkg.h
+include/gnash/styles.h
+include/gnash/text_pkg.h
+%%KPARTS%%lib/kde3/libklashpart.so
+%%KPARTS%%lib/kde3/libklashpart.la
+%%KPARTS4%%kde4/share/apps/klash/pluginsinfo
+%%KPARTS4%%kde4/share/apps/klash/klashpartui.rc
+%%KPARTS4%%kde4/share/kde4/services/klash_part.desktop
+%%KPARTS4%%kde4/lib/kde4/libklashpart.so
+%%KPARTS4%%kde4/lib/kde4/libklashpart.la
+%%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi
+%%CYGNAL%%etc/cygnalrc.dist
+%%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi
 @unexec if cmp -s %D/etc/gnashpluginrc.dist %D/etc/gnashpluginrc; then rm -f %D/etc/gnashpluginrc; fi
 etc/gnashpluginrc.dist
 @exec if [ ! -f %B/gnashpluginrc ]; then cp -p %D/%F %B/gnashpluginrc; fi
 @unexec if cmp -s %D/etc/gnashrc.dist %D/etc/gnashrc; then rm -f %D/etc/gnashrc; fi
 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
-lib/gnash/libgnashbase-%%GNASHVER%%.so
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashbase.so
+lib/gnash/libgnashbase.so.0
 lib/gnash/libgnashcore-%%GNASHVER%%.so
 lib/gnash/libgnashcore.la
 lib/gnash/libgnashcore.so
@@ -36,9 +273,10 @@ lib/gnash/libgnashnet.so.0
 lib/gnash/libgnashsound-%%GNASHVER%%.so
 lib/gnash/libgnashsound.la
 lib/gnash/libgnashsound.so
-%%GTK%%lib/gnash/libmozsdk.la
-%%GTK%%lib/gnash/libmozsdk.so
-%%GTK%%lib/gnash/libmozsdk.so.0
+%%NPAPI%%lib/gnash/libmozsdk.la
+%%NPAPI%%lib/gnash/libmozsdk.so
+%%NPAPI%%lib/gnash/libmozsdk.so.0
+libdata/pkgconfig/gnash.pc
 %%DOCSDIR%%/gnashuser.html
 %%DOCSDIR%%/images/car_crash.png
 %%DOCSDIR%%/images/rtmp.png
@@ -52,10 +290,14 @@ share/locale/fi/LC_MESSAGES/gnash.mo
 share/locale/fr/LC_MESSAGES/gnash.mo
 share/locale/it/LC_MESSAGES/gnash.mo
 share/locale/ja/LC_MESSAGES/gnash.mo
-share/locale/sv/LC_MESSAGES/gnash.mo
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/images
 @dirrm %%DOCSDIR%%
 @dirrm lib/gnash
-%%KONQPLUGIN%%@dirrm share/apps/klash
-%%FFPLUGIN%%@dirrmtry %%WEBPLUGINS_DIR%%
+%%CYGNAL%%@dirrm lib/cygnal/plugins
+%%CYGNAL%%@dirrm lib/cygnal
+@dirrm include/gnash
+@comment Should be //KPARTS//, but it is installed regardless of whether plugin is enabled
+%%KPARTS%%@dirrm share/apps/klash
+%%KPARTS4%%@dirrm kde4/share/apps/klash
+%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%%