Mon Nov 5 09:06:58 2012 UTC ()
Pullup ticket #3959 - requested by tron
mail/fetchmail: build fix

Revisions pulled up:
- mail/fetchmail/options.mk                                     1.16

-------------------------------------------------------------------
   Module Name:	pkgsrc
   Committed By:	tron
   Date:		Sun Nov  4 23:06:23 UTC 2012

   Modified Files:
   	pkgsrc/mail/fetchmail: options.mk

   Log Message:
   Force use of "openssl" package from pkgsrc under NetBSD 5.* and older
   to fix the build. As the "fetchmail" package doesn't provide any
   shared libraries this shouldn't cause problems caused by mixing two
   versions of OpenSSL.

   To generate a diff of this commit:
   cvs rdiff -u -r1.15 -r1.16 pkgsrc/mail/fetchmail/options.mk


(spz)
diff -r1.15 -r1.15.44.1 pkgsrc/mail/fetchmail/options.mk
cvs diff -r1.15 -r1.15.44.1 pkgsrc/mail/fetchmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/fetchmail/options.mk 2007/11/07 08:57:10 1.15
+++ pkgsrc/mail/fetchmail/options.mk 2012/11/05 09:06:58 1.15.44.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.15 2007/11/07 08:57:10 tron Exp $ 1# $NetBSD: options.mk,v 1.15.44.1 2012/11/05 09:06:58 spz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail
4PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl 4PKG_SUPPORTED_OPTIONS= kerberos4 kerberos gssapi ssl
5PKG_OPTIONS_OPTIONAL_GROUPS= socks 5PKG_OPTIONS_OPTIONAL_GROUPS= socks
6PKG_OPTIONS_GROUP.socks= socks4 socks5 6PKG_OPTIONS_GROUP.socks= socks4 socks5
7 7
8PKG_SUGGESTED_OPTIONS= ssl 8PKG_SUGGESTED_OPTIONS= ssl
9 9
10.include "../../mk/bsd.options.mk" 10.include "../../mk/bsd.options.mk"
11 11
12### 12###
13### Authentication via GSSAPI (currently only over Kerberos V) support. 13### Authentication via GSSAPI (currently only over Kerberos V) support.
14### 14###
@@ -36,26 +36,33 @@ CONFIGURE_ARGS+= --with-kerberos=no @@ -36,26 +36,33 @@ CONFIGURE_ARGS+= --with-kerberos=no
36### 36###
37.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi) 37.if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi)
38. include "../../mk/krb5.buildlink3.mk" 38. include "../../mk/krb5.buildlink3.mk"
39PKG_USE_KERBEROS= yes 39PKG_USE_KERBEROS= yes
40CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} 40CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q}
41.else 41.else
42CONFIGURE_ARGS+= --with-kerberos5=no 42CONFIGURE_ARGS+= --with-kerberos5=no
43.endif 43.endif
44 44
45### 45###
46### Support POP3 and IMAP over SSL. 46### Support POP3 and IMAP over SSL.
47### 47###
48.if !empty(PKG_OPTIONS:Mssl) 48.if !empty(PKG_OPTIONS:Mssl)
 49. if !empty(MACHINE_PLATFORM:MNetBSD-[1-5].*-*)
 50# "fetchmail" requires the "SSL_CTX_clear_options" library function which
 51# was added in OpenSSL 0.9.8m. NetBSD 5.* ships with a snapshot that
 52# claims to be OpenSSL 0.9.9 but doesn't provide this function. Force
 53# the use of the "openssl" package to fix the build.
 54USE_BUILTIN.openssl= no
 55. endif
49. include "../../security/openssl/buildlink3.mk" 56. include "../../security/openssl/buildlink3.mk"
50CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} 57CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q}
51.else 58.else
52CONFIGURE_ARGS+= --without-ssl 59CONFIGURE_ARGS+= --without-ssl
53.endif 60.endif
54 61
55### 62###
56### Include SOCKS firewall support 63### Include SOCKS firewall support
57### 64###
58.if !empty(PKG_OPTIONS:Msocks4) 65.if !empty(PKG_OPTIONS:Msocks4)
59.include "../../net/socks4/buildlink3.mk" 66.include "../../net/socks4/buildlink3.mk"
60CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.socks4} 67CONFIGURE_ARGS+= --with-socks=${BUILDLINK_PREFIX.socks4}
61.endif 68.endif