Clean up Solaris db handling by just noting that we need db-1.85

functionality.

4 files changed, 12 insertions, 16 deletions

diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index 685c1f4febb..4f4b1d8eda2 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.8 2004/02/22 01:52:05 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.9 2004/02/24 00:22:45 jlam Exp $
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
@@ -7,6 +7,7 @@ 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.
@@ -48,9 +49,7 @@ BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 
 FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
 
-.if ${OPSYS} == "SunOS"
-.  include "../../databases/db/buildlink3.mk"
-.endif
+.include "../../databases/db/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 7929b1e8663..f661221f505 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/24 00:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/24 00:22:45 jlam Exp $
 
 DISTNAME=	courier-imap-2.2.1
 COMMENT=	IMAP server for access to Maildir-style mailboxes
@@ -9,6 +9,7 @@ DEPENDS+=	courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
+USE_DB185=		yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
@@ -43,9 +44,7 @@ CONF_FILES_PERMS+=	${EGDIR}/${FILE} ${PKG_SYSCONFDIR}/${FILE}	\
 .endfor
 RCD_SCRIPTS=		courierimap courierimaps courierpop courierpops
 
-.if ${OPSYS} == "SunOS"
-.  include "../../databases/db/buildlink3.mk"
-.endif
+.include "../../databases/db/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
 pre-configure:
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index c6f665e1e76..0530afd09ab 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/24 00:18:08 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/24 00:22:45 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 COMMENT=	Courier Maildir utilities
@@ -7,6 +7,7 @@ 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"
@@ -38,9 +39,7 @@ INSTALL_TARGET=		install-strip
 
 CONF_FILES=	${EGDIR}/quotawarnmsg ${PKG_SYSCONFDIR}/quotawarnmsg
 
-.if ${OPSYS} == "SunOS"
-.  include "../../databases/db/buildlink3.mk"
-.endif
+.include "../../databases/db/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 9ad6776e88f..81c4d27251e 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/02/24 00:14:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/24 00:22:45 jlam Exp $
 
 DISTNAME=	sqwebmail-3.6.2
 CATEGORIES=	www
@@ -10,6 +10,7 @@ DEPENDS+=	courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
+USE_DB185=		yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
@@ -85,9 +86,7 @@ CONF_FILES_PERMS+=	${DATADIR}/sqwebmail/${FILE}			\
 .endfor
 RCD_SCRIPTS=		pcpd sqwebmaild
 
-.if ${OPSYS} == "SunOS"
-.  include "../../databases/db/buildlink3.mk"
-.endif
+.include "../../databases/db/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 pre-configure: