[pkgsrc/trunk]: pkgsrc/databases Do not use libfetch in openldap-client.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90e2cac52a7c
branches:  trunk
changeset: 610211:90e2cac52a7c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Oct 21 09:00:55 2012 +0000

description:
Do not use libfetch in openldap-client.

diffstat:

 databases/openldap-client/buildlink3.mk |  3 +--
 databases/openldap/Makefile.common      |  7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diffs (38 lines):

diff -r 68539e624b04 -r 90e2cac52a7c databases/openldap-client/buildlink3.mk
--- a/databases/openldap-client/buildlink3.mk   Sun Oct 21 09:00:16 2012 +0000
+++ b/databases/openldap-client/buildlink3.mk   Sun Oct 21 09:00:55 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2012/10/21 00:20:27 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2012/10/21 09:00:56 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -21,7 +21,6 @@
     !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl)
 .  include "../../security/cyrus-sasl/buildlink3.mk"
 .endif
-.include "../../net/libfetch/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .endif # OPENLDAP_BUILDLINK3_MK
 
diff -r 68539e624b04 -r 90e2cac52a7c databases/openldap/Makefile.common
--- a/databases/openldap/Makefile.common        Sun Oct 21 09:00:16 2012 +0000
+++ b/databases/openldap/Makefile.common        Sun Oct 21 09:00:55 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2012/09/28 12:28:53 manu Exp $
+# $NetBSD: Makefile.common,v 1.34 2012/10/21 09:00:55 joerg Exp $
 #
 # used by databases/openldap-client/Makefile
 # used by databases/openldap-cloak/Makefile
@@ -87,9 +87,8 @@
 
 PTHREAD_OPTS+=         require
 
-# This avoids linking with base libfetch.so, which depends on base OpenSSL.
-# causing crashes when openldap-client is linked with pkgsrc OpenSSL.
-.include "../../net/libfetch/buildlink3.mk"
+CONFIGURE_ARGS+=       --without-fetch
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/tcp_wrappers/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"