Update totem and totem-xine to 1.4.0:

1.4.0
 * Added Bulgarian user guide
 * Show the "Seeking to" label in fullscreen as well
 * Make the standard zoom keyboard shortcuts work
 * Allow to save thumbnails in JPEG rather than PNG
 * Playlist parser fixes for Rhythmbox' initial import
 * Make nautilus startup faster by only initialising the backend when
 we require it (GStreamer)

1.3.92:
 * Get the list of subtitles and languages (GStreamer 0.10)
 * Fix the window title not getting set properly when loading a new file
 * Avoid hang when skipping to the next file (GStreamer 0.10)
 * Require glib 2.8 to avoid crashers (GStreamer 0.10)
 * Compilation fix with glib > 2.8.0 and < 2.9.1
 * Fix a critical warning on startup when a particular file is in the recent
 files list
 * Fix a warning on open (GStreamer 0.8)

1.3.91:
 * Show the waiting cursor when opening files, parsing playlists and starting up
 * Add popup menu support with the keyboard to the playlist
 * Don't reverse items when moving them down the playlist
 * Remove the scrollbars in the playlist when it's been emptied
 * Don't look for subtitles on HTTP servers
 * Don't show playlists as ignored after having parsed them successfully
 * Bigger and better logo
 * Fix a possible crash with the ASF playlist parser
 * Add support for the target property, opening the movie in a stand-alone
 Totem (Mozilla plugin)
 * Add support for background music (Mozilla plugin)
 * Take the aspect ratio of the screen when setting the size of the
 visualisations (xine-lib, GStreamer 0.10)
 * Fix compilation with glib < 2.8
 * Add ability to disable text subtitles when Totem loads them automatically
 (xine-lib)
 * Better logo mode handling (GStreamer 0.8)
 * Free the video output after showing images (GStreamer 0.8)
 * Show the logo when playing an audio file without visualisations
 (GStreamer 0.10)
 * Better key seek handling (GStreamer 0.10)
 * Fix problems with setting the speaker arrangement (GStreamer 0.10)
 * Fix playback of files with non-16-bit audio (GStreamer 0.10)
 * Don't block when getting metadata (GStreamer 0.10)
 * Better error message when the decoder/demuxer doesn't support streaming
 (GStreamer 0.10)

1.3.90:
 * Use Ctrl+S as "Take Screenshot..." shortcut
 * Fix a possible crash on start with multiple totem processes
 * Support application/smil and application/x-smil mime-types
 * Better parsing of SMIL playlists
 * Better parsing of ASX playlists with multiple REF entries per ENTRY
 * Make the about box parented on the Mozilla window (Mozilla plugin)
 * Fix data being dropped when streaming from fast servers (Mozilla plugin)
 * Fix the state of the volume button on startup (Mozilla plugin)
 * Fix the Subtitles and Audio tracks not being available (xine-lib)
 * Support on-the-fly visualisation plugins change (GStreamer)
 * Fallback if the configured output plugins aren't available (GStreamer)
 * Don't shrink the toplevel window when setting the logo (GStreamer)
 * Fix video thumbnailing for movies with a non-1/1 aspect ratio

6 files changed, 48 insertions, 22 deletions

diff --git a/multimedia/totem-xine/Makefile b/multimedia/totem-xine/Makefile
index e8353288a98..fd64c0226b4 100644
--- a/multimedia/totem-xine/Makefile
+++ b/multimedia/totem-xine/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 21:36:13 jmmv Exp $
 #
 
 .include "../../multimedia/totem/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-xine-/}
-PKGREVISION=	4
 
 COMMENT+=	(using Xine)
 
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index fd9b7320d96..38ea148b046 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.9 2006/03/21 06:00:47 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/30 21:36:13 jmmv Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	5
-
 COMMENT+=	(using GStreamer)
 
 CONFLICTS+=	totem-xine-[0-9]*
 
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
-.include "../../multimedia/gstreamer0.8/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-gstreamer=0.10
+
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index bacb67e06f8..d03a25e47e1 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2006/01/18 12:55:55 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2006/03/30 21:36:13 jmmv Exp $
 #
 
