update to 2.30.1.1

This switches to the gnome-2.30 release branch

4 files changed, 23 insertions, 15 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 3f6be2ba7e1..1f3085b7dfb 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.101 2010/06/13 22:43:46 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2010/06/15 20:48:23 drochner Exp $
 #
 
-DISTNAME=	file-roller-2.28.2
-PKGREVISION=	1
+DISTNAME=	file-roller-2.30.1.1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.28/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.30/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index 64b1d8317b5..b542f66f774 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2009/12/16 17:22:19 drochner Exp $
+@comment $NetBSD: PLIST,v 1.35 2010/06/15 20:48:23 drochner Exp $
 bin/file-roller
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
@@ -9,6 +9,7 @@ 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/packages.match
 share/file-roller/ui/add-options.ui
 share/file-roller/ui/batch-add-files.ui
 share/file-roller/ui/batch-password.ui
@@ -122,6 +123,12 @@ share/gnome/help/file-roller/vi/figures/file-roller_main_window.png
 share/gnome/help/file-roller/vi/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/vi/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/vi/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/icons/hicolor/16x16/apps/file-roller.png
 share/icons/hicolor/22x22/apps/file-roller.png
 share/icons/hicolor/24x24/apps/file-roller.png
@@ -148,6 +155,7 @@ share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/dz/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
+share/locale/en@shaw/LC_MESSAGES/file-roller.mo
 share/locale/en_CA/LC_MESSAGES/file-roller.mo
 share/locale/en_GB/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
@@ -236,3 +244,4 @@ 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-vi.omf
+share/omf/file-roller/file-roller-zh_CN.omf
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 4184b3c74ae..a7d69ffd479 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.51 2009/12/16 17:22:19 drochner Exp $
+$NetBSD: distinfo,v 1.52 2010/06/15 20:48:23 drochner Exp $
 
-SHA1 (file-roller-2.28.2.tar.bz2) = e2a1535b1f8d76db95521b95d8efc9b596be5999
-RMD160 (file-roller-2.28.2.tar.bz2) = 2c5bef872de906a86dee98b1add2ba489ed8907d
-Size (file-roller-2.28.2.tar.bz2) = 1749187 bytes
+SHA1 (file-roller-2.30.1.1.tar.bz2) = 256d86b66fcb671d7bd23b797bd16ba013558698
+RMD160 (file-roller-2.30.1.1.tar.bz2) = 46a9e38f62ae3428da1d991dcef856d94cd180b3
+Size (file-roller-2.30.1.1.tar.bz2) = 1816845 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
-SHA1 (patch-unzip) = d1abae47ce713af26875c972b351fcd4d00ca22e
+SHA1 (patch-unzip) = 1cd1c33445e2699694ef7daf6dcd09a54fec53bb
diff --git a/archivers/file-roller/patches/patch-unzip b/archivers/file-roller/patches/patch-unzip
index a945c8b56ee..0bf5fc05783 100644
--- a/archivers/file-roller/patches/patch-unzip
+++ b/archivers/file-roller/patches/patch-unzip
@@ -1,6 +1,6 @@
-$NetBSD: patch-unzip,v 1.1 2009/09/19 07:46:56 ahoka Exp $
+$NetBSD: patch-unzip,v 1.2 2010/06/15 20:48:23 drochner Exp $
 
---- src/fr-command-zip.c.orig	2009-06-30 01:32:59.000000000 +0200
+--- src/fr-command-zip.c.orig	2010-03-11 17:44:54.000000000 +0000
 +++ src/fr-command-zip.c
 @@ -33,6 +33,7 @@
  #include "fr-command.h"
@@ -37,12 +37,12 @@ $NetBSD: patch-unzip,v 1.1 2009/09/19 07:46:56 ahoka Exp $
  	fr_process_add_arg (comm->process, "-t");
  	add_password_arg (comm, comm->password);
  	fr_process_add_arg (comm->process, comm->filename);
-@@ -399,7 +400,7 @@ fr_command_zip_get_capabilities (FrComma
+@@ -400,7 +401,7 @@ fr_command_zip_get_capabilities (FrComma
  		else
  			capabilities |= FR_COMMAND_CAN_READ_WRITE;
  	}
--	else if (is_program_in_path ("unzip"))
-+	else if (is_program_in_path (FR_UNZIP_COMMAND))
+-	else if (is_program_available ("unzip", check_command))
++	else if (is_program_available (FR_UNZIP_COMMAND, check_command))
  		capabilities |= FR_COMMAND_CAN_READ;
  
  	return capabilities;