Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

12 files changed, 196 insertions, 58 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 14784828a70c..a08999c13d84 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,14 +3,15 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.10.4
+PORTVERSION=	2.12.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.10
+MASTER_SITE_SUBDIR=	sources/file-roller/2.12
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,8 +28,9 @@ INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
+		gnomedocutils
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -37,6 +39,8 @@ GCONF_SCHEMAS=	file-roller.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/fr-command-tar.c
+	@${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|atoll|fr_atoll|g'
 
 post-install:
 	@-update-desktop-database
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index e7be152bfb20..86f081c99341 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.10.4.tar.bz2) = 74115fe3289042cc41dc517dede3f64f
-SIZE (gnome2/file-roller-2.10.4.tar.bz2) = 1307330
+MD5 (gnome2/file-roller-2.12.1.tar.bz2) = 5b256e9c56e132007ae6933b6b604157
+SIZE (gnome2/file-roller-2.12.1.tar.bz2) = 1162479
diff --git a/archivers/file-roller/files/patch-help_Makefile.in b/archivers/file-roller/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..d1e1b99597dd
--- /dev/null
+++ b/archivers/file-roller/files/patch-help_Makefile.in
@@ -0,0 +1,20 @@
+--- help/Makefile.in.orig	Tue Aug  9 00:19:45 2005
++++ help/Makefile.in	Tue Aug  9 00:20:04 2005
+@@ -869,7 +869,7 @@
+ 	@for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \
+ 	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f "$$d$$fig"; then \
+-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    if ! test -d "$(distdir)/$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
+ 	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
+@@ -944,7 +944,7 @@
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \
diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h
new file mode 100644
index 000000000000..d3223290fe1c
--- /dev/null
+++ b/archivers/file-roller/files/patch-src_file-utils.h
@@ -0,0 +1,16 @@
+--- src/file-utils.h.orig	Sun Jul  3 19:11:59 2005
++++ src/file-utils.h	Sun Jul  3 19:12:52 2005
+@@ -25,8 +25,13 @@
+ 
+ #include <sys/types.h>
+ #include <time.h>
++#include <stdlib.h>
++#include <limits.h>
+ #include <libgnomevfs/gnome-vfs-file-size.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
++
++#undef fr_atoll
++#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
+ 
+ 
+ #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c
index 5a046266d274..c4e3bac836f0 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,13 +1,13 @@
---- src/fr-command-tar.c.orig	Fri Apr 22 13:11:56 2005
-+++ src/fr-command-tar.c	Fri Apr 22 13:16:00 2005
-@@ -221,6 +221,10 @@
+--- src/fr-command-tar.c.orig	Fri Jul  1 14:41:32 2005
++++ src/fr-command-tar.c	Sun Jul  3 19:03:01 2005
+@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
+ #if defined (__SVR4) && defined (__sun)
  	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
  		command = g_strdup ("/usr/sfw/bin/gtar");
- 	}
++	}
 +#elif defined(__FreeBSD__)
 +	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
 +		command = g_strdup ("%%LOCALBASE%%/bin/gtar");
-+	}
+ 	}
  #endif
  	if (command != NULL)
- 		fr_process_begin_command (comm->process, command);
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index e6b9618adeaa..61dad2114c70 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -8,7 +8,8 @@ libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file_roller.glade
+share/gnome/file-roller/glade/file-roller-extract.glade
+share/gnome/file-roller/glade/file-roller.glade
 share/gnome/help/file-roller/C/figures/file-roller_home.png
 share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@@ -16,53 +17,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
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
@@ -113,6 +139,7 @@ share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
 share/locale/kn/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/ku/LC_MESSAGES/file-roller.mo
 share/locale/lt/LC_MESSAGES/file-roller.mo
 share/locale/lv/LC_MESSAGES/file-roller.mo
 share/locale/mk/LC_MESSAGES/file-roller.mo
