update to 2.18.1

This moves this pkg to the new stable gnome branch, too much to list here.

5 files changed, 68 insertions, 37 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 5a774b89935..3359c174852 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.17 2007/03/21 12:05:51 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2007/04/11 18:03:39 drochner Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT+=	(using GStreamer)
-PKGREVISION=	1
 
 CONFLICTS+=	totem-xine-[0-9]*
 
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index 96bdd8679c1..1c1ce63ac5b 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.29 2007/03/23 20:30:12 drochner Exp $
+# $NetBSD: Makefile.common,v 1.30 2007/04/11 18:03:39 drochner Exp $
 #
 
-DISTNAME=	totem-2.16.6
+DISTNAME=	totem-2.18.1
 CATEGORIES=	multimedia gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/totem/2.18/}
 
 MAINTAINER=	jmmv@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/totem/
diff --git a/multimedia/totem/PLIST b/multimedia/totem/PLIST
index 699624eced2..62ca53b23f9 100644
--- a/multimedia/totem/PLIST
+++ b/multimedia/totem/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2006/10/17 16:35:11 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2007/04/11 18:03:39 drochner Exp $
 bin/totem
+bin/totem-video-indexer
 bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
 include/totem/1/plparser/totem-pl-parser-builtins.h
@@ -35,7 +36,6 @@ share/gnome/help/totem/de/figures/totem_show_playlist_button.png
 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/legal.xml
 share/gnome/help/totem/de/totem.xml
 share/gnome/help/totem/es/figures/totem_next_button.png
 share/gnome/help/totem/es/figures/totem_pause_button.png
@@ -45,7 +45,6 @@ share/gnome/help/totem/es/figures/totem_show_playlist_button.png
 share/gnome/help/totem/es/figures/totem_start_window.png
 share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/es/figures/totem_volume_mute_button.png
-share/gnome/help/totem/es/legal.xml
 share/gnome/help/totem/es/totem.xml
 share/gnome/help/totem/fr/figures/totem_next_button.png
 share/gnome/help/totem/fr/figures/totem_pause_button.png
@@ -55,12 +54,43 @@ share/gnome/help/totem/fr/figures/totem_show_playlist_button.png
 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/legal.xml
 share/gnome/help/totem/fr/totem.xml
-share/gnome/help/totem/ru/figures/totem_screenshot.png
+share/gnome/help/totem/pa/figures/totem_next_button.png
+share/gnome/help/totem/pa/figures/totem_pause_button.png
+share/gnome/help/totem/pa/figures/totem_play_button.png
+share/gnome/help/totem/pa/figures/totem_previous_button.png
+share/gnome/help/totem/pa/figures/totem_show_playlist_button.png
+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/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
+share/gnome/help/totem/pt_BR/figures/totem_previous_button.png
+share/gnome/help/totem/pt_BR/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pt_BR/figures/totem_start_window.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pt_BR/totem.xml
+share/gnome/help/totem/ru/figures/totem_next_button.png
+share/gnome/help/totem/ru/figures/totem_pause_button.png
+share/gnome/help/totem/ru/figures/totem_play_button.png
+share/gnome/help/totem/ru/figures/totem_previous_button.png
+share/gnome/help/totem/ru/figures/totem_show_playlist_button.png
 share/gnome/help/totem/ru/figures/totem_start_window.png
-share/gnome/help/totem/ru/legal.xml
+share/gnome/help/totem/ru/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/ru/figures/totem_volume_mute_button.png
 share/gnome/help/totem/ru/totem.xml
+share/gnome/help/totem/sv/figures/totem_next_button.png
+share/gnome/help/totem/sv/figures/totem_pause_button.png
+share/gnome/help/totem/sv/figures/totem_play_button.png
+share/gnome/help/totem/sv/figures/totem_previous_button.png
+share/gnome/help/totem/sv/figures/totem_show_playlist_button.png
+share/gnome/help/totem/sv/figures/totem_start_window.png
+share/gnome/help/totem/sv/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/sv/figures/totem_volume_mute_button.png
+share/gnome/help/totem/sv/totem.xml
 share/gnome/help/totem/uk/figures/totem_next_button.png
 share/gnome/help/totem/uk/figures/totem_pause_button.png
 share/gnome/help/totem/uk/figures/totem_play_button.png
