CVS commit: pkgsrc/mk

[Joerg Sonnenberger <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Feb  6 15:27:00 UTC 2009

Modified Files:
        pkgsrc/mk: bsd.pkg.mk
        pkgsrc/mk/flavor/pkg: depends.mk

Log Message:
Fix circular dependency detection for the case of non-leading circles.
For the dependency chain A->B->B the old code created:
_PKGSRC_DEPS=", B-1.0, A-1.0", which obviously can't match the PKGNAME
of B.
Skip the _flavor-bootstrap-depends processing if PKG_FAIL_REASON is
already set and move the check for circular dependencies right after the
block that defines PKGNAME and friends.


To generate a diff of this commit:
cvs rdiff -r1.1952 -r1.1953 pkgsrc/mk/bsd.pkg.mk
cvs rdiff -r1.43 -r1.44 pkgsrc/mk/flavor/pkg/depends.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.