Mon Mar 16 18:37:07 2009 UTC ()

Move _SYS_VARS processing to a point where BUILDLINK_PACKAGES is
finalised.


(joerg)

diff -r1.203 -r1.204 pkgsrc/mk/buildlink3/bsd.buildlink3.mk

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2008/06/22 23:54:06 1.203
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2009/03/16 18:37:07 1.204

 @@ -1,14 +1,14 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.203 2008/06/22 23:54:06 dholland Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.204 2009/03/16 18:37:07 joerg Exp $
+#
 # Copyright (c) 2004 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -71,39 +71,26 @@
 # the base system, then it should provide an appropriate value for
 # BUILDLINK_PREFIX.<pkg> for that case.  The case where a dependency is
 # satisfied by a pkgsrc-installed package is handled automatically by this
 # file.
+#
 # The different variables that may be set in a buildlink3.mk file are
 # described below.
+#
 # The variable name convention used in this Makefile are:
+#
 # BUILDLINK_*	public buildlink-related variables usable in other Makefiles
 # _BLNK_*	private buildlink-related variables to this Makefile
 _VARGROUPS+=		bl3
 .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS
 _SYS_VARS.bl3+=		BUILDLINK_${v}
 .endfor
 .for p in ${BUILDLINK_PACKAGES}
 .  for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS
 _SYS_VARS.bl3+=		BUILDLINK_${v}.${p}
 .  endfor
 .  for v in IGNORE_PKG USE_BUILTIN
 _SYS_VARS.bl3+=		${v}.${p}
 .  endfor
 .endfor
 .if ${PKG_DEBUG_LEVEL} > 0
 ECHO_BUILDLINK_MSG?=	${ECHO}
 .else
 ECHO_BUILDLINK_MSG?=	${ECHO_WRAPPER_MSG}
 .endif
 BUILDLINK_DIR=		${WRKDIR}/.buildlink
 BUILDLINK_BINDIR=	${BUILDLINK_DIR}/bin
 BUILDLINK_SRCDIR=	${.CURDIR}/../../mk/buildlink3
 .if ${X11_TYPE} == "modular"
 BUILDLINK_X11_DIR=	${BUILDLINK_DIR}
 .else
 BUILDLINK_X11_DIR=	${BUILDLINK_DIR:H}/.x11-buildlink
 .endif
 @@ -139,26 +126,39 @@ MAKEFLAGS+=		IGNORE_PKG.${_pkg_}=${IGNOR
 .  endif
 .endfor
 # _BLNK_PACKAGES contains all of the unique elements of BUILDLINK_PACKAGES
 # that shouldn't be skipped.
+#
 _BLNK_PACKAGES=		# empty
 .for _pkg_ in ${BUILDLINK_PACKAGES}
 .  if empty(_BLNK_PACKAGES:M${_pkg_}) && !defined(IGNORE_PKG.${_pkg_})
 _BLNK_PACKAGES+=	${_pkg_}
 .  endif
 .endfor
 _VARGROUPS+=		bl3
 .for v in BINDIR CFLAGS CPPFLAGS DEPENDS LDFLAGS LIBS
 _SYS_VARS.bl3+=		BUILDLINK_${v}
 .endfor
 .for p in ${BUILDLINK_PACKAGES}
 .  for v in AUTO_VARS BUILTIN_MK CONTENTS_FILTER CPPFLAGS DEPMETHOD FILES_CMD INCDIRS IS_DEPOT LDFLAGS LIBDIRS PKGNAME PREFIX RPATHDIRS
 _SYS_VARS.bl3+=		BUILDLINK_${v}.${p}
 .  endfor
 .  for v in IGNORE_PKG USE_BUILTIN
 _SYS_VARS.bl3+=		${v}.${p}
 .  endfor
 .endfor
 # By default, every package receives a full dependency.
 .for _pkg_ in ${_BLNK_PACKAGES}
 BUILDLINK_DEPMETHOD.${_pkg_}?=	full
 .endfor
 # _BLNK_DEPENDS contains all of the elements of _BLNK_PACKAGES for which
 # we must add a dependency.  We add a dependency if we aren't using the
 # built-in version of the package, and the package was either explicitly
 # requested as a dependency (BUILDLINK_DEPENDS) or is a build dependency
 # somewhere in the chain.
+#
 _BLNK_DEPENDS=	# empty
 .for _pkg_ in ${_BLNK_PACKAGES}