Update to 2.12.1:

version 2.12.1
---------------
	* Updated translations: it, bn, sv, ku, vi, eu.

version 2.12.0
---------------
	* New and updated translations.

version 2.11.92
---------------
	* Do not allow Drag and Drop on the same window.

version 2.11.91
---------------
	* Fixed bug #311437: [breezy] can't extract a filename from a directory
	  with a space in it from ISO.
	* Ported the help documents to gnome-doc-utils.
	* Fixed bug #312243: wrong zoo and 7-zip extensions.
	* Fixed bug #312240: escape sequences in rar output.
	* Fixed bug #312246: FR does not read all pending output.

version 2.11.90
---------------
	* Fixed bug #105521: single click: list view should have mouse-over.
	* Fixed bug #310015: crash when listing 7-zip archive with 7za 4.x
	* Updated translations: de bg zh_TW gl sr sr@Latn gu ja fi

version 2.11.2
--------------
	* Removed copy/move/rename/delete archive commands.
	* The recent files items are in the Archive menu instead of a submenu.
	* Changes in the properties dialog: align labels to left, allow window
	  resizing, ellipsize filename and path labels.
	* Fixed bug #142860: File-roller displays files larger
	  than 2GB as 2GB.

version 2.11.1
--------------
	* Do not create a _FILES folder anymore (#167261).
	* Allow to extract more archives at once.  Added an --extract-here
	  command line option.
	* Use g_filename_display_name and g_filename_display_basename when
          appropriate.
	* Prevent renaming of files to silently overwrite other existing
          files (#168287).
	* Header cleanup (#171618).
	* Allow stock labels to show through, be nice to translators (#172867).

4 files changed, 67 insertions, 25 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 359a8af7e65..f0b47994c80 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.44 2005/08/21 11:48:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2005/10/16 12:11:05 jmmv Exp $
 #
 
-DISTNAME=	file-roller-2.10.4
+DISTNAME=	file-roller-2.12.1
 CATEGORIES=	archivers gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/file-roller/2.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
@@ -36,6 +36,7 @@ BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.4.0
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/archivers/file-roller/PLIST b/archivers/file-roller/PLIST
index cfe604dc289..8a8c4c338ae 100644
--- a/archivers/file-roller/PLIST
+++ b/archivers/file-roller/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.15 2005/08/21 11:48:34 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/10/16 12:11:05 jmmv Exp $
 bin/file-roller
 lib/bonobo/libfile-roller-component.la
 lib/bonobo/servers/File_Roller_Component.server
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 share/application-registry/file-roller.applications
 share/applications/file-roller.desktop
-share/file-roller/glade/file_roller.glade
+share/file-roller/glade/file-roller-extract.glade
+share/file-roller/glade/file-roller.glade
 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
@@ -14,53 +15,78 @@ share/gnome/help/file-roller/C/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/C/file-roller.xml
 share/gnome/help/file-roller/C/legal.xml
+share/gnome/help/file-roller/de/figures/file-roller_home.png
+share/gnome/help/file-roller/de/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/de/figures/file-roller_main_window.png
+share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/de/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/de/file-roller.xml
-share/gnome/help/file-roller/de/legal.xml
 share/gnome/help/file-roller/es/figures/file-roller_home.png
 share/gnome/help/file-roller/es/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/es/figures/file-roller_main_window.png
 share/gnome/help/file-roller/es/figures/file-roller_rightarrow.png
 share/gnome/help/file-roller/es/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/es/file-roller.xml
-share/gnome/help/file-roller/es/legal.xml
+share/gnome/help/file-roller/fr/figures/file-roller_home.png
+share/gnome/help/file-roller/fr/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/fr/figures/file-roller_main_window.png
+share/gnome/help/file-roller/fr/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/fr/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/fr/file-roller.xml
-share/gnome/help/file-roller/fr/legal.xml
+share/gnome/help/file-roller/it/figures/file-roller_home.png
+share/gnome/help/file-roller/it/figures/file-roller_leftarrow.png
 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/it/legal.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/ja/legal.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/ko/legal.xml
-share/gnome/help/file-roller/ru/figures/fr-add-dialog.png
-share/gnome/help/file-roller/ru/figures/fr-extract.png
-share/gnome/help/file-roller/ru/figures/fr-mainwindow.png
-share/gnome/help/file-roller/ru/figures/fr-prefs.png
+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
+share/gnome/help/file-roller/ru/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/ru/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/ru/file-roller.xml
-share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/sv/figures/file-roller_home.png
+share/gnome/help/file-roller/sv/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/sv/figures/file-roller_main_window.png
+share/gnome/help/file-roller/sv/figures/file-roller_rightarrow.png
+share/gnome/help/file-roller/sv/figures/file-roller_uparrow.png
 share/gnome/help/file-roller/sv/file-roller.xml
-share/gnome/help/file-roller/sv/legal.xml
 share/gnome/help/file-roller/uk/figures/file-roller_home.png
 share/gnome/help/file-roller/uk/figures/file-roller_leftarrow.png
 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/uk/legal.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_CN/legal.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_HK/legal.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/gnome/help/file-roller/zh_TW/legal.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/file-roller.mo
@@ -95,6 +121,7 @@ ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/file-roller.mo
+${PKGLOCALEDIR}/locale/ku/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/file-roller.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/file-roller.mo
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index f81995177a2..493dcd10bdd 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.17 2005/08/21 11:48:34 jmmv Exp $
+$NetBSD: distinfo,v 1.18 2005/10/16 12:11:05 jmmv Exp $
 
-SHA1 (file-roller-2.10.4.tar.bz2) = 2b2ab70553a31a81902a4e59f8bb317b29b56caf
-RMD160 (file-roller-2.10.4.tar.bz2) = 222d8517a2d2ab867ca534b0f5916e721a050b9b
-Size (file-roller-2.10.4.tar.bz2) = 1307330 bytes
+SHA1 (file-roller-2.12.1.tar.bz2) = 87cca6adcdc4bbfd146eb458f33f6c7f1d203204
+RMD160 (file-roller-2.12.1.tar.bz2) = 160cf13fc5685c498d5bb8d9e3e44ca3b00f401b
+Size (file-roller-2.12.1.tar.bz2) = 1162479 bytes
+SHA1 (patch-aa) = cf35baed6df744049ed5b00cc93a7f79b2ffe2bc
diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
new file mode 100644
index 00000000000..bce278e82c4
--- /dev/null
+++ b/archivers/file-roller/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.6 2005/10/16 12:11:05 jmmv Exp $
+
+--- help/Makefile.in.orig	2005-10-03 19:39:29.000000000 +0200
++++ help/Makefile.in
+@@ -944,7 +944,7 @@ install-doc-figs:
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \