update to 2.28.1

This switches to the gnome-2.28 release branch.

8 files changed, 56 insertions, 62 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 906c1fd2761..cd28140d5d9 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.36 2009/09/07 10:02:13 drochner Exp $
+# $NetBSD: Makefile,v 1.37 2009/10/21 18:56:15 drochner Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
 COMMENT+=	(using GStreamer)
 
 CONFLICTS+=	totem-xine-[0-9]*
@@ -18,4 +16,7 @@ BUILDLINK_API_DEPENDS.gst-plugins0.10-base+=	gst-plugins0.10-base>=0.10.7
 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk"
 .include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../x11/libunique/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../net/libgdata/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 2d55e700408..65b86a2e90e 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.51 2009/09/07 10:02:13 drochner Exp $
+# $NetBSD: Makefile.common,v 1.52 2009/10/21 18:56:15 drochner Exp $
 #
 # used by multimedia/totem-browser-plugin/Makefile
 # used by multimedia/totem-nautilus/Makefile
 # used by multimedia/totem-xine/Makefile
 
-DISTNAME=	totem-2.26.3
+DISTNAME=	totem-2.28.1
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.26/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.28/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/totem/
@@ -35,14 +35,10 @@ GCONF_SCHEMAS+=	totem-video-thumbnail.schemas
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.8.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gnome-icon-theme+=	gnome-icon-theme>=2.10.0
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-BUILDLINK_API_DEPENDS.gnome-vfs+=		gnome-vfs>=2.8.2
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index a4133221f4a..0fba6dd08c7 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,17 +1,31 @@
-@comment $NetBSD: PLIST,v 1.22 2009/07/09 18:20:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.23 2009/10/21 18:56:15 drochner Exp $
 bin/totem
 bin/totem-audio-preview
 bin/totem-video-indexer
 bin/totem-video-thumbnailer
-lib/libbaconvideowidget.la
 lib/totem/plugins/brasero-disc-recorder/brasero-disc-recorder.totem-plugin
 lib/totem/plugins/brasero-disc-recorder/libbrasero-disc-recorder.la
 lib/totem/plugins/coherence_upnp/coherence_upnp.py
 lib/totem/plugins/coherence_upnp/coherence_upnp.pyc
 lib/totem/plugins/coherence_upnp/coherence_upnp.pyo
 lib/totem/plugins/coherence_upnp/coherence_upnp.totem-plugin
+lib/totem/plugins/dbus/dbus-service.py
+lib/totem/plugins/dbus/dbus-service.pyc
+lib/totem/plugins/dbus/dbus-service.pyo
+lib/totem/plugins/dbus/dbus-service.totem-plugin
 lib/totem/plugins/gromit/gromit.totem-plugin
 lib/totem/plugins/gromit/libgromit.la
+lib/totem/plugins/iplayer/iplayer.py
+lib/totem/plugins/iplayer/iplayer.pyc
+lib/totem/plugins/iplayer/iplayer.pyo
+lib/totem/plugins/iplayer/iplayer.totem-plugin
+lib/totem/plugins/iplayer/iplayer.ui
+lib/totem/plugins/iplayer/iplayer2.py
+lib/totem/plugins/iplayer/iplayer2.pyc
+lib/totem/plugins/iplayer/iplayer2.pyo
+lib/totem/plugins/iplayer/listparser.py
+lib/totem/plugins/iplayer/listparser.pyc
+lib/totem/plugins/iplayer/listparser.pyo
 lib/totem/plugins/jamendo/jamendo.py
 lib/totem/plugins/jamendo/jamendo.pyc
 lib/totem/plugins/jamendo/jamendo.pyo
@@ -41,6 +55,7 @@ lib/totem/plugins/pythonconsole/pythonconsole.totem-plugin
 lib/totem/plugins/screensaver/libscreensaver.la
 lib/totem/plugins/screensaver/screensaver.totem-plugin
 lib/totem/plugins/screenshot/gallery.ui
+lib/totem/plugins/screenshot/gnome-screenshot.ui
 lib/totem/plugins/screenshot/libscreenshot.la
 lib/totem/plugins/screenshot/screenshot.totem-plugin
 lib/totem/plugins/skipto/libskipto.la
