From: Thomas Cort <tcort@minix3.org>
Date: Mon, 27 Jun 2011 16:01:38 +0000 (+0000)
Subject: use ${PKGPATH} instead of ${CATEGORIES}/${PKGBASE}
X-Git-Tag: v3.2.0~519
X-Git-Url: http://zhaoyanbai.com/repos/%22../static/icons/mdoc.3.ps?a=commitdiff_plain;h=55c7e24c74f85f54d0baa62593eb60993558ace1;p=minix.git

use ${PKGPATH} instead of ${CATEGORIES}/${PKGBASE}

Some packages are in multiple categories (one example is
devel/libgetopt). This broke the IF statement because
${CATEGORIES} got expanded to "cat1 cat2". The proper
variable to use is PKGPATH.
---

diff --git a/share/mk/pkgsrchooks.mk b/share/mk/pkgsrchooks.mk
index 8e61f9fee..ad4a6a36a 100644
--- a/share/mk/pkgsrchooks.mk
+++ b/share/mk/pkgsrchooks.mk
@@ -14,7 +14,7 @@ PKG_REQUIRES_MINIX_LIBC=no
 
 # Search PKGS_REQUIRING_MINIX_LIBC to see if it needs Minix libc
 .for PKG_REQUIRING_MINIX_LIBC in ${PKGS_REQUIRING_MINIX_LIBC}
-.if "${PKG_REQUIRING_MINIX_LIBC}" == "${CATEGORIES}/${PKGBASE}"
+.if "${PKG_REQUIRING_MINIX_LIBC}" == "${PKGPATH}"
 PKG_REQUIRES_MINIX_LIBC=yes
 .endif
 .endfor