diff options
| author | sbd <sbd> | 2011-12-17 07:29:49 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-12-17 07:29:49 +0000 |
| commit | 71ea1499500440c49d2a8f0386c503487bd1349a (patch) | |
| tree | d4d3af52c518d19db6e86f9782548c4431d65ee4 /mail/cyrus-imapd23 | |
| parent | 8af2607ff610f885244a738b8e72a30f62dbaabd (diff) | |
| download | pkgsrc-71ea1499500440c49d2a8f0386c503487bd1349a.tar.gz | |
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.
Diffstat (limited to 'mail/cyrus-imapd23')
| -rw-r--r-- | mail/cyrus-imapd23/Makefile | 14 | ||||
| -rw-r--r-- | mail/cyrus-imapd23/options.mk | 4 |
2 files changed, 3 insertions, 15 deletions
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) |