From 8a5a01643d213d6b4fb11d02ce83aed361748465 Mon Sep 17 00:00:00 2001
From: sbd <sbd>
Date: Wed, 7 Dec 2011 20:39:19 +0000
Subject: If a package Makefile is going to try and detect a builtin libraray
 it should honor the PREFER* variables.

---
 mail/cyrus-imapd/Makefile   | 8 +++++++-
 mail/cyrus-imapd23/Makefile | 8 +++++++-
 mail/cyrus-imapd24/Makefile | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'mail')

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6f9dc0fde46..c65f7e7d907 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2011/08/14 13:25:21 obache Exp $
+# $NetBSD: Makefile,v 1.89 2011/12/07 20:39:19 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.2.13p1
 PKGREVISION=	5
@@ -89,6 +89,12 @@ PLIST.ldap=		yes
 COMERRBASE?=		/usr
 .endif
 .if defined(COMERRBASE)
+# As com_err is a library the PREFER_* user variables should be honored.
+#
+BUILTIN_PKG:=   com_err
+.include "../../mk/buildlink3/bsd.builtin.mk"
+.endif
+.if defined(PREFER.com_err) && ${PREFER.com_err} != "pkgsrc"
 .  if exists(${COMERRBASE}/include/krb5/com_err.h)
 CPPFLAGS+=		-I${COMERRBASE}/include/krb5
 .  endif
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index dea09f6a35c..a0a20289899 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/10/05 01:22:57 obache Exp $
+# $NetBSD: Makefile,v 1.16 2011/12/07 20:39:19 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.3.18
 CATEGORIES=	mail
@@ -59,6 +59,12 @@ CONFIGURE_ARGS+=	--enable-replication
 COMERRBASE?=		/usr
 .endif
 .if defined(COMERRBASE)
+# As com_err is a library the PREFER_* user variables should be honored.
+#
+BUILTIN_PKG:=   com_err
+.include "../../mk/buildlink3/bsd.builtin.mk"
+.endif
+.if defined(PREFER.com_err) && ${PREFER.com_err} != "pkgsrc"
 .  if exists(${COMERRBASE}/include/krb5/com_err.h)
 CPPFLAGS+=		-I${COMERRBASE}/include/krb5
 .  endif
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index ff601ea6db1..7d90b3d2c07 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/10/05 01:32:31 obache Exp $
+# $NetBSD: Makefile,v 1.14 2011/12/07 20:39:19 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.4.12
 CATEGORIES=	mail
@@ -56,6 +56,12 @@ CONFIGURE_ARGS+=	--enable-replication
 COMERRBASE?=		/usr
 .endif
 .if defined(COMERRBASE)
+# As com_err is a library the PREFER_* user variables should be honored.
+#
+BUILTIN_PKG:=   com_err
+.include "../../mk/buildlink3/bsd.builtin.mk"
+.endif
+.if defined(PREFER.com_err) && ${PREFER.com_err} != "pkgsrc"
 .  if exists(${COMERRBASE}/include/krb5/com_err.h)
 CPPFLAGS+=		-I${COMERRBASE}/include/krb5
 .  endif
-- 
cgit v1.2.3