diff options
| author | sbd <sbd> | 2011-12-17 07:29:49 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-12-17 07:29:49 +0000 |
| commit | 743b305db00b9b6d33cb6b83ddf5bbf9eb0d1f19 (patch) | |
| tree | d4d3af52c518d19db6e86f9782548c4431d65ee4 /mail/cyrus-imapd | |
| parent | 0ef2282354ecff8278c50164f75e4f25ae5acfb7 (diff) | |
| download | pkgsrc-743b305db00b9b6d33cb6b83ddf5bbf9eb0d1f19.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-imapd')
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 16 |
1 files changed, 2 insertions, 14 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". # |