[pkgsrc/trunk]: pkgsrc/mk Fix previous... instead of moving bsd.pkg.barrier.m...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be46245ec1e9
branches:  trunk
changeset: 515683:be46245ec1e9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jul 06 16:58:17 2006 +0000

description:
Fix previous... instead of moving bsd.pkg.barrier.mk down below .MAIN,
move .MAIN all the way to the top of the file.  bsd.pkg.barrier.mk
(currently) needs to be included before bsd.wrapper.mk since it defines
_BARRIER_COOKIE, which is expanded and used in place within bsd.wrapper.mk.
This makes the "wrapper" phase run again.

diffstat:

 mk/bsd.pkg.mk |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r ac0999c203cd -r be46245ec1e9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jul 06 16:27:28 2006 +0000
+++ b/mk/bsd.pkg.mk     Thu Jul 06 16:58:17 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1861 2006/07/06 15:43:10 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1862 2006/07/06 16:58:17 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -18,6 +18,8 @@
 # Include any preferences, if not already included, and common definitions
 ############################################################################
 
+.MAIN: all
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
@@ -463,6 +465,9 @@
 # Tools
 .include "../../mk/tools/bsd.tools.mk"
 
+# Barrier
+.include "../../mk/bsd.pkg.barrier.mk"
+
 # Unprivileged builds
 .include "../../mk/unprivileged.mk"
 
@@ -509,11 +514,6 @@
 PATH=  ${_PATH_CMD:sh} # DOES NOT use :=, to defer evaluation
 .endif
 
-.MAIN: all
-
-# Barrier
-.include "../../mk/bsd.pkg.barrier.mk"
-
 ################################################################
 # Many ways to disable a package.
 #