diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-15 17:54:49 +0000 |
| commit | b67b0725c487d6867521ee52db866b955f29d0fd (patch) | |
| tree | 5579b0ab6b1d842e66a7d3075d37a9f9564a124e /www/htdig | |
| parent | 8f9890fc252ddfbc4e7f77aea28c933fe28c5a81 (diff) | |
| download | pkgsrc-b67b0725c487d6867521ee52db866b955f29d0fd.tar.gz | |
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.
Diffstat (limited to 'www/htdig')
| -rw-r--r-- | www/htdig/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/htdig/Makefile b/www/htdig/Makefile index d545d896b8d..819d0994e22 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/05/26 20:40:50 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2004/11/15 17:54:50 jlam Exp $ DISTNAME= htdig-3.1.6 CATEGORIES= www databases @@ -18,6 +18,7 @@ COMMENT= WWW indexing and searching system USE_BUILDLINK3= YES USE_LANGUAGES= c c++ USE_PKGINSTALL= YES +USE_DB185= yes BDB_ACCEPTED= db2 GNU_CONFIGURE= yes @@ -28,8 +29,7 @@ CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ --with-image-dir=${PREFIX}/share/examples/htdig \ --with-search-dir=${PREFIX}/share/examples/htdig CXXFLAGS+= -Wno-deprecated -CPPFLAGS+= ${BUILDLINK_CPPFLAGS.db} ${CXXFLAGS} -LDFLAGS+= ${BUILDLINK_LDFLAGS.db} +CPPFLAGS+= ${CXXFLAGS} INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL PKG_SYSCONFSUBDIR= htdig |