Module Name:	pkgsrc
Committed By:	jlam
Date:		Mon Nov 15 17:54:50 UTC 2004

Modified Files:
	pkgsrc/databases/db: buildlink3.mk
	pkgsrc/databases/db3: buildlink3.mk
	pkgsrc/databases/db4: buildlink3.mk
	pkgsrc/databases/openldap: options.mk
	pkgsrc/databases/p5-BerkeleyDB: Makefile
	pkgsrc/lang/python20: Makefile
	pkgsrc/lang/python23: Makefile.common
	pkgsrc/mail/bogofilter: Makefile
	pkgsrc/mail/cucipop: Makefile
	pkgsrc/mail/cyrus-imapd21: Makefile
	pkgsrc/mail/cyrus-imapd22: Makefile
	pkgsrc/mail/exim3: Makefile
	pkgsrc/mail/maildrop: Makefile
	pkgsrc/misc/rpm: Makefile
	pkgsrc/mk: bdb.buildlink3.mk
	pkgsrc/pkgtools/pkg_filecheck: Makefile
	pkgsrc/security/pam-dbm: Makefile
	pkgsrc/www/htdig: Makefile
Added Files:
	pkgsrc/mk: db1.builtin.mk

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.


To generate a diff of this commit:
cvs rdiff -r1.18 -r1.19 pkgsrc/databases/db/buildlink3.mk
cvs rdiff -r1.15 -r1.16 pkgsrc/databases/db3/buildlink3.mk
cvs rdiff -r1.20 -r1.21 pkgsrc/databases/db4/buildlink3.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/openldap/options.mk
cvs rdiff -r1.6 -r1.7 pkgsrc/databases/p5-BerkeleyDB/Makefile
cvs rdiff -r1.22 -r1.23 pkgsrc/lang/python20/Makefile
cvs rdiff -r1.18 -r1.19 pkgsrc/lang/python23/Makefile.common
cvs rdiff -r1.22 -r1.23 pkgsrc/mail/bogofilter/Makefile
cvs rdiff -r1.17 -r1.18 pkgsrc/mail/cucipop/Makefile
cvs rdiff -r1.24 -r1.25 pkgsrc/mail/cyrus-imapd21/Makefile
cvs rdiff -r1.23 -r1.24 pkgsrc/mail/cyrus-imapd22/Makefile
cvs rdiff -r1.14 -r1.15 pkgsrc/mail/exim3/Makefile
cvs rdiff -r1.20 -r1.21 pkgsrc/mail/maildrop/Makefile
cvs rdiff -r1.49 -r1.50 pkgsrc/misc/rpm/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/mk/bdb.buildlink3.mk
cvs rdiff -r0 -r1.1 pkgsrc/mk/db1.builtin.mk
cvs rdiff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_filecheck/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/security/pam-dbm/Makefile
cvs rdiff -r1.19 -r1.20 pkgsrc/www/htdig/Makefile

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