4 files changed, 55 insertions, 27 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index b22cecb0bb45..0a63a9456055 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	totem
-PORTVERSION=	0.99.9
-PORTREVISION=	4
+PORTVERSION=	0.99.11
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/..$//}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/...$//}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	hendrik@scholz.net
@@ -26,6 +25,8 @@ USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
 
+MAN1=	totem.1
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libdvdnav.so)
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 711c7add008c..ae941cdd4324 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/totem-0.99.9.tar.bz2) = e90467c1b4185edbad6571a139e4a42c
-SIZE (gnome2/totem-0.99.9.tar.bz2) = 776253
+MD5 (gnome2/totem-0.99.11.tar.bz2) = ba35dec88f4b185a611eb516c1b464e7
+SIZE (gnome2/totem-0.99.11.tar.bz2) = 915745
diff --git a/multimedia/totem/files/patch-src_bacon-video-widget-xine.c b/multimedia/totem/files/patch-src_bacon-video-widget-xine.c
new file mode 100644
index 000000000000..8e173d631f5f
--- /dev/null
+++ b/multimedia/totem/files/patch-src_bacon-video-widget-xine.c
@@ -0,0 +1,17 @@
+--- src/bacon-video-widget-xine.c.orig	Sat Apr 17 00:51:30 2004
++++ src/bacon-video-widget-xine.c	Mon Apr 19 19:43:30 2004
+@@ -1267,12 +1267,14 @@
+ 		xine_stop (bvw->priv->stream);
+ 		message = g_strdup (_("The audio device is busy. Is another application using it?"));
+ 		break;
++#if 0
+ 	case XINE_MSG_PERMISSION_ERROR:
+ 		if (strncmp (bvw->priv->mrl, "file:", 5) == 0)
+ 			message = g_strdup (_("You are not allowed to open this file."));
+ 		else
+ 			message = g_strdup (_("The server refused access to this file or stream."));
+ 		break;
++#endif
+ 	}
+ 
+ 	if (message == NULL)
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 6cd32a744541..f65903e95654 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -40,51 +40,54 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-asf/%
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-ms-wmv/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-msvideo/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/video@x-nsv/%gconf.xml
-etc/gconf/schemas/totem.schemas
 etc/gconf/schemas/totem-video-thumbnail.schemas
+etc/gconf/schemas/totem.schemas
 libdata/bonobo/servers/Totem_properties.server
 libexec/totem-properties-page
 share/gnome/application-registry/totem.applications
 share/gnome/applications/totem.desktop
+share/gnome/help/totem/C/figures/totem_next_button.png
+share/gnome/help/totem/C/figures/totem_pause_button.png
+share/gnome/help/totem/C/figures/totem_play_button.png
+share/gnome/help/totem/C/figures/totem_previous_button.png
+share/gnome/help/totem/C/figures/totem_show_playlist_button.png
+share/gnome/help/totem/C/figures/totem_start_window.png
+share/gnome/help/totem/C/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/C/figures/totem_volume_mute_button.png
+share/gnome/help/totem/C/legal.xml
+share/gnome/help/totem/C/totem.xml
 share/gnome/mime-info/totem.keys
+share/gnome/omf/totem/totem-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/totem/totem-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/totem/totem-de.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/totem/totem-de.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/media-player-48.png
 share/gnome/pixmaps/vanity.png
 share/gnome/totem/filmholes.png
 share/gnome/totem/media-player-48.png
-share/gnome/totem/stock_media_next.png
-share/gnome/totem/stock_media_previous.png
-share/gnome/totem/stock_media_pause.png
-share/gnome/totem/stock_media_play.png
-share/gnome/totem/stock-tool-brightness-contrast-22.png
 share/gnome/totem/playlist-16.png
 share/gnome/totem/playlist-24.png
 share/gnome/totem/playlist-playing.png
+share/gnome/totem/playlist.glade
+share/gnome/totem/properties.glade
 share/gnome/totem/rhythmbox-volume-max.png
 share/gnome/totem/rhythmbox-volume-zero.png
