Merge changes in packages from the buildlink2 branch that have

buildlink2.mk files back into the main trunk.  This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.

5 files changed, 52 insertions, 13 deletions

diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 942a57d8f9b..0eba60899c4 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2002/08/19 19:29:18 mycroft Exp $
+# $NetBSD: Makefile,v 1.46 2002/08/25 18:38:23 jlam Exp $
 
 DISTNAME=	openldap-2.0.25
 SVR4_PKGNAME=	oldap
@@ -12,9 +12,7 @@ COMMENT=	Lightweight directory access protocol server and client package
 
 CONFLICTS+=	ldapsdk-[0-9]*
 
-USE_BUILDLINK_ONLY=	YES
-REPLACE_BUILDLINK_SED+=	-e "s|-L${WRKSRC}/libraries||g"
-
+USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
 
@@ -35,13 +33,13 @@ CONFIGURE_ARGS+=	--localstatedir=/var/openldap
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=	-I${BUILDLINK_DIR}/include/db2
+.include "../../databases/db/buildlink2.mk"
+CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
 LIBS=		-ldb2 -lpthread -lrt
 .endif
 
 .if defined(USE_SASL) && (${USE_SASL} == "YES")
-.include "../../security/cyrus-sasl/buildlink.mk"
+.include "../../security/cyrus-sasl/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 CONFIGURE_ARGS+=	--enable-spasswd
 .endif
@@ -109,9 +107,9 @@ test:
 	-@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
-.include "../../security/openssl/buildlink.mk"
-.include "../../security/tcp_wrappers/buildlink.mk"
-.include "../../mk/pthread.buildlink.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 
 .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} != "none")
 CONFIGURE_ARGS+=	--with-threads
diff --git a/databases/openldap/PLIST b/databases/openldap/PLIST
index 570cf3c16d7..465590f6b9a 100644
--- a/databases/openldap/PLIST
+++ b/databases/openldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/19 19:29:18 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/08/25 18:38:23 jlam Exp $
 bin/ldapadd
 bin/ldapdelete
 bin/ldapmodify
diff --git a/databases/openldap/buildlink.mk b/databases/openldap/buildlink.mk
index 9c90a905aee..8a0633103f7 100644
--- a/databases/openldap/buildlink.mk
+++ b/databases/openldap/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2002/08/01 05:53:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2002/08/25 18:38:23 jlam Exp $
 #
 # This Makefile fragment is included by packages that use openldap.
 #
diff --git a/databases/openldap/buildlink2.mk b/databases/openldap/buildlink2.mk
new file mode 100644
index 00000000000..4fc9d3f797b
--- /dev/null
+++ b/databases/openldap/buildlink2.mk
@@ -0,0 +1,41 @@
+# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:38:24 jlam Exp $
+
+.if !defined(OPENLDAP_BUILDLINK2_MK)
+OPENLDAP_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		openldap
+BUILDLINK_DEPENDS.openldap?=	openldap-2.0.*
+BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.openldap=openldap
+BUILDLINK_PREFIX.openldap_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.openldap=	include/disptmpl.h
+BUILDLINK_FILES.openldap+=	include/lber.h
+BUILDLINK_FILES.openldap+=	include/lber_types.h
+BUILDLINK_FILES.openldap+=	include/ldap.h
+BUILDLINK_FILES.openldap+=	include/ldap_cdefs.h
+BUILDLINK_FILES.openldap+=	include/ldap_features.h
+BUILDLINK_FILES.openldap+=	include/ldap_schema.h
+BUILDLINK_FILES.openldap+=	include/srchpref.h
+BUILDLINK_FILES.openldap+=	lib/liblber.*
+BUILDLINK_FILES.openldap+=	lib/libldap.*
+
+USE_PTHREAD=		native
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
+.  include "../../databases/db/buildlink2.mk"
+.endif
+
+.include "../../mk/pthread.buildlink2.mk"
+
+.if defined(USE_SASL) && (${USE_SASL} == "YES")
+.  include "../../security/cyrus-sasl/buildlink2.mk"
+.endif
+
+BUILDLINK_TARGETS+=	openldap-buildlink
+
+openldap-buildlink: _BUILDLINK_USE
+
+.endif	# OPENLDAP_BUILDLINK2_MK
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index e32ffc86fbc..c67e4b3f486 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/08/19 19:29:19 mycroft Exp $
+$NetBSD: distinfo,v 1.13 2002/08/25 18:38:24 jlam Exp $
 
 SHA1 (openldap-2.0.25.tgz) = fc62147b4de1057bbd3797471a7773406a212e61
 Size (openldap-2.0.25.tgz) = 1304098 bytes