Pullup ticket #3088 - requested by tnn

multimedia/mplayer-plugin: build fix

Revisions pulled up;
- multimedia/mplayer-plugin/distinfo		1.2
- multimedia/mplayer-plugin/patches/patch-aa	1.2
- multimedia/mplayer-plugin/patches/patch-ab	delete
- multimedia/mplayer-plugin/patches/patch-ad	delete
- multimedia/mplayer-plugin/patches/patch-ag	1.2
---
Module Name:	pkgsrc
Committed By:	tnn
Date:		Wed Apr 21 15:58:03 UTC 2010

Modified Files:
	pkgsrc/multimedia/mplayer-plugin: distinfo
	pkgsrc/multimedia/mplayer-plugin/patches: patch-aa patch-ag
Removed Files:
	pkgsrc/multimedia/mplayer-plugin/patches: patch-ab patch-ad

Log Message:
fix xulrunner-1.9.2.x build breakage reported on pkgsrc-users@

5 files changed, 27 insertions, 38 deletions

diff --git a/multimedia/mplayer-plugin/distinfo b/multimedia/mplayer-plugin/distinfo
index 6923bf05894..a4eccfca42a 100644
--- a/multimedia/mplayer-plugin/distinfo
+++ b/multimedia/mplayer-plugin/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/14 08:56:08 tnn Exp $
+$NetBSD: distinfo,v 1.1.1.1.6.1 2010/04/22 17:53:38 tron 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) = 2a6724f536ad8a08c7766dfb269458df12bb3603
-SHA1 (patch-ab) = 950bec845ef3120e8b63a2343e79d5ded99a8bfa
-SHA1 (patch-ad) = 06699a71bb0f8da969d11a812a544e3aefa4d9a7
+SHA1 (patch-aa) = 76af562fe428b474554218cc6763e8832f591acd
 SHA1 (patch-ae) = 885eafce6747ed1f682eb78a6e15a473806924e3
 SHA1 (patch-af) = 812a4921c4a467fbf6163292f04ef5888ef6e8ed
-SHA1 (patch-ag) = 0af0bcb4bc722e1be290e1b4ef13c45f36bb77d0
+SHA1 (patch-ag) = f4b58bce0e3128e4cb8c7466ad33b97a1eeba2fe
diff --git a/multimedia/mplayer-plugin/patches/patch-aa b/multimedia/mplayer-plugin/patches/patch-aa
index 51cbf174374..d892aee73bf 100644
--- a/multimedia/mplayer-plugin/patches/patch-aa
+++ b/multimedia/mplayer-plugin/patches/patch-aa
@@ -1,12 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
+$NetBSD: patch-aa,v 1.1.1.1.6.1 2010/04/22 17:53:38 tron Exp $
 
---- Source/plugin.cpp.orig	2004-11-17 02:27:11.000000000 +0100
-+++ Source/plugin.cpp	2004-11-17 02:27:25.000000000 +0100
-@@ -34,6 +34,7 @@
+--- Source/plugin.h.orig	2008-01-03 00:20:34.000000000 +0000
++++ Source/plugin.h
+@@ -35,6 +35,10 @@
   *
   * ***** END LICENSE BLOCK ***** */
  
++#include <stdlib.h>
 +#include <string.h>
- #include "plugin.h"
- #include "nsIServiceManager.h"
- #include "nsIMemory.h"
++#include <assert.h>
++
+ #ifndef __PLUGIN_H__
+ #define __PLUGIN_H__
+ #ifdef BSD
diff --git a/multimedia/mplayer-plugin/patches/patch-ab b/multimedia/mplayer-plugin/patches/patch-ab
deleted file mode 100644
index 028719ff34f..00000000000
--- a/multimedia/mplayer-plugin/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
-
---- Source/plugin-support.cpp.orig	2004-11-17 02:28:45.000000000 +0100
-+++ Source/plugin-support.cpp	2004-11-17 02:29:03.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <strings.h>
- #include <errno.h>
diff --git a/multimedia/mplayer-plugin/patches/patch-ad b/multimedia/mplayer-plugin/patches/patch-ad
deleted file mode 100644
index 8215c96514f..00000000000
--- a/multimedia/mplayer-plugin/patches/patch-ad
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/09/14 08:56:08 tnn Exp $
-
---- Source/plugin-list.cpp.orig	2004-11-17 02:32:12.000000000 +0100
-+++ Source/plugin-list.cpp	2004-11-17 02:32:32.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <errno.h>
- #ifndef _GNU_SOURCE
diff --git a/multimedia/mplayer-plugin/patches/patch-ag b/multimedia/mplayer-plugin/patches/patch-ag
index 4413466f170..0e27ffb0b07 100644
--- a/multimedia/mplayer-plugin/patches/patch-ag
+++ b/multimedia/mplayer-plugin/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
+$NetBSD: patch-ag,v 1.1.1.1.6.1 2010/04/22 17:53:38 tron Exp $
 
---- include/npupp.h.orig	2009-09-14 09:57:07.000000000 +0200
+--- include/npupp.h.orig	2010-04-21 15:52:56.000000000 +0000
 +++ include/npupp.h
-@@ -0,0 +1,1292 @@
+@@ -0,0 +1,1298 @@
 +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: NPL 1.1/GPL 2.0/LGPL 2.1
@@ -59,12 +59,16 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
 +#define GENERATINGCFM 0
 +#endif
 +
++#include "nptypes.h"
++#define uint16 uint16_t
++#define int16 int16_t
++#define uint32 uint32_t
++#define int32  int32_t
++
 +#ifndef _NPAPI_H_
 +#include "npapi.h"
 +#endif
 +
-+#include "jri.h"
-+
 +/******************************************************************************************
 +   plug-in function table macros
 + 	        for each function in and out of the plugin API we define
@@ -935,6 +939,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
 +
 +#endif
 +
++#if 0
 +
 +/* NPN_GetJavaEnv */
 +
@@ -987,6 +992,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
 +
 +#endif
 +
++#endif /* if 0 */
 +
 +/* NPN_InvalidateRect */
 +
@@ -1094,7 +1100,7 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
 +    NPP_PrintUPP print;
 +    NPP_HandleEventUPP event;
 +    NPP_URLNotifyUPP urlnotify;
-+    JRIGlobalRef javaClass;
++    void* javaClass;
 +    NPP_GetValueUPP getvalue;
 +    NPP_SetValueUPP setvalue;
 +} NPPluginFuncs;
@@ -1114,8 +1120,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/09/14 08:56:09 tnn Exp $
 +    NPN_MemFreeUPP memfree;
 +    NPN_MemFlushUPP memflush;
 +    NPN_ReloadPluginsUPP reloadplugins;
-+    NPN_GetJavaEnvUPP getJavaEnv;
-+    NPN_GetJavaPeerUPP getJavaPeer;
++    void* getJavaEnv;
++    void* getJavaPeer;
 +    NPN_GetURLNotifyUPP geturlnotify;
 +    NPN_PostURLNotifyUPP posturlnotify;
 +    NPN_GetValueUPP getvalue;