update to 2.18.1

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

4 files changed, 40 insertions, 64 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f77340b8d85..75486207571 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.68 2007/03/21 12:05:41 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2007/04/11 18:20:36 drochner Exp $
 #
 
-DISTNAME=	file-roller-2.16.3
-PKGREVISION=	1
+DISTNAME=	file-roller-2.18.1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.16/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.18/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 0aeff837125..e70d234833b 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,9 +1,18 @@
-@comment $NetBSD: PLIST,v 1.21 2006/09/15 15:21:18 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.22 2007/04/11 18:20:36 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/file-roller-extract.glade
+share/file-roller/glade/ask-password.glade
 share/file-roller/glade/file-roller.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
+share/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
+share/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
+share/file-roller/icons/hicolor/24x24/actions/extract-archive.png
+share/file-roller/icons/hicolor/24x24/actions/preview-file.png
 share/gconf/schemas/file-roller.schemas
 share/gnome/help/file-roller/C/figures/file-roller_home.png
 share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
@@ -42,18 +51,6 @@ share/gnome/help/file-roller/it/figures/file-roller_main_window.png
 share/gnome/help/file-roller/it/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/it/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/it/file-roller.xml
-share/gnome/help/file-roller/ja/figures/file-roller_home.png
-share/gnome/help/file-roller/ja/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ja/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ja/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ja/file-roller.xml
-share/gnome/help/file-roller/ko/figures/file-roller_home.png
-share/gnome/help/file-roller/ko/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_main_window.png
-share/gnome/help/file-roller/ko/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/ko/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/ko/file-roller.xml
 share/gnome/help/file-roller/nl/figures/file-roller_home.png
 share/gnome/help/file-roller/nl/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/nl/figures/file-roller_main_window.png
@@ -78,25 +75,10 @@ share/gnome/help/file-roller/uk/figures/file-roller_main_window.png
 share/gnome/help/file-roller/uk/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/uk/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/uk/file-roller.xml
-share/gnome/help/file-roller/zh_CN/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_CN/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_CN/file-roller.xml
-share/gnome/help/file-roller/zh_HK/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_HK/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_HK/file-roller.xml
-share/gnome/help/file-roller/zh_TW/figures/file-roller_home.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_leftarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_main_window.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_rightarrow.png
-share/gnome/help/file-roller/zh_TW/figures/file-roller_uparrow.png
-share/gnome/help/file-roller/zh_TW/file-roller.xml
-share/icons/hicolor/48x48/apps/file-roller.png
+share/icons/hicolor/16x16/apps/file-roller.png
+share/icons/hicolor/22x22/apps/file-roller.png
+share/icons/hicolor/32x32/apps/file-roller.png
+share/icons/hicolor/scalable/apps/file-roller.svg
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
@@ -181,24 +163,17 @@ share/omf/file-roller/file-roller-de.omf
 share/omf/file-roller/file-roller-es.omf
 share/omf/file-roller/file-roller-fr.omf
 share/omf/file-roller/file-roller-it.omf
-share/omf/file-roller/file-roller-ja.omf
-share/omf/file-roller/file-roller-ko.omf
 share/omf/file-roller/file-roller-nl.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
-share/omf/file-roller/file-roller-zh_CN.omf
-share/omf/file-roller/file-roller-zh_HK.omf
-share/omf/file-roller/file-roller-zh_TW.omf
 @dirrm share/omf/file-roller
 @comment in scrollkeeper: @dirrm share/omf
-@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
-@dirrm share/gnome/help/file-roller/zh_TW/figures
-@dirrm share/gnome/help/file-roller/zh_TW
-@dirrm share/gnome/help/file-roller/zh_HK/figures
-@dirrm share/gnome/help/file-roller/zh_HK
-@dirrm share/gnome/help/file-roller/zh_CN/figures
-@dirrm share/gnome/help/file-roller/zh_CN
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/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/file-roller/uk/figures
 @dirrm share/gnome/help/file-roller/uk
 @dirrm share/gnome/help/file-roller/sv/figures
@@ -207,10 +182,6 @@ share/omf/file-roller/file-roller-zh_TW.omf
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/nl/figures
 @dirrm share/gnome/help/file-roller/nl
-@dirrm share/gnome/help/file-roller/ko/figures
-@dirrm share/gnome/help/file-roller/ko
-@dirrm share/gnome/help/file-roller/ja/figures
-@dirrm share/gnome/help/file-roller/ja
 @dirrm share/gnome/help/file-roller/it/figures
 @dirrm share/gnome/help/file-roller/it
 @dirrm share/gnome/help/file-roller/fr/figures
@@ -226,7 +197,14 @@ share/omf/file-roller/file-roller-zh_TW.omf
 @dirrm share/gnome/help/file-roller
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/file-roller/icons/hicolor/24x24/actions
+@dirrm share/file-roller/icons/hicolor/24x24
+@dirrm share/file-roller/icons/hicolor/16x16/actions
+@dirrm share/file-roller/icons/hicolor/16x16
+@dirrm share/file-roller/icons/hicolor
+@dirrm share/file-roller/icons
 @dirrm share/file-roller/glade
 @dirrm share/file-roller
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm libexec/file-roller
 @comment in nautilus: @dirrm lib/nautilus/extensions-1.0
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 316cfda030e..48f4a61fa57 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.29 2007/03/25 06:11:12 wiz Exp $
+$NetBSD: distinfo,v 1.30 2007/04/11 18:20:37 drochner Exp $
 
-SHA1 (file-roller-2.16.3.tar.bz2) = d6d12003656bdc9e692da97939ec65891f829c24
-RMD160 (file-roller-2.16.3.tar.bz2) = 8856a2e74402ce46a7660f8e6d2733fdf0c52492
-Size (file-roller-2.16.3.tar.bz2) = 1130693 bytes
-SHA1 (patch-aa) = f48c3600bb0cd78451a42c45f55936b444a2bf0d
-SHA1 (patch-ab) = 31fa3169dcf6e79911e53e36fb336b4e40098532
+SHA1 (file-roller-2.18.1.tar.bz2) = 2c18dc1056641d3451f1b529299377c783d7aef8
+RMD160 (file-roller-2.18.1.tar.bz2) = 92103dde016c963c4fb229fcd914dfe2c338d359
+Size (file-roller-2.18.1.tar.bz2) = 1128245 bytes
+SHA1 (patch-aa) = 7e6773de99b4277874ce5b01530de357848b2d69
diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
index c6ba865ed83..610e76962a0 100644
--- a/archivers/file-roller/patches/patch-aa
+++ b/archivers/file-roller/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.8 2006/05/26 12:03:54 joerg Exp $
+$NetBSD: patch-aa,v 1.9 2007/04/11 18:20:38 drochner Exp $
 
---- data/Makefile.in.orig	2006-05-26 11:55:09.000000000 +0000
+--- data/Makefile.in.orig	2007-03-12 20:26:05.000000000 +0100
 +++ data/Makefile.in
-@@ -634,7 +634,6 @@ uninstall-info: uninstall-info-recursive
- install-data-hook:
- 	@-if test -z "$(DESTDIR)"; then \
+@@ -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)
+ 	if test -z "$(DESTDIR)"; then \
  		echo "Updating Gtk icon cache."; \
 -		$(gtk_update_icon_cache); \
  	else \