Update to 3.45, our previous version was from 2 years ago...

Please see http://mplayerplug-in.sourceforge.net/news.php
for the list of changes.

NOTE: Sorry, but ENOTIME to update the gtk1 version.

6 files changed, 28 insertions, 56 deletions

diff --git a/multimedia/mplayer-plugin-firefox/Makefile b/multimedia/mplayer-plugin-firefox/Makefile
index e95a2b35144..6c031689dae 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile
+++ b/multimedia/mplayer-plugin-firefox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2007/05/12 14:05:54 ghen Exp $
+# $NetBSD: Makefile,v 1.10 2007/09/09 19:30:07 xtraeme Exp $
 #
 
-PKGREVISION=	7
+#PKGREVISION=	1
 BROWSER=	firefox
 
 CONFIGURE_ARGS+=	--disable-gtk1
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 4025b385c3b..31ea1a687fd 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.15 2007/02/15 23:15:47 joerg Exp $
+# $NetBSD: Makefile.common,v 1.16 2007/09/09 19:30:07 xtraeme Exp $
 #
 
-DISTNAME=		mplayerplug-in-2.70
-PKGNAME=		mplayer-plugin-${BROWSER}-2.70
+DISTNAME=		mplayerplug-in-3.45
+PKGNAME=		mplayer-plugin-${BROWSER}-3.45
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=mplayerplug-in/}
 
@@ -17,6 +17,12 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 
+CONFIGURE_ARGS+=	--enable-wmp
+CONFIGURE_ARGS+=	--enable-qt
+CONFIGURE_ARGS+=	--enable-rm
+CONFIGURE_ARGS+=	--enable-gmp
+CONFIGURE_ARGS+=	--enable-dvx
+
 FILESDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/files
 PATCHDIR=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/patches
 DISTINFO_FILE=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/distinfo
@@ -35,10 +41,6 @@ post-extract:
 		${FILESDIR}/mozilla-${f}.pc.in > ${WRKSRC}/mozilla-${f}.pc
 .endfor
 
