From owner-svn-ports-head@freebsd.org Thu Aug 4 19:25:47 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E455BAF8B5; Thu, 4 Aug 2016 19:25:47 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F1A84190A; Thu, 4 Aug 2016 19:25:46 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u74JPkOV075279; Thu, 4 Aug 2016 19:25:46 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u74JPk85075278; Thu, 4 Aug 2016 19:25:46 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201608041925.u74JPk85075278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Thu, 4 Aug 2016 19:25:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419652 - head/security/fwbuilder X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Aug 2016 19:25:47 -0000 Author: marino Date: Thu Aug 4 19:25:45 2016 New Revision: 419652 URL: https://svnweb.freebsd.org/changeset/ports/419652 Log: security/fwbuilder: Fix bad RUN_DEPENDS specification for rcs The fwbuilder makefile specifies devel/rcs as a run dependency for FreeBSD 10 and later, but the specification is ignored on a stock FreeBSD 10.3 installed from an ISO. At some point rcs was removed before FreeBSD-10 release, but it seems to have been put back and controlled with a build knob, so it may or may not be present on FreeBSD 10 or later. Change the test from checking OSVERSION to checking for the existence of /usr/bin/rcs. It's a better chek and it fixes a potential dependency mismatch issue between the port and the built package. While here, change RUN_DEPENDS= to RUN_DEPENDS+= to avoid a potential overwrite of existing values. Approved by: infrastructure blanket (redundant deps work) Modified: head/security/fwbuilder/Makefile Modified: head/security/fwbuilder/Makefile ============================================================================== --- head/security/fwbuilder/Makefile Thu Aug 4 19:17:44 2016 (r419651) +++ head/security/fwbuilder/Makefile Thu Aug 4 19:25:45 2016 (r419652) @@ -4,7 +4,7 @@ PORTNAME= fwbuilder DISTVERSION= 5.1.0 PORTVERSION= ${DISTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security BUILD= 3599 # XXX in developement version of this port: PKGNAMESUFFIX= -devel @@ -66,9 +66,9 @@ PORTDOCS= * .include -.if ${OSVERSION} >= 1000055 +.if !exists (/usr/bin/rcs) # IMPORTANT: Newer versions of rcs will NOT work with fwbuilder. -RUN_DEPENDS= rcs:devel/rcs57 +RUN_DEPENDS+= rcs:devel/rcs57 .endif .if empty(PORT_OPTIONS:MDOCS)