[pkgsrc/trunk]: pkgsrc update to 2.20.1

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2d3bbff9a2c
branches:  trunk
changeset: 535011:e2d3bbff9a2c
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Mon Nov 05 19:26:20 2007 +0000

description:
update to 2.20.1
This switches to the new gnome-2.20 branch.

diffstat:

 archivers/file-roller/Makefile         |   7 +-
 archivers/file-roller/PLIST            |  22 ++++++++-
 archivers/file-roller/distinfo         |  10 ++--
 archivers/file-roller/patches/patch-aa |  10 ++--
 multimedia/totem/Makefile              |   3 +-
 multimedia/totem/Makefile.common       |   7 +-
 multimedia/totem/PLIST                 |  76 ++++++++++++++++++++++++++++-----
 multimedia/totem/distinfo              |  11 ++--
 multimedia/totem/patches/patch-aa      |   8 +-
 multimedia/totem/patches/patch-ab      |  31 +++++++++++++
 10 files changed, 139 insertions(+), 46 deletions(-)

diffs (truncated from 378 to 300 lines):

diff -r 514afcce7b4d -r e2d3bbff9a2c archivers/file-roller/Makefile
--- a/archivers/file-roller/Makefile    Mon Nov 05 19:23:31 2007 +0000
+++ b/archivers/file-roller/Makefile    Mon Nov 05 19:26:20 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.76 2007/09/21 13:03:25 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2007/11/05 19:27:29 drochner Exp $
 #
 
-DISTNAME=      file-roller-2.18.4
-PKGREVISION=   4
+DISTNAME=      file-roller-2.20.1
 CATEGORIES=    archivers gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/file-roller/2.18/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/file-roller/2.20/}
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 514afcce7b4d -r e2d3bbff9a2c archivers/file-roller/PLIST
--- a/archivers/file-roller/PLIST       Mon Nov 05 19:23:31 2007 +0000
+++ b/archivers/file-roller/PLIST       Mon Nov 05 19:26:20 2007 +0000
@@ -1,11 +1,15 @@
-@comment $NetBSD: PLIST,v 1.25 2007/09/25 10:54:09 hira Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/11/05 19:27:29 drochner Exp $
 bin/file-roller
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 libexec/file-roller/isoinfo.sh
-libexec/file-roller/move-here.sh
 share/applications/file-roller.desktop
-share/file-roller/glade/ask-password.glade
-share/file-roller/glade/file-roller.glade
+share/file-roller/glade/add-options.glade
+share/file-roller/glade/batch-add-files.glade
+share/file-roller/glade/batch-password.glade
+share/file-roller/glade/delete.glade
+share/file-roller/glade/open-with.glade
+share/file-roller/glade/password.glade
+share/file-roller/glade/properties.glade
 share/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
 share/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
 share/file-roller/icons/hicolor/16x16/actions/extract-archive.png
@@ -57,6 +61,12 @@
 share/gnome/help/file-roller/nl/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/nl/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/nl/file-roller.xml
+share/gnome/help/file-roller/oc/figures/file-roller_home.png
+share/gnome/help/file-roller/oc/figures/file-roller_leftarrow.png
+share/gnome/help/file-roller/oc/figures/file-roller_main_window.png
+share/gnome/help/file-roller/oc/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/oc/figures/file-roller_uparrow.png
+share/gnome/help/file-roller/oc/file-roller.xml
 share/gnome/help/file-roller/ru/figures/file-roller_home.png
 share/gnome/help/file-roller/ru/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/ru/figures/file-roller_main_window.png
@@ -141,6 +151,7 @@
 share/locale/ro/LC_MESSAGES/file-roller.mo
 share/locale/ru/LC_MESSAGES/file-roller.mo
 share/locale/rw/LC_MESSAGES/file-roller.mo
+share/locale/si/LC_MESSAGES/file-roller.mo
 share/locale/sk/LC_MESSAGES/file-roller.mo
 share/locale/sl/LC_MESSAGES/file-roller.mo
 share/locale/sq/LC_MESSAGES/file-roller.mo
@@ -166,6 +177,7 @@
 share/omf/file-roller/file-roller-fr.omf
 share/omf/file-roller/file-roller-it.omf
 share/omf/file-roller/file-roller-nl.omf
+share/omf/file-roller/file-roller-oc.omf
 share/omf/file-roller/file-roller-ru.omf
 share/omf/file-roller/file-roller-sv.omf
 share/omf/file-roller/file-roller-uk.omf