@@ -51,9 +66,7 @@ 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
+lib/totem/plugins/youtube/libyoutube.la
 lib/totem/plugins/youtube/youtube.totem-plugin
 lib/totem/plugins/youtube/youtube.ui
 man/man1/totem-video-thumbnailer.1
@@ -237,6 +250,15 @@ share/gnome/help/totem/uk/figures/totem_start_window.png
 share/gnome/help/totem/uk/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/uk/figures/totem_volume_mute_button.png
 share/gnome/help/totem/uk/totem.xml
+share/gnome/help/totem/zh_CN/figures/totem_next_button.png
+share/gnome/help/totem/zh_CN/figures/totem_pause_button.png
+share/gnome/help/totem/zh_CN/figures/totem_play_button.png
+share/gnome/help/totem/zh_CN/figures/totem_previous_button.png
+share/gnome/help/totem/zh_CN/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_CN/figures/totem_start_window.png
+share/gnome/help/totem/zh_CN/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_CN/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_CN/totem.xml
 share/gnome/help/totem/zh_HK/figures/totem_next_button.png
 share/gnome/help/totem/zh_HK/figures/totem_pause_button.png
 share/gnome/help/totem/zh_HK/figures/totem_play_button.png
@@ -298,6 +320,7 @@ share/locale/bn/LC_MESSAGES/totem.mo
 share/locale/bn_IN/LC_MESSAGES/totem.mo
 share/locale/br/LC_MESSAGES/totem.mo
 share/locale/ca/LC_MESSAGES/totem.mo
+share/locale/ca@valencia/LC_MESSAGES/totem.mo
 share/locale/crh/LC_MESSAGES/totem.mo
 share/locale/cs/LC_MESSAGES/totem.mo
 share/locale/cy/LC_MESSAGES/totem.mo
@@ -344,7 +367,6 @@ share/locale/oc/LC_MESSAGES/totem.mo
 share/locale/or/LC_MESSAGES/totem.mo
 share/locale/pa/LC_MESSAGES/totem.mo
 share/locale/pl/LC_MESSAGES/totem.mo
-share/locale/ps/LC_MESSAGES/totem.mo
 share/locale/pt/LC_MESSAGES/totem.mo
 share/locale/pt_BR/LC_MESSAGES/totem.mo
 share/locale/ro/LC_MESSAGES/totem.mo
@@ -389,6 +411,7 @@ share/omf/totem/totem-pt_BR.omf
 share/omf/totem/totem-ru.omf
 share/omf/totem/totem-sv.omf
 share/omf/totem/totem-uk.omf
+share/omf/totem/totem-zh_CN.omf
 share/omf/totem/totem-zh_HK.omf
 share/omf/totem/totem-zh_TW.omf
 share/totem/filmholes-big-left.png
@@ -400,6 +423,5 @@ share/totem/playlist.ui
 share/totem/plugins.ui
 share/totem/properties.ui
 share/totem/totem.ui
-share/totem/totem_logo.png
 share/totem/uri.ui
 share/totem/video-list.ui
diff --git a/multimedia/totem/buildlink3.mk b/multimedia/totem/buildlink3.mk
index 9da511539e1..23be089b053 100644
--- a/multimedia/totem/buildlink3.mk
+++ b/multimedia/totem/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:57:00 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2009/10/21 18:56:15 drochner Exp $
 
 BUILDLINK_TREE+=	totem
 
@@ -9,7 +9,6 @@ BUILDLINK_API_DEPENDS.totem+=	{totem,totem-xine}>=1.4.0
 BUILDLINK_ABI_DEPENDS.totem+=	totem>=2.26.3nb1
 BUILDLINK_PKGSRCDIR.totem?=	../../multimedia/totem
 
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .endif # TOTEM_BUILDLINK3_MK
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index aaad8bd1ffc..66ce7a70517 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.33 2009/09/07 18:21:55 drochner Exp $
+$NetBSD: distinfo,v 1.34 2009/10/21 18:56:15 drochner Exp $
 
