Update gnash to 0.8.10.

Gnash 0.8.10
2012/01/30

Improvements since 0.8.9 release are:

 * Qt4 GUI supports mouse wheel, clipboard, and screen resolution.
 * Enhanced UI support for script limits (abort popups, user prefs).
 * BitmapData functions copyPixels(), copyChannel(), perlinNoise() and noise()
   implemented.
 * Node id mapping in ActionScript XML class implemented (XML.idMap).
 * Fix dispatching of Sound.onLoad event, fixing google dict audio.
 * Fix support for control tags found after last expected frame (#33176).
 * Fix support for uncompressed sound with gstreamer media handler.
 * Implement Button.getDepth(), fix button key events.
 * Fixes to startDrag and stopDrag opcodes.
 * Implement onSoundComplete() for event sounds (#23020).
 * Fix MovieClip.onLoad event dispatching and constant pools handling, fixing
   support for movies generated by the evil Adobe Captivate tool (#33521).
 * Fix unattached Sound.stop() semantic (#33888) enjoy Super Mario!
 * OpenVG renderer added.
 * Improved framebuffer GUI and touchscreen support.
 * Framebuffer now supports using multiple renderers.
 * Refactored input device support.
 * Fix parsing of lossless 16bit bitmaps, fixing support for movies
   generated by the evil TechSmit Camtasia tool (#34625).
 * Improved double buffering support for AGG in a framebuffer.
 * Thumbnailer for SWF files and GNOME2 desktop config for it.

12 files changed, 96 insertions, 87 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index 20dc79655df..66428792d1e 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2012/02/06 12:41:02 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2012/02/16 10:44:53 obache Exp $
 #
 
-DISTNAME=		gnash-${VER}
-VER=			0.8.9
-PKGREVISION=		9
+DISTNAME=		gnash-0.8.10
 CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${VER}/}
+MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -26,6 +24,7 @@ INSTALL_TARGET=		install install-plugin
 CONFIG_SHELL=		${TOOLS_BASH}
 CONFIGURE_ARGS+=	--with-boost-incl=${BUILDLINK_PREFIX.boost-headers}/include
 CONFIGURE_ARGS+=	--with-boost-lib=${BUILDLINK_PREFIX.boost-libs}/lib
+CONFIGURE_ARGS+=	--without-gconf
 
 EGDIR=			${PREFIX}/share/examples/gnash
 INSTALLATION_DIRS=	${EGDIR}
diff --git a/multimedia/gnash/PLIST b/multimedia/gnash/PLIST
index cb5519a6aed..c425bf54c44 100644
--- a/multimedia/gnash/PLIST
+++ b/multimedia/gnash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/04/12 13:15:01 obache Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/02/16 10:44:53 obache Exp $
 ${PLIST.gstreamer}bin/findmicrophones
 ${PLIST.gstreamer}bin/findwebcams
 bin/gnash
@@ -49,7 +49,6 @@ include/gnash/Point_as.h
 include/gnash/RTMP.h
 include/gnash/Range2d.h
 include/gnash/Rectangle_as.h
-include/gnash/Renderer.h
 include/gnash/SWFCtype.h
 include/gnash/SharedMem.h
 include/gnash/SimpleBuffer.h
@@ -133,6 +132,7 @@ 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/Video_as.h
 include/gnash/asobj/XMLNode_as.h
 include/gnash/asobj/XMLSocket_as.h
 include/gnash/asobj/XML_as.h
@@ -153,7 +153,10 @@ include/gnash/geom_pkg.h
 include/gnash/getclocktime.hpp
 include/gnash/gettext.h
 include/gnash/gmemory.h
-include/gnash/jemtree.h
+include/gnash/jemalloc.h
+include/gnash/jemalloc_gnash.h
+include/gnash/jemalloc_rb.h
+include/gnash/jemalloc_types.h
 include/gnash/log.h
 include/gnash/net_pkg.h
 include/gnash/noseek_fd_adapter.h
@@ -161,7 +164,6 @@ 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
@@ -179,6 +181,7 @@ include/gnash/vm/fn_call.h
 include/gnash/zlib_adapter.h
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashcore.la
+lib/gnash/libgnashdevice.la
 lib/gnash/libgnashmedia.la
 lib/gnash/libgnashrender.la
 lib/gnash/libgnashsound.la
@@ -200,12 +203,12 @@ man/man1/rtmpget.1
 man/man1/soldumper.1
 ${PLIST.gtk}share/applications/gnash.desktop
 ${PLIST.kde4}share/applications/klash.desktop
+share/doc/gnash/gnashref.html
+share/doc/gnash/gnashuser.html
+share/doc/gnash/images/rtmp.png
 share/examples/gnash/gnashpluginrc
 share/examples/gnash/gnashrc
 share/gnash/GnashG.png
-share/gnash/doc/gnash/C/gnashref.html
-share/gnash/doc/gnash/C/gnashuser.html
-share/gnash/doc/gnash/C/images/rtmp.png
 share/gnash/gnash-splash.swf
 share/gnash/gnash_128_96.ico
 ${PLIST.kde}share/kde/apps/klash/klashpartui.rc
@@ -215,9 +218,16 @@ ${PLIST.kde4}share/kde4/services/klash_part.desktop
 ${PLIST.gtk}share/icons/hicolor/32x32/apps/gnash.xpm
 ${PLIST.kde4}share/icons/hicolor/32x32/apps/klash.xpm
 share/locale/cs/LC_MESSAGES/gnash.mo
+share/locale/da/LC_MESSAGES/gnash.mo
 share/locale/de/LC_MESSAGES/gnash.mo
+share/locale/el/LC_MESSAGES/gnash.mo
+share/locale/en_GB/LC_MESSAGES/gnash.mo
 share/locale/es/LC_MESSAGES/gnash.mo
 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/km/LC_MESSAGES/gnash.mo
+share/locale/ne/LC_MESSAGES/gnash.mo
+share/locale/ru/LC_MESSAGES/gnash.mo
+share/locale/zh_TW/LC_MESSAGES/gnash.mo
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 6aed03fa6bc..6aff1ea7276 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.16 2011/04/12 13:15:01 obache Exp $
+$NetBSD: distinfo,v 1.17 2012/02/16 10:44:53 obache Exp $
 
-SHA1 (gnash-0.8.9.tar.bz2) = 585c320c98b3304fcbba230f2c4b1fdf2a52aee0
-RMD160 (gnash-0.8.9.tar.bz2) = 34bb51cfe5b8593dc14bc2c21c0085277dbb23f1
-Size (gnash-0.8.9.tar.bz2) = 3777140 bytes
-SHA1 (patch-aa) = 5d2e5ac763bfa6480f246743c5eee88c6a2a0d21
-SHA1 (patch-ae) = 67c5093f417b0faa78e6fac2e5a16cb5aea8588e
-SHA1 (patch-libbase_Makefile.in) = 14101fcd56d0913901be82b9653a157ca85da441
-SHA1 (patch-libcore_Makefile.in) = afbcf74085ea4276735cd117a18263ff716f3014
-SHA1 (patch-libmedia_Makefile.in) = c59307744f0d85f239607ddb8a465bda9172ffd0
-SHA1 (patch-librender_Makefile.in) = 60101200612d3cd2d803652705b6e015d1a72ec1
-SHA1 (patch-libsound_Makefile.in) = 399b6f053c8415dd85e9cb825324871366065bfa
-SHA1 (patch-plugin_klash4_Makefile.in) = 086b08bd6ba5ddfa09297e6636e9f00acb6cd990
+SHA1 (gnash-0.8.10.tar.bz2) = be3b12a5edcd3b05f2ae73d02f0991aa786e7300
+RMD160 (gnash-0.8.10.tar.bz2) = 0093174ec0a912309772c033b5f1c1ad46ab41dc
+Size (gnash-0.8.10.tar.bz2) = 4238106 bytes
+SHA1 (patch-aa) = 2698c2841523938772ba9e24a798c3cbc3395380
+SHA1 (patch-ae) = ca44e2559a1ce0a24baf6d5479636f967e011202
+SHA1 (patch-libbase_Makefile.in) = c5b6533f5ac2b2ee26d0547c3054375e72512ccf
+SHA1 (patch-libcore_Makefile.in) = 6b92917f0be3779b7f6e1993ac29960cef50c736
+SHA1 (patch-libmedia_Makefile.in) = 10fde4560a20dcb28599d8c51a4fc7af93109474
+SHA1 (patch-librender_Makefile.in) = 25e38d82e3ecc156ff1f2b855a05437da015f3ce
+SHA1 (patch-libsound_Makefile.in) = 26c7390196b7e0bb301427b27cf87a1ae52f0b87
+SHA1 (patch-plugin_klash4_Makefile.in) = 86c669eb0ed2478a6f4d328266af2188395f0f10
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index 132e85eac71..45609500268 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.16 2011/12/08 10:39:13 obache Exp $
+# $NetBSD: options.mk,v 1.17 2012/02/16 10:44:53 obache Exp $
 #
 
 #
@@ -29,9 +29,9 @@ PLIST.gtk=		yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mkde)
-BUILDLINK_DEPMETHOD.xulrunner192=	build
-.include "../../devel/xulrunner192/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-npapi-incl=${BUILDLINK_PREFIX.xulrunner192}/include/xulrunner192
+BUILDLINK_FNAME_TRANSFORM.npapi-sdk+=	-e 's|lib/pkgconfig/npapi-sdk.pc|lib/pkgconfig/mozilla-plugin.pc|'
+.include "../../devel/npapi-sdk/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-npapi-incl=${BUILDLINK_PREFIX.npapi-sdk}/include/npapi-sdk
 CONFIGURE_ARGS+=	--with-npapi-install=system
 CONFIGURE_ARGS+=	--with-npapi-plugindir=${PREFIX}/lib/netscape/plugins
 PLIST.plugin=		yes
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+=	--enable-media=${GNASH_MEDIA:Unone:tW:S/ /,/}
 
 .if !empty(PKG_OPTIONS:Mffmpeg)
 .include "../../multimedia/ffmpeg/buildlink3.mk"
-CONFIGURE_ARGS+=	--enable-hwaccel=VAAPI
+CONFIGURE_ARGS+=	--enable-device=VAAPI
 .else
-CONFIGURE_ARGS+=	--enable-hwaccel=none
+CONFIGURE_ARGS+=	--enable-device=x11
 .endif
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
index 3b88b84506d..ac754847c8a 100644
--- a/multimedia/gnash/patches/patch-aa
+++ b/multimedia/gnash/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-aa,v 1.13 2012/02/16 10:44:54 obache Exp $
 
---- configure.orig	2011-03-18 13:50:30.000000000 +0000
+--- configure.orig	2012-01-19 19:19:29.000000000 +0000
 +++ configure
-@@ -27796,7 +27796,7 @@ fi
-       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
-     fi
-     if test x"${KDE4_APPSDATADIR}" = x ; then
--      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
-+      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde/apps/klash"
-     fi
- 
-   if test x"${ac_cv_path_kde4_incl}" != x ; then
-@@ -27986,7 +27986,7 @@ else
+@@ -29366,7 +29366,7 @@ else
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -20,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 2011/04/12 13:15:01 obache Exp $
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
-@@ -28281,9 +28281,9 @@ fi
+@@ -29661,9 +29661,9 @@ fi
      fi
  
      KDE3_PLUGINDIR="${KDE3_PREFIX}/lib/kde3"
@@ -33,3 +24,12 @@ $NetBSD: patch-aa,v 1.12 2011/04/12 13:15:01 obache Exp $
  
    if test x"${ac_cv_path_kde3_incl}" != x ; then
      if test x"${ac_cv_path_kde3_incl}" != x"-I/usr/include"; then
+@@ -30855,7 +30855,7 @@ fi
+       KDE4_CONFIGDIR="${KDE4_PREFIX}/share/kde4/config"
+     fi
+     if test x"${KDE4_APPSDATADIR}" = x ; then
+-      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde4/apps/klash"
++      KDE4_APPSDATADIR="${KDE4_PREFIX}/share/kde/apps/klash"
+     fi
+ 
+   if test x"${ac_cv_path_kde4_incl}" != x ; then
diff --git a/multimedia/gnash/patches/patch-ae b/multimedia/gnash/patches/patch-ae
index 61635ebeabe..6678c0e78c1 100644
--- a/multimedia/gnash/patches/patch-ae
+++ b/multimedia/gnash/patches/patch-ae
@@ -1,24 +1,24 @@
-$NetBSD: patch-ae,v 1.3 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-ae,v 1.4 2012/02/16 10:44:54 obache Exp $
 
---- gui/Makefile.in.orig	2011-03-18 13:50:23.000000000 +0000
+--- gui/Makefile.in.orig	2012-01-19 19:49:49.000000000 +0000
 +++ gui/Makefile.in
-@@ -1413,8 +1413,8 @@ GUI_SRCS = gnash.cpp \
- @BUILD_QTOPIA3_GUI_TRUE@	$(GNASH_LIBS) $(AM_LDFLAGS) \
- @BUILD_QTOPIA3_GUI_TRUE@	$(am__append_13) $(am__append_16)
+@@ -1496,8 +1496,8 @@ GUI_SRCS = gnash.cpp \
+ @BUILD_QTOPIA3_GUI_TRUE@	$(AM_LDFLAGS) $(am__append_19) \
+ @BUILD_QTOPIA3_GUI_TRUE@	$(am__append_22)
  @BUILD_KDE3_GUI_TRUE@kde3_gnash_CPPFLAGS = -DGUI_KDE3 \
 -@BUILD_KDE3_GUI_TRUE@	-DGUI_CONFIG=\"KDE3\" $(AM_CPPFLAGS) \
  @BUILD_KDE3_GUI_TRUE@	$(KDE3_CFLAGS) $(QT3_CFLAGS) \
 +@BUILD_KDE3_GUI_TRUE@	-DGUI_CONFIG=\"KDE3\" $(AM_CPPFLAGS) \
- @BUILD_KDE3_GUI_TRUE@	$(am__append_20) $(am__append_23)
- @BUILD_KDE3_GUI_TRUE@kde3_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp \
- @BUILD_KDE3_GUI_TRUE@	$(am__append_22) $(am__append_25)
-@@ -1429,8 +1429,8 @@ GUI_SRCS = gnash.cpp \
- @BUILD_KDE4_GUI_TRUE@	$(am__append_30) $(am__append_33) \
- @BUILD_KDE4_GUI_TRUE@	$(am__append_36)
- @BUILD_KDE4_GUI_TRUE@kde4_gnash_CPPFLAGS = -DGUI_KDE4 \
--@BUILD_KDE4_GUI_TRUE@	-DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) \
- @BUILD_KDE4_GUI_TRUE@	$(KDE4_CFLAGS) $(QT4_CFLAGS) \
-+@BUILD_KDE4_GUI_TRUE@	-DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) \
- @BUILD_KDE4_GUI_TRUE@	$(am__append_28) $(am__append_31) \
- @BUILD_KDE4_GUI_TRUE@	$(am__append_34)
- @BUILD_KDE4_GUI_TRUE@kde4_gnash_LDFLAGS = -export-dynamic 
+ @BUILD_KDE3_GUI_TRUE@	$(am__append_26) $(am__append_29)
+ @BUILD_KDE3_GUI_TRUE@kde3_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp \
+ @BUILD_KDE3_GUI_TRUE@	qt/kde.cpp qt/kdesup.h qt/kde_glue.h \
+@@ -1512,8 +1512,8 @@ GUI_SRCS = gnash.cpp \
+ @BUILD_QT4_GUI_TRUE@	qt/Qt4Glue.h $(am__append_36) \
+ @BUILD_QT4_GUI_TRUE@	$(am__append_39) $(am__append_42)
+ @BUILD_QT4_GUI_TRUE@qt4_gnash_CPPFLAGS = -DGUI_QT4 \
+-@BUILD_QT4_GUI_TRUE@	-DGUI_CONFIG=\"QT4\" $(AM_CPPFLAGS) \
+ @BUILD_QT4_GUI_TRUE@	$(QT4_CFLAGS) $(am__append_34) \
++@BUILD_QT4_GUI_TRUE@	-DGUI_CONFIG=\"QT4\" $(AM_CPPFLAGS) \
+ @BUILD_QT4_GUI_TRUE@	$(am__append_37) $(am__append_40)
+ @BUILD_QT4_GUI_TRUE@qt4_gnash_LDFLAGS = -export-dynamic 
+ @BUILD_QT4_GUI_TRUE@qt4_gnash_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS) \
diff --git a/multimedia/gnash/patches/patch-libbase_Makefile.in b/multimedia/gnash/patches/patch-libbase_Makefile.in
index 608c445c847..afdf1cffb69 100644
--- a/multimedia/gnash/patches/patch-libbase_Makefile.in
+++ b/multimedia/gnash/patches/patch-libbase_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-libbase_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-libbase_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * let not to remove libtoo .la files, to maintain PLIST easier.
 
