diff options
| -rw-r--r-- | mail/evolution/Makefile | 3 | ||||
| -rw-r--r-- | mail/evolution/options.mk | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index b3114ca9e56..0691ed7c818 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.161 2010/07/13 12:24:34 drochner Exp $ +# $NetBSD: Makefile,v 1.162 2010/07/18 04:50:29 dsainty Exp $ DISTNAME= evolution-2.30.2 CATEGORIES= mail time gnome @@ -29,7 +29,6 @@ CPPFLAGS+= -I/usr/include/krb5 CONFIGURE_ARGS+= --with-openldap CONFIGURE_ARGS+= --without-static-ldap CONFIGURE_ARGS+= --enable-pilot-conduits=no -CONFIGURE_ARGS+= --with-krb4=/usr CONFIGURE_ARGS+= --with-krb5=/usr .if defined(PKGREVISION) CONFIGURE_ARGS+= --with-sub-version=nb${PKGREVISION} diff --git a/mail/evolution/options.mk b/mail/evolution/options.mk index 28589806f8f..4edea9a931f 100644 --- a/mail/evolution/options.mk +++ b/mail/evolution/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2008/10/26 23:17:21 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2010/07/18 04:50:29 dsainty Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.evolution -PKG_SUPPORTED_OPTIONS= krb4 krb5 ssl +PKG_SUPPORTED_OPTIONS= krb5 ssl PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" @@ -14,12 +14,6 @@ PKG_SUGGESTED_OPTIONS= ssl PKG_FAIL_REASON+= "Kerberos support conflicts with SSL" .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" |