Sun Sep 2 00:52:50 2018 UTC ()
imap-uw: remove conditional logic for netbsd 1.x


(maya)
diff -r1.8 -r1.9 pkgsrc/mail/imap-uw/options.mk
cvs diff -r1.8 -r1.9 pkgsrc/mail/imap-uw/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/options.mk 2018/02/16 22:06:58 1.8
+++ pkgsrc/mail/imap-uw/options.mk 2018/09/02 00:52:50 1.9
@@ -1,34 +1,21 @@ @@ -1,34 +1,21 @@
1# $NetBSD: options.mk,v 1.8 2018/02/16 22:06:58 jdolecek Exp $ 1# $NetBSD: options.mk,v 1.9 2018/09/02 00:52:50 maya Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw 5PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw
6PKG_SUPPORTED_OPTIONS+= imapuw-cleartextpwd imapuw-whoson inet6 ssl 6PKG_SUPPORTED_OPTIONS+= imapuw-cleartextpwd imapuw-whoson inet6 ssl
7PKG_SUGGESTED_OPTIONS+= imapuw-cleartextpwd inet6 ssl 7PKG_SUGGESTED_OPTIONS+= imapuw-cleartextpwd inet6 ssl
8 
9# On NetBSD 1.x, using the native Kerberos 5 implementation causes 
10# interoperability problems with OpenSSL 0.9.7 and above. 
11# 
12.if !empty(MACHINE_PLATFORM:MNetBSD-1.*) 
13CHECK_BUILTIN.heimdal:= yes 
14. include "../../security/heimdal/builtin.mk" 
15CHECK_BUILTIN.heimdal:= no 
16. if !empty(USE_BUILTIN.heimdal:M[nN][oO]) 
17PKG_SUPPORTED_OPTIONS+= kerberos 8PKG_SUPPORTED_OPTIONS+= kerberos
18. endif 
19.else 
20PKG_SUPPORTED_OPTIONS+= kerberos 
21.endif 
22 9
23.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
24 11
25### 12###
26### Support both IPv6 and IPv4 connections. 13### Support both IPv6 and IPv4 connections.
27### 14###
28.if !empty(PKG_OPTIONS:Minet6) 15.if !empty(PKG_OPTIONS:Minet6)
29MAKE_FLAGS+= IP=6 16MAKE_FLAGS+= IP=6
30.else 17.else
31MAKE_FLAGS+= IP=4 18MAKE_FLAGS+= IP=4
32.endif 19.endif
33 20
34### 21###