[pkgsrc/trunk]: pkgsrc/multimedia/mplayer-plugin * fixes build with xulrunner...

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2ce4e4033317
branches:  trunk
changeset: 590066:2ce4e4033317
user:      obache <obache%pkgsrc.org@localhost>
date:      Fri Jul 01 13:25:02 2011 +0000

description:
* fixes build with xulrunner-2, include mozilla-config.h unconditionally.
  PR#45110.
* change dependency on xulrunner to build only.

Not bump PKGREVISION, because it is inpossible to build after dependency was
switched to xulrunner-2.
XXX: still firefox-4.1 does not recognize this plugin as add-on for me.

diffstat:

 multimedia/mplayer-plugin/Makefile         |   3 ++-
 multimedia/mplayer-plugin/distinfo         |   4 ++--
 multimedia/mplayer-plugin/patches/patch-aa |  12 +++++++++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 2575c85e73f3 -r 2ce4e4033317 multimedia/mplayer-plugin/Makefile
--- a/multimedia/mplayer-plugin/Makefile        Fri Jul 01 03:31:40 2011 +0000
+++ b/multimedia/mplayer-plugin/Makefile        Fri Jul 01 13:25:02 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/04/22 13:44:17 obache Exp $
+# $NetBSD: Makefile,v 1.9 2011/07/01 13:25:02 obache Exp $
 #
 
 DISTNAME=              mplayerplug-in-3.55
@@ -48,6 +48,7 @@
        ${INSTALL_LIB} ${WRKSRC}/*.so   ${DESTDIR}${PREFIX}/lib/netscape/plugins
        ${INSTALL_DATA} ${WRKSRC}/*.xpt ${DESTDIR}${PREFIX}/lib/netscape/plugins
 
+BUILDLINK_DEPMETHOD.xulrunner= build
 .include "../../devel/xulrunner/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
diff -r 2575c85e73f3 -r 2ce4e4033317 multimedia/mplayer-plugin/distinfo
--- a/multimedia/mplayer-plugin/distinfo        Fri Jul 01 03:31:40 2011 +0000
+++ b/multimedia/mplayer-plugin/distinfo        Fri Jul 01 13:25:02 2011 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2010/04/21 15:58:03 tnn Exp $
+$NetBSD: distinfo,v 1.3 2011/07/01 13:25:02 obache Exp $
 
 SHA1 (mplayerplug-in-3.55.tar.gz) = 69726d4e16523b1a39c284efee081c31b0ea7f7f
 RMD160 (mplayerplug-in-3.55.tar.gz) = e01224b14883a93211745be0a329a3f524f39d8c
 Size (mplayerplug-in-3.55.tar.gz) = 281845 bytes
-SHA1 (patch-aa) = 76af562fe428b474554218cc6763e8832f591acd
+SHA1 (patch-aa) = 66a7a7532677a33e653cc5a64b42a670c63a55df
 SHA1 (patch-ae) = 885eafce6747ed1f682eb78a6e15a473806924e3
 SHA1 (patch-af) = 812a4921c4a467fbf6163292f04ef5888ef6e8ed
 SHA1 (patch-ag) = f4b58bce0e3128e4cb8c7466ad33b97a1eeba2fe
diff -r 2575c85e73f3 -r 2ce4e4033317 multimedia/mplayer-plugin/patches/patch-aa
--- a/multimedia/mplayer-plugin/patches/patch-aa        Fri Jul 01 03:31:40 2011 +0000
+++ b/multimedia/mplayer-plugin/patches/patch-aa        Fri Jul 01 13:25:02 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2010/04/21 15:58:03 tnn Exp $
+$NetBSD: patch-aa,v 1.3 2011/07/01 13:25:02 obache Exp $
 
 --- Source/plugin.h.orig       2008-01-03 00:20:34.000000000 +0000
 +++ Source/plugin.h
@@ -13,3 +13,13 @@
  #ifndef __PLUGIN_H__
  #define __PLUGIN_H__
  #ifdef BSD
+@@ -47,9 +51,7 @@
+ #define _GNU_SOURCE
+ #endif
+ #endif
+-#ifdef GECKOSDK_ENABLED
+ #include "mozilla-config.h"
+-#endif
+ #include "pluginbase.h"
+ #include "nsScriptablePeer.h"
+ #include "plugin-setup.h"