Tue May 26 11:32:22 2009 UTC ()
Update to use SSLINCLUDE and SSLLIB instead of SSLDIR for EXTRASPECIALS.
Should be fix PR 41232, pick up incorrect location as pkgsrc expected.


(obache)
diff -r1.6 -r1.7 pkgsrc/mail/imap-uw/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/mail/imap-uw/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/imap-uw/options.mk 2008/05/26 22:01:07 1.6
+++ pkgsrc/mail/imap-uw/options.mk 2009/05/26 11:32:22 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.6 2008/05/26 22:01:07 tron Exp $ 1# $NetBSD: options.mk,v 1.7 2009/05/26 11:32:22 obache 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 8
9# On NetBSD 1.x, using the native Kerberos 5 implementation causes 9# On NetBSD 1.x, using the native Kerberos 5 implementation causes
10# interoperability problems with OpenSSL 0.9.7 and above. 10# interoperability problems with OpenSSL 0.9.7 and above.
11# 11#
12.if !empty(MACHINE_PLATFORM:MNetBSD-1.*) 12.if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
13CHECK_BUILTIN.heimdal:= yes 13CHECK_BUILTIN.heimdal:= yes
14. include "../../security/heimdal/builtin.mk" 14. include "../../security/heimdal/builtin.mk"
@@ -52,23 +52,25 @@ LDFLAGS+= -lwhoson @@ -52,23 +52,25 @@ LDFLAGS+= -lwhoson
52CFLAGS+= -DUSE_WHOSON 52CFLAGS+= -DUSE_WHOSON
53.endif 53.endif
54 54
55### 55###
56### Support SSL/TLS connections. 56### Support SSL/TLS connections.
57### 57###
58.if !empty(PKG_OPTIONS:Mssl) 58.if !empty(PKG_OPTIONS:Mssl)
59. include "../../security/openssl/buildlink3.mk" 59. include "../../security/openssl/buildlink3.mk"
60. if !empty(PKG_OPTIONS:Mimapuw-cleartextpwd) 60. if !empty(PKG_OPTIONS:Mimapuw-cleartextpwd)
61MAKE_FLAGS+= SSLTYPE=unix # plaintext auth 61MAKE_FLAGS+= SSLTYPE=unix # plaintext auth
62. else 62. else
63MAKE_FLAGS+= SSLTYPE=nopwd # plaintext auth only over SSL/TLS 63MAKE_FLAGS+= SSLTYPE=nopwd # plaintext auth only over SSL/TLS
64. endif 64. endif
 65
65MESSAGE_SRC+= ${PKGDIR}/MESSAGE.ssl 66MESSAGE_SRC+= ${PKGDIR}/MESSAGE.ssl
66MESSAGE_SUBST+= SSLCERTS=${SSLCERTS:Q} 67MESSAGE_SUBST+= SSLCERTS=${SSLCERTS:Q}
67MESSAGE_SUBST+= SSLKEYS=${SSLKEYS:Q} 68MESSAGE_SUBST+= SSLKEYS=${SSLKEYS:Q}
68 69
69EXTRASPECIALS+= SSLDIR=${SSLBASE:Q} 70EXTRASPECIALS+= SSLINCLUDE=${SSLBASE:Q}/include
 71EXTRASPECIALS+= SSLLIB=${SSLBASE:Q}/lib
70EXTRASPECIALS+= SSLCERTS=${SSLCERTS:Q} 72EXTRASPECIALS+= SSLCERTS=${SSLCERTS:Q}
71EXTRASPECIALS+= SSLKEYS=${SSLKEYS:Q} 73EXTRASPECIALS+= SSLKEYS=${SSLKEYS:Q}
72.else 74.else
73MAKE_FLAGS+= SSLTYPE=none # no SSL/TLS 75MAKE_FLAGS+= SSLTYPE=none # no SSL/TLS
74.endif 76.endif