update to 2.22.1

This switches to the gnome-2.22 release branch.

7 files changed, 100 insertions, 66 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 6ea4062de53..68064474a1d 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.25 2008/03/06 14:53:52 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2008/04/15 18:23:54 drochner Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	2
 COMMENT+=	(using GStreamer)
 
 CONFLICTS+=	totem-xine-[0-9]*
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index ea62680fde0..9b265bda8d1 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.37 2008/01/11 13:58:48 drochner Exp $
+# $NetBSD: Makefile.common,v 1.38 2008/04/15 18:23:54 drochner Exp $
 #
 
-DISTNAME=	totem-2.20.3
+DISTNAME=	totem-2.22.1
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.22/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/totem/
@@ -20,8 +20,6 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGES=		c c++
 
-PKGCONFIG_OVERRIDE=	totem-plparser.pc.in
-
 GCONF_SCHEMAS=		totem.schemas
 GCONF_SCHEMAS+=	totem-handlers.schemas
 GCONF_SCHEMAS+=	totem-video-thumbnail.schemas
@@ -42,10 +40,11 @@ BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.6.0
 .include "../../sysutils/gnome-vfs/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/iso-codes/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
-.include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXtst/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../multimedia/totem-pl-parser/buildlink3.mk"
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 236d5510cbb..94f6e5bae15 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,16 +1,12 @@
-@comment $NetBSD: PLIST,v 1.14 2007/11/05 19:26:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/04/15 18:23:54 drochner Exp $
 bin/totem
+bin/totem-audio-preview
 bin/totem-video-indexer
 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
-lib/pkgconfig/totem-plparser.pc
 lib/totem/plugins/gromit/gromit.totem-plugin
 lib/totem/plugins/gromit/libgromit.la
+lib/totem/plugins/media-player-keys/libmedia_player_keys.la
+lib/totem/plugins/media-player-keys/media-player-keys.totem-plugin
 lib/totem/plugins/ontop/libontop.la
 lib/totem/plugins/ontop/ontop.totem-plugin
 lib/totem/plugins/properties/libmovie-properties.la
@@ -20,6 +16,13 @@ lib/totem/plugins/screensaver/screensaver.totem-plugin
 lib/totem/plugins/skipto/libskipto.la
 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/youtube/youtube.py
+lib/totem/plugins/youtube/youtube.pyc
+lib/totem/plugins/youtube/youtube.pyo
+lib/totem/plugins/youtube/youtube.totem-plugin
+lib/totem/plugins/youtube/youtube.ui
 man/man1/totem-video-thumbnailer.1
 man/man1/totem.1
 share/applications/totem.desktop
@@ -57,6 +60,15 @@ share/gnome/help/totem/de/figures/totem_start_window.png
 share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/de/figures/totem_volume_mute_button.png
 share/gnome/help/totem/de/totem.xml
+share/gnome/help/totem/el/figures/totem_next_button.png
+share/gnome/help/totem/el/figures/totem_pause_button.png
+share/gnome/help/totem/el/figures/totem_play_button.png
+share/gnome/help/totem/el/figures/totem_previous_button.png
+share/gnome/help/totem/el/figures/totem_show_playlist_button.png
+share/gnome/help/totem/el/figures/totem_start_window.png
+share/gnome/help/totem/el/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/el/figures/totem_volume_mute_button.png
+share/gnome/help/totem/el/totem.xml
 share/gnome/help/totem/en_GB/figures/totem_next_button.png
 share/gnome/help/totem/en_GB/figures/totem_pause_button.png
 share/gnome/help/totem/en_GB/figures/totem_play_button.png
@@ -84,6 +96,15 @@ share/gnome/help/totem/fr/figures/totem_start_window.png
 share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
 share/gnome/help/totem/fr/totem.xml
+share/gnome/help/totem/it/figures/totem_next_button.png
+share/gnome/help/totem/it/figures/totem_pause_button.png
+share/gnome/help/totem/it/figures/totem_play_button.png
+share/gnome/help/totem/it/figures/totem_previous_button.png
+share/gnome/help/totem/it/figures/totem_show_playlist_button.png
+share/gnome/help/totem/it/figures/totem_start_window.png
+share/gnome/help/totem/it/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/it/figures/totem_volume_mute_button.png
+share/gnome/help/totem/it/totem.xml
 share/gnome/help/totem/oc/figures/totem_next_button.png
 share/gnome/help/totem/oc/figures/totem_pause_button.png
 share/gnome/help/totem/oc/figures/totem_play_button.png