---- libbase/Makefile.in.orig	2011-04-10 12:30:08.000000000 +0000
+--- libbase/Makefile.in.orig	2012-01-19 19:49:50.000000000 +0000
 +++ libbase/Makefile.in
-@@ -1461,10 +1461,6 @@ mudflap:
- 	@echo "Rebuilding with GCC Mudflap support"
- 	$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
+@@ -1481,10 +1481,6 @@ gnashrc: gnashrc.in Makefile
+ gnashpluginrc: gnashpluginrc.in
+ 	$(edit) '$(srcdir)/$@.in' >$@
  
 -# Remove libtool .la files
 -install-exec-hook:
diff --git a/multimedia/gnash/patches/patch-libcore_Makefile.in b/multimedia/gnash/patches/patch-libcore_Makefile.in
index 24774fc2a1e..e9fc2350dfb 100644
--- a/multimedia/gnash/patches/patch-libcore_Makefile.in
+++ b/multimedia/gnash/patches/patch-libcore_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-libcore_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-libcore_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * let not to remove libtoo .la files, to maintain PLIST easier.
 
---- libcore/Makefile.in.orig	2011-04-10 12:30:08.000000000 +0000
+--- libcore/Makefile.in.orig	2012-01-19 19:49:50.000000000 +0000
 +++ libcore/Makefile.in
