update to 2.24.2

This switches to the gnome-2.24 release branch.
also pull in Python, enables the youtube plugin

5 files changed, 52 insertions, 10 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 1fbb405b78b..ee7cbdcdf41 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/06/20 01:09:28 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2008/10/16 17:26:07 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -10,6 +10,7 @@ COMMENT+=	(using GStreamer)
 CONFLICTS+=	totem-xine-[0-9]*
 
 CONFIGURE_ARGS+=	--enable-gstreamer=yes
+CONFIGURE_ARGS+=	--disable-browser-plugins
 
 BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.7
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 6aeb594c3fe..9d48a04e0b4 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.40 2008/04/30 13:38:16 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.41 2008/10/16 17:26:07 drochner Exp $
 #
 
-DISTNAME=	totem-2.22.2
+DISTNAME=	totem-2.24.2
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.24/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/totem/
@@ -29,6 +29,10 @@ BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=2.8.2
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.6.0
 
+.include "../../lang/python/application.mk"
+.include "../../x11/py-gtk2/buildlink3.mk"
+.include "../../www/py-gdata/buildlink3.mk"
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 94f6e5bae15..4e4b8603ffa 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.15 2008/04/15 18:23:54 drochner Exp $
+@comment $NetBSD: PLIST,v 1.16 2008/10/16 17:26:07 drochner Exp $
 bin/totem
 bin/totem-audio-preview
 bin/totem-video-indexer
 bin/totem-video-thumbnailer
+lib/libbaconvideowidget.la
 lib/totem/plugins/gromit/gromit.totem-plugin
 lib/totem/plugins/gromit/libgromit.la
 lib/totem/plugins/media-player-keys/libmedia_player_keys.la
@@ -11,6 +12,13 @@ lib/totem/plugins/ontop/libontop.la
 lib/totem/plugins/ontop/ontop.totem-plugin
 lib/totem/plugins/properties/libmovie-properties.la
 lib/totem/plugins/properties/movie-properties.totem-plugin
+lib/totem/plugins/pythonconsole/console.py
+lib/totem/plugins/pythonconsole/console.pyc
+lib/totem/plugins/pythonconsole/console.pyo
+lib/totem/plugins/pythonconsole/pythonconsole.py
+lib/totem/plugins/pythonconsole/pythonconsole.pyc
+lib/totem/plugins/pythonconsole/pythonconsole.pyo
+lib/totem/plugins/pythonconsole/pythonconsole.totem-plugin
 lib/totem/plugins/screensaver/libscreensaver.la
 lib/totem/plugins/screensaver/screensaver.totem-plugin
 lib/totem/plugins/skipto/libskipto.la
@@ -18,6 +26,9 @@ lib/totem/plugins/skipto/skipto.totem-plugin
 lib/totem/plugins/skipto/skipto.ui
 lib/totem/plugins/thumbnail/libthumbnail.la
 lib/totem/plugins/thumbnail/thumbnail.totem-plugin
+lib/totem/plugins/totem/__init__.py
+lib/totem/plugins/totem/__init__.pyc
+lib/totem/plugins/totem/__init__.pyo
 lib/totem/plugins/youtube/youtube.py
 lib/totem/plugins/youtube/youtube.pyc
 lib/totem/plugins/youtube/youtube.pyo
@@ -123,6 +134,15 @@ share/gnome/help/totem/pa/figures/totem_start_window.png
 share/gnome/help/totem/pa/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/pa/figures/totem_volume_mute_button.png
 share/gnome/help/totem/pa/totem.xml
+share/gnome/help/totem/pl/figures/totem_next_button.png
+share/gnome/help/totem/pl/figures/totem_pause_button.png
+share/gnome/help/totem/pl/figures/totem_play_button.png
+share/gnome/help/totem/pl/figures/totem_previous_button.png
+share/gnome/help/totem/pl/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pl/figures/totem_start_window.png
+share/gnome/help/totem/pl/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pl/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pl/totem.xml
 share/gnome/help/totem/pt_BR/figures/totem_next_button.png
 share/gnome/help/totem/pt_BR/figures/totem_pause_button.png
 share/gnome/help/totem/pt_BR/figures/totem_play_button.png
