Update to 0.8.3:

2008-05-10 Russ Nelson <nelson@crynwr.com>

Sixth alpha release of Gnash (0.8.3).
Improvements since 0.8.2 release are:

More visible to users:
    * Native fullscreen support (from AS) implemented.
    * Long command-line options properly supported.
    * View detailed movie information from GTK gui.
    * Added an option in Preferences to initially display a movie
      as a blank ("Click here to start") screen.
    * Added "dump" GUI to dump a movie to disk.
    * Improved Cairo rendering performance.
    * Fix support for OpenOffice Impress SWF exporter (malformed..)

Less visible to users:
    * Garbage Collector usage reduced where appropriate.
    * Mouse.hide and Mouse.show implemented in GTK.
    * ActionScript inheritance fixes:
        o super implemented correctly (still not 100% compatible for SWF7)
        o implements / instanceof works correctly now
    * FsCommands quit, fullscreen and showMenu implemented.
    * FsCommand-to-javascript implemented (plugin).
    * Minor ActionScript compatibility fixes: String, XML, toLocaleString,
      int, parseInt. fromCharCode, toString (SWF4) etc.
    * Fixes to arguments class (tests: Function.as, line404~456).
    * Stage.scaleMode implemented (fixes resizing of various movies).
    * Stage.align implemented.
    * Fixes to Date class (platform consistent).
    * Logging uses boost::format.
    * Improved Win32 support: builds using MinGW/MSYS (cross-compile
      not tested yet), and initial implementation of npgnash.dll exists.
    * Sprite handling improved, fixing FlowPlayer and other video SWFs.
    * TextField handling:
          o Fix in device font handling (DefineFontInfo tag)
          o Fix support for DefineFont2 tag (sizes)
          o Improve TextField support for TextFormat use.
    * Fix parsing of malformed XML files
    * Fix loading of text / XML with Byte Order Marks.
    * Minor fix to _x and _y translation.
    * More functions correctly registered as ASnative.
    * System.capabilities information expanded.
    * Jemalloc memory allocator from Mozilla added as an option.
    * Redesigned and implemented AMF0 support, with the beginning of
      AMF3 support.
    * SWF8 line styles support (both from tag and drawing api)

5 files changed, 71 insertions, 19 deletions

diff --git a/multimedia/gnash/Makefile b/multimedia/gnash/Makefile
index ea611092e27..8d8e9ebee28 100644
--- a/multimedia/gnash/Makefile
+++ b/multimedia/gnash/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2008/04/29 20:16:08 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2008/06/22 15:20:56 wiz Exp $
 #
 
-DISTNAME=		gnash-0.8.2
-PKGREVISION=		1
+DISTNAME=		gnash-${VER}
+VER=			0.8.3
 CATEGORIES=		multimedia
-MASTER_SITES=		${MASTER_SITE_GNU:=gnash/0.8.2/}
+MASTER_SITES=		${MASTER_SITE_GNU:=gnash/${VER}/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		matias@dotbsd.org
@@ -25,12 +25,21 @@ INSTALL_TARGET=		install
 # /bin/sh finds a syntax error without line number
 CONFIG_SHELL=		${TOOLS_BASH}
 
+EGDIR=			${PREFIX}/share/examples/gnash
+INSTALLATION_DIRS=	${EGDIR}
+INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
+CONF_FILES+=		${EGDIR}/gnashpluginrc ${PKG_SYSCONFDIR}/gnashpluginrc
+CONF_FILES+=		${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
+
 .include "options.mk"
 
 PLIST_SRC+=		${PKGDIR}/PLIST
 
+.include "../../devel/atk/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
diff --git a/multimedia/gnash/PLIST b/multimedia/gnash/PLIST
index db3f79f493c..bca6f1f13c9 100644
--- a/multimedia/gnash/PLIST
+++ b/multimedia/gnash/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/27 06:44:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/06/22 15:20:56 wiz Exp $
 bin/dumpshm
 bin/gnash
 bin/gprocessor
@@ -6,7 +6,9 @@ bin/soldumper
 lib/gnash/libgnashamf.la
 lib/gnash/libgnashbase.la
 lib/gnash/libgnashmedia.la
+lib/gnash/libgnashnet.la
 lib/gnash/libgnashserver.la
+lib/gnash/libmozsdk.la
 man/man1/cygnal.1
 man/man1/dumpshm.1
 man/man1/gnash.1
@@ -16,6 +18,8 @@ share/doc/gnash/gnashref.html
 share/doc/gnash/gnashuser.html
 share/doc/gnash/images/car_crash.png
 share/doc/gnash/images/rtmp.png
+share/examples/gnash/gnashpluginrc
+share/examples/gnash/gnashrc
 share/${KDE}gnash/GnashG.png
 share/${KDE}gnash/gnash_128_96.ico
 share/${KDE}locale/cs/LC_MESSAGES/gnash.mo
@@ -24,8 +28,10 @@ share/${KDE}locale/es/LC_MESSAGES/gnash.mo
 share/${KDE}locale/fi/LC_MESSAGES/gnash.mo
 share/${KDE}locale/fr/LC_MESSAGES/gnash.mo
 share/${KDE}locale/it/LC_MESSAGES/gnash.mo
+share/${KDE}locale/ja/LC_MESSAGES/gnash.mo
 share/${KDE}locale/sv/LC_MESSAGES/gnash.mo
 @dirrm share/${KDE}gnash
+@dirrm share/examples/gnash
 @dirrm share/doc/gnash/images
 @dirrm share/doc/gnash
 @dirrm lib/gnash
diff --git a/multimedia/gnash/distinfo b/multimedia/gnash/distinfo
index 6b8af3ed612..f5185390534 100644
--- a/multimedia/gnash/distinfo
+++ b/multimedia/gnash/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/04/27 06:44:52 wiz Exp $
+$NetBSD: distinfo,v 1.10 2008/06/22 15:20:56 wiz Exp $
 
-SHA1 (gnash-0.8.2.tar.bz2) = 1d524f9a5e96037db4159fe6142b0c228b6130be
-RMD160 (gnash-0.8.2.tar.bz2) = 63466362edae138bc976f9c025f36703c7edce9f
-Size (gnash-0.8.2.tar.bz2) = 2637636 bytes
+SHA1 (gnash-0.8.3.tar.bz2) = 3cd4a0930e772a42b0155295fca292fd94be7c42
+RMD160 (gnash-0.8.3.tar.bz2) = f7bf4d06d35c3ad40df4419b179fc6482731854b
+Size (gnash-0.8.3.tar.bz2) = 2902610 bytes
+SHA1 (patch-aa) = 05460170941019168fa072c803ad60eac919e44a
 SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
 SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
diff --git a/multimedia/gnash/options.mk b/multimedia/gnash/options.mk
index e198fcfccbe..53003f371bd 100644
--- a/multimedia/gnash/options.mk
+++ b/multimedia/gnash/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2008/05/22 20:58:32 wiz Exp $
+# $NetBSD: options.mk,v 1.8 2008/06/22 15:20:56 wiz Exp $
 #
 
 #
@@ -6,10 +6,13 @@
 #
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.gnash
-PKG_SUPPORTED_OPTIONS=		gtk kde agg cairo mitshm opengl
-PKG_OPTIONS_OPTIONAL_GROUPS=    gnash-media
-PKG_OPTIONS_GROUP.gnash-media=  ffmpeg gstreamer
-PKG_SUGGESTED_OPTIONS+=         agg gstreamer gtk mitshm
+# XXX: add support for SDL or FLTK GUIs?
+PKG_SUPPORTED_OPTIONS=		gtk kde mitshm
+PKG_OPTIONS_OPTIONAL_GROUPS=	gnash-media
+PKG_OPTIONS_GROUP.gnash-media=	ffmpeg gstreamer
+PKG_OPTIONS_REQUIRED_GROUPS=	gnash-renderer
+PKG_OPTIONS_GROUP.gnash-renderer=	agg cairo opengl
+PKG_SUGGESTED_OPTIONS+=		agg gstreamer gtk mitshm
 
 .include "../../mk/bsd.options.mk"
 
@@ -32,7 +35,7 @@ PLIST_SUBST+=		KDE="kde/"
 .include "../../meta-pkgs/kde3/kde3.mk"
 
 post-install:
-	cd ${WRKSRC}/plugin/klash && make install-plugin
+	cd ${WRKSRC}/plugin/klash && ${MAKE} install-plugin
 .else
 PLIST_SUBST+=		KDE=""
 .endif
@@ -43,24 +46,26 @@ CONFIGURE_ARGS+=	--enable-gui=${GNASH_GUIS:tW:S/ /,/}
 ### Select renderers.
 ###
 .if !empty(PKG_OPTIONS:Magg)
-GNASH_RENDERS+=		agg
+GNASH_RENDER=		agg
+CONFIGURE_ARGS+=	--enable-agg
 .include "../../graphics/agg/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mcairo)
-GNASH_RENDERS+=		cairo
+GNASH_RENDER=		cairo
+CONFIGURE_ARGS+=	--enable-cairo
 .include "../../graphics/cairo/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
-GNASH_RENDERS+=		ogl
+GNASH_RENDER=		ogl
 .include "../../x11/glproto/buildlink3.mk"
 .if !empty(PKG_OPTIONS:Mgtk)
 .include "../../graphics/gtkglext/buildlink3.mk"
 .endif
 .endif
 
-CONFIGURE_ARGS+=	--enable-renderer=${GNASH_RENDERS:tW:S/ /,/}
+CONFIGURE_ARGS+=	--enable-renderer=${GNASH_RENDER}
 
 ###
 ### Select a media handler
diff --git a/multimedia/gnash/patches/patch-aa b/multimedia/gnash/patches/patch-aa
new file mode 100644
index 00000000000..3af12e82b78
--- /dev/null
+++ b/multimedia/gnash/patches/patch-aa
@@ -0,0 +1,31 @@
+$NetBSD: patch-aa,v 1.10 2008/06/22 15:20:56 wiz Exp $
+
+--- configure.orig	2008-06-19 10:48:05.000000000 +0000
++++ configure
+@@ -53135,7 +53135,7 @@ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-    if test x"$FOP" == x; then
++    if test x"$FOP" = x; then
+         # Extract the first word of "fop", so it can be a program name with args.
+ set dummy fop; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -58445,7 +58445,7 @@ fi
+         echo "               This version of ffmpeg may not work!" >&3
+         echo "               Version 51.27.0 or newer is highly recommended." >&3
+       else
+-	if test x"${avformat_h}" == x; then
++	if test x"${avformat_h}" = x; then
+           echo "        ERROR: FFMPEG's libavcodec header is installed but not libavformat." >&3
+           echo "               You can install FFMPEG from http://ffmpeg.mplayerhq.hu" >&3
+           echo "               or .deb users: apt-get install libavformat-dev" >&3
+@@ -58791,7 +58791,7 @@ if test x$ext_mysql = xyes; then
+   fi
+ fi
+ 
+-if test "$GMSGFMT" == ":"; then
++if test "$GMSGFMT" = ":"; then
+   echo "        WARNING: You need the gettext package installed to use translations." >&4
+   echo "                 Required for building a package or 'make distcheck'" >&4
+   echo "                 Install it from http://www.gnu.org/software/gettext/" >&4