Subject: CVS commit: pkgsrc
From: Johnny C. Lam
Date: 2004-11-15 18:54:50
Message id: 20041115175450.25D0D2DA1D@cvs.netbsd.org

Log Message:
Rework the Berkeley DB detection in buildlink3:

  * Add a db1.builtin.mk file that detects whether DB-1.85 functionality
    exists in the base system, and remove the distinction between
    "native" and the other Berkeley DB packages -- we now refer to
    db[1234].  This paves the way for any future databases/db1 package.

  * USE_DB185 shouldn't need to be set by any packages -- its correct
    value is now automatically determined by bdb.buildlink3.mk depending
    on whether we explicitly request db1 or not.  By default, if you
    include bdb.buildlink3.mk, you want DB-1.85 functionality and
    USE_DB185 defaults to "yes", but if you explicitly remove db1 from
    the list of acceptable DBs, then USE_DB185 defaults to "no".

  * Set BDB_LIBS to the library options needed to link against the DB
    library when bdb.buildlink3.mk is included.

  * We only add the DB library to the linker command automatically if
    we want DB-1.85 functionality; otherwise assume that the package
    configure process can figure out how to probe for the correct
    headers and libraries.

Edit package Makefiles to nuke redundant settings of USE_DB185.

Files:
RevisionActionfile
1.19modifypkgsrc/databases/db/buildlink3.mk
1.16modifypkgsrc/databases/db3/buildlink3.mk
1.21modifypkgsrc/databases/db4/buildlink3.mk
1.7modifypkgsrc/databases/openldap/options.mk
1.7modifypkgsrc/databases/p5-BerkeleyDB/Makefile
1.23modifypkgsrc/lang/python20/Makefile
1.19modifypkgsrc/lang/python23/Makefile.common
1.23modifypkgsrc/mail/bogofilter/Makefile
1.18modifypkgsrc/mail/cucipop/Makefile
1.25modifypkgsrc/mail/cyrus-imapd21/Makefile
1.15modifypkgsrc/mail/exim3/Makefile
1.21modifypkgsrc/mail/maildrop/Makefile
1.50modifypkgsrc/misc/rpm/Makefile
1.12modifypkgsrc/pkgtools/pkg_filecheck/Makefile
1.3modifypkgsrc/security/pam-dbm/Makefile
1.20modifypkgsrc/www/htdig/Makefile