@@ -138,13 +159,33 @@ 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_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
+share/gnome/help/totem/zh_HK/figures/totem_previous_button.png
+share/gnome/help/totem/zh_HK/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_HK/figures/totem_start_window.png
+share/gnome/help/totem/zh_HK/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_HK/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_HK/totem.xml
+share/gnome/help/totem/zh_TW/figures/totem_next_button.png
+share/gnome/help/totem/zh_TW/figures/totem_pause_button.png
+share/gnome/help/totem/zh_TW/figures/totem_play_button.png
+share/gnome/help/totem/zh_TW/figures/totem_previous_button.png
+share/gnome/help/totem/zh_TW/figures/totem_show_playlist_button.png
+share/gnome/help/totem/zh_TW/figures/totem_start_window.png
+share/gnome/help/totem/zh_TW/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/zh_TW/figures/totem_volume_mute_button.png
+share/gnome/help/totem/zh_TW/totem.xml
 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/48x48/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/as/LC_MESSAGES/totem.mo
 share/locale/az/LC_MESSAGES/totem.mo
 share/locale/be/LC_MESSAGES/totem.mo
 share/locale/be@latin/LC_MESSAGES/totem.mo
@@ -179,6 +220,7 @@ share/locale/is/LC_MESSAGES/totem.mo
 share/locale/it/LC_MESSAGES/totem.mo
 share/locale/ja/LC_MESSAGES/totem.mo
 share/locale/ka/LC_MESSAGES/totem.mo
+share/locale/kn/LC_MESSAGES/totem.mo
 share/locale/ko/LC_MESSAGES/totem.mo
 share/locale/ku/LC_MESSAGES/totem.mo
 share/locale/lt/LC_MESSAGES/totem.mo
@@ -201,6 +243,7 @@ share/locale/pt_BR/LC_MESSAGES/totem.mo
 share/locale/ro/LC_MESSAGES/totem.mo
 share/locale/ru/LC_MESSAGES/totem.mo
 share/locale/rw/LC_MESSAGES/totem.mo
+share/locale/si/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
@@ -223,37 +266,45 @@ share/omf/totem/totem-C.omf
 share/omf/totem/totem-bg.omf
 share/omf/totem/totem-ca.omf
 share/omf/totem/totem-de.omf
+share/omf/totem/totem-el.omf
 share/omf/totem/totem-en_GB.omf
 share/omf/totem/totem-es.omf
 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-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_HK.omf
+share/omf/totem/totem-zh_TW.omf
 share/totem/filmholes-big-left.png
 share/totem/filmholes-big-right.png
 share/totem/filmholes.png
 share/totem/fullscreen.ui
 share/totem/mozilla-viewer.ui
-share/totem/playlist-ui.xml
 share/totem/playlist.ui
 share/totem/plugins.ui
 share/totem/properties.ui
-share/totem/totem-ui.xml
 share/totem/totem.ui
 share/totem/totem_logo.png
 share/totem/uri.ui
+share/totem/video-list.ui
 @dirrm share/totem
 @dirrm share/omf/totem
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/gnome/help/totem/zh_TW/figures
+@dirrm share/gnome/help/totem/zh_TW
+@dirrm share/gnome/help/totem/zh_HK/figures
+@dirrm share/gnome/help/totem/zh_HK
 @dirrm share/gnome/help/totem/uk/figures
 @dirrm share/gnome/help/totem/uk
 @dirrm share/gnome/help/totem/sv/figures
@@ -266,12 +317,16 @@ share/totem/uri.ui
 @dirrm share/gnome/help/totem/pa
 @dirrm share/gnome/help/totem/oc/figures
 @dirrm share/gnome/help/totem/oc
+@dirrm share/gnome/help/totem/it/figures
+@dirrm share/gnome/help/totem/it
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/es/figures
 @dirrm share/gnome/help/totem/es
 @dirrm share/gnome/help/totem/en_GB/figures
 @dirrm share/gnome/help/totem/en_GB
+@dirrm share/gnome/help/totem/el/figures
+@dirrm share/gnome/help/totem/el
 @dirrm share/gnome/help/totem/de/figures
 @dirrm share/gnome/help/totem/de
 @dirrm share/gnome/help/totem/ca/figures
@@ -284,14 +339,13 @@ share/totem/uri.ui
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/totem/plugins/youtube
+@dirrm lib/totem/plugins/thumbnail
 @dirrm lib/totem/plugins/skipto
 @dirrm lib/totem/plugins/screensaver
 @dirrm lib/totem/plugins/properties
 @dirrm lib/totem/plugins/ontop
+@dirrm lib/totem/plugins/media-player-keys
 @dirrm lib/totem/plugins/gromit
 @dirrm lib/totem/plugins
 @dirrm lib/totem
-@comment in nautilus: @dirrm lib/nautilus/extensions-1.0
-@dirrm include/totem/1/plparser
-@dirrm include/totem/1
-@dirrm include/totem
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 376b0fa268e..87a095fd4f7 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2008/01/11 13:58:49 drochner Exp $
+$NetBSD: distinfo,v 1.20 2008/04/15 18:23:54 drochner Exp $
 
-SHA1 (totem-2.20.3.tar.gz) = 9d6dba3307e3d3fd7c94064f36ea17d773aa441c
-RMD160 (totem-2.20.3.tar.gz) = fdc8f76af6f04381f34a6f888e0da1e0ac806b22
-Size (totem-2.20.3.tar.gz) = 3115096 bytes
-SHA1 (patch-aa) = 3a2bb0a2954df435f408dd9c048a36a1a7590427
-SHA1 (patch-ab) = 267d8bea252488933fa383d5fd2188f72980b873
+SHA1 (totem-2.22.1.tar.gz) = f0ba20247d2ad491a239ff0c1faf0e52ab57a98f
+RMD160 (totem-2.22.1.tar.gz) = 4e5ddb432e0ab1b066ed9a128a6fc5490350e437
+Size (totem-2.22.1.tar.gz) = 3489611 bytes
+SHA1 (patch-aa) = 6e4ed0bc2c56644ff988fb06104c2d9877894fbd
+SHA1 (patch-ad) = dd138a330004e4f1130b74e1689d117acf7a9c6c
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
index 7844bf2351d..10458f7ca5e 100644
--- a/multimedia/totem/patches/patch-aa
+++ b/multimedia/totem/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2007/11/05 19:26:20 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2008/04/15 18:23:54 drochner Exp $
 
---- Makefile.in.orig	2007-09-16 23:55:43.000000000 +0200
+--- Makefile.in.orig	2008-03-10 12:46:50.000000000 +0100
 +++ Makefile.in
-@@ -73,7 +73,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+@@ -61,7 +61,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
    distclean-recursive maintainer-clean-recursive
  ETAGS = etags
  CTAGS = ctags
--DIST_SUBDIRS = bindings po data lib src help browser-plugin
-+DIST_SUBDIRS = bindings po data lib src help
+-DIST_SUBDIRS = lib bindings po data src help browser-plugin
++DIST_SUBDIRS = lib bindings po data src help
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  distdir = $(PACKAGE)-$(VERSION)
  top_distdir = $(distdir)
diff --git a/multimedia/totem/patches/patch-ab b/multimedia/totem/patches/patch-ab
deleted file mode 100644
index f4496fb9f16..00000000000
--- a/multimedia/totem/patches/patch-ab
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/11/05 19:26:20 drochner Exp $
-
---- configure.orig	2007-09-28 22:09:38.000000000 +0200
-+++ configure
-@@ -23058,7 +23058,7 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
- 
- plugin_error_or_ignore()
- {
--	if test "${error_on_bad_plugin}" == "1" ; then
-+	if test "${error_on_bad_plugin}" = "1" ; then
- 		{ { echo "$as_me:$LINENO: error: $1" >&5
- echo "$as_me: error: $1" >&2;}
-    { (exit 1); exit 1; }; }
-@@ -23080,7 +23080,7 @@ fi
- used_plugins=""
- used_plugins2=""
- 
--if test "x${with_plugins}" == "xautodetect" ; then
-+if test "x${with_plugins}" = "xautodetect" ; then
- 	# Default to all plugins and just ignore them if they won't compile
- 	with_plugins="all"
- 	error_on_bad_plugin="0"
-@@ -23559,7 +23559,7 @@ fi
- 	esac
- 
- 	# Add the specified plugin
--	if test "${add_plugin}" == "1" ; then
-+	if test "${add_plugin}" = "1" ; then
- 		used_plugins2="${used_plugins2} ${plugin}"
- 	fi
- done
diff --git a/multimedia/totem/patches/patch-ad b/multimedia/totem/patches/patch-ad
new file mode 100644
index 00000000000..0eb0e452ae6
--- /dev/null
+++ b/multimedia/totem/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.3 2008/04/15 18:23:54 drochner Exp $
+
+--- data/Makefile.in.orig	2008-04-03 21:28:58.000000000 +0200
++++ data/Makefile.in
+@@ -768,7 +768,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-bugreportSCRIPTS install-data-local \
++install-data-am: install-data-local \
+ 	install-desktopDATA install-man install-schemaDATA \
+ 	install-stuffDATA
+ 	@$(NORMAL_INSTALL)