Wed Jul 28 07:27:54 2010 UTC ()
Remove a remanent of the krb4 option


(dsainty)
diff -r1.2 -r1.3 pkgsrc/mail/evolution/options.mk
cvs diff -r1.2 -r1.3 pkgsrc/mail/evolution/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/evolution/Attic/options.mk 2010/07/18 04:50:29 1.2
+++ pkgsrc/mail/evolution/Attic/options.mk 2010/07/28 07:27:54 1.3
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: options.mk,v 1.2 2010/07/18 04:50:29 dsainty Exp $ 1# $NetBSD: options.mk,v 1.3 2010/07/28 07:27:54 dsainty Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.evolution 3PKG_OPTIONS_VAR= PKG_OPTIONS.evolution
4PKG_SUPPORTED_OPTIONS= krb5 ssl 4PKG_SUPPORTED_OPTIONS= krb5 ssl
5PKG_SUGGESTED_OPTIONS= ssl 5PKG_SUGGESTED_OPTIONS= ssl
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mssl) && !empty(PKG_OPTIONS:Mkrb[45]) 9.if !empty(PKG_OPTIONS:Mssl) && !empty(PKG_OPTIONS:Mkrb5)
10# If Kerberos is enabled, the libcrypto library is linked in, which causes 10# If Kerberos is enabled, the libcrypto library is linked in, which causes
11# function name conflicts with libsoftokn3 provided by Mozilla NSS. These 11# function name conflicts with libsoftokn3 provided by Mozilla NSS. These
12# cause runtime crashes, so don't allow these options to be specified 12# cause runtime crashes, so don't allow these options to be specified
13# together. 13# together.
14PKG_FAIL_REASON+= "Kerberos support conflicts with SSL" 14PKG_FAIL_REASON+= "Kerberos support conflicts with SSL"
15.endif 15.endif
16 16
17.if !empty(PKG_OPTIONS:Mkrb5) 17.if !empty(PKG_OPTIONS:Mkrb5)
18CONFIGURE_ARGS+= --with-krb5 18CONFIGURE_ARGS+= --with-krb5
19. include "../../mk/krb5.buildlink3.mk" 19. include "../../mk/krb5.buildlink3.mk"
20.else 20.else
21CONFIGURE_ARGS+= --without-krb5 21CONFIGURE_ARGS+= --without-krb5
22.endif 22.endif