From 4db0539a2bd0689f521ac871ccefd5a3bff42f10 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Wed, 1 Aug 2007 12:21:56 +0000
Subject: [PATCH] Define PKGPATH earlier so that mk.conf can use it. Requested
 by David Brownlee on tech-pkg.

---
 mk/bsd.prefs.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 727c0c4ade38..722046ed7366 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.258 2007/07/30 14:10:36 joerg Exp $
+# $NetBSD: bsd.prefs.mk,v 1.259 2007/08/01 12:21:56 joerg Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -251,6 +251,9 @@ MAKE_ENV+=		USETOOLS=no
 OBJECT_FMT?=		Mach-O
 .endif
 
+# Provide PKGPATH early on so that mk.conf can use it.
+PKGPATH?=		${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
+
 # Load the settings from MAKECONF, which is /etc/mk.conf by default.
 .include <bsd.own.mk>
 
@@ -518,7 +521,6 @@ USE_TOOLS+=	awk:pkgsrc cut:pkgsrc echo:pkgsrc pwd:pkgsrc		\
 
 .include "${_PKGSRC_TOPDIR}/mk/tools/defaults.mk"
 
-PKGPATH?=		${.CURDIR:C|.*/([^/]*/[^/]*)$|\1|}
 .if !defined(_PKGSRCDIR)
 _PKGSRCDIR!=		cd ${_PKGSRC_TOPDIR} && ${PWD_CMD}
 MAKEFLAGS+=		_PKGSRCDIR=${_PKGSRCDIR:Q}