From d1058fafe61511e18a1325b48e5f13f18ed4fc9d Mon Sep 17 00:00:00 2001 From: John Marino Date: Fri, 22 Jan 2016 13:19:37 +0000 Subject: [PATCH] archivers/file_roller: Fix ambiguous RUN_DEPENDS file_roller requires the ports version of unzip (I'm assuming based on makefile's specifications). However, since the full path to unzip was not specified, the base unzip satifies the requirement which results in the archivers/unzip package not being registered as a run dependency. Enforce the requirement by specifying "zipinfo" instead. It is a unique name which ensures archivers/unzip is always registered as a dependency, thus guaranteeing the ports unzip will be available for file roller. This requires a bump because all existing packages have a bad registry. Reported by: fernandel on forums Approved by: just fix it --- archivers/file-roller/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 3a0eebb44b58..53a5249234a3 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,6 +3,7 @@ PORTNAME= file-roller PORTVERSION= 3.16.4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= GNOME @@ -13,7 +14,10 @@ COMMENT= Archive manager for zip files, tar, etc BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool RUN_DEPENDS= gtar:${PORTSDIR}/archivers/gtar \ - unzip:${PORTSDIR}/archivers/unzip + zipinfo:${PORTSDIR}/archivers/unzip + +# Port unzip is desired, but specify the uniquely named zipinfo to ensure +# archivers/unzip is pulled in. Using "unzip" is satisfied by base unzip PORTSCOUT= limitw:1,even