update to 2.32.1

This switches to the gnome-2.32 release branch.

4 files changed, 32 insertions, 9 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index ce6bc37ea54..3b8e87fedc3 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.105 2010/11/15 22:56:08 abs Exp $
+# $NetBSD: Makefile,v 1.106 2010/11/28 13:06:16 drochner Exp $
 #
 
-DISTNAME=	file-roller-2.30.2
-PKGREVISION=	2
+DISTNAME=	file-roller-2.32.1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.30/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.32/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index b542f66f774..47a7c217c85 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/06/15 20:48:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/11/28 13:06:16 drochner Exp $
 bin/file-roller
 libexec/file-roller/isoinfo.sh
 libexec/file-roller/rpm2cpio
@@ -87,6 +87,12 @@ 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/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
@@ -158,6 +164,7 @@ 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/eo/LC_MESSAGES/file-roller.mo
 share/locale/es/LC_MESSAGES/file-roller.mo
 share/locale/et/LC_MESSAGES/file-roller.mo
 share/locale/eu/LC_MESSAGES/file-roller.mo
@@ -165,6 +172,7 @@ share/locale/fa/LC_MESSAGES/file-roller.mo
 share/locale/fi/LC_MESSAGES/file-roller.mo
 share/locale/fr/LC_MESSAGES/file-roller.mo
 share/locale/fur/LC_MESSAGES/file-roller.mo
+share/locale/fy/LC_MESSAGES/file-roller.mo
 share/locale/ga/LC_MESSAGES/file-roller.mo
 share/locale/gl/LC_MESSAGES/file-roller.mo
 share/locale/gu/LC_MESSAGES/file-roller.mo
@@ -219,6 +227,7 @@ share/locale/te/LC_MESSAGES/file-roller.mo
 share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tk/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
+share/locale/ug/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/ur/LC_MESSAGES/file-roller.mo
 share/locale/ur_PK/LC_MESSAGES/file-roller.mo
@@ -238,6 +247,7 @@ share/omf/file-roller/file-roller-es.omf
 share/omf/file-roller/file-roller-fi.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-nl.omf
 share/omf/file-roller/file-roller-oc.omf
 share/omf/file-roller/file-roller-ru.omf
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index dbaef7b2342..2ae2e85546b 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.53 2010/07/06 16:43:05 drochner Exp $
+$NetBSD: distinfo,v 1.54 2010/11/28 13:06:16 drochner Exp $
 
-SHA1 (file-roller-2.30.2.tar.bz2) = 994ed5d930c4c012004c1c598904335905eea239
-RMD160 (file-roller-2.30.2.tar.bz2) = 580bbf929b75835627475dbda69f9872e43c3eb2
-Size (file-roller-2.30.2.tar.bz2) = 1818246 bytes
+SHA1 (file-roller-2.32.1.tar.bz2) = 48eb7e1cac561804a2f9ad4fdeef8e5cce8adc62
+RMD160 (file-roller-2.32.1.tar.bz2) = 09a313112fcd621f80669645ce93af5961947b25
+Size (file-roller-2.32.1.tar.bz2) = 1916180 bytes
 SHA1 (patch-aa) = 0e536d0b9c8e88b97ea7af600e3bb6d6ba496acf
+SHA1 (patch-ab) = f923d205769dfc49b9777561f481e8ce9f9e27e3
 SHA1 (patch-unzip) = 1cd1c33445e2699694ef7daf6dcd09a54fec53bb
diff --git a/archivers/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
new file mode 100644
index 00000000000..310efa59458
--- /dev/null
+++ b/archivers/file-roller/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.9 2010/11/28 13:06:17 drochner Exp $
+
+--- src/fr-command-lrzip.c.orig	2010-11-16 17:30:30.000000000 +0000
++++ src/fr-command-lrzip.c
+@@ -53,7 +53,7 @@ list__process_line (char     *line,
+ 	struct stat st;
+ 	time_t tt;
+ 	if (stat (comm->filename, &st) == 0)
+-		fdata->modified = st.st_mtim.tv_sec;
++		fdata->modified = st.st_mtime;
+ 	else
+ 		time(&(fdata->modified));
+ 	fdata->modified;