diff options
| author | jmmv <jmmv> | 2004-11-06 18:39:02 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2004-11-06 18:39:02 +0000 |
| commit | 23e212cfb4d767219c8d88e64e4e64c27523a472 (patch) | |
| tree | 93f1f3e1bf9a1f457b58a7cb8d0b1ea97f7b1c7c /mail/evolution | |
| parent | d1f351cb2846ed5dd8b585efa6fc66f7841a8d34 (diff) | |
| download | pkgsrc-23e212cfb4d767219c8d88e64e4e64c27523a472.tar.gz | |
Let the user enable/disable Kerberos 4 and 5 support through the new krb4
and krb5 options. These are disabled by default, so bump PKGREVISION to 4
because the package was previously finding and using both libraries.
Also forbid the usage of krb[45] options together with ssl. This fixes a
crash when using SSL, because the Mozilla NSS libraries and libcrypto (used
by Kerberos) have functions with the same name. I don't know why this
worked for me in the first place, but it doesn't any more.
Diffstat (limited to 'mail/evolution')
| -rw-r--r-- | mail/evolution/Makefile | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 3065a7a2259..a3effe03637 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2004/10/29 14:57:15 jmmv Exp $ +# $NetBSD: Makefile,v 1.70 2004/11/06 18:39:02 jmmv Exp $ DISTNAME= evolution-2.0.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= mail time gnome MASTER_SITES= ftp://ftp.ximian.com/pub/source/evolution/ \ ${MASTER_SITE_GNOME:=sources/evolution/2.0/} @@ -19,11 +19,18 @@ BUILDLINK_DEPENDS.glib2+= glib2>=2.4.0nb2 BUILDLINK_DEPENDS.gtkhtml3+= gtkhtml3>=3.2.3 PKG_OPTIONS_VAR= PKG_OPTIONS.evolution -PKG_SUPPORTED_OPTIONS= ipv6 ssl +PKG_SUPPORTED_OPTIONS= ipv6 krb4 krb5 ssl -.include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.options.mk" +.if !empty(PKG_OPTIONS:Mssl) && !empty(PKG_OPTIONS:Mkrb[45]) +# If Kerberos is enabled, the libcrypto library is linked in, which causes +# function name conflicts with libsoftokn3 provided by Mozilla NSS. These +# cause runtime crashes, so don't allow these options to be specified +# together. +PKG_FAIL_REASON= "Kerberos support conflicts with SSL" +.endif + GNU_CONFIGURE= YES USE_DIRS+= gnome2-1.5 USE_GNU_TOOLS+= make yacc @@ -58,6 +65,19 @@ CONFIGURE_ARGS+= --enable-ipv6=yes CONFIGURE_ARGS+= --disable-ipv6 .endif +.if !empty(PKG_OPTIONS:Mkrb4) +CONFIGURE_ARGS+= --with-krb4 +.else +CONFIGURE_ARGS+= --without-krb4 +.endif + +.if !empty(PKG_OPTIONS:Mkrb5) +CONFIGURE_ARGS+= --with-krb5 +. include "../../mk/krb5.buildlink3.mk" +.else +CONFIGURE_ARGS+= --without-krb5 +.endif + .if !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --enable-nss=yes # XXX We should have a standalone NSS package and use it here, instead of |