3 files changed, 27 insertions, 78 deletions
diff --git a/package/openldap/Config.in b/package/openldap/Config.in
deleted file mode 100644
index 5a3c29c6e..000000000
--- a/package/openldap/Config.in
+++ /dev/null
@@ -1,33 +0,0 @@
-config ADK_COMPILE_OPENLDAP
-	prompt "openldap.......................... OpenSource LDAP software"
-	boolean
-	default n
-
-config ADK_PACKAGE_OPENLDAP_SLAPD
-	prompt "openldap-slapd.................. OpenLDAP server"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	select ADK_PACKAGE_LIBPTHREAD
-	select ADK_PACKAGE_LIBOPENSSL
-	select ADK_PACKAGE_LIBDB
-	select ADK_PACKAGE_LIBSASL2
-	depends on ADK_COMPILE_OPENLDAP
-	help
-	  http://www.openldap.org/
-
-config ADK_PACKAGE_OPENLDAP_UTILS
-	prompt   "openldap-utils.................. OpenLDAP client utilities"
-	tristate
-	default n
-	select ADK_PACKAGE_LIBOPENLDAP
-	depends on ADK_COMPILE_OPENLDAP
-	help
-	  
-	  OpenLDAP Software is an open source implementation of the 
-	  Lightweight Directory Access Protocol (LDAP).
-	  
-	  http://www.openldap.org/
-	  
-	  This package contains client programs required to access LDAP servers.
-
diff --git a/package/openldap/Config.in.lib b/package/openldap/Config.in.lib
deleted file mode 100644
index 6efae3dc3..000000000
--- a/package/openldap/Config.in.lib
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_PACKAGE_LIBOPENLDAP
-        prompt "libopenldap....................... OpenLDAP client libraries"
-        tristate
-        default n
-        depends on ADK_COMPILE_OPENLDAP
-        select ADK_PACKAGE_LIBSASL2
-	help
-	  
-	  OpenLDAP Software is an open source implementation of the 
-	  Lightweight Directory Access Protocol (LDAP).
-	  
-	  http://www.openldap.org/
-	  
-	  This package contains the shared LDAP client libraries, needed by other programs.
-
diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index 988dc61ca..db05887d0 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,17 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openldap
-PKG_VERSION:=		2.4.16
+PKG_VERSION:=		2.4.21
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ed5b86e9d2b372d10edfe3bb59fee165
+PKG_MD5SUM:=		e7128c57b2bacd940e8906057c94ff26
 PKG_DESCR:=		OpenLDAP client libraries
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libopenssl libsasl2
+PKG_BUILDDEP+=		cyrus-sasl openssl libdb
 PKG_URL:=		http://www.openldap.org
-PKG_SITES:=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
-			ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/ \
-			ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
-			ftp://ftp.plig.org/pub/OpenLDAP/openldap-release/
+PKG_SITES:=		ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
 
 PKG_DESCR_1:=		OpenLDAP utilities
 PKG_DEPENDS_1:=		libopenldap
@@ -32,21 +30,25 @@ $(eval $(call PKG_template,OPENLDAP_UTILS,openldap-utils,${PKG_VERSION}-${PKG_RE
 $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2}))
 
 PKG_CONFIGURE_OPTIONS+=	\
-	--enable-slapd \
-	--enable-bdb \
-	--disable-hdb \
-	--disable-relay \
-	--enable-dynamic \
-	--enable-syslog \
-	--enable-local \
-	--disable-syncprov \
-	--disable-slurpd \
-	--without-gssapi \
-	--without-fetch \
-	--with-cyrus-sasl \
-	--with-threads \
-	--with-tls \
-	--with-yielding_select="yes" \
+			--enable-slapd \
+			--enable-bdb \
+			--disable-hdb \
+			--disable-relay \
+			--enable-dynamic \
+			--enable-syslog \
+			--enable-local \
+			--disable-syncprov \
+			--disable-slurpd \
+			--without-gssapi \
+			--without-fetch \
+			--with-cyrus-sasl \
+			--with-threads \
+			--with-tls \
+			--with-yielding_select="yes" \
+
+CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
+CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS}
+XAKE_FLAGS+=		STRIP="" CPPFLAGS="-D_GNU_SOURCE"
 
 pre-configure:
 	(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
@@ -65,18 +67,13 @@ pre-configure:
 	${MAKE} -C ${WRKBUILD}/libraries/liblutil clean
 	${MAKE} -C ${WRKBUILD}/libraries/liblunicode clean
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
-CONFIGURE_ARGS+=	${PKG_CONFIGURE_OPTIONS}
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
-XAKE_FLAGS+=		STRIP="" CPPFLAGS="-D_GNU_SOURCE"
-
 post-install:
 	${INSTALL_DIR} ${IDIR_LIBOPENLDAP}/etc/openldap
-	${CP} ${WRKINST}/etc/openldap/ldap.conf ${IDIR_LIBOPENLDAP}/etc/openldap/
+	${CP} ${WRKINST}/etc/openldap/ldap.conf \
+		${IDIR_LIBOPENLDAP}/etc/openldap/
 	${INSTALL_DIR} ${IDIR_LIBOPENLDAP}/usr/lib/
-	${CP} ${WRKINST}/usr/lib/lib{lber,ldap}*.so.* ${IDIR_LIBOPENLDAP}/usr/lib/
+	${CP} ${WRKINST}/usr/lib/lib{lber,ldap}*.so* \
+		${IDIR_LIBOPENLDAP}/usr/lib/
 	${INSTALL_DIR} ${IDIR_OPENLDAP_UTILS}/usr/bin
 	${CP} ${WRKINST}/usr/bin/ldap* ${IDIR_OPENLDAP_UTILS}/usr/bin/
 	${INSTALL_DIR} ${IDIR_OPENLDAP_SLAPD}/etc/openldap/schema