svn commit: r419652 - head/security/fwbuilder

[John Marino]

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 <bsd.port.options.mk>
 
-.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)