@@ -248,7 +268,7 @@ 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
+share/locale/sr@latin/LC_MESSAGES/totem.mo
 share/locale/sv/LC_MESSAGES/totem.mo
 share/locale/ta/LC_MESSAGES/totem.mo
 share/locale/te/LC_MESSAGES/totem.mo
@@ -273,6 +293,7 @@ share/omf/totem/totem-fr.omf
 share/omf/totem/totem-it.omf
 share/omf/totem/totem-oc.omf
 share/omf/totem/totem-pa.omf
+share/omf/totem/totem-pl.omf
 share/omf/totem/totem-pt_BR.omf
 share/omf/totem/totem-ru.omf
 share/omf/totem/totem-sv.omf
@@ -313,6 +334,8 @@ share/totem/video-list.ui
 @dirrm share/gnome/help/totem/ru
 @dirrm share/gnome/help/totem/pt_BR/figures
 @dirrm share/gnome/help/totem/pt_BR
+@dirrm share/gnome/help/totem/pl/figures
+@dirrm share/gnome/help/totem/pl
 @dirrm share/gnome/help/totem/pa/figures
 @dirrm share/gnome/help/totem/pa
 @dirrm share/gnome/help/totem/oc/figures
@@ -340,9 +363,11 @@ share/totem/video-list.ui
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/totem/plugins/youtube
+@dirrm lib/totem/plugins/totem
 @dirrm lib/totem/plugins/thumbnail
 @dirrm lib/totem/plugins/skipto
 @dirrm lib/totem/plugins/screensaver
+@dirrm lib/totem/plugins/pythonconsole
 @dirrm lib/totem/plugins/properties
 @dirrm lib/totem/plugins/ontop
 @dirrm lib/totem/plugins/media-player-keys
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 76e9ba90a0a..b901632d83d 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.21 2008/04/29 10:01:05 drochner Exp $
+$NetBSD: distinfo,v 1.22 2008/10/16 17:26:07 drochner Exp $
 
-SHA1 (totem-2.22.2.tar.gz) = 66fbd2277965634bb6b6df6bc54ee1606b43f021
-RMD160 (totem-2.22.2.tar.gz) = 5ef81cb8803059a8dda6b1b0c1f4a78c3e305aa4
-Size (totem-2.22.2.tar.gz) = 3489241 bytes
+SHA1 (totem-2.24.2.tar.gz) = ee7e48911ae0071b49dc5f08ecac1a2323a2c813
+RMD160 (totem-2.24.2.tar.gz) = e281c29ead84d771303b166d7d618419cad0e339
+Size (totem-2.24.2.tar.gz) = 3713802 bytes
 SHA1 (patch-aa) = 6e4ed0bc2c56644ff988fb06104c2d9877894fbd
 SHA1 (patch-ad) = dd138a330004e4f1130b74e1689d117acf7a9c6c
+SHA1 (patch-ae) = f0fb18003531ab0bb20337734c839a942c6e3822
diff --git a/multimedia/totem/patches/patch-ae b/multimedia/totem/patches/patch-ae
new file mode 100644
index 00000000000..eb8448db0a2
--- /dev/null
+++ b/multimedia/totem/patches/patch-ae
@@ -0,0 +1,11 @@
+$NetBSD: patch-ae,v 1.1 2008/10/16 17:26:07 drochner Exp $
+
+--- help/totem.omf.in.orig	2008-04-24 11:55:48.000000000 +0200
++++ help/totem.omf.in
+@@ -1,6 +1,4 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" 
+- "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
+ <omf>
+   <resource>
+     <subject category="GNOME|Multimedia"/>