-SHA1 (totem-2.26.3.tar.gz) = eb7fc23c6ff6c8e7c5a23ff15ec9fa1b59b5a494
-RMD160 (totem-2.26.3.tar.gz) = 91386162699fd1c56c0976080c84ba677e8d566e
-Size (totem-2.26.3.tar.gz) = 4709812 bytes
+SHA1 (totem-2.28.1.tar.gz) = 4d6dfc012c9209bd986f889288526c77a237db7e
+RMD160 (totem-2.28.1.tar.gz) = 4ec14a140d218fda9ede7cbeeb7970cb8f7bc2be
+Size (totem-2.28.1.tar.gz) = 4599255 bytes
 SHA1 (patch-ad) = ec8cd092d202255981049ace4ac643c41a0044be
 SHA1 (patch-af) = 8e4ffb97aedbf56a052d5ffacea73f8b2f071183
-SHA1 (patch-ag) = 41365aaf9864eeb871346e338b6c7cc7aaa676bb
-SHA1 (patch-ah) = 37d9a8e2938134befc1f606f8602b88831b4d16c
+SHA1 (patch-ai) = 6f95138b8260dc925493845e34a7b7e9f6f93a53
diff --git a/multimedia/totem/patches/patch-ag b/multimedia/totem/patches/patch-ag
deleted file mode 100644
index 845eb4bb08b..00000000000
--- a/multimedia/totem/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/09/07 10:02:13 drochner Exp $
-
---- src/plugins/jamendo/jamendo.ui.orig	2009-04-27 01:56:26.000000000 +0200
-+++ src/plugins/jamendo/jamendo.ui
-@@ -187,7 +187,7 @@
- 				<property name="scrollable">False</property>
- 				<property name="enable_popup">False</property>
- 				<child>
--					<object class="GtkVBox" id="vbox1">
-+					<object class="GtkVBox" id="vbox11">
- 						<property name="visible">True</property>
- 						<property name="homogeneous">False</property>
- 						<property name="spacing">0</property>
diff --git a/multimedia/totem/patches/patch-ah b/multimedia/totem/patches/patch-ah
deleted file mode 100644
index 33453f2254a..00000000000
--- a/multimedia/totem/patches/patch-ah
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2009/09/07 18:21:55 drochner Exp $
-
---- src/plugins/youtube/youtube.py.orig	2009-09-07 20:11:03.000000000 +0200
-+++ src/plugins/youtube/youtube.py
-@@ -203,8 +203,8 @@ class YouTube (totem.Plugin):
- 
- 	def resolve_t_param (self, youtube_id):
- 		"""We have to get the t parameter from the actual video page, since Google changed how their URLs work"""
--		stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id))
--		regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"")
-+		stream = urllib.urlopen ("http://youtube.com/get_video_info?video_id=" + urllib.quote (youtube_id))
-+		regexp1 = re.compile ("(?m)&token=([^&]+)(?:&|$)")
- 		regexp2 = re.compile ("</head>")
- 
- 		contents = stream.read ()
-@@ -213,7 +213,7 @@ class YouTube (totem.Plugin):
- 			matches = regexp1.search (contents)
- 			if (matches != None):
- 				stream.close ()
--				return matches.group (1)
-+				return urllib.unquote(matches.group (1))
- 
- 			"""Check to see if we've come to the end of the <head> tag; in which case, we should give up"""
- 			if (regexp2.search (contents) != None):
diff --git a/multimedia/totem/patches/patch-ai b/multimedia/totem/patches/patch-ai
new file mode 100644
index 00000000000..84fa96f5caa
--- /dev/null
+++ b/multimedia/totem/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2009/10/21 18:56:15 drochner Exp $
+
+--- help/totem-docs.h.orig	2009-09-29 13:40:56.000000000 +0200
++++ help/totem-docs.h
+@@ -1,7 +1,9 @@
+ const gchar* documentation_credits[] = {
++#if 0
+ 	"Baptiste Mille-Mathias <baptiste.millemathias@gmail.org>",
+ 	"Chee Bin HOH <cbhoh@gnome.org>",
+ 	"Philip Withnall <philip@tecnocode.co.uk>",
++#endif
+ 	NULL
+ };
+