pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Reverse the use of USE_DB185 in bdb.buildlink3.mk -- i...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7259ec2cf393
branches: trunk
changeset: 471328:7259ec2cf393
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Mar 26 18:48:52 2004 +0000
description:
Reverse the use of USE_DB185 in bdb.buildlink3.mk -- it defaults to
"yes" and packages that can't use the DB-1.85 API should set it to "no".
This makes the native DB the preferred DB if it exists.
diffstat:
mail/courier-auth/Makefile.authdaemond | 3 +--
mail/courier-imap/Makefile | 3 +--
mail/courier-maildirmake/Makefile | 3 +--
mail/sqwebmail/Makefile | 3 +--
mk/bdb.buildlink3.mk | 15 ++++++++++-----
security/PAM/Makefile | 3 +--
security/heimdal/Makefile | 3 +--
x11/gnome-libs/Makefile | 3 +--
8 files changed, 17 insertions(+), 19 deletions(-)
diffs (158 lines):
diff -r f9282e12cf79 -r 7259ec2cf393 mail/courier-auth/Makefile.authdaemond
--- a/mail/courier-auth/Makefile.authdaemond Fri Mar 26 18:39:31 2004 +0000
+++ b/mail/courier-auth/Makefile.authdaemond Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
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 -r f9282e12cf79 -r 7259ec2cf393 mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/mail/courier-imap/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
-USE_DB185= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
diff -r f9282e12cf79 -r 7259ec2cf393 mail/courier-maildirmake/Makefile
--- a/mail/courier-maildirmake/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/mail/courier-maildirmake/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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_LANGUAGES= c c++
USE_PKGINSTALL= yes
USE_PERL5= build
-USE_DB185= yes
DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL
.include "../courier-auth/Makefile.common"
diff -r f9282e12cf79 -r 7259ec2cf393 mail/sqwebmail/Makefile
--- a/mail/sqwebmail/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/mail/sqwebmail/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
USE_BUILDLINK3= yes
USE_LANGUAGES= c c++
-USE_DB185= yes
USE_PERL5= yes
REPLACE_PERL= sysconftool
diff -r f9282e12cf79 -r 7259ec2cf393 mk/bdb.buildlink3.mk
--- a/mk/bdb.buildlink3.mk Fri Mar 26 18:39:31 2004 +0000
+++ b/mk/bdb.buildlink3.mk Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
. 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 -r f9282e12cf79 -r 7259ec2cf393 security/PAM/Makefile
--- a/security/PAM/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/security/PAM/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
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 -r f9282e12cf79 -r 7259ec2cf393 security/heimdal/Makefile
--- a/security/heimdal/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/security/heimdal/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
.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 -r f9282e12cf79 -r 7259ec2cf393 x11/gnome-libs/Makefile
--- a/x11/gnome-libs/Makefile Fri Mar 26 18:39:31 2004 +0000
+++ b/x11/gnome-libs/Makefile Fri Mar 26 18:48:52 2004 +0000
@@ -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 @@
USE_BUILDLINK3= YES
USE_PKGLOCALEDIR= YES
-USE_DB185= YES
LOCALSTATEDIR= /var/gnome
PLIST_SUBST+= LOCALBASE=${LOCALBASE} \
Home |
Main Index |
Thread Index |
Old Index