+share/gnome/totem/screenshot.glade
+share/gnome/totem/stock-tool-brightness-contrast-22.png
+share/gnome/totem/stock_media_next.png
+share/gnome/totem/stock_media_pause.png
+share/gnome/totem/stock_media_play.png
+share/gnome/totem/stock_media_previous.png
 share/gnome/totem/totem.glade
-share/gnome/totem/totem-download.glade
 share/gnome/totem/totem_logo.png
-share/gnome/totem/playlist.glade
-share/gnome/totem/properties.glade
 share/gnome/totem/uri.glade
 share/gnome/totem/vanity.glade
 share/gnome/totem/vanity.png
-share/gnome/help/totem/C/totem.xml
-share/gnome/help/totem/C/legal.xml
-share/gnome/help/totem/C/figures/totem_next_button.png
-share/gnome/help/totem/C/figures/totem_pause_button.png
-share/gnome/help/totem/C/figures/totem_play_button.png
-share/gnome/help/totem/C/figures/totem_previous_button.png
-share/gnome/help/totem/C/figures/totem_show_playlist_button.png
-share/gnome/help/totem/C/figures/totem_start_window.png
-share/gnome/help/totem/C/figures/totem_volume_maximum_button.png
-share/gnome/help/totem/C/figures/totem_volume_mute_button.png
-share/gnome/omf/totem/totem-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/totem/totem-C.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/totem.mo
+share/locale/ar/LC_MESSAGES/totem.mo
 share/locale/az/LC_MESSAGES/totem.mo
-share/locale/bg/LC_MESSAGES/totem.mo
 share/locale/be/LC_MESSAGES/totem.mo
+share/locale/bg/LC_MESSAGES/totem.mo
 share/locale/bn/LC_MESSAGES/totem.mo
 share/locale/ca/LC_MESSAGES/totem.mo
 share/locale/cs/LC_MESSAGES/totem.mo
@@ -92,18 +95,23 @@ share/locale/cy/LC_MESSAGES/totem.mo
 share/locale/da/LC_MESSAGES/totem.mo
 share/locale/de/LC_MESSAGES/totem.mo
 share/locale/el/LC_MESSAGES/totem.mo
+share/locale/en_CA/LC_MESSAGES/totem.mo
 share/locale/en_GB/LC_MESSAGES/totem.mo
 share/locale/es/LC_MESSAGES/totem.mo
 share/locale/et/LC_MESSAGES/totem.mo
+share/locale/eu/LC_MESSAGES/totem.mo
 share/locale/fi/LC_MESSAGES/totem.mo
 share/locale/fr/LC_MESSAGES/totem.mo
 share/locale/ga/LC_MESSAGES/totem.mo
 share/locale/he/LC_MESSAGES/totem.mo
 share/locale/hr/LC_MESSAGES/totem.mo
+share/locale/hu/LC_MESSAGES/totem.mo
 share/locale/it/LC_MESSAGES/totem.mo
 share/locale/ja/LC_MESSAGES/totem.mo
 share/locale/ko/LC_MESSAGES/totem.mo
+share/locale/lt/LC_MESSAGES/totem.mo
 share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/mk/LC_MESSAGES/totem.mo
 share/locale/ml/LC_MESSAGES/totem.mo
 share/locale/ms/LC_MESSAGES/totem.mo
 share/locale/nl/LC_MESSAGES/totem.mo
@@ -119,6 +127,7 @@ share/locale/sv/LC_MESSAGES/totem.mo
 share/locale/tr/LC_MESSAGES/totem.mo
 share/locale/uk/LC_MESSAGES/totem.mo
 share/locale/vi/LC_MESSAGES/totem.mo
+share/locale/wa/LC_MESSAGES/totem.mo
 share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm share/gnome/help/totem/C/figures
@@ -166,4 +175,5 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@vnd.rn-realmedia
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@ogg
 @dirrm etc/gconf/gconf.xml.defaults/apps/totem
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/totem/totem-de.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/totem/totem-C.omf 2>/dev/null || /usr/bin/true