[pkgsrc/trunk]: pkgsrc/databases/openldap bl3ify

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b01717b2bbdd
branches:  trunk
changeset: 465986:b01717b2bbdd
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jan 09 20:43:02 2004 +0000

description:
bl3ify

diffstat:

 databases/openldap/Makefile |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r a9fe908bd84c -r b01717b2bbdd databases/openldap/Makefile
--- a/databases/openldap/Makefile       Fri Jan 09 20:40:05 2004 +0000
+++ b/databases/openldap/Makefile       Fri Jan 09 20:43:02 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2003/12/04 14:48:17 agc Exp $
+# $NetBSD: Makefile,v 1.63 2004/01/09 20:43:02 jlam Exp $
 #
 
 DISTNAME=              openldap-2.1.22
@@ -14,7 +14,9 @@
 
 CONFLICTS+=            ldapsdk-[0-9]*
 
-USE_BUILDLINK2=                YES
+PKG_INSTALLATION_TYPES=        overwrite pkgviews
+
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 USE_LIBTOOL=           YES
 GNU_CONFIGURE=         YES
@@ -39,18 +41,16 @@
 CONFIGURE_ARGS+=       --enable-ldbm
 CONFIGURE_ARGS+=       --enable-crypt
 
-CPPFLAGS+=             -I${BUILDLINK_PREFIX.db4}/include/db4
-
 BUILD_DEFS+=           USE_SASL USE_SASL2
 
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_SASL2) && (${USE_SASL2} == "YES")
-.include "../../security/cyrus-sasl2/buildlink2.mk"
+.include "../../security/cyrus-sasl2/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-cyrus-sasl
 CONFIGURE_ARGS+=       --enable-spasswd
 .elif defined(USE_SASL) && (${USE_SASL} == "YES")
-.include "../../security/cyrus-sasl/buildlink2.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-cyrus-sasl
 CONFIGURE_ARGS+=       --enable-spasswd
 .endif
@@ -102,10 +102,10 @@
                ${RM} -f ${PKG_SYSCONFDIR}/$${f}.default;               \
        done
 
-.include "../../databases/db4/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-.include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../databases/db4/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=       --with-threads