[Midnightbsd-cvs] mports [22253] trunk/Mk/components/metadata.mk: attempt to catch the new case where /usr/mports is not on depends lines

[laffer1 at midnightbsd.org]

Revision: 22253
          http://svnweb.midnightbsd.org/mports/?rev=22253
Author:   laffer1
Date:     2017-01-28 18:06:20 -0500 (Sat, 28 Jan 2017)
Log Message:
-----------
attempt to catch the new case where /usr/mports is not on depends lines

Modified Paths:
--------------
    trunk/Mk/components/metadata.mk

Modified: trunk/Mk/components/metadata.mk
===================================================================
--- trunk/Mk/components/metadata.mk	2017-01-28 22:59:06 UTC (rev 22252)
+++ trunk/Mk/components/metadata.mk	2017-01-28 23:06:20 UTC (rev 22253)
@@ -34,10 +34,14 @@
 		@rdirs = map((split /:/)[1], split(q{ }, q{${RUN_DEPENDS}})); \
 		@ddirs = map((split /:/)[0], split(q{ }, q{${DEPENDS}})); \
 		@ldirs = map((split /:/)[1], split(q{ }, q{${LIB_DEPENDS}})); \
-		for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs) { \
+		@pkgdirs = map((split /:/)[1], split(q{ }, q{${PKG_DEPENDS}})); \
+		for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs, \@pkgdirs) { \
 			my @dirs = @$$i; \
 			@$$i = (); \
 			for (@dirs) { \
+				if (index($$_, "/usr/mports") == -1) {
+					$$_ = "/usr/mports" . $$_;
+				}
 				if (-d $$_) { \
 					push @$$i, $$_; \
 				} else { \