-post-wrapper:
-	@${MKDIR} ${BUILDLINK_DIR}/lib/pkgconfig
-	@${CP} ${WRKSRC}/*.pc ${BUILDLINK_DIR}/lib/pkgconfig
-
 SUBST_CLASSES+=		conf
 SUBST_STAGE.conf=	post-patch
 SUBST_FILES.conf=	Source/plugin-setup.cpp
@@ -59,10 +61,8 @@ do-install:
 .if !exists(${PREFIX}/lib/${BROWSER}/plugins)
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/${BROWSER}/plugins
 .endif
-	${INSTALL_LIB} ${WRKSRC}/mplayerplug-in.so	\
-		${PREFIX}/lib/${BROWSER}/plugins
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.xpt	\
-		${PREFIX}/lib/${BROWSER}/plugins
+	${INSTALL_LIB} ${WRKSRC}/*.so	${PREFIX}/lib/${BROWSER}/plugins
+	${INSTALL_DATA} ${WRKSRC}/*.xpt	${PREFIX}/lib/${BROWSER}/plugins
 
 .include "../../x11/libXpm/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
diff --git a/multimedia/mplayer-plugin-firefox/PLIST b/multimedia/mplayer-plugin-firefox/PLIST
index a8f761019e7..7d8f0bfbaff 100644
--- a/multimedia/mplayer-plugin-firefox/PLIST
+++ b/multimedia/mplayer-plugin-firefox/PLIST
@@ -1,6 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2005/04/19 15:12:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2007/09/09 19:30:07 xtraeme Exp $
 lib/${BROWSER}/plugins/mplayerplug-in.so
 lib/${BROWSER}/plugins/mplayerplug-in.xpt
+lib/${BROWSER}/plugins/mplayerplug-in-dvx.so
+lib/${BROWSER}/plugins/mplayerplug-in-dvx.xpt
+lib/${BROWSER}/plugins/mplayerplug-in-gmp.so
+lib/${BROWSER}/plugins/mplayerplug-in-gmp.xpt
+lib/${BROWSER}/plugins/mplayerplug-in-qt.so
+lib/${BROWSER}/plugins/mplayerplug-in-qt.xpt
+lib/${BROWSER}/plugins/mplayerplug-in-rm.so
+lib/${BROWSER}/plugins/mplayerplug-in-rm.xpt
+lib/${BROWSER}/plugins/mplayerplug-in-wmp.so
+lib/${BROWSER}/plugins/mplayerplug-in-wmp.xpt
 share/examples/mplayer-plugin-${BROWSER}/mplayerplug-in.conf
 share/examples/mplayer-plugin-${BROWSER}/mplayerplug-in.types
 @dirrm share/examples/mplayer-plugin-${BROWSER}
diff --git a/multimedia/mplayer-plugin-firefox/distinfo b/multimedia/mplayer-plugin-firefox/distinfo
index a6066e9dcae..4dfc078d34f 100644
--- a/multimedia/mplayer-plugin-firefox/distinfo
+++ b/multimedia/mplayer-plugin-firefox/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.2 2005/02/24 11:24:04 agc Exp $
+$NetBSD: distinfo,v 1.3 2007/09/09 19:30:07 xtraeme Exp $
 
-SHA1 (mplayerplug-in-2.70.tar.gz) = cc5d34060f64cea07f5696c5ad273f24b7fd4259
-RMD160 (mplayerplug-in-2.70.tar.gz) = 9606d093d8ecd6f71c69ed11ff69cce5d7f95ff8
-Size (mplayerplug-in-2.70.tar.gz) = 167973 bytes
+SHA1 (mplayerplug-in-3.45.tar.gz) = 39a888c6e65b83f862abef83f5e0381ec7a6a6ea
+RMD160 (mplayerplug-in-3.45.tar.gz) = 6a9700860397a6c7952b8e2ea8a9a610376a1528
+Size (mplayerplug-in-3.45.tar.gz) = 228032 bytes
 SHA1 (patch-aa) = 2a6724f536ad8a08c7766dfb269458df12bb3603
 SHA1 (patch-ab) = 950bec845ef3120e8b63a2343e79d5ded99a8bfa
-SHA1 (patch-ac) = caf4406c81b624dd9e05f0547d8a2ac700341454
 SHA1 (patch-ad) = 06699a71bb0f8da969d11a812a544e3aefa4d9a7
-SHA1 (patch-ae) = c5a073ba5895a3474b6aaaae2cc7f82e0e040ef3
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ac b/multimedia/mplayer-plugin-firefox/patches/patch-ac
deleted file mode 100644
index 0e85b53e727..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/11/17 02:31:34 xtraeme Exp $
-
---- Source/plugin-setup.cpp.orig	2004-11-17 02:30:00.000000000 +0100
-+++ Source/plugin-setup.cpp	2004-11-17 02:30:12.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- 
- #ifndef STATICDECLS
diff --git a/multimedia/mplayer-plugin-firefox/patches/patch-ae b/multimedia/mplayer-plugin-firefox/patches/patch-ae
deleted file mode 100644
index 3a9676f1ac2..00000000000
--- a/multimedia/mplayer-plugin-firefox/patches/patch-ae
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2004/11/17 02:31:35 xtraeme Exp $
-
---- Source/plugin-threads.cpp.orig	2004-11-17 02:33:15.000000000 +0100
-+++ Source/plugin-threads.cpp	2004-11-17 02:34:59.000000000 +0100
-@@ -1,3 +1,4 @@
-+#include <string.h>
- #include "plugin.h"
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -6,6 +7,7 @@
- #include <fcntl.h>
- #include <signal.h>
- #include <sys/wait.h>
-+#include <sys/param.h>
- 
- extern int DEBUG;
- 
-@@ -202,7 +204,9 @@
- 	// make the operations on the control pipe non-blocking
- 	flags = fcntl(*control, F_GETFL, 0);
- 	flags |= O_NONBLOCK;
-+#ifndef BSD
- 	flags |= O_NDELAY;
-+#endif
- 	fcntl(*control, F_SETFL, flags);
- 
- 	return fdopen(filedesr[0], "r");