Update to 1.5.91.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7059 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 127 insertions, 24 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 5c74235fa..18cc4c37a 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	1.5.90
+PORTVERSION=	1.5.91
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -51,10 +51,19 @@ CONFLICTS?=	totem-gstreamer-[0-9]*
 USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
 PLIST_SUB+=	MOZILLA=""
-CONFIGURE_ARGS+=--with-mozilla=${GECKO}
+CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
+		--enable-gmp-plugin \
+		--enable-complex-plugin \
+		--enable-narrowspace-plugin
 .else
 PLIST_SUB+=	MOZILLA="@comment "
-CONFIGURE_ARGS+=--disable-mozilla
+CONFIGURE_ARGS+=--without-mozilla \
+		--disable-browser-plugins \
+		--disable-mozilla \
+		--disable-basic-plugin \
+		--disable-gmp-plugin \
+		--disable-complex-plugin \
+		--disable-narrowspace-plugin
 .endif
 
 .if defined(WITH_GSTREAMER)
@@ -73,9 +82,10 @@ LIB_DEPENDS+=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav
 
 post-patch:
 	@${CP} -f ${FILESDIR}/pkg-message.in ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e 's|/plugins||; \
-		s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|' \
-		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e ' s|@MOZILLA_PLUGINDIR@|${PREFIX}/lib/browser_plugins|; \
+		s|mozilla/plugins|browser_plugins|' \
+		${WRKSRC}/browser-plugin/Makefile.in \
+		${WRKSRC}/browser-plugin/idl/Makefile.in
 
 post-install:
 	@-update-desktop-database
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 30828e94e..2e508479a 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-1.5.90.tar.bz2) = f4d03b463cfb08299b5bce75e3ed3ec1
-SHA256 (gnome2/totem-1.5.90.tar.bz2) = bec301402b4b28f69604b5159235294c951f26cf5a489960589f1e0cb89d8531
-SIZE (gnome2/totem-1.5.90.tar.bz2) = 1739896
+MD5 (gnome2/totem-1.5.91.tar.bz2) = 2195f9a36c5328c3ee10f1dfda206865
+SHA256 (gnome2/totem-1.5.91.tar.bz2) = f1cc3cc2dca987fda5921f6179e5bd4ee6da502287f0ddab528060c6d07239cb
+SIZE (gnome2/totem-1.5.91.tar.bz2) = 1808043
diff --git a/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
new file mode 100644
index 000000000..9a16349f4
--- /dev/null
+++ b/multimedia/totem/files/patch-browser-plugin_totemPlugin.cpp
@@ -0,0 +1,10 @@
+--- browser-plugin/totemPlugin.cpp.orig	Mon Aug 14 17:01:14 2006
++++ browser-plugin/totemPlugin.cpp	Mon Aug 14 17:01:24 2006
+@@ -27,6 +27,7 @@
+ #include <stdint.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <signal.h>
+ #include <sys/wait.h>
+ #include <sys/poll.h>
+ #include <string.h>
diff --git a/multimedia/totem/files/patch-configure b/multimedia/totem/files/patch-configure
new file mode 100644
index 000000000..0d0963ea5
--- /dev/null
+++ b/multimedia/totem/files/patch-configure
@@ -0,0 +1,68 @@
+--- configure.orig	Mon Aug 14 17:36:36 2006
++++ configure	Mon Aug 14 17:40:16 2006
+@@ -22387,6 +22387,7 @@ else
+ fi;
+ echo "$as_me:$LINENO: result: $enable_basic_plugin" >&5
+ echo "${ECHO_T}$enable_basic_plugin" >&6
++fi
+ 
+ 
+ 
+@@ -22398,6 +22399,7 @@ else
+   ENABLE_BASIC_PLUGIN_FALSE=
+ fi
+ 
++if test "$ENABLE_MOZILLA" = "yes"; then
+ 
+ echo "$as_me:$LINENO: checking whether to enable the GMP browser plugin" >&5
+ echo $ECHO_N "checking whether to enable the GMP browser plugin... $ECHO_C" >&6
+@@ -22410,6 +22412,7 @@ else
+ fi;
+ echo "$as_me:$LINENO: result: $enable_gmp_plugin" >&5
+ echo "${ECHO_T}$enable_gmp_plugin" >&6
++fi
+ 
+ 
+ 
+@@ -22422,6 +22425,8 @@ else
+ fi
+ 
+ 
++if test "$ENABLE_MOZILLA" = "yes"; then
++
+ echo "$as_me:$LINENO: checking whether to enable the Complex browser plugin" >&5
+ echo $ECHO_N "checking whether to enable the Complex browser plugin... $ECHO_C" >&6
+ # Check whether --enable-complex-plugin or --disable-complex-plugin was given.
+@@ -22433,6 +22438,7 @@ else
+ fi;
+ echo "$as_me:$LINENO: result: $enable_complex_plugin" >&5
+ echo "${ECHO_T}$enable_complex_plugin" >&6
++fi
+ 
+ 
+ 
+@@ -22445,6 +22451,8 @@ else
+ fi
+ 
+ 
++if test "$ENABLE_MOZILLA" = "yes"; then
++
+ echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5
+ echo $ECHO_N "checking whether to enable the NarrowSpace browser plugin... $ECHO_C" >&6
+ # Check whether --enable-narrowspace-plugin or --disable-narrowspace-plugin was given.
+@@ -22456,6 +22464,7 @@ else
+ fi;
+ echo "$as_me:$LINENO: result: $enable_narrowspace_plugin" >&5
+ echo "${ECHO_T}$enable_narrowspace_plugin" >&6
++fi
+ 
+ 
+ 
+@@ -22468,7 +22477,6 @@ else
+ fi
+ 
+ 
+-fi
+ 
+ 
+ # Check whether --enable-nautilus or --disable-nautilus was given.
diff --git a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp b/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
deleted file mode 100644
index 2c34077ea..000000000
--- a/multimedia/totem/files/patch-src_totem-mozilla-plugin.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/totem-mozilla-plugin.cpp.orig	Tue Nov  8 21:50:10 2005
-+++ src/totem-mozilla-plugin.cpp	Tue Nov  8 21:50:27 2005
-@@ -27,6 +27,7 @@
- #include <stdint.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <signal.h>
- #include <sys/wait.h>
- #include <string.h>
- 
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index c3aec9488..cb8225d09 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -4,10 +4,22 @@ include/totem/1/plparser/totem-disc.h
 include/totem/1/plparser/totem-pl-parser-builtins.h
 include/totem/1/plparser/totem-pl-parser-features.h
 include/totem/1/plparser/totem-pl-parser.h
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.a
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.la
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.so
-%%MOZILLA%%lib/browser_plugins/libtotem_mozilla.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so
+%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
 lib/libtotem-plparser.a
 lib/libtotem-plparser.la
 lib/libtotem-plparser.so
