From 0f66442049740107d1e59a28f2821e2c4f329aa5 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Tue, 6 Jun 2006 15:28:51 +0000
Subject: Move some variable definitions out of bsd.prefs.mk and back into
 bsd.pkg.mk.  They didn't actually need to be defined in bsd.prefs.mk, just
 somewhere before the "main" bsd.<phase>.mk files were included. This moves
 some conditional (?=) definitions back into bsd.pkg.mk so they won't conflict
 with any conditional definitions in package Makefiles.

This should fix the "checksum" problems in lang/php-gd as noted here:

    http://mail-index.netbsd.org/pkgsrc-users/2006/06/05/0012.html

where EXTRACT_SUFX had the wrong value due to the order in while *.mk
files were included.
---
 mk/extract/bsd.extract-vars.mk | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'mk/extract')

diff --git a/mk/extract/bsd.extract-vars.mk b/mk/extract/bsd.extract-vars.mk
index 3ff08de0e9b..6cb0ace7db9 100644
--- a/mk/extract/bsd.extract-vars.mk
+++ b/mk/extract/bsd.extract-vars.mk
@@ -1,8 +1,8 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.1 2006/06/06 03:05:48 jlam Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.2 2006/06/06 15:28:52 jlam Exp $
 #
-# This Makefile fragment is included to bsd.prefs.mk and defines some
-# variables which must be defined earlier than where bsd.extract.mk
-# is included.
+# This Makefile fragment is included separately by bsd.pkg.mk and
+# defines some variables which must be defined earlier than where
+# bsd.extract.mk is included.
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
-- 
cgit v1.2.3