Pullup ticket #4799 - requested by manu

databases/openldap-smbk5pwd: build fix

Revisions pulled up:
- databases/openldap-smbk5pwd/Makefile                          1.18
- databases/openldap/distinfo                                   1.100 patch
- databases/openldap/patches/patch-de                           deleted

---
   Module Name:    pkgsrc
   Committed By:   manu
   Date:           Mon Aug 10 12:47:51 UTC 2015

   Modified Files:
           pkgsrc/databases/openldap: distinfo
           pkgsrc/databases/openldap-smbk5pwd: Makefile
   Removed Files:
           pkgsrc/databases/openldap/patches: patch-de

   Log Message:
   Use OpenSSL libcrypto instead of libdes on NetBSD

   All recent NetBSD releases now have an OpenSSL recent enough so
   that the DES symbols required by slapo-smbk5pwd can be found in
   OpenSSL's libcrypto. We therefore do not need to link with -ldes
   anymore, especialy since it now causes a build failure.

3 files changed, 3 insertions, 27 deletions

diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile
index fdffbe2d93c..21df7c0acda 100644
--- a/databases/openldap-smbk5pwd/Makefile
+++ b/databases/openldap-smbk5pwd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/10/01 08:32:32 adam Exp $
+# $NetBSD: Makefile,v 1.17.6.1 2015/08/25 18:41:13 tron Exp $
 
 PKGNAME=	${DISTNAME:S/-/-smbk5pwd-/}
 COMMENT=	Samba and Kerberos password sync for OpenLDAP
@@ -18,10 +18,6 @@ do-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD"
-LIBS+=		-ldes
-.endif
-
 .include "../../databases/openldap-server/options.mk"
 
 .include "../../mk/krb5.buildlink3.mk"
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index a4bbd67ceeb..8520e5dcc40 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.97 2014/10/01 08:32:31 adam Exp $
+$NetBSD: distinfo,v 1.97.6.1 2015/08/25 18:41:13 tron Exp $
 
 SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96
 RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344
@@ -17,5 +17,5 @@ SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a
 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
 SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
-SHA1 (patch-de) = f371fc2bd2534832bf57c363095eecacb5cb1fe3
+SHA1 (patch-its7506) = a50f9428d6d7dd28f71d21e11ae3f8b0f1372f75
 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
diff --git a/databases/openldap/patches/patch-de b/databases/openldap/patches/patch-de
deleted file mode 100644
index 3ede6425e64..00000000000
--- a/databases/openldap/patches/patch-de
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-de,v 1.4 2014/10/01 08:32:31 adam Exp $
-
---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig	2014-09-19 01:48:49.000000000 +0000
-+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
-@@ -70,8 +70,15 @@ static ObjectClass *oc_krb5KDCEntry;
- #include <nettle/md4.h>
- typedef unsigned char DES_cblock[8];
- #elif HAVE_OPENSSL
-+#ifdef __NetBSD__
-+#include <des.h>
-+#include <md4.h>
-+typedef des_key_schedule DES_key_schedule;
-+typedef des_cblock DES_cblock;
-+#else
- #include <openssl/des.h>
- #include <openssl/md4.h>
-+#endif
- #else
- #error Unsupported crypto backend.
- #endif