-@@ -2686,10 +2686,6 @@ mudflap:
- clean-hook:
- 	-rm -f core.*
+@@ -2702,10 +2702,6 @@ uninstall-am: uninstall-DISPLAYHEADERS u
+ 	uninstall-local uninstall-pkglibLTLIBRARIES
+ 
  
 -# Remove libtool .la files
 -install-exec-hook:
diff --git a/multimedia/gnash/patches/patch-libmedia_Makefile.in b/multimedia/gnash/patches/patch-libmedia_Makefile.in
index 6972e61211c..a2488961abb 100644
--- a/multimedia/gnash/patches/patch-libmedia_Makefile.in
+++ b/multimedia/gnash/patches/patch-libmedia_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-libmedia_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-libmedia_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * let not to remove libtoo .la files, to maintain PLIST easier.
 
---- libmedia/Makefile.in.orig	2011-04-10 12:30:09.000000000 +0000
+--- libmedia/Makefile.in.orig	2012-01-19 19:49:51.000000000 +0000
 +++ libmedia/Makefile.in
-@@ -1416,10 +1416,6 @@ mudflap:
- clean-hook:
- 	-rm -f core.* *.obj
+@@ -1387,10 +1387,6 @@ uninstall-am: uninstall-local uninstall-
+ 	uninstall-local uninstall-pkglibLTLIBRARIES
+ 
  
 -# Remove libtool .la files
 -install-exec-hook:
diff --git a/multimedia/gnash/patches/patch-librender_Makefile.in b/multimedia/gnash/patches/patch-librender_Makefile.in
index 3667eaca40f..7a03995a4be 100644
--- a/multimedia/gnash/patches/patch-librender_Makefile.in
+++ b/multimedia/gnash/patches/patch-librender_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-librender_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-librender_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * let not to remove libtoo .la files, to maintain PLIST easier.
 
---- librender/Makefile.in.orig	2011-04-10 12:30:09.000000000 +0000
+--- librender/Makefile.in.orig	2012-01-19 19:49:51.000000000 +0000
 +++ librender/Makefile.in
-@@ -990,10 +990,6 @@ mudflap:
+@@ -1138,10 +1138,6 @@ uninstall-am: uninstall-local uninstall-
  clean-hook:
  	-rm -f core.*
  
diff --git a/multimedia/gnash/patches/patch-libsound_Makefile.in b/multimedia/gnash/patches/patch-libsound_Makefile.in
index b55101261c7..2f442ce81ef 100644
--- a/multimedia/gnash/patches/patch-libsound_Makefile.in
+++ b/multimedia/gnash/patches/patch-libsound_Makefile.in
@@ -1,12 +1,12 @@
-$NetBSD: patch-libsound_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-libsound_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * let not to remove libtoo .la files, to maintain PLIST easier.
 
