Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 4 Jan 2018 19:09:04 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r458043 - branches/2018Q1/Mk
Message-ID:  <201801041909.w04J94cN022765@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Thu Jan  4 19:09:04 2018
New Revision: 458043
URL: https://svnweb.freebsd.org/changeset/ports/458043

Log:
  MFH: r458041
  
  Fix package-depends-list for FLAVORS.
  
  Reported by:	dinoex
  Approved by:	portmgr (implicit)

Modified:
  branches/2018Q1/Mk/bsd.port.mk
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/Mk/bsd.port.mk
==============================================================================
--- branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 19:08:49 2018	(r458042)
+++ branches/2018Q1/Mk/bsd.port.mk	Thu Jan  4 19:09:04 2018	(r458043)
@@ -4213,6 +4213,12 @@ PACKAGE-DEPENDS-LIST?= \
 	fi; \
 	checked="${PARENT_CHECKED}"; \
 	for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \
+		case $${dir} in \
+		*@*) \
+			flavor=$${dir\#*@}; \
+			dir=$${dir%@*}; \
+			;; \
+		esac; \
 		case "$$dir" in \
 		/*) ;; \
 		*) dir=${PORTSDIR}/$$dir ;; \
@@ -4222,7 +4228,7 @@ PACKAGE-DEPENDS-LIST?= \
 			case $$checked in	\
 			$$dir|$$dir\ *|*\ $$dir|*\ $$dir\ *) continue;;	\
 			esac;	\
-			childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
+			childout=$$(cd $$dir; FLAVOR=$${flavor} ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \
 			set -- $$childout; \
 			childdir=""; \
 			while [ $$\# != 0 ]; do \



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