From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 7 Feb 2010 20:03:20 +0100
Subject: change defaults for CONFIG/BUILD/INSTALL styles

All packages need an update, so here is a very huge commit.
Most of the 460 source packages use automatic style for configuration,
building and installing. Make these styles default to "auto".
If you have a package, which does not conform to this, just use
manual style and add a do-$task make target.

I added a new style named AUTOTOOL style, which is needed for some
broken packages, which needs to be updated via autoconf or automake.

I renamed CONFIGURE_STYLE to CONFIG_STYLE.

Updates for some packages, which have newer upstream versions.

Renaming of all package/*/extra directories. Use the directory
src/ to provide overwrites of source files or to add the code, when
no upstream package is available or used. src directory will be automatically
used.
---
 package/openldap/Makefile | 58 ++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

(limited to 'package/openldap')

diff --git a/package/openldap/Makefile b/package/openldap/Makefile
index f2a42debb..db05887d0 100644
--- a/package/openldap/Makefile
+++ b/package/openldap/Makefile
@@ -4,18 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		openldap
-PKG_VERSION:=		2.4.19
+PKG_VERSION:=		2.4.21
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		cyrus-sasl openssl libdb
-PKG_MD5SUM:=		4a6dab2711fcf141f19bb680bc335887
+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
@@ -33,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} ; \
@@ -66,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
-- 
cgit v1.2.3