@@ -83,6 +95,11 @@ share/gnome/omf/totem/totem-fr.omf
 share/gnome/omf/totem/totem-ru.omf
 share/gnome/omf/totem/totem-uk.omf
 share/gnome/pixmaps/vanity.png
+%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html
+%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html
+%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html
 share/gnome/totem/filmholes-big-left.png
 share/gnome/totem/filmholes-big-right.png
 share/gnome/totem/filmholes.png
@@ -105,7 +122,11 @@ share/gnome/totem/totem_logo.png
 share/gnome/totem/uri.glade
 share/gnome/totem/vanity.glade
 share/gnome/totem/vanity.png
-share/icons/hicolor/48x48/apps/media-player-48.png
+share/icons/hicolor/16x16/apps/totem.png
+share/icons/hicolor/22x22/apps/totem.png
+share/icons/hicolor/24x24/apps/totem.png
+share/icons/hicolor/32x32/apps/totem.png
+share/icons/hicolor/scalable/apps/totem.svg
 share/locale/am/LC_MESSAGES/totem.mo
 share/locale/ar/LC_MESSAGES/totem.mo
 share/locale/az/LC_MESSAGES/totem.mo
@@ -160,6 +181,7 @@ share/locale/ro/LC_MESSAGES/totem.mo
 share/locale/ru/LC_MESSAGES/totem.mo
 share/locale/rw/LC_MESSAGES/totem.mo
 share/locale/sk/LC_MESSAGES/totem.mo
+share/locale/sl/LC_MESSAGES/totem.mo
 share/locale/sq/LC_MESSAGES/totem.mo
 share/locale/sr/LC_MESSAGES/totem.mo
 share/locale/sr@Latn/LC_MESSAGES/totem.mo
@@ -176,12 +198,15 @@ share/locale/xh/LC_MESSAGES/totem.mo
 share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_HK/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrm share/gnome/totem/doc
 @dirrm share/gnome/totem
 @dirrm share/gnome/omf/totem
 @dirrm share/gnome/help/totem/uk/figures