---- libsound/Makefile.in.orig	2011-04-10 12:30:09.000000000 +0000
+--- libsound/Makefile.in.orig	2012-01-19 19:49:51.000000000 +0000
 +++ libsound/Makefile.in
-@@ -972,10 +972,6 @@ mudflap:
- clean-hook:
- 	-rm -f core.* *.obj
+@@ -1028,10 +1028,6 @@ uninstall-am: uninstall-local uninstall-
+ 	uninstall-local uninstall-pkglibLTLIBRARIES
+ 
  
 -# Remove libtool .la files
 -install-exec-hook:
diff --git a/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in b/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in
index c2a99483a4f..961bb6a04d0 100644
--- a/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in
+++ b/multimedia/gnash/patches/patch-plugin_klash4_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-plugin_klash4_Makefile.in,v 1.1 2011/04/12 13:15:01 obache Exp $
+$NetBSD: patch-plugin_klash4_Makefile.in,v 1.2 2012/02/16 10:44:54 obache Exp $
 
 * install libtool archive as usual manner.
 
---- plugin/klash4/Makefile.in.orig	2011-04-11 08:03:43.000000000 +0000
+--- plugin/klash4/Makefile.in.orig	2012-01-19 19:49:52.000000000 +0000
 +++ plugin/klash4/Makefile.in
-@@ -1014,8 +1014,7 @@ uninstall-am: uninstall-dist_kde_appsdat
+@@ -1021,8 +1021,7 @@ uninstall-am: uninstall-dist_kde_appsdat
  @KPARTS4_TRUE@	install-dist_kde_appsdataDATA install-dist_kde_rcDATA \
  @KPARTS4_TRUE@	install-dist_kde_servicesDATA
  @KPARTS4_TRUE@	test -d $(DESTDIR)$(plugindir) || $(mkinstalldirs) $(DESTDIR)$(plugindir)