9 files changed, 1 insertions, 159 deletions

diff --git a/MOVED b/MOVED
index f385c5b8d9ed..ac1d3545502e 100644
--- a/MOVED
+++ b/MOVED
@@ -4470,3 +4470,4 @@ sysutils/zfSnap|sysutils/zfsnap|2010-08-03|Change name to lower case
 mail/lightning|deskutils/lightning|2010-08-03|Upstream development discontinued
 mail/lightning|deskutils/lightning|2010-08-03|Upstream development discontinued
 devel/py_otp_interface|devel/py-interface|2010-08-06|Duplicate py-interface port has better distutils handling
+www/mplayer-plugin|www/gecko-mediaplayer|2010-08-08|Upstream support dropped
diff --git a/www/Makefile b/www/Makefile
index 6233ccc26067..d344dfda5628 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -575,7 +575,6 @@
     SUBDIR += mozex
     SUBDIR += mozilla
     SUBDIR += mozplugger
-    SUBDIR += mplayer-plugin
     SUBDIR += multisort
     SUBDIR += mybb
     SUBDIR += myfaces
diff --git a/www/mplayer-plugin/Makefile b/www/mplayer-plugin/Makefile
deleted file mode 100644
index 6191bf0c0bad..000000000000
--- a/www/mplayer-plugin/Makefile
+++ /dev/null
@@ -1,70 +0,0 @@
-# New ports collection makefile for:	mplayerplug-in
-# Date Created:				20 February 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mplayerplug-in
-PORTVERSION=	3.55
-PORTREVISION=	7
-CATEGORIES=	www multimedia
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/v${PORTVERSION}
-
-MAINTAINER=	gecko@FreeBSD.org
-COMMENT=	A Mozilla plugin for the MPlayer media player
-
-RUN_DEPENDS=	mplayer:${PORTSDIR}/multimedia/mplayer
-
-DEPRECATED=	Upstream support dropped. Please consider using www/gecko-mediaplayer instead
-EXPIRATION_DATE=2010-08-01
-
-USE_GETTEXT=	yes
-USE_GMAKE=	yes
-USE_GECKO=	libxul
-USE_WEBPLUGINS=	gecko*
-WEBPLUGINS_FILES=mplayerplug-in.so mplayerplug-in.xpt mplayerplug-in-wmp.so \
-		mplayerplug-in-qt.so mplayerplug-in-rm.so \
-		mplayerplug-in-gmp.so mplayerplug-in-wmp.xpt \
-		mplayerplug-in-qt.xpt mplayerplug-in-rm.xpt \
-		mplayerplug-in-gmp.xpt mplayerplug-in-dvx.so \
-		mplayerplug-in-dvx.xpt
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-gmp
-USE_GNOME=	gnometarget
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DBSD" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GECKO_XPIDL="${XPIDL}"
-USE_XORG=	x11 xpm xt
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/www/firefox/Makefile.webplugins"
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|make|${GMAKE}|g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
-		${WRKSRC}/Source/plugin-setup.cpp
-
-do-install:
-	${MKDIR} ${WEBPLUGINS_DIR}
-.for moo in ${WEBPLUGINS_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${moo} ${WEBPLUGINS_DIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
-		${PREFIX}/etc/mplayerplug-in.conf.dist
-	if [ ! -f ${PREFIX}/etc/mplayerplug-in.conf ]; then \
-		${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.conf \
-			${PREFIX}/etc/mplayerplug-in.conf ; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \
-		${PREFIX}/etc/mplayerplug-in.types.dist
-	if [ ! -f ${PREFIX}/etc/mplayerplug-in.types ]; then \
-		${INSTALL_DATA} ${WRKSRC}/mplayerplug-in.types \
-			${PREFIX}/etc/mplayerplug-in.types ;\
-	fi
-	cd ${WRKSRC}/po && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \
-		Makefile ${MAKE_ARGS} install
-
-.include <bsd.port.post.mk>
diff --git a/www/mplayer-plugin/distinfo b/www/mplayer-plugin/distinfo
deleted file mode 100644
index ee8c1232f967..000000000000
--- a/www/mplayer-plugin/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (mplayerplug-in-3.55.tar.gz) = cb59d32221cfbd04b6a8b3bb55593484
-SHA256 (mplayerplug-in-3.55.tar.gz) = ba5affde4c5d5a89c8bf987ae9326daabbf8ea8279fccd589474e5157fc67b7e
-SIZE (mplayerplug-in-3.55.tar.gz) = 281845
diff --git a/www/mplayer-plugin/files/patch-Source_plugin-support.cpp b/www/mplayer-plugin/files/patch-Source_plugin-support.cpp
deleted file mode 100644
index 5e2dc49d100f..000000000000
--- a/www/mplayer-plugin/files/patch-Source_plugin-support.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- Source/plugin-support.cpp.orig	Sat Feb 18 17:05:30 2006
-+++ Source/plugin-support.cpp	Sat Feb 18 17:05:58 2006
-@@ -486,9 +486,13 @@ void killmplayer(nsPluginInstance * inst
-     if (instance->paused == 1)
- 	sendCommand(instance, "pause\n");
-     sendCommand(instance, "quit\n");
-+#ifndef BSD
-     pthread_mutex_lock(&(instance->read_mutex));
-+#endif
-     instance->cancelled = 1;
-+#ifndef BSD
-     pthread_mutex_unlock(&(instance->read_mutex));
-+#endif
- 
- /*    count = 0;
-     while (count < 500) {
diff --git a/www/mplayer-plugin/files/patch-Source_plugin-threads.cpp b/www/mplayer-plugin/files/patch-Source_plugin-threads.cpp
deleted file mode 100644
index 5483d4b8237b..000000000000
--- a/www/mplayer-plugin/files/patch-Source_plugin-threads.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- Source/plugin-threads.cpp.orig	2008-06-12 23:38:37.000000000 -0400
-+++ Source/plugin-threads.cpp	2009-10-01 05:04:31.000000000 -0400
-@@ -14,8 +14,11 @@
- 
- static void sig_child(int signo)
- {
--    // Not used, so commented out
--    // wait(NULL);
-+	pid_t pid;
-+	int status;
-+
-+	pid = wait(&status);
-+	return;
- }
diff --git a/www/mplayer-plugin/files/patch-configure b/www/mplayer-plugin/files/patch-configure
deleted file mode 100644
index 6b1e401114dc..000000000000
--- a/www/mplayer-plugin/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2008-06-24 09:15:05.000000000 -0400
-+++ configure	2009-04-10 17:04:02.000000000 -0400
-@@ -3789,7 +3789,7 @@
-   if test $succeeded = yes; then
-       MOZPLUG_CFLAGS="${MOZPLUG_CFLAGS} -I`$PKG_CONFIG --variable=includedir libxul`"
- MOZILLA_HOME=`$PKG_CONFIG --variable=libdir libxul`
--GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`
-+GECKO_IDLDIR=`$PKG_CONFIG --variable=idldir libxul`/`$PKG_CONFIG --variable=includetype libxul`
- 
-   else
-      { echo "$as_me:$LINENO: WARNING: libxul not found" >&5
diff --git a/www/mplayer-plugin/pkg-descr b/www/mplayer-plugin/pkg-descr
deleted file mode 100644
index 5426030de4f2..000000000000
--- a/www/mplayer-plugin/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-A Mozilla plugin that uses MPlayer to play videos from websites.
-
-WWW: http://mplayerplug-in.sourceforge.net/
diff --git a/www/mplayer-plugin/pkg-plist b/www/mplayer-plugin/pkg-plist
deleted file mode 100644
index 3f36c2c2d9bd..000000000000
--- a/www/mplayer-plugin/pkg-plist
+++ /dev/null
@@ -1,41 +0,0 @@
-@unexec if cmp -s %D/etc/mplayerplug-in.conf %D/etc/mplayerplug-in.conf.dist; then rm -f %D/etc/mplayerplug-in.conf; fi
-etc/mplayerplug-in.conf.dist
-@unexec if cmp -s %D/etc/mplayerplug-in.types %D/etc/mplayerplug-in.types.dist; then rm -f %D/etc/mplayerplug-in.types; fi
-etc/mplayerplug-in.types.dist
-%%WEBPLUGINS_DIR%%/mplayerplug-in-dvx.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in-dvx.xpt
-%%WEBPLUGINS_DIR%%/mplayerplug-in-gmp.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in-gmp.xpt
-%%WEBPLUGINS_DIR%%/mplayerplug-in-qt.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in-qt.xpt
-%%WEBPLUGINS_DIR%%/mplayerplug-in-rm.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in-rm.xpt
-%%WEBPLUGINS_DIR%%/mplayerplug-in-wmp.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in-wmp.xpt
-%%WEBPLUGINS_DIR%%/mplayerplug-in.so
-%%WEBPLUGINS_DIR%%/mplayerplug-in.xpt
-share/locale/cs/LC_MESSAGES/mplayerplug-in.mo
-share/locale/da/LC_MESSAGES/mplayerplug-in.mo
-share/locale/de/LC_MESSAGES/mplayerplug-in.mo
-share/locale/en_US/LC_MESSAGES/mplayerplug-in.mo
-share/locale/es/LC_MESSAGES/mplayerplug-in.mo
-share/locale/fr/LC_MESSAGES/mplayerplug-in.mo
-share/locale/hu/LC_MESSAGES/mplayerplug-in.mo
-share/locale/it/LC_MESSAGES/mplayerplug-in.mo
-share/locale/ja/LC_MESSAGES/mplayerplug-in.mo
-share/locale/ko/LC_MESSAGES/mplayerplug-in.mo
-share/locale/nb/LC_MESSAGES/mplayerplug-in.mo
-share/locale/nl/LC_MESSAGES/mplayerplug-in.mo
-share/locale/pl/LC_MESSAGES/mplayerplug-in.mo
-share/locale/pt_BR/LC_MESSAGES/mplayerplug-in.mo
-share/locale/ru/LC_MESSAGES/mplayerplug-in.mo
-share/locale/se/LC_MESSAGES/mplayerplug-in.mo
-share/locale/sk/LC_MESSAGES/mplayerplug-in.mo
-share/locale/tr/LC_MESSAGES/mplayerplug-in.mo
-share/locale/wa/LC_MESSAGES/mplayerplug-in.mo
-share/locale/zh_CN/LC_MESSAGES/mplayerplug-in.mo
-@dirrmtry %%WEBPLUGINS_DIR%%
-@dirrmtry share/locale/se/LC_MESSAGES
-@dirrmtry share/locale/se
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US