@@ -182,6 +194,8 @@
 @dirrm share/gnome/help/file-roller/sv
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
+@dirrm share/gnome/help/file-roller/oc/figures
+@dirrm share/gnome/help/file-roller/oc
 @dirrm share/gnome/help/file-roller/nl/figures
 @dirrm share/gnome/help/file-roller/nl
 @dirrm share/gnome/help/file-roller/it/figures
diff -r 514afcce7b4d -r e2d3bbff9a2c archivers/file-roller/distinfo
--- a/archivers/file-roller/distinfo    Mon Nov 05 19:23:31 2007 +0000
+++ b/archivers/file-roller/distinfo    Mon Nov 05 19:26:20 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.32 2007/07/13 16:28:39 drochner Exp $
+$NetBSD: distinfo,v 1.33 2007/11/05 19:27:29 drochner Exp $
 
-SHA1 (file-roller-2.18.4.tar.bz2) = 062ab5f46e4b95a1b55cbcb16c778c4b28c08d75
-RMD160 (file-roller-2.18.4.tar.bz2) = 07dfaeac5618032eb01d10a998b7bc80ed96c6da
-Size (file-roller-2.18.4.tar.bz2) = 1175112 bytes
-SHA1 (patch-aa) = 7e6773de99b4277874ce5b01530de357848b2d69
+SHA1 (file-roller-2.20.1.tar.bz2) = 34d6ebb8297497ccc7ce585d2a622d94505815bf
+RMD160 (file-roller-2.20.1.tar.bz2) = 3bc9c14db78db53f196cfd9a585f25222e760ec0
+Size (file-roller-2.20.1.tar.bz2) = 1223800 bytes
+SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
diff -r 514afcce7b4d -r e2d3bbff9a2c archivers/file-roller/patches/patch-aa
--- a/archivers/file-roller/patches/patch-aa    Mon Nov 05 19:23:31 2007 +0000
+++ b/archivers/file-roller/patches/patch-aa    Mon Nov 05 19:26:20 2007 +0000
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.9 2007/04/11 18:20:38 drochner Exp $
+$NetBSD: patch-aa,v 1.10 2007/11/05 19:27:29 drochner Exp $
 
---- data/Makefile.in.orig      2007-03-12 20:26:05.000000000 +0100
+--- data/Makefile.in.orig      2007-09-17 21:40:34.000000000 +0200
 +++ data/Makefile.in
-@@ -596,7 +596,6 @@ install-data-local:
- @GCONF_SCHEMAS_INSTALL_TRUE@  GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$(schema_DATA)
+@@ -623,7 +623,6 @@ uninstall-hook: update-icon-cache
+ update-icon-cache:
        if test -z "$(DESTDIR)"; then \
                echo "Updating Gtk icon cache."; \
 -              $(gtk_update_icon_cache); \
        else \
-               echo "*** Icon cache not updated.  After install, run this:"; \
+               echo "*** Icon cache not updated.  After (un)install, run this:"; \
                echo "***   $(gtk_update_icon_cache)"; \
diff -r 514afcce7b4d -r e2d3bbff9a2c multimedia/totem/Makefile
--- a/multimedia/totem/Makefile Mon Nov 05 19:23:31 2007 +0000
+++ b/multimedia/totem/Makefile Mon Nov 05 19:26:20 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2007/09/21 13:04:09 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2007/11/05 19:26:20 drochner Exp $
 #
 
 .include "Makefile.common"
 
 COMMENT+=      (using GStreamer)
-PKGREVISION=   2
 
 CONFLICTS+=    totem-xine-[0-9]*
 
diff -r 514afcce7b4d -r e2d3bbff9a2c multimedia/totem/Makefile.common
--- a/multimedia/totem/Makefile.common  Mon Nov 05 19:23:31 2007 +0000
+++ b/multimedia/totem/Makefile.common  Mon Nov 05 19:26:20 2007 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.35 2007/09/21 13:04:09 wiz Exp $
+# $NetBSD: Makefile.common,v 1.36 2007/11/05 19:26:20 drochner Exp $
 #
 
-DISTNAME=      totem-2.18.2
-PKGREVISION=   2
+DISTNAME=      totem-2.20.1
 CATEGORIES=    multimedia gnome
-MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/totem/2.18/}
+MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/totem/2.20/}
 
 MAINTAINER=    jmmv%NetBSD.org@localhost
 HOMEPAGE=      http://www.gnome.org/projects/totem/
diff -r 514afcce7b4d -r e2d3bbff9a2c multimedia/totem/PLIST
--- a/multimedia/totem/PLIST    Mon Nov 05 19:23:31 2007 +0000
+++ b/multimedia/totem/PLIST    Mon Nov 05 19:26:20 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2007/09/25 10:54:16 hira Exp $
+@comment $NetBSD: PLIST,v 1.14 2007/11/05 19:26:20 drochner Exp $
 bin/totem
 bin/totem-video-indexer
 bin/totem-video-thumbnailer
@@ -9,6 +9,17 @@
 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/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/screensaver/libscreensaver.la
+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
 man/man1/totem-video-thumbnailer.1
 man/man1/totem.1
 share/applications/totem.desktop
@@ -28,6 +39,15 @@
 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/ca/figures/totem_next_button.png
+share/gnome/help/totem/ca/figures/totem_pause_button.png
+share/gnome/help/totem/ca/figures/totem_play_button.png
+share/gnome/help/totem/ca/figures/totem_previous_button.png
+share/gnome/help/totem/ca/figures/totem_show_playlist_button.png
+share/gnome/help/totem/ca/figures/totem_start_window.png
+share/gnome/help/totem/ca/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/ca/figures/totem_volume_mute_button.png
+share/gnome/help/totem/ca/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
@@ -37,6 +57,15 @@
 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/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
+share/gnome/help/totem/en_GB/figures/totem_previous_button.png
+share/gnome/help/totem/en_GB/figures/totem_show_playlist_button.png
+share/gnome/help/totem/en_GB/figures/totem_start_window.png
+share/gnome/help/totem/en_GB/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/en_GB/figures/totem_volume_mute_button.png
+share/gnome/help/totem/en_GB/totem.xml
 share/gnome/help/totem/es/figures/totem_next_button.png
 share/gnome/help/totem/es/figures/totem_pause_button.png
 share/gnome/help/totem/es/figures/totem_play_button.png
@@ -55,6 +84,15 @@
 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/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
+share/gnome/help/totem/oc/figures/totem_previous_button.png
+share/gnome/help/totem/oc/figures/totem_show_playlist_button.png
+share/gnome/help/totem/oc/figures/totem_start_window.png
+share/gnome/help/totem/oc/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/oc/figures/totem_volume_mute_button.png
+share/gnome/help/totem/oc/totem.xml
 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
@@ -154,6 +192,7 @@
 share/locale/ne/LC_MESSAGES/totem.mo
 share/locale/nl/LC_MESSAGES/totem.mo
 share/locale/nn/LC_MESSAGES/totem.mo
+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
@@ -182,33 +221,31 @@
 share/locale/zh_TW/LC_MESSAGES/totem.mo
 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-en_GB.omf
 share/omf/totem/totem-es.omf
 share/omf/totem/totem-fr.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/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/fullscreen.ui
+share/totem/mozilla-viewer.ui
 share/totem/playlist-ui.xml
-share/totem/playlist.glade
-share/totem/properties.glade
-share/totem/screenshot.glade
-share/totem/skip_to.glade
-share/totem/stock-tool-brightness-contrast-22.png
+share/totem/playlist.ui
+share/totem/plugins.ui
+share/totem/properties.ui
 share/totem/totem-ui.xml
-share/totem/totem.glade
+share/totem/totem.ui
 share/totem/totem_logo.png
-share/totem/uri.glade
-share/totem/vanity.glade
-share/totem/vanity.png
+share/totem/uri.ui
 @dirrm share/totem
-@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/totem
 @comment in scrollkeeper: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
@@ -227,12 +264,18 @@
 @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/oc/figures
+@dirrm share/gnome/help/totem/oc
 @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/de/figures
 @dirrm share/gnome/help/totem/de
+@dirrm share/gnome/help/totem/ca/figures
+@dirrm share/gnome/help/totem/ca
 @dirrm share/gnome/help/totem/bg/figures
 @dirrm share/gnome/help/totem/bg
 @dirrm share/gnome/help/totem/C/figures
@@ -241,6 +284,13 @@
 @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/skipto
+@dirrm lib/totem/plugins/screensaver
+@dirrm lib/totem/plugins/properties
+@dirrm lib/totem/plugins/ontop