-DISTNAME=	totem-1.3.0
+DISTNAME=	totem-1.4.0
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.3/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/1.4/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.hadess.net/totem.php3
@@ -27,14 +27,8 @@ GCONF2_SCHEMAS+=	totem-handlers.schemas
 GCONF2_SCHEMAS+=	totem-video-thumbnail.schemas
 
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.3
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.totem
-.include "../../www/mozilla/gecko-options.mk"
-.include "../../mk/bsd.options.mk"
-
 BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 
-.include "../../audio/musicbrainz/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -43,12 +37,13 @@ BUILDLINK_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
-.include "../../www/mozilla/gecko-depends.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 13d83c4651a..d2dbd261513 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2006/01/12 16:57:49 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2006/03/30 21:36:13 jmmv Exp $
 bin/totem
 bin/totem-video-thumbnailer
 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
 lib/libtotem-plparser.la
 lib/nautilus/extensions-1.0/libtotem-properties-page.la
@@ -23,6 +24,9 @@ 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/help/totem/bg/figures/totem_start_window.png
+share/gnome/help/totem/bg/legal.xml
+share/gnome/help/totem/bg/totem.xml
 share/gnome/help/totem/de/figures/totem_next_button.png
 share/gnome/help/totem/de/figures/totem_pause_button.png
 share/gnome/help/totem/de/figures/totem_play_button.png
@@ -73,6 +77,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/br/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/totem.mo
@@ -99,6 +104,7 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/totem.mo
@@ -129,8 +135,10 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/totem.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/totem.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/totem.mo
 share/omf/totem/totem-C.omf
+share/omf/totem/totem-bg.omf
 share/omf/totem/totem-de.omf
 share/omf/totem/totem-es.omf
 share/omf/totem/totem-fr.omf
@@ -175,6 +183,8 @@ share/totem/vanity.png
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/de/figures
 @dirrm share/gnome/help/totem/de
+@dirrm share/gnome/help/totem/bg/figures
+@dirrm share/gnome/help/totem/bg
 @dirrm share/gnome/help/totem/C/figures
 @dirrm share/gnome/help/totem/C
 @dirrm share/gnome/help/totem
diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk
new file mode 100644
index 00000000000..d0a5fc9317d
--- /dev/null
+++ b/multimedia/totem/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2006/03/30 21:36:13 jmmv Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+TOTEM_BUILDLINK3_MK:=	${TOTEM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	totem
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ntotem}
+BUILDLINK_PACKAGES+=	totem
+
+.if !empty(TOTEM_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.totem+=	{totem,totem-xine}>=1.4.0
+BUILDLINK_PKGSRCDIR.totem?=	../../multimedia/totem
+.endif	# TOTEM_BUILDLINK3_MK
+
+.include "../../sysutils/gnome-vfs2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 05e08b88aa9..b88b10243be 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/01/12 16:57:49 jmmv Exp $
+$NetBSD: distinfo,v 1.6 2006/03/30 21:36:13 jmmv Exp $
 
-SHA1 (totem-1.3.0.tar.gz) = 5bc6fd3199aa67c2c0799a063178b1b2362683fc
-RMD160 (totem-1.3.0.tar.gz) = 039dc36c7974f6d22295ca5a1469706744eba4c5
-Size (totem-1.3.0.tar.gz) = 2010546 bytes
+SHA1 (totem-1.4.0.tar.gz) = 2384fdc8f71656dea1f679a5ae883acd173329c3
+RMD160 (totem-1.4.0.tar.gz) = f664bc69dc9c12af97b3ec0b8b44a6cf61d02bb6
+Size (totem-1.4.0.tar.gz) = 2296718 bytes
 SHA1 (patch-aa) = 1267125093c4e76fc61575b83890b9adacff9a0d
 SHA1 (patch-ab) = 6327cf86050bf2fbd9d6b37c338304ddeb08092c