4 files changed, 43 insertions, 31 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index de0126a63ca1..fa28a296e74a 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.2.5
+PORTVERSION=	2.4.0.1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.2
+MASTER_SITE_SUBDIR=	sources/file-roller/2.4
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -18,11 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha \
-		lzop:${PORTSDIR}/archivers/lzop
+		lzop:${PORTSDIR}/archivers/lzop \
+		zoo:${PORTSDIR}/archivers/zoo
 .if !exists(/usr/bin/bzip2)
 RUN_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 8f8c24d2e779..324640a2c041 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1 +1 @@
-MD5 (gnome2/file-roller-2.2.5.tar.gz) = 161aa4e9d7032d298115d0386635a9e9
+MD5 (gnome2/file-roller-2.4.0.1.tar.bz2) = d268975b20679bc6b8f4f88492e7bfdf
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 6ae5fcfa32bf..9a0fb58a82ed 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,32 +1,24 @@
---- src/fr-command-tar.c.orig	Fri Aug  9 09:10:51 2002
-+++ src/fr-command-tar.c	Fri Oct 11 12:14:40 2002
-@@ -117,7 +117,7 @@
- {
- 	int   i;
- 	char *field;
--	int   n = 6;
-+	int   n = 8;
- 
- 	n--;
- 	field = eat_spaces (line);
-@@ -129,6 +129,10 @@
- 	return field;
+--- src/fr-command-tar.c.orig	Mon May 19 14:15:50 2003
++++ src/fr-command-tar.c	Tue May 20 20:43:39 2003
+@@ -83,6 +83,11 @@
+ 	return mktime (&tm);
  }
  
-+static char *months[] = { 
++static char *months[] = {
 +    "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
 +    "Nov", "Dec"
 +};
++
  
  static void
  process_line (char     *line, 
-@@ -138,15 +142,30 @@
- 	FRCommand  *comm = FR_COMMAND (data);
- 	char      **fields;
- 	char       *name_field;
-+	int        i;
-+	struct tm  tm = {0, };
-+	char      **time_fields;
+@@ -92,19 +97,34 @@
+ 	FRCommand   *comm = FR_COMMAND (data);
+ 	char       **fields;
+ 	const char  *name_field;
++	int          i;
++	struct tm    tm = {0, };
++	char       **time_fields;
  
  	g_return_if_fail (line != NULL);
  
@@ -53,3 +45,8 @@
  
  	/* Full path */
  
+-	name_field = get_last_field (line, 6);
++	name_field = get_last_field (line, 8);
+ 	fields = g_strsplit (name_field, " -> ", 2);
+ 
+ 	if (fields[1] == NULL) {
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 1245807ca7e8..10aacc1c1ee4 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -10,10 +10,10 @@ etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui/%gconf.xml
 etc/gconf/schemas/file-roller.schemas
 lib/bonobo/libfile-roller-component.so
 libdata/bonobo/servers/File_Roller_Component.server
-%%PORTDOCS%%share/doc/fileroller/AUTHORS
-%%PORTDOCS%%share/doc/fileroller/NEWS
-%%PORTDOCS%%share/doc/fileroller/README
-%%PORTDOCS%%share/doc/fileroller/TODO
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/application-registry/file-roller.applications
 share/gnome/applications/file-roller.desktop
 share/gnome/file-roller/glade/file_roller.glade
@@ -27,20 +27,29 @@ 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/file-roller.xml
 share/gnome/help/file-roller/ru/legal.xml
+share/gnome/help/file-roller/uk/figures/fr-add-dialog.png
+share/gnome/help/file-roller/uk/figures/fr-extract.png
+share/gnome/help/file-roller/uk/figures/fr-mainwindow.png
+share/gnome/help/file-roller/uk/figures/fr-prefs.png
+share/gnome/help/file-roller/uk/file-roller.xml
+share/gnome/help/file-roller/uk/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
 @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/file-roller/file-roller-ru.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/file-roller/file-roller-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/file-roller.png
 share/locale/am/LC_MESSAGES/file-roller.mo
-share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
 share/locale/be/LC_MESSAGES/file-roller.mo
 share/locale/bg/LC_MESSAGES/file-roller.mo
+share/locale/bn/LC_MESSAGES/file-roller.mo
 share/locale/ca/LC_MESSAGES/file-roller.mo
 share/locale/cs/LC_MESSAGES/file-roller.mo
+share/locale/cy/LC_MESSAGES/file-roller.mo
 share/locale/da/LC_MESSAGES/file-roller.mo
 share/locale/de/LC_MESSAGES/file-roller.mo
 share/locale/el/LC_MESSAGES/file-roller.mo
@@ -77,12 +86,15 @@ share/locale/sq/LC_MESSAGES/file-roller.mo
 share/locale/sr/LC_MESSAGES/file-roller.mo
 share/locale/sr@Latn/LC_MESSAGES/file-roller.mo
 share/locale/sv/LC_MESSAGES/file-roller.mo
+share/locale/th/LC_MESSAGES/file-roller.mo
 share/locale/tr/LC_MESSAGES/file-roller.mo
 share/locale/uk/LC_MESSAGES/file-roller.mo
 share/locale/vi/LC_MESSAGES/file-roller.mo
 share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/omf/file-roller
+@dirrm share/gnome/help/file-roller/uk/figures
+@dirrm share/gnome/help/file-roller/uk
 @dirrm share/gnome/help/file-roller/ru/figures
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/C/figures
@@ -90,7 +102,7 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller
 @dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
-%%PORTDOCS%%@dirrm share/doc/fileroller
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/ui
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/file-roller/general
@@ -99,5 +111,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/file-roller
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-uk.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-ru.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/file-roller/file-roller-C.omf 2>/dev/null || /usr/bin/true