diff options
| author | obache <obache> | 2012-01-05 11:52:33 +0000 |
|---|---|---|
| committer | obache <obache> | 2012-01-05 11:52:33 +0000 |
| commit | ccb98e0f43ba9c31740339b1aa314fcda4950249 (patch) | |
| tree | 3dd1ae35410923b6acd952133da51e7b61398e15 /mail | |
| parent | 3daca0c8eb69878e6d7ba7ba067bb35320c4b562 (diff) | |
| download | pkgsrc-ccb98e0f43ba9c31740339b1aa314fcda4950249.tar.gz | |
Prefer system builtin com_err other than Linux.
fixes PR#45782.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/cyrus-imapd/Makefile | 5 | ||||
| -rw-r--r-- | mail/cyrus-imapd23/options.mk | 5 | ||||
| -rw-r--r-- | mail/cyrus-imapd24/options.mk | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 47ec552b726..fe4efc167bb 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2011/12/20 11:59:46 obache Exp $ +# $NetBSD: Makefile,v 1.93 2012/01/05 11:52:33 obache Exp $ DISTNAME= cyrus-imapd-2.2.13p1 PKGREVISION= 5 @@ -86,6 +86,9 @@ CHECK_BUILTIN.mit-krb5:= no exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) CPPFLAGS+= -I/usr/include/krb5 CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. elif ${OPSYS} != "Linux" && \ + exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h) +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et . else CONFIGURE_ARGS+= --with-com-err=yes . endif diff --git a/mail/cyrus-imapd23/options.mk b/mail/cyrus-imapd23/options.mk index f28eca8bc56..65d316b1f62 100644 --- a/mail/cyrus-imapd23/options.mk +++ b/mail/cyrus-imapd23/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2011/12/20 11:59:46 obache Exp $ +# $NetBSD: options.mk,v 1.5 2012/01/05 11:52:34 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd @@ -42,6 +42,9 @@ CHECK_BUILTIN.mit-krb5:= no exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) CPPFLAGS+= -I/usr/include/krb5 CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. elif ${OPSYS} != "Linux" && \ + exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h) +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et . else CONFIGURE_ARGS+= --with-com-err=yes . endif diff --git a/mail/cyrus-imapd24/options.mk b/mail/cyrus-imapd24/options.mk index 820b83121c2..5265086c9a2 100644 --- a/mail/cyrus-imapd24/options.mk +++ b/mail/cyrus-imapd24/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2011/12/20 11:59:46 obache Exp $ +# $NetBSD: options.mk,v 1.6 2012/01/05 11:52:34 obache Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd @@ -42,6 +42,9 @@ CHECK_BUILTIN.mit-krb5:= no exists(/usr/bin/compile_et) && exists(/usr/include/krb5/com_err.h) CPPFLAGS+= -I/usr/include/krb5 CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et +. elif ${OPSYS} != "Linux" && \ + exists(/usr/bin/compile_et) && exists(/usr/include/com_err.h) +CONFIGURE_ENV+= COMPILE_ET=/usr/bin/compile_et . else CONFIGURE_ARGS+= --with-com-err=yes . endif |