8 files changed, 66 insertions, 164 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index f87e29786621..4ba28821efe3 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -6,30 +6,40 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.8.4
+PORTVERSION=	2.10.0
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.8
+MASTER_SITE_SUBDIR=	sources/file-roller/2.10
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
+# XXX: We need the ports version of gtar since gtar-1.13.25 included with
+# FreeBSD is not sufficient.  If the base version of GNU tar is updated, then
+# we can do away with this dependency.
+RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
+
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui desktopfileutils
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	file-roller.schemas
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/src/fr-command-tar.c
+
 post-install:
-	@-update-desktop-database > /dev/null
+	@-update-desktop-database
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS NEWS README TODO
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index 924432cded1e..97e96af0d99b 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4
-SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279
+MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088
+SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026
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 ea69f1180a69..ea0addced05c 100644
--- a/archivers/file-roller/files/patch-src_fr-command-tar.c
+++ b/archivers/file-roller/files/patch-src_fr-command-tar.c
@@ -1,73 +1,11 @@
---- src/fr-command-tar.c.orig	Mon Apr 19 15:10:23 2004
-+++ src/fr-command-tar.c	Tue Apr 20 02:15:36 2004
-@@ -226,6 +226,11 @@
- 	return g_strdup (f_start);
- }
+--- src/fr-command-tar.c.orig	Sun Feb 20 17:17:15 2005
++++ src/fr-command-tar.c	Sun Feb 20 17:19:07 2005
+@@ -219,7 +219,7 @@
+ 	/* In solaris gtar is present under /usr/sfw/bin */
  
-+static char *months[] = {
-+	"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-+	"Nov", "Dec"
-+};
-+
+ 	prev_path = g_getenv ("PATH");
+-	temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin");
++	temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin");
+ 	putenv (temp);
  
