head	1.3;
access;
symbols
	pkgsrc-2019Q2:1.2.0.76
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.74
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.72
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.70
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.68
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.66
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.64
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.62
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.58
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.56
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.54
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.52
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.50
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.48
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.46
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.44
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.42
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.40
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.38
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.36
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.34
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.32
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.30
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.28
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.26
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.24
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.22
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.20
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.18
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.16
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.14
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.12
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.10
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.8
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.6
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.4
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.2
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.1.0.6
	pkgsrc-2010Q1-base:1.1
	pkgsrc-2009Q4:1.1.0.4
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.2
	pkgsrc-2009Q3-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2019.09.14.21.46.15;	author nia;	state dead;
branches;
next	1.2;
commitid	kl5uCY7bY8BPI1DB;

1.2
date	2010.06.15.20.48.23;	author drochner;	state Exp;
branches;
next	1.1;

1.1
date	2009.09.19.07.46.56;	author ahoka;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Remove archivers/file-roller - successor fork archivers/engrampa
@
text
@$NetBSD: patch-unzip,v 1.2 2010/06/15 20:48:23 drochner Exp $

--- src/fr-command-zip.c.orig	2010-03-11 17:44:54.000000000 +0000
+++ src/fr-command-zip.c
@@@@ -33,6 +33,7 @@@@
 #include "fr-command.h"
 #include "fr-command-zip.h"
 
+#define FR_UNZIP_COMMAND	     "@@@@UNZIP_COMMAND@@@@"
 #define EMPTY_ARCHIVE_WARNING        "Empty zipfile."
 #define ZIP_SPECIAL_CHARACTERS       "[]*?!^-\\"
 
@@@@ -187,7 +188,7 @@@@ fr_command_zip_list (FrCommand  *comm)
 {
 	fr_process_set_out_line_func (comm->process, list__process_line, comm);
 
-	fr_process_begin_command (comm->process, "unzip");
+	fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
 	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 +303,7 @@@@ fr_command_zip_extract (FrCommand  *comm
 				      process_line__common,
 				      comm);
 
-	fr_process_begin_command (comm->process, "unzip");
+	fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
 
 	if (dest_dir != NULL) {
 		fr_process_add_arg (comm->process, "-d");
@@@@ -334,7 +335,7 @@@@ fr_command_zip_extract (FrCommand  *comm
 static void
 fr_command_zip_test (FrCommand   *comm)
 {
-	fr_process_begin_command (comm->process, "unzip");
+	fr_process_begin_command (comm->process, FR_UNZIP_COMMAND);
 	fr_process_add_arg (comm->process, "-t");
 	add_password_arg (comm, comm->password);
 	fr_process_add_arg (comm->process, comm->filename);
@@@@ -400,7 +401,7 @@@@ fr_command_zip_get_capabilities (FrComma
 		else
 			capabilities |= FR_COMMAND_CAN_READ_WRITE;
 	}
-	else if (is_program_available ("unzip", check_command))
+	else if (is_program_available (FR_UNZIP_COMMAND, check_command))
 		capabilities |= FR_COMMAND_CAN_READ;
 
 	return capabilities;
@


1.2
log
@update to 2.30.1.1
This switches to the gnome-2.30 release branch
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Missed this patch in my last unzip commit.
@
text
@d3 1
a3 1
--- src/fr-command-zip.c.orig	2009-06-30 01:32:59.000000000 +0200
d40 1
a40 1
@@@@ -399,7 +400,7 @@@@ fr_command_zip_get_capabilities (FrComma
d44 2
a45 2
-	else if (is_program_in_path ("unzip"))
+	else if (is_program_in_path (FR_UNZIP_COMMAND))
@