Convert to use bdb.buildlink3.mk.

8 files changed, 18 insertions, 18 deletions

diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index 4f4b1d8eda2..14cca11c34c 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.9 2004/02/24 00:22:45 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.10 2004/03/10 18:07:16 jlam Exp $
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
@@ -49,7 +49,7 @@ BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 
 FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
 
-.include "../../databases/db/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .if defined(USE_PAM)
 BUILD_DEFS+=		USE_PAM
 .  include "../../security/PAM/buildlink3.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f661221f505..88fcdd3902b 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/24 00:22:45 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/03/10 18:07:16 jlam Exp $
 
 DISTNAME=	courier-imap-2.2.1
 COMMENT=	IMAP server for access to Maildir-style mailboxes
@@ -44,8 +44,8 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-.include "../../databases/db/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 
 pre-configure:
 	cd ${WRKSRC}; for file in					\
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 0530afd09ab..1e1465f0a13 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/24 00:22:45 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/03/10 18:07:16 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 COMMENT=	Courier Maildir utilities
@@ -39,7 +39,7 @@ INSTALL_TARGET=		install-strip
 
 CONF_FILES=	${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
 
-.include "../../databases/db/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 4a4fda46afe..511532661e1 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/03/07 12:29:41 martti Exp $
+# $NetBSD: Makefile,v 1.28 2004/03/10 18:07:16 jlam Exp $
 
 DISTNAME=	postfix-2.0.18-20040209
 PKGNAME=	postfix-20040209
@@ -213,9 +213,9 @@ do-install:
 
 .if ${OPSYS} == "Linux"
 .include "../../databases/db/buildlink3.mk"
-CCARGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
-AUXLIBS+=	-L${BUILDLINK_PREFIX.db}/lib                    \
-		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db}/lib     \
+CCARGS+=	-I${BUILDLINK_PREFIX.db2}/include/db2
+AUXLIBS+=	-L${BUILDLINK_PREFIX.db2}/lib                    \
+		-Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.db2}/lib     \
 		-ldb2
 .endif
 
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index e2a594fc7c6..0d3583d88d9 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/24 01:20:21 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/03/10 18:07:16 jlam Exp $
 
 DISTNAME=	sqwebmail-3.6.2
 CATEGORIES=	www
@@ -87,8 +87,8 @@ CONF_FILES_PERMS+=	${DATADIR}/sqwebmail/${FILE}			\
 .endfor
 RCD_SCRIPTS=		pcpd sqwebmail sqwebmaild
 
-.include "../../databases/db/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 
 pre-configure:
 	for file in ${WRKSRC}/sqwebmail/Makefile.in; do			\
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 2ac834605fa..ca7047893a6 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/24 15:00:22 grant Exp $
+# $NetBSD: Makefile,v 1.22 2004/03/10 18:07:16 jlam Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -100,5 +100,5 @@ post-install:
 .endif
 	${INSTALL_DATA_DIR} ${DOCDIR}
 
-.include "../../databases/db/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 7e501907eb9..55dd1dc0cdd 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/23 12:35:11 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/03/10 18:07:16 jlam Exp $
 
 DISTNAME=		heimdal-0.6
 PKGREVISION=		1
@@ -40,7 +40,7 @@ BUILD_DEFS+=		USE_DB4
 .include "../../databases/db4/buildlink3.mk"
 .else
 USE_DB185=		yes
-.include "../../databases/db/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 .endif
 
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f3113859f53..1e7d8d6fb24 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2004/03/08 19:40:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.99 2004/03/10 18:07:16 jlam Exp $
 
 DISTNAME=		gnome-libs-1.4.2
 PKGREVISION=		3
@@ -61,11 +61,11 @@ post-install:
 		${LOCALBASE}/share/aclocal/libart.m4
 
 .include "../../audio/esound/buildlink3.mk"
-.include "../../databases/db/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/imlib/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../net/ORBit/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
+.include "../../mk/bdb.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"