Tue Sep 22 13:23:57 2009 UTC ()
- install for all npapi browsers
- include <stdlib.h> for free()


(tnn)
diff -r1.21 -r1.22 pkgsrc/multimedia/gnash/Makefile
diff -r1.1 -r1.2 pkgsrc/multimedia/gnash/PLIST.gtk
diff -r1.13 -r1.14 pkgsrc/multimedia/gnash/distinfo
diff -r1.10 -r1.11 pkgsrc/multimedia/gnash/options.mk
diff -r0 -r1.6 pkgsrc/multimedia/gnash/patches/patch-ab
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/gnash/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gnash/Attic/Makefile 2009/08/26 19:58:05 1.21
+++ pkgsrc/multimedia/gnash/Attic/Makefile 2009/09/22 13:23:57 1.22
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile,v 1.21 2009/08/26 19:58:05 sno Exp $ 1# $NetBSD: Makefile,v 1.22 2009/09/22 13:23:57 tnn Exp $
2# 2#
3 3
4DISTNAME= gnash-${VER} 4DISTNAME= gnash-${VER}
5VER= 0.8.3 5VER= 0.8.3
6PKGREVISION= 5 6PKGREVISION= 6
7CATEGORIES= multimedia 7CATEGORIES= multimedia
8MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/} 8MASTER_SITES= ${MASTER_SITE_GNU:=gnash/${VER}/}
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= matias@dotbsd.org 11MAINTAINER= matias@dotbsd.org
12HOMEPAGE= http://www.gnashdev.org/ 12HOMEPAGE= http://www.gnashdev.org/
13COMMENT= GPL Flash movie player 13COMMENT= GPL Flash movie player
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17USE_PKGLOCALEDIR= yes 17USE_PKGLOCALEDIR= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
19USE_LIBTOOL= yes 19USE_LIBTOOL= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21USE_TOOLS+= bash gmake msgfmt pkg-config 21USE_TOOLS+= bash gmake msgfmt pkg-config
22CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/firefox/plugins 
23# for appending below 22# for appending below
24INSTALL_TARGET= install 23INSTALL_TARGET= install
25 24
26# /bin/sh finds a syntax error without line number 25# /bin/sh finds a syntax error without line number
27CONFIG_SHELL= ${TOOLS_BASH} 26CONFIG_SHELL= ${TOOLS_BASH}
28 27
29EGDIR= ${PREFIX}/share/examples/gnash 28EGDIR= ${PREFIX}/share/examples/gnash
30INSTALLATION_DIRS= ${EGDIR} 29INSTALLATION_DIRS= ${EGDIR}
31INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 30INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
32CONF_FILES+= ${EGDIR}/gnashpluginrc ${PKG_SYSCONFDIR}/gnashpluginrc 31CONF_FILES+= ${EGDIR}/gnashpluginrc ${PKG_SYSCONFDIR}/gnashpluginrc
33CONF_FILES+= ${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc 32CONF_FILES+= ${EGDIR}/gnashrc ${PKG_SYSCONFDIR}/gnashrc
34 33
35.include "options.mk" 34.include "options.mk"
cvs diff -r1.1 -r1.2 pkgsrc/multimedia/gnash/Attic/PLIST.gtk (expand / switch to unified diff)

--- pkgsrc/multimedia/gnash/Attic/PLIST.gtk 2008/04/27 06:44:52 1.1
+++ pkgsrc/multimedia/gnash/Attic/PLIST.gtk 2009/09/22 13:23:57 1.2
@@ -1,3 +1,3 @@ @@ -1,3 +1,3 @@
1@comment $NetBSD: PLIST.gtk,v 1.1 2008/04/27 06:44:52 wiz Exp $ 1@comment $NetBSD: PLIST.gtk,v 1.2 2009/09/22 13:23:57 tnn Exp $
2bin/gtk-gnash 2bin/gtk-gnash
3lib/firefox/plugins/libgnashplugin.so 3lib/netscape/plugins/libgnashplugin.so
cvs diff -r1.13 -r1.14 pkgsrc/multimedia/gnash/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gnash/Attic/distinfo 2008/09/15 19:54:58 1.13
+++ pkgsrc/multimedia/gnash/Attic/distinfo 2009/09/22 13:23:57 1.14
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.13 2008/09/15 19:54:58 abs Exp $ 1$NetBSD: distinfo,v 1.14 2009/09/22 13:23:57 tnn Exp $
2 2
3SHA1 (gnash-0.8.3.tar.bz2) = 3cd4a0930e772a42b0155295fca292fd94be7c42 3SHA1 (gnash-0.8.3.tar.bz2) = 3cd4a0930e772a42b0155295fca292fd94be7c42
4RMD160 (gnash-0.8.3.tar.bz2) = f7bf4d06d35c3ad40df4419b179fc6482731854b 4RMD160 (gnash-0.8.3.tar.bz2) = f7bf4d06d35c3ad40df4419b179fc6482731854b
5Size (gnash-0.8.3.tar.bz2) = 2902610 bytes 5Size (gnash-0.8.3.tar.bz2) = 2902610 bytes
6SHA1 (patch-aa) = 05460170941019168fa072c803ad60eac919e44a 6SHA1 (patch-aa) = 05460170941019168fa072c803ad60eac919e44a
 7SHA1 (patch-ab) = b86c152618ed4258bede5d95f71446db3af8ad0f
7SHA1 (patch-ac) = 6454620529a281c707f7ccf68eb17c0754dfe7a7 8SHA1 (patch-ac) = 6454620529a281c707f7ccf68eb17c0754dfe7a7
8SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701 9SHA1 (patch-ae) = d4f18032bc091e5ef84fcb81f16ea649c5c20701
9SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef 10SHA1 (patch-ag) = f4f82df7bff71464cdb3a76b91c4b2475a8e9eef
cvs diff -r1.10 -r1.11 pkgsrc/multimedia/gnash/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/gnash/Attic/options.mk 2008/09/11 18:27:24 1.10
+++ pkgsrc/multimedia/gnash/Attic/options.mk 2009/09/22 13:23:57 1.11
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1# $NetBSD: options.mk,v 1.10 2008/09/11 18:27:24 ahoka Exp $ 1# $NetBSD: options.mk,v 1.11 2009/09/22 13:23:57 tnn Exp $
2# 2#
3 3
4# 4#
5# see http://www.gnu.org/software/gnash/manual/gnashref.html#codedeps 5# see http://www.gnu.org/software/gnash/manual/gnashref.html#codedeps
6# 6#
7 7
8PKG_OPTIONS_VAR= PKG_OPTIONS.gnash 8PKG_OPTIONS_VAR= PKG_OPTIONS.gnash
9# XXX: add support for SDL or FLTK GUIs? 9# XXX: add support for SDL or FLTK GUIs?
10PKG_SUPPORTED_OPTIONS= gtk kde mitshm 10PKG_SUPPORTED_OPTIONS= gtk kde mitshm
11PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media 11PKG_OPTIONS_OPTIONAL_GROUPS= gnash-media
12PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer 12PKG_OPTIONS_GROUP.gnash-media= ffmpeg gstreamer
13PKG_OPTIONS_REQUIRED_GROUPS= gnash-renderer 13PKG_OPTIONS_REQUIRED_GROUPS= gnash-renderer
14PKG_OPTIONS_GROUP.gnash-renderer= agg cairo opengl 14PKG_OPTIONS_GROUP.gnash-renderer= agg cairo opengl
15PKG_SUGGESTED_OPTIONS+= agg gstreamer gtk mitshm 15PKG_SUGGESTED_OPTIONS+= agg gstreamer gtk mitshm
16 16
17.include "../../mk/bsd.options.mk" 17.include "../../mk/bsd.options.mk"
18 18
19### 19###
20### Select GUIs. 20### Select GUIs.
21### 21###
22.if !empty(PKG_OPTIONS:Mgtk) 22.if !empty(PKG_OPTIONS:Mgtk)
23GNASH_GUIS+= gtk 23GNASH_GUIS+= gtk
24PLIST_SRC+= ${PKGDIR}/PLIST.gtk 24PLIST_SRC+= ${PKGDIR}/PLIST.gtk
25CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/firefox/plugins 25CONFIGURE_ARGS+= --with-npapi-plugindir=${PREFIX}/lib/netscape/plugins
26INSTALL_TARGET+= install-plugin 26INSTALL_TARGET+= install-plugin
27.include "../../x11/gtk2/buildlink3.mk" 27.include "../../x11/gtk2/buildlink3.mk"
28.endif 28.endif
29 29
30.if !empty(PKG_OPTIONS:Mkde) 30.if !empty(PKG_OPTIONS:Mkde)
31GNASH_GUIS+= kde 31GNASH_GUIS+= kde
32PLIST_SRC+= ${PKGDIR}/PLIST.kde 32PLIST_SRC+= ${PKGDIR}/PLIST.kde
33PLIST_SUBST+= KDE="kde/" 33PLIST_SUBST+= KDE="kde/"
34CONFIGURE_ARGS+= --with-kde-pluginprefix=${PREFIX} 34CONFIGURE_ARGS+= --with-kde-pluginprefix=${PREFIX}
35# XXX: next three are ignored by configure script 35# XXX: next three are ignored by configure script
36CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps 36CONFIGURE_ARGS+= --with-kde-appsdatadir=${PREFIX}/share/kde/apps
37CONFIGURE_ARGS+= --with-kde-configdir=${PREFIX}/share/kde/config 37CONFIGURE_ARGS+= --with-kde-configdir=${PREFIX}/share/kde/config
38CONFIGURE_ARGS+= --with-kde-servicesdir=${PREFIX}/share/kde/services 38CONFIGURE_ARGS+= --with-kde-servicesdir=${PREFIX}/share/kde/services
File Added: pkgsrc/multimedia/gnash/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.6 2009/09/22 13:23:57 tnn Exp $

--- libbase/utility.h.orig	2008-06-06 22:07:55.000000000 +0200
+++ libbase/utility.h
@@ -29,6 +29,7 @@
 #include <typeinfo>
 #include <cmath>
 #include <boost/cstdint.hpp>
+#include <stdlib.h>
 
 #if defined(__GNUC__) && __GNUC__ > 2
 #  include <cxxabi.h>