Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Apr 2012 11:08:46 GMT
From:      Mark Linimon <linimon@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/166608: [patch] bsd.port.mk: fix unneccessary dependency on archivers/unzip
Message-ID:  <201204031108.q33B8k2T016106@freefall.freebsd.org>
Resent-Message-ID: <201204031110.q33BA1TL016143@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         166608
>Category:       ports
>Synopsis:       [patch] bsd.port.mk: fix unneccessary dependency on archivers/unzip
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 03 11:10:01 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Mark Linimon
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
FreeBSD
>Environment:
>Description:
unzip was imported to base Tue Jan 8 UTC via
http://svnweb.freebsd.org/base?view=revision&revision=175154 .  Ever since
that time, it has been unneccesary for ports such as databases/sqlite3 to
depend on the port.

OSVERSION was not updated, but unrelated 800009 was only 1 day later.
>How-To-Repeat:
>Fix:
Index: Mk/bsd.commands.mk
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.commands.mk,v
retrieving revision 1.10
diff -u -r1.10 bsd.commands.mk
--- Mk/bsd.commands.mk	22 Feb 2012 17:34:47 -0000	1.10
+++ Mk/bsd.commands.mk	3 Apr 2012 10:51:11 -0000
@@ -89,7 +89,11 @@
 UMOUNT?=	/sbin/umount
 UNAME?=		/usr/bin/uname
 UNMAKESELF_CMD?=	${LOCALBASE}/bin/unmakeself
+.if exists(/usr/bin/unzip)
+UNZIP_CMD?=	/usr/bin/unzip
+.else
 UNZIP_CMD?=	${LOCALBASE}/bin/unzip
+.endif
 WHICH?=		/usr/bin/which
 XARGS?=		/usr/bin/xargs
 XMKMF?=		${LOCALBASE}/bin/xmkmf -a
Index: Mk/bsd.port.mk
===================================================================
RCS file: /home/FreeBSD/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.708
diff -u -r1.708 bsd.port.mk
--- Mk/bsd.port.mk	13 Mar 2012 08:14:45 -0000	1.708
+++ Mk/bsd.port.mk	3 Apr 2012 11:04:23 -0000
@@ -1625,7 +1625,7 @@
 .endif
 
 .if defined(PATCHFILES)
-.if ${PATCHFILES:M*.zip}x != x
+.if ${PATCHFILES:M*.zip}x != && ${OSVERSION} < 800009
 PATCH_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 .endif
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204031108.q33B8k2T016106>