Don't use a builtin libcom_err if not using kerberos.

Builtin librarys like com_err should only be used if there is are proper
buildlink3.mk and builtin.mk files for the library, otherwise part of the
point of having the buildlink/builtin system is lost.

There no point in having a buildlink/builtin files for com_err as
currently only three packages use it by itself (mail/cyrus-imapd*) and
using the package suppled library only adds 72K to the package size.

5 files changed, 8 insertions, 44 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 5cc5f9e15b7..eb8e6c789c1 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2011/12/09 02:16:13 sbd Exp $
+# $NetBSD: Makefile,v 1.91 2011/12/17 07:29:49 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.2.13p1
 PKGREVISION=	5
@@ -72,10 +72,10 @@ CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
 CONFIGURE_ENV+=		COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE=		${KRB5BASE}
 .else
 CONFIGURE_ARGS+=	--without-krb
 CONFIGURE_ARGS+=	--disable-gssapi
+CONFIGURE_ARGS+=	--with-com-err=yes
 .endif
 
 PLIST_VARS+=		ldap
@@ -85,18 +85,6 @@ PLIST.ldap=		yes
 .  include "../../databases/openldap-client/buildlink3.mk"
 .endif
 
-.if exists(/usr/bin/compile_et)
-COMERRBASE?=		/usr
-.endif
-.if defined(COMERRBASE)
-.  if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+=		-I${COMERRBASE}/include/krb5
-.  endif
-CONFIGURE_ENV+=		COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+=	--with-com-err=yes
-.endif
-
 # CYRUS_IDLE selects the method used to implement IMAP IDLE.  Valid values
 # are "poll", "idled" or "no".  The default is "poll".
 #
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 1c5ae8222f9..8f5731d24be 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2011/12/09 02:16:13 sbd Exp $
+# $NetBSD: Makefile,v 1.18 2011/12/17 07:29:49 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.3.18
 CATEGORIES=	mail
@@ -55,18 +55,6 @@ CONFIGURE_ARGS+=	--enable-replication
 
 .include "options.mk"
 
-.if exists(/usr/bin/compile_et)
-COMERRBASE?=		/usr
-.endif
-.if defined(COMERRBASE)
-.  if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+=		-I${COMERRBASE}/include/krb5
-.  endif
-CONFIGURE_ENV+=		COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+=	--with-com-err=yes
-.endif
-
 MAKE_ENV+=		PERL=${PERL5:Q}
 
 HTMLDIR=		${PREFIX}/share/doc/cyrus-imapd
diff --git a/mail/cyrus-imapd23/options.mk b/mail/cyrus-imapd23/options.mk
index 4bedc25ece6..80d23d1d4bb 100644
--- a/mail/cyrus-imapd23/options.mk
+++ b/mail/cyrus-imapd23/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/06/03 06:55:54 obache Exp $
+# $NetBSD: options.mk,v 1.3 2011/12/17 07:29:49 sbd Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
@@ -28,10 +28,10 @@ CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
 CONFIGURE_ENV+=		COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE=		${KRB5BASE}
 .else
 CONFIGURE_ARGS+=	--without-krb
 CONFIGURE_ARGS+=	--disable-gssapi
+CONFIGURE_ARGS+=	--with-com-err=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 4a38b901753..f960b7c0315 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2011/12/09 02:16:13 sbd Exp $
+# $NetBSD: Makefile,v 1.16 2011/12/17 07:29:49 sbd Exp $
 
 DISTNAME=	cyrus-imapd-2.4.12
 CATEGORIES=	mail
@@ -52,18 +52,6 @@ CONFIGURE_ARGS+=	--enable-replication
 
 .include "options.mk"
 
-.if exists(/usr/bin/compile_et)
-COMERRBASE?=		/usr
-.endif
-.if defined(COMERRBASE)
-.  if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+=		-I${COMERRBASE}/include/krb5
-.  endif
-CONFIGURE_ENV+=		COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+=	--with-com-err=yes
-.endif
-
 MAKE_ENV+=		PERL=${PERL5:Q}
 
 HTMLDIR=		${PREFIX}/share/doc/cyrus-imapd
diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk
index 093b4e1f002..d313dd01181 100644
--- a/mail/cyrus-imapd24/options.mk
+++ b/mail/cyrus-imapd24/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/07/06 09:45:45 obache Exp $
+# $NetBSD: options.mk,v 1.4 2011/12/17 07:29:49 sbd Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
@@ -28,10 +28,10 @@ CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
 GSSIMPL.heimdal=	heimdal
 GSSIMPL.mit-krb5=	mit
 CONFIGURE_ENV+=		COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE=		${KRB5BASE}
 .else
 CONFIGURE_ARGS+=	--without-krb
 CONFIGURE_ARGS+=	--disable-gssapi
+CONFIGURE_ARGS+=	--with-com-err=yes
 .endif
 
 .if !empty(PKG_OPTIONS:Mldap)