diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-19 06:30:16 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-02-19 06:30:16 +0800 |
commit | e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4 (patch) | |
tree | 0171e5869fa2298a02705d0c2358a76e36c80ac7 | |
parent | 75eeeff408be6d582a4234c95085267305d21683 (diff) | |
download | marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar.gz marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar.bz2 marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar.lz marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar.xz marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.tar.zst marcuscom-ports-e16c3e2db0c4b3cad4f1c5465cba6625f9ec81e4.zip |
Use tar instead of gtar. The recent fix for #105739 broke this on FreeBSD.
The file-roller developers have been notified.
Reported by: Joa~o Grilo <grilo@netcabo.pt>
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1857 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | archivers/file-roller/Makefile | 1 | ||||
-rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-tar.c | 40 | ||||
-rw-r--r-- | archivers/fileroller/Makefile | 1 | ||||
-rw-r--r-- | archivers/fileroller/files/patch-src_fr-command-tar.c | 40 |
4 files changed, 78 insertions, 4 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 1d1a0601f..832ddcbb8 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -7,6 +7,7 @@ PORTNAME= fileroller PORTVERSION= 2.5.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} 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 9a0fb58a8..6f51fa144 100644 --- a/archivers/file-roller/files/patch-src_fr-command-tar.c +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -1,5 +1,5 @@ ---- 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 +--- src/fr-command-tar.c.orig Mon Feb 16 10:53:20 2004 ++++ src/fr-command-tar.c Wed Feb 18 17:30:26 2004 @@ -83,6 +83,11 @@ return mktime (&tm); } @@ -50,3 +50,39 @@ fields = g_strsplit (name_field, " -> ", 2); if (fields[1] == NULL) { +@@ -176,7 +196,7 @@ + process_line, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-tvf"); + fr_process_add_arg (comm->process, comm->e_filename); +@@ -234,7 +254,7 @@ + process_line__add, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); + +@@ -285,7 +305,7 @@ + process_line__delete, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_set_begin_func (comm->process, begin_func__delete, comm); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); +@@ -322,7 +342,7 @@ + process_line__extract, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); + fr_process_add_arg (comm->process, "-xf"); diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile index 1d1a0601f..832ddcbb8 100644 --- a/archivers/fileroller/Makefile +++ b/archivers/fileroller/Makefile @@ -7,6 +7,7 @@ PORTNAME= fileroller PORTVERSION= 2.5.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/archivers/fileroller/files/patch-src_fr-command-tar.c b/archivers/fileroller/files/patch-src_fr-command-tar.c index 9a0fb58a8..6f51fa144 100644 --- a/archivers/fileroller/files/patch-src_fr-command-tar.c +++ b/archivers/fileroller/files/patch-src_fr-command-tar.c @@ -1,5 +1,5 @@ ---- 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 +--- src/fr-command-tar.c.orig Mon Feb 16 10:53:20 2004 ++++ src/fr-command-tar.c Wed Feb 18 17:30:26 2004 @@ -83,6 +83,11 @@ return mktime (&tm); } @@ -50,3 +50,39 @@ fields = g_strsplit (name_field, " -> ", 2); if (fields[1] == NULL) { +@@ -176,7 +196,7 @@ + process_line, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-tvf"); + fr_process_add_arg (comm->process, comm->e_filename); +@@ -234,7 +254,7 @@ + process_line__add, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); + +@@ -285,7 +305,7 @@ + process_line__delete, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_set_begin_func (comm->process, begin_func__delete, comm); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); +@@ -322,7 +342,7 @@ + process_line__extract, + comm); + +- fr_process_begin_command (comm->process, "gtar"); ++ fr_process_begin_command (comm->process, "tar"); + fr_process_add_arg (comm->process, "--force-local"); + fr_process_add_arg (comm->process, "-v"); + fr_process_add_arg (comm->process, "-xf"); |