@@ -156,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku 2> /dev/null || true
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/zh_TW/figures
 @dirrm share/gnome/help/file-roller/zh_TW
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 14784828a70c..a08999c13d84 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -3,14 +3,15 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/archivers/fileroller/Makefile,v 1.79 2005/10/03 21:14:16 mezz Exp $
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.10.4
+PORTVERSION=	2.12.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.10
+MASTER_SITE_SUBDIR=	sources/file-roller/2.12
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,8 +28,9 @@ INSTALLS_OMF=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2
-USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2 \
+		gnomedocutils
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -37,6 +39,8 @@ GCONF_SCHEMAS=	file-roller.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/fr-command-tar.c
+	@${FIND} ${WRKSRC} -name "fr-command-*.c" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|atoll|fr_atoll|g'
 
 post-install:
 	@-update-desktop-database
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index e7be152bfb20..86f081c99341 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.10.4.tar.bz2) = 74115fe3289042cc41dc517dede3f64f
-SIZE (gnome2/file-roller-2.10.4.tar.bz2) = 1307330
+MD5 (gnome2/file-roller-2.12.1.tar.bz2) = 5b256e9c56e132007ae6933b6b604157
+SIZE (gnome2/file-roller-2.12.1.tar.bz2) = 1162479
diff --git a/archivers/fileroller/files/patch-help_Makefile.in b/archivers/fileroller/files/patch-help_Makefile.in
new file mode 100644
index 000000000000..d1e1b99597dd
--- /dev/null
+++ b/archivers/fileroller/files/patch-help_Makefile.in
@@ -0,0 +1,20 @@
+--- help/Makefile.in.orig	Tue Aug  9 00:19:45 2005
++++ help/Makefile.in	Tue Aug  9 00:20:04 2005
+@@ -869,7 +869,7 @@
+ 	@for fig in $(_DOC_C_FIGURES) $(_DOC_LC_FIGURES); do \
+ 	  if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f "$$d$$fig"; then \
+-	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    if ! test -d "$(distdir)/$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $(distdir)/$$figdir"; \
+ 	      $(mkinstalldirs) "$(distdir)/$$figdir"; \
+@@ -944,7 +944,7 @@
+ 	    else \
+ 	      figfile="$(srcdir)/C/$$fig"; \
+ 	    fi; \
+-	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*\|.*/\1/'`; \
++	    figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
+ 	    figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
+ 	    if ! test -d "$$figdir"; then \
+ 	      echo "$(mkinstalldirs) $$figdir"; \
diff --git a/archivers/fileroller/files/patch-src_file-utils.h b/archivers/fileroller/files/patch-src_file-utils.h
new file mode 100644
index 000000000000..d3223290fe1c
--- /dev/null
+++ b/archivers/fileroller/files/patch-src_file-utils.h
@@ -0,0 +1,16 @@
+--- src/file-utils.h.orig	Sun Jul  3 19:11:59 2005
++++ src/file-utils.h	Sun Jul  3 19:12:52 2005
+@@ -25,8 +25,13 @@
+ 
+ #include <sys/types.h>
+ #include <time.h>
++#include <stdlib.h>
++#include <limits.h>
+ #include <libgnomevfs/gnome-vfs-file-size.h>
+ #include <libgnomevfs/gnome-vfs-mime-handlers.h>
++
++#undef fr_atoll
++#define fr_atoll(nptr) strtoll(nptr, (char **)NULL, 10)
+ 
+ 
+ #define FILENAME_MAX_LENGTH 30 /* FIXME: find out the best value */
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index 5a046266d274..c4e3bac836f0 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,13 +1,13 @@
---- src/fr-command-tar.c.orig	Fri Apr 22 13:11:56 2005
-+++ src/fr-command-tar.c	Fri Apr 22 13:16:00 2005
-@@ -221,6 +221,10 @@
+--- src/fr-command-tar.c.orig	Fri Jul  1 14:41:32 2005
++++ src/fr-command-tar.c	Sun Jul  3 19:03:01 2005
+@@ -222,6 +223,10 @@ begin_tar_command (FRCommand *comm)
+ #if defined (__SVR4) && defined (__sun)
  	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
  		command = g_strdup ("/usr/sfw/bin/gtar");
- 	}
++	}
 +#elif defined(__FreeBSD__)
 +	if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
 +		command = g_strdup ("%%LOCALBASE%%/bin/gtar");
-+	}
+ 	}
  #endif
  	if (command != NULL)
- 		fr_process_begin_command (comm->process, command);
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index e6b9618adeaa..61dad2114c70 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -8,7 +8,8 @@ libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file_roller.glade
+share/gnome/file-roller/glade/file-roller-extract.glade
+share/gnome/file-roller/glade/file-roller.glade
 share/gnome/help/file-roller/C/figures/file-roller_home.png
 share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
 share/gnome/help/file-roller/C/figures/file-roller_main_window.png
@@ -16,53 +17,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
 share/gnome/mime-info/file-roller.keys
 share/gnome/mime-info/file-roller.mime
 share/gnome/omf/file-roller/file-roller-C.omf
@@ -113,6 +139,7 @@ share/locale/it/LC_MESSAGES/file-roller.mo
 share/locale/ja/LC_MESSAGES/file-roller.mo
 share/locale/kn/LC_MESSAGES/file-roller.mo
 share/locale/ko/LC_MESSAGES/file-roller.mo
+share/locale/ku/LC_MESSAGES/file-roller.mo
 share/locale/lt/LC_MESSAGES/file-roller.mo
 share/locale/lv/LC_MESSAGES/file-roller.mo
 share/locale/mk/LC_MESSAGES/file-roller.mo
@@ -156,6 +183,8 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/rw 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ku 2> /dev/null || true
 @dirrm share/gnome/omf/file-roller
 @dirrm share/gnome/help/file-roller/zh_TW/figures
 @dirrm share/gnome/help/file-roller/zh_TW