diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 18:18:17 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 18:18:17 +0800 |
| commit | 77298a4bf437a1d7469a93be6fc0de298f48d313 (patch) | |
| tree | b0b2ec271c6803ca11e8eed36aeb34d7a2265fc8 /archivers/file-roller/files | |
| parent | ad0f663912a361dac187acf7bfd0420e531423ec (diff) | |
| download | marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar.gz marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar.bz2 marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar.lz marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar.xz marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.tar.zst marcuscom-ports-77298a4bf437a1d7469a93be6fc0de298f48d313.zip | |
Register conflicts between file-roller.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15803 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'archivers/file-roller/files')
3 files changed, 62 insertions, 0 deletions
diff --git a/archivers/file-roller/files/patch-src_fr-command-lrzip.c b/archivers/file-roller/files/patch-src_fr-command-lrzip.c new file mode 100644 index 000000000..ae2d7d440 --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-lrzip.c @@ -0,0 +1,11 @@ +--- src/fr-command-lrzip.c.orig 2010-08-26 12:40:56.000000000 -0400 ++++ src/fr-command-lrzip.c 2010-08-26 12:41:41.000000000 -0400 +@@ -53,7 +53,7 @@ list__process_line (char *line, + struct stat st; + time_t tt; + if (stat (comm->filename, &st) == 0) +- fdata->modified = st.st_mtim.tv_sec; ++ fdata->modified = st.st_mtime; + else + time(&(fdata->modified)); + fdata->modified; diff --git a/archivers/file-roller/files/patch-src_fr-command-tar.c b/archivers/file-roller/files/patch-src_fr-command-tar.c new file mode 100644 index 000000000..78843a28c --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-tar.c @@ -0,0 +1,12 @@ +--- 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)) + 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/files/patch-src_fr-command-zip.c b/archivers/file-roller/files/patch-src_fr-command-zip.c new file mode 100644 index 000000000..ee9ec93de --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-zip.c @@ -0,0 +1,39 @@ +--- src/fr-command-zip.c.orig 2010-01-02 17:02:44.000000000 -0500 ++++ src/fr-command-zip.c 2010-01-02 17:08:03.000000000 -0500 +@@ -187,7 +187,11 @@ fr_command_zip_list (FrCommand *comm) + { + fr_process_set_out_line_func (comm->process, list__process_line, comm); + ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else + fr_process_begin_command (comm->process, "unzip"); ++#endif + fr_process_set_begin_func (comm->process, list__begin, comm); + fr_process_add_arg (comm->process, "-ZTs"); + fr_process_add_arg (comm->process, comm->filename); +@@ -302,7 +306,11 @@ fr_command_zip_extract (FrCommand *comm + process_line__common, + comm); + ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else + fr_process_begin_command (comm->process, "unzip"); ++#endif + + if (dest_dir != NULL) { + fr_process_add_arg (comm->process, "-d"); +@@ -334,7 +342,11 @@ fr_command_zip_extract (FrCommand *comm + static void + fr_command_zip_test (FrCommand *comm) + { +- fr_process_begin_command (comm->process, "unzip"); ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#endif + fr_process_add_arg (comm->process, "-t"); + add_password_arg (comm, comm->password); + fr_process_add_arg (comm->process, comm->filename); |