svn commit: r414547 - head/Mk

Bryan Drewery bdrewery at FreeBSD.org
Tue May 3 18:36:30 UTC 2016


Author: bdrewery
Date: Tue May  3 18:36:29 2016
New Revision: 414547
URL: https://svnweb.freebsd.org/changeset/ports/414547

Log:
  Fix excluding implied options.
  
  This fixes the devel/git-lite port to not get PERL despite being excluded.
  
  PR:		207460
  PR:		202701
  With hat:	portmgr
  Differential Revision:	https://reviews.freebsd.org/D5538

Modified:
  head/Mk/bsd.options.mk

Modified: head/Mk/bsd.options.mk
==============================================================================
--- head/Mk/bsd.options.mk	Tue May  3 18:27:04 2016	(r414546)
+++ head/Mk/bsd.options.mk	Tue May  3 18:36:29 2016	(r414547)
@@ -216,6 +216,16 @@ OPTIONS_DEFAULT+=	${OPTIONS_DEFAULT_${AR
 _ALL_EXCLUDE=	${OPTIONS_EXCLUDE_${ARCH}} ${OPTIONS_EXCLUDE} \
 		${OPTIONS_SLAVE} ${OPTIONS_EXCLUDE_${OPSYS}}
 
+.for opt in ${OPTIONS_DEFINE:O:u}
+.  if !${_ALL_EXCLUDE:M${opt}}
+.    for opt_implied in ${${opt}_IMPLIES}
+.       if ${_ALL_EXCLUDE:M${opt_implied}}
+_ALL_EXCLUDE+=	${opt}
+.       endif
+.    endfor
+.  endif
+.endfor
+
 # Remove options the port maintainer doesn't want
 .for opt in ${_ALL_EXCLUDE:O:u}
 OPTIONS_DEFAULT:=	${OPTIONS_DEFAULT:N${opt}}


More information about the svn-ports-head mailing list