- static void
- process_line (char     *line, 
-@@ -234,28 +239,37 @@
- 	FileData    *fdata;
- 	FRCommand   *comm = FR_COMMAND (data);
- 	char       **fields;
--	int          date_idx;
--	char        *field_date, *field_time, *field_size, *field_name;
-+	int          i;
-+	struct tm    tm = {0, };
-+	char       **time_fields;
-+	const char  *field_name;
- 
- 	g_return_if_fail (line != NULL);
- 
- 	fdata = file_data_new ();
- 
--	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
-+	fields = split_line (line, 7);
-+
-+	fdata->size = atol (fields[2]);
-+	for (i = 0; i < 12; i++) {
-+		if (!strncmp(fields[3], months[i], 3)) break;
-+	}
- 
--	field_size = get_prev_field (line, date_idx, 1);
--	fdata->size = atol (field_size);
--	g_free (field_size);
--
--	field_date = get_next_field (line, date_idx, 1);
--	field_time = get_next_field (line, date_idx, 2);
--	fdata->modified = mktime_from_string (field_date, field_time);
--	g_free (field_date);
--	g_free (field_time);
-+	tm.tm_mon = i;
-+	tm.tm_year = atoi (fields[6]) - 1900;
-+	tm.tm_mday = atoi (fields[4]);
-+	time_fields = g_strsplit(fields[5], ":", 2);
-+	tm.tm_hour = atoi (time_fields[0]);
-+	tm.tm_min = atoi (time_fields[1]);
-+	tm.tm_sec = 0;
-+	tm.tm_isdst = -1;
-+	fdata->modified = mktime(&tm);
-+	g_strfreev (fields);
-+	g_strfreev (time_fields);
- 
- 	/* Full path */
- 
--	field_name = tar_get_last_field (line, date_idx, 3);
-+	field_name = get_last_field (line, 8);
- 	fields = g_strsplit (field_name, " -> ", 2);
- 
- 	if (fields[1] == NULL) {
-@@ -274,7 +288,6 @@
- 	if (fields[1] != NULL)
- 		fdata->link = g_strdup (fields[1]);
- 	g_strfreev (fields);
--	g_free (field_name);
- 
- 	fdata->name = g_strdup (file_name_from_path (fdata->full_path));
- 	fdata->path = remove_level_from_path (fdata->full_path);
+ 	path = g_find_program_in_path ("gtar");
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 187b11b08251..139cdaa0f85b 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -1,5 +1,6 @@
 bin/file-roller
 lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.so
 libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml
 share/gnome/help/file-roller/sv/figures/file-roller_main_window.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/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/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_main_window.png
@@ -141,6 +143,7 @@ share/locale/tk/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/xh/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
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index f87e29786621..4ba28821efe3 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -6,30 +6,40 @@
 #
 
 PORTNAME=	fileroller
-PORTVERSION=	2.8.4
+PORTVERSION=	2.10.0
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/file-roller/2.8
+MASTER_SITE_SUBDIR=	sources/file-roller/2.10
 DISTNAME=	file-roller-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An archive manager for zip files, tar, etc
 
+# XXX: We need the ports version of gtar since gtar-1.13.25 included with
+# FreeBSD is not sufficient.  If the base version of GNU tar is updated, then
+# we can do away with this dependency.
+RUN_DEPENDS=	${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
+
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui desktopfileutils
+USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils nautilus2
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	file-roller.schemas
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/src/fr-command-tar.c
+
 post-install:
-	@-update-desktop-database > /dev/null
+	@-update-desktop-database
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS NEWS README TODO
diff --git a/archivers/fileroller/distinfo b/archivers/fileroller/distinfo
index 924432cded1e..97e96af0d99b 100644
--- a/archivers/fileroller/distinfo
+++ b/archivers/fileroller/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/file-roller-2.8.4.tar.bz2) = deabb6d24152457cf0afc036358602d4
-SIZE (gnome2/file-roller-2.8.4.tar.bz2) = 1410279
+MD5 (gnome2/file-roller-2.10.0.tar.bz2) = 0cb5b09aad7c9d352922994a6e8cf088
+SIZE (gnome2/file-roller-2.10.0.tar.bz2) = 1311026
diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c
index ea69f1180a69..ea0addced05c 100644
--- a/archivers/fileroller/files/patch-src_fr-command-tar.c
+++ b/archivers/fileroller/files/patch-src_fr-command-tar.c
@@ -1,73 +1,11 @@
---- src/fr-command-tar.c.orig	Mon Apr 19 15:10:23 2004
-+++ src/fr-command-tar.c	Tue Apr 20 02:15:36 2004
-@@ -226,6 +226,11 @@
- 	return g_strdup (f_start);
- }
+--- src/fr-command-tar.c.orig	Sun Feb 20 17:17:15 2005
++++ src/fr-command-tar.c	Sun Feb 20 17:19:07 2005
+@@ -219,7 +219,7 @@
+ 	/* In solaris gtar is present under /usr/sfw/bin */
  
-+static char *months[] = {
-+	"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct",
-+	"Nov", "Dec"
-+};
-+
+ 	prev_path = g_getenv ("PATH");
+-	temp = g_strdup_printf ("PATH=%s:%s", prev_path, "/usr/sfw/bin");
++	temp = g_strdup_printf ("PATH=%s:%s:%s", "%%LOCALBASE%%/bin", prev_path, "/usr/sfw/bin");
+ 	putenv (temp);
  
- static void
- process_line (char     *line, 
-@@ -234,28 +239,37 @@
- 	FileData    *fdata;
- 	FRCommand   *comm = FR_COMMAND (data);
- 	char       **fields;
--	int          date_idx;
--	char        *field_date, *field_time, *field_size, *field_name;
-+	int          i;
-+	struct tm    tm = {0, };
-+	char       **time_fields;
-+	const char  *field_name;
- 
- 	g_return_if_fail (line != NULL);
- 
- 	fdata = file_data_new ();
- 
--	date_idx = get_index_from_pattern (line, "%n%n%n%n-%n%n-%n%n %n%n:%n%n");
-+	fields = split_line (line, 7);
-+
-+	fdata->size = atol (fields[2]);
-+	for (i = 0; i < 12; i++) {
-+		if (!strncmp(fields[3], months[i], 3)) break;
-+	}
- 
--	field_size = get_prev_field (line, date_idx, 1);
--	fdata->size = atol (field_size);
--	g_free (field_size);
--
--	field_date = get_next_field (line, date_idx, 1);
--	field_time = get_next_field (line, date_idx, 2);
--	fdata->modified = mktime_from_string (field_date, field_time);
--	g_free (field_date);
--	g_free (field_time);
-+	tm.tm_mon = i;
-+	tm.tm_year = atoi (fields[6]) - 1900;
-+	tm.tm_mday = atoi (fields[4]);
-+	time_fields = g_strsplit(fields[5], ":", 2);
-+	tm.tm_hour = atoi (time_fields[0]);
-+	tm.tm_min = atoi (time_fields[1]);
-+	tm.tm_sec = 0;
-+	tm.tm_isdst = -1;
-+	fdata->modified = mktime(&tm);
-+	g_strfreev (fields);
-+	g_strfreev (time_fields);
- 
- 	/* Full path */
- 
--	field_name = tar_get_last_field (line, date_idx, 3);
-+	field_name = get_last_field (line, 8);
- 	fields = g_strsplit (field_name, " -> ", 2);
- 
- 	if (fields[1] == NULL) {
-@@ -274,7 +288,6 @@
- 	if (fields[1] != NULL)
- 		fdata->link = g_strdup (fields[1]);
- 	g_strfreev (fields);
--	g_free (field_name);
- 
- 	fdata->name = g_strdup (file_name_from_path (fdata->full_path));
- 	fdata->path = remove_level_from_path (fdata->full_path);
+ 	path = g_find_program_in_path ("gtar");
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 187b11b08251..139cdaa0f85b 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -1,5 +1,6 @@
 bin/file-roller
 lib/bonobo/libfile-roller-component.so
+lib/nautilus/extensions-1.0/libnautilus-fileroller.so
 libdata/bonobo/servers/File_Roller_Component.server
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -47,10 +48,11 @@ share/gnome/help/file-roller/ru/legal.xml
 share/gnome/help/file-roller/sv/figures/file-roller_main_window.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/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/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_main_window.png
@@ -141,6 +143,7 @@ share/locale/tk/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/xh/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