@@ -69,7 +99,6 @@ share/gnome/help/totem/uk/figures/totem_show_playlist_button.png
 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/legal.xml
 share/gnome/help/totem/uk/totem.xml
 share/icons/hicolor/16x16/apps/totem.png
 share/icons/hicolor/22x22/apps/totem.png
@@ -80,6 +109,7 @@ share/locale/am/LC_MESSAGES/totem.mo
 share/locale/ar/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
 share/locale/bg/LC_MESSAGES/totem.mo
 share/locale/bn/LC_MESSAGES/totem.mo
 share/locale/bn_IN/LC_MESSAGES/totem.mo
@@ -155,26 +185,23 @@ share/omf/totem/totem-bg.omf
 share/omf/totem/totem-de.omf
 share/omf/totem/totem-es.omf
 share/omf/totem/totem-fr.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/pixmaps/vanity.png
 share/totem/filmholes-big-left.png
 share/totem/filmholes-big-right.png
 share/totem/filmholes.png
 share/totem/mozilla-viewer.glade
-share/totem/playlist-playing.png
+share/totem/playlist-ui.xml
 share/totem/playlist.glade
-share/totem/popup.glade
 share/totem/properties.glade
-share/totem/rhythmbox-volume-max.png
-share/totem/rhythmbox-volume-zero.png
 share/totem/screenshot.glade
 share/totem/skip_to.glade
 share/totem/stock-tool-brightness-contrast-22.png
-share/totem/stock_media_next.png
-share/totem/stock_media_pause.png
-share/totem/stock_media_play.png
-share/totem/stock_media_previous.png
+share/totem/totem-ui.xml
 share/totem/totem.glade
 share/totem/totem_logo.png
 share/totem/uri.glade
@@ -192,8 +219,14 @@ share/totem/vanity.png
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @dirrm share/gnome/help/totem/uk/figures
 @dirrm share/gnome/help/totem/uk
+@dirrm share/gnome/help/totem/sv/figures
+@dirrm share/gnome/help/totem/sv
 @dirrm share/gnome/help/totem/ru/figures
 @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/pa/figures
+@dirrm share/gnome/help/totem/pa
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/es/figures
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index f2ad0ad91d6..d456cff2c45 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2007/03/23 20:30:12 drochner Exp $
+$NetBSD: distinfo,v 1.16 2007/04/11 18:03:39 drochner Exp $
 
-SHA1 (totem-2.16.6.tar.gz) = 62d950db5c57c6c263f4fc846b88c5f952c6fbec
-RMD160 (totem-2.16.6.tar.gz) = 6db88bcd2da597163fd32eb078ee45fb007e9f1d
-Size (totem-2.16.6.tar.gz) = 2544154 bytes
-SHA1 (patch-aa) = 6b000bf0e24244377d0c01307a7c9e650286e51d
-SHA1 (patch-ad) = b5bcd9a86094c68624f2f3cc408d09730f514c29
+SHA1 (totem-2.18.1.tar.gz) = eb868ef4273b06a623e5b5d2fc29ff829d17edf1
+RMD160 (totem-2.18.1.tar.gz) = d55bda990e22e29c7fabbb4faae126f9d5b1db38
+Size (totem-2.18.1.tar.gz) = 2876476 bytes
+SHA1 (patch-aa) = e3fdbb095e9f1c46cf13a5e83efc79d686ad1d50
diff --git a/multimedia/totem/patches/patch-aa b/multimedia/totem/patches/patch-aa
index 099158a9bc0..7da783a243c 100644
--- a/multimedia/totem/patches/patch-aa
+++ b/multimedia/totem/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2006/09/15 15:23:51 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2007/04/11 18:03:39 drochner Exp $
 
---- Makefile.in.orig	2006-09-03 21:39:11.000000000 +0200
+--- Makefile.in.orig	2007-04-04 16:41:43.000000000 +0200
 +++ Makefile.in
-@@ -315,7 +315,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = po data src browser-plugin help
-+SUBDIRS = po data src help
- EXTRA_DIST = \
- 	COPYING.LIB		\
- 	autogen.sh		\
+@@ -73,7 +73,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
+   distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+-DIST_SUBDIRS = po data src help browser-plugin
++DIST_SUBDIRS = po data src help
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ distdir = $(PACKAGE)-$(VERSION)
+ top_distdir = $(distdir)