mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

Now that -CURRENT has /usr/bin/unzip, explicitly invoke (and depend on)

Browse Source 
archivers/unzip.
This commit is contained in:
Joe Marcus Clarke 2010-01-02 22:11:22 +00:00
parent d1054d1993
commit 463d6d0b94
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=247019
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
archivers/file-roller/Makefile
View File

@ -8,6 +8,7 @@
PORTNAME= file-roller
PORTVERSION= 2.28.2
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= GNOME
@ -18,7 +19,8 @@ COMMENT= An archive manager for zip files, tar, etc
OPTIONS= NAUTILUS "Enable Nautilus extension" on
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar
RUN_DEPENDS= ${LOCALBASE}/bin/gtar:${PORTSDIR}/archivers/gtar \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
USE_LDCONFIG= yes
USE_BZIP2= yes
@ -47,8 +49,9 @@ CONFIGURE_ARGS+= --disable-nautilus-actions
.endif
post-patch:
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
${WRKSRC}/src/fr-command-tar.c
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
${WRKSRC}/src/fr-command-tar.c \
${WRKSRC}/src/fr-command-zip.c
post-install:
@-update-desktop-database

39
archivers/file-roller/files/patch-src_fr-command-zip.c Normal file
View File

@ -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);