summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
Diffstat (limited to 'archivers')
-rw-r--r--archivers/file-roller/Makefile19
-rw-r--r--archivers/file-roller/distinfo4
-rw-r--r--archivers/file-roller/patches/patch-aa40
-rw-r--r--archivers/file-roller/patches/patch-ab49
4 files changed, 109 insertions, 3 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index bc8dfa391cc..e9946d12d8a 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/10 11:52:05 jmmv Exp $
#
DISTNAME= file-roller-2.4.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/file-roller/2.4/}
@@ -12,6 +12,9 @@ COMMENT= Front-end to archiving programs like tar and zip
BUILD_USES_MSGFMT= yes
DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
+DEPENDS+= gtar-base>=1.13.25:../../archivers/gtar-base
+DEPENDS+= unzip>=5.50nb2:../../archivers/unzip
+DEPENDS+= zip>=2.3nb2:../../archivers/zip
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
@@ -21,6 +24,18 @@ USE_PKGLOCALEDIR= yes
GCONF2_SCHEMAS= file-roller.schemas
+EVAL_PREFIX+= PREFIX.gtar=gtar
+PREFIX.gtar_DEFAULT= ${LOCALBASE}
+CPPFLAGS+= -DFILEROLLER_TAR=\"\\\"${PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar\\\"\"
+
+EVAL_PREFIX+= PREFIX.unzip=unzip
+PREFIX.unzip_DEFAULT= ${LOCALBASE}
+CPPFLAGS+= -DFILEROLLER_UNZIP=\"\\\"${PREFIX.unzip}/bin/unzip\\\"\"
+
+EVAL_PREFIX+= PREFIX.zip=zip
+PREFIX.zip_DEFAULT= ${LOCALBASE}
+CPPFLAGS+= -DFILEROLLER_ZIP=\"\\\"${PREFIX.zip}/bin/zip\\\"\"
+
.include "../../devel/GConf2/schemas.mk"
.include "../../devel/libbonobo/buildlink2.mk"
.include "../../devel/libgnomeui/buildlink2.mk"
diff --git a/archivers/file-roller/distinfo b/archivers/file-roller/distinfo
index fe84fa7f4c2..374e0878fc5 100644
--- a/archivers/file-roller/distinfo
+++ b/archivers/file-roller/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/02/06 17:37:30 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/02/10 11:52:05 jmmv Exp $
SHA1 (file-roller-2.4.4.tar.gz) = ba60bc2240ccda621dc8a9003c8407778d31a7fa
Size (file-roller-2.4.4.tar.gz) = 1118488 bytes
+SHA1 (patch-aa) = cad25eaa8080edf1f148e8cec186235895e75490
+SHA1 (patch-ab) = b6f2ee00e38b648728610c0bccc297143d03493d
diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
new file mode 100644
index 00000000000..c1b56526a6d
--- /dev/null
+++ b/archivers/file-roller/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+
+--- src/fr-command-tar.c.orig 2004-01-26 12:31:55.000000000 +0100
++++ src/fr-command-tar.c
+@@ -177,7 +177,7 @@ fr_command_tar_list (FRCommand *comm)
+ comm);
+
+ fr_process_clear (comm->process);
+- fr_process_begin_command (comm->process, "tar");
++ fr_process_begin_command (comm->process, FILEROLLER_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);
+@@ -235,7 +235,7 @@ fr_command_tar_add (FRCommand *comm,
+ process_line__add,
+ comm);
+
+- fr_process_begin_command (comm->process, "tar");
++ fr_process_begin_command (comm->process, FILEROLLER_TAR);
+ fr_process_add_arg (comm->process, "--force-local");
+ fr_process_add_arg (comm->process, "-v");
+
+@@ -286,7 +286,7 @@ fr_command_tar_delete (FRCommand *comm,
+ process_line__delete,
+ comm);
+
+- fr_process_begin_command (comm->process, "tar");
++ fr_process_begin_command (comm->process, FILEROLLER_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");
+@@ -323,7 +323,7 @@ fr_command_tar_extract (FRCommand *comm
+ process_line__extract,
+ comm);
+
+- fr_process_begin_command (comm->process, "tar");
++ fr_process_begin_command (comm->process, FILEROLLER_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/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
new file mode 100644
index 00000000000..711136adeb2
--- /dev/null
+++ b/archivers/file-roller/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+
+--- src/fr-command-zip.c.orig 2004-01-26 12:31:55.000000000 +0100
++++ src/fr-command-zip.c
+@@ -221,7 +221,7 @@ fr_command_zip_list (FRCommand *comm)
+ comm);
+
+ fr_process_clear (comm->process);
+- fr_process_begin_command (comm->process, "unzip");
++ fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+ fr_process_add_arg (comm->process, "-qq");
+ fr_process_add_arg (comm->process, "-v");
+ fr_process_add_arg (comm->process, "-l");
+@@ -264,7 +264,7 @@ fr_command_zip_add (FRCommand *comm,
+ process_line__common,
+ comm);
+
+- fr_process_begin_command (comm->process, "zip");
++ fr_process_begin_command (comm->process, FILEROLLER_ZIP);
+
+ if (base_dir != NULL)
+ fr_process_set_working_dir (comm->process, base_dir);
+@@ -310,7 +310,7 @@ fr_command_zip_delete (FRCommand *comm,
+ process_line__common,
+ comm);
+
+- fr_process_begin_command (comm->process, "zip");
++ fr_process_begin_command (comm->process, FILEROLLER_ZIP);
+ fr_process_add_arg (comm->process, "-d");
+ add_filename_arg (comm);
+
+@@ -339,7 +339,7 @@ fr_command_zip_extract (FRCommand *comm
+ process_line__common,
+ comm);
+
+- fr_process_begin_command (comm->process, "unzip");
++ fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+
+ if (dest_dir != NULL) {
+ char *e_dest_dir = shell_escape (dest_dir);
+@@ -377,7 +377,7 @@ static void
+ fr_command_zip_test (FRCommand *comm,
+ const char *password)
+ {
+- fr_process_begin_command (comm->process, "unzip");
++ fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+ fr_process_add_arg (comm->process, "-t");
+ add_password_arg (comm, password);
+ add_filename_arg (comm);
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-04 21:51:23 +0000