diff options
| -rw-r--r-- | mail/courier-auth/Makefile.authdaemond | 3 | ||||
| -rw-r--r-- | mail/courier-imap/Makefile | 3 | ||||
| -rw-r--r-- | mail/courier-maildirmake/Makefile | 3 | ||||
| -rw-r--r-- | mail/sqwebmail/Makefile | 3 | ||||
| -rw-r--r-- | mk/bdb.buildlink3.mk | 15 | ||||
| -rw-r--r-- | security/PAM/Makefile | 3 | ||||
| -rw-r--r-- | security/heimdal/Makefile | 3 | ||||
| -rw-r--r-- | x11/gnome-libs/Makefile | 3 |
8 files changed, 17 insertions, 19 deletions
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond index 14cca11c34c..4898af50ced 100644 --- a/mail/courier-auth/Makefile.authdaemond +++ b/mail/courier-auth/Makefile.authdaemond @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.authdaemond,v 1.10 2004/03/10 18:07:16 jlam Exp $ +# $NetBSD: Makefile.authdaemond,v 1.11 2004/03/26 18:48:52 jlam Exp $ USE_BUILDLINK3= yes USE_LANGUAGES= c c++ @@ -7,7 +7,6 @@ USE_LANGUAGES= c c++ PERL5_REQD+= 5.6.0 USE_PERL5?= build -USE_DB185= yes # These are files needed by the configure scripts or are needed by the # build process. diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index 23ac02871fb..db05965fc4e 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2004/03/26 02:27:43 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2004/03/26 18:48:52 jlam Exp $ DISTNAME= courier-imap-2.2.1 PKGREVISON= 1 @@ -11,7 +11,6 @@ DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake USE_BUILDLINK3= yes USE_LANGUAGES= c c++ -USE_DB185= yes USE_PERL5= yes REPLACE_PERL= sysconftool diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile index 1e1465f0a13..8101cd1b3e2 100644 --- a/mail/courier-maildirmake/Makefile +++ b/mail/courier-maildirmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/03/10 18:07:16 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2004/03/26 18:48:52 jlam Exp $ PKGNAME= courier-maildirmake-${BASE_VERS} COMMENT= Courier Maildir utilities @@ -7,7 +7,6 @@ USE_BUILDLINK3= yes USE_LANGUAGES= c c++ USE_PKGINSTALL= yes USE_PERL5= build -USE_DB185= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL .include "../courier-auth/Makefile.common" diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 0d3583d88d9..585d6d95f55 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/03/10 18:07:16 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2004/03/26 18:48:52 jlam Exp $ DISTNAME= sqwebmail-3.6.2 CATEGORIES= www @@ -10,7 +10,6 @@ DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake USE_BUILDLINK3= yes USE_LANGUAGES= c c++ -USE_DB185= yes USE_PERL5= yes REPLACE_PERL= sysconftool diff --git a/mk/bdb.buildlink3.mk b/mk/bdb.buildlink3.mk index 24d3a9a4936..5d354b5c5f1 100644 --- a/mk/bdb.buildlink3.mk +++ b/mk/bdb.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bdb.buildlink3.mk,v 1.3 2004/03/18 09:12:13 jlam Exp $ +# $NetBSD: bdb.buildlink3.mk,v 1.4 2004/03/26 18:48:52 jlam Exp $ # # This Makefile fragment is meant to be included by packages that # require a Berkeley DB implementation. db.buildlink3.mk will: @@ -52,20 +52,25 @@ MAKEFLAGS+= _BDB_INSTALLED.${_bdb_}=${_BDB_INSTALLED.${_bdb_}} . endif . endfor +USE_DB185?= yes _BDB_OK.native?= no _BDB_INSTALLED.native?= no -. if defined(USE_DB185) -. if exists(/usr/include/db.h) +. if exists(/usr/include/db.h) _BDB_OK.native= yes _BDB_INSTALLED.native= yes _BDB_INCDIRS= include _BDB_TRANSFORM= # empty -. elif exists(/usr/include/db1/db.h) +. elif exists(/usr/include/db1/db.h) _BDB_OK.native= yes _BDB_INSTALLED.native= yes _BDB_INCDIRS= include/db1 _BDB_TRANSFORM= l:db:db1 -. endif +. endif +. if !empty(USE_DB185:M[nN][oO]) +_BDB_OK.native= no +_BDB_INSTALLED.native= no +_BDB_INCDIRS= # empty +_BDB_TRANSFORM= # empty . endif . if !defined(_BDB_TYPE) diff --git a/security/PAM/Makefile b/security/PAM/Makefile index ca7047893a6..82c82c9c728 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2004/03/10 18:07:16 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2004/03/26 18:48:52 jlam Exp $ # DISTNAME= Linux-PAM-0.77 @@ -19,7 +19,6 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= yes USE_PKGINSTALL= yes USE_GNU_TOOLS+= make -USE_DB185= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-docdir=${PREFIX}/share/doc/PAM diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index a706bb40053..cca4e457e74 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2004/03/26 02:27:52 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/26 18:48:52 jlam Exp $ DISTNAME= heimdal-0.6 PKGREVISION= 2 @@ -39,7 +39,6 @@ BUILD_DEFS+= USE_DB4 .if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS]) .include "../../databases/db4/buildlink3.mk" .else -USE_DB185= yes .include "../../mk/bdb.buildlink3.mk" .endif diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index b8304692e85..fd465b417ee 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2004/03/12 21:33:28 jlam Exp $ +# $NetBSD: Makefile,v 1.101 2004/03/26 18:48:52 jlam Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 3 @@ -29,7 +29,6 @@ CONFIGURE_ENV+= ${CONFIGURE_ENV.db-${BDB_TYPE}} USE_BUILDLINK3= YES USE_PKGLOCALEDIR= YES -USE_DB185= YES LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ |