5 files changed, 32 insertions, 75 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 8701cd11f14e..cb13cd5e9057 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.104 2006/10/03 20:20:38 mezz Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.117 2007/03/12 23:23:57 marcus Exp $
 #
 
 PORTNAME=	file-roller
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index c5c0583d97f5..78db0bbe4f87 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/file-roller-2.16.3.tar.bz2) = 3ee134c04b73a584c9ec494d5e542c6d
-SHA256 (gnome2/file-roller-2.16.3.tar.bz2) = ac9a0c671c64cc1ee59f4a82655b68f917e204143c9d77c252f5cf4af0a71f6b
-SIZE (gnome2/file-roller-2.16.3.tar.bz2) = 1130693
+MD5 (gnome2/file-roller-2.18.0.tar.bz2) = 8f8b6b0e4598f2773f6948a631ca8721
+SHA256 (gnome2/file-roller-2.18.0.tar.bz2) = 3305c9a4b832576d0cf63d6040b6aba9e350d6214fba802e4a94d3a0afac4e88
+SIZE (gnome2/file-roller-2.18.0.tar.bz2) = 1126681
diff --git a/archivers/file-roller/files/patch-src_file-utils.h b/archivers/file-roller/files/patch-src_file-utils.h
deleted file mode 100644
index d3223290fe1c..000000000000
--- a/archivers/file-roller/files/patch-src_file-utils.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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 c4e3bac836f0..78843a28c6e9 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,12 @@
---- 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)
+--- src/fr-command-tar.c.orig	Sun Oct 15 12:33:56 2006
++++ src/fr-command-tar.c	Mon Oct 16 19:18:03 2006
+@@ -231,6 +231,9 @@
  #if defined (__SVR4) && defined (__sun)
- 	if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) {
+ 	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)) {
++	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 311d5c698f64..3b06de91f7d3 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -2,13 +2,22 @@ bin/file-roller
 lib/nautilus/extensions-1.0/libnautilus-fileroller.a
 lib/nautilus/extensions-1.0/libnautilus-fileroller.la
 lib/nautilus/extensions-1.0/libnautilus-fileroller.so
+libexec/file-roller/isoinfo.sh
+libexec/file-roller/move-here.sh
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/applications/file-roller.desktop
-share/gnome/file-roller/glade/file-roller-extract.glade
+share/gnome/file-roller/glade/ask-password.glade
 share/gnome/file-roller/glade/file-roller.glade
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/16x16/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/extract-archive.png
+share/gnome/file-roller/icons/hicolor/24x24/actions/preview-file.png
 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
@@ -46,18 +55,6 @@ 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/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/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
@@ -82,40 +79,20 @@ 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/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_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_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/omf/file-roller/file-roller-C.omf
 share/gnome/omf/file-roller/file-roller-bg.omf
 share/gnome/omf/file-roller/file-roller-de.omf
 share/gnome/omf/file-roller/file-roller-es.omf
 share/gnome/omf/file-roller/file-roller-fr.omf
 share/gnome/omf/file-roller/file-roller-it.omf
-share/gnome/omf/file-roller/file-roller-ja.omf
-share/gnome/omf/file-roller/file-roller-ko.omf
 share/gnome/omf/file-roller/file-roller-nl.omf
 share/gnome/omf/file-roller/file-roller-ru.omf
 share/gnome/omf/file-roller/file-roller-sv.omf
 share/gnome/omf/file-roller/file-roller-uk.omf
-share/gnome/omf/file-roller/file-roller-zh_CN.omf
-share/gnome/omf/file-roller/file-roller-zh_HK.omf
-share/gnome/omf/file-roller/file-roller-zh_TW.omf
-share/icons/hicolor/48x48/apps/file-roller.png
+share/icons/hicolor/16x16/apps/file-roller.png
+share/icons/hicolor/22x22/apps/file-roller.png
+share/icons/hicolor/32x32/apps/file-roller.png
+share/icons/hicolor/scalable/apps/file-roller.svg
 share/locale/am/LC_MESSAGES/file-roller.mo
 share/locale/ar/LC_MESSAGES/file-roller.mo
 share/locale/az/LC_MESSAGES/file-roller.mo
@@ -195,12 +172,6 @@ share/locale/zh_CN/LC_MESSAGES/file-roller.mo
 share/locale/zh_HK/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/zh_TW/figures
-@dirrm share/gnome/help/file-roller/zh_TW
-@dirrm share/gnome/help/file-roller/zh_HK/figures
-@dirrm share/gnome/help/file-roller/zh_HK
-@dirrm share/gnome/help/file-roller/zh_CN/figures
-@dirrm share/gnome/help/file-roller/zh_CN
 @dirrm share/gnome/help/file-roller/uk/figures
 @dirrm share/gnome/help/file-roller/uk
 @dirrm share/gnome/help/file-roller/sv/figures
@@ -209,10 +180,6 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/ru
 @dirrm share/gnome/help/file-roller/nl/figures
 @dirrm share/gnome/help/file-roller/nl
-@dirrm share/gnome/help/file-roller/ko/figures
-@dirrm share/gnome/help/file-roller/ko
-@dirrm share/gnome/help/file-roller/ja/figures
-@dirrm share/gnome/help/file-roller/ja
 @dirrm share/gnome/help/file-roller/it/figures
 @dirrm share/gnome/help/file-roller/it
 @dirrm share/gnome/help/file-roller/fr/figures
@@ -226,9 +193,16 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
 @dirrm share/gnome/help/file-roller/C/figures
 @dirrm share/gnome/help/file-roller/C
 @dirrm share/gnome/help/file-roller
+@dirrm share/gnome/file-roller/icons/hicolor/24x24/actions
+@dirrm share/gnome/file-roller/icons/hicolor/24x24
+@dirrm share/gnome/file-roller/icons/hicolor/16x16/actions
+@dirrm share/gnome/file-roller/icons/hicolor/16x16
+@dirrm share/gnome/file-roller/icons/hicolor
+@dirrm share/gnome/file-roller/icons
 @dirrm share/gnome/file-roller/glade
 @dirrm share/gnome/file-roller
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm libexec/file-roller
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_TW/LC_MESSAGES