Convert to buildlink3.

4 files changed, 31 insertions, 37 deletions

diff --git a/databases/openldap1/Makefile b/databases/openldap1/Makefile
index aabe5af47d1..e6707ac7d9e 100644
--- a/databases/openldap1/Makefile
+++ b/databases/openldap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 21:28:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/05/09 17:46:01 snj Exp $
 #
 
 DISTNAME=	openldap-1.2.13
@@ -16,7 +16,7 @@ COMMENT=	Lightweight directory access protocol server and client package
 
 CONFLICTS+=	ldapsdk-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/build/ltconfig
 
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
 .if ${OPSYS} == "SunOS" || ${OPSYS} == "Linux"
-.include "../../databases/db/buildlink2.mk"
+.include "../../databases/db/buildlink3.mk"
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.db}/include/db2
 LIBS=		-ldb2 -lpthread -lrt
 .endif
diff --git a/databases/openldap1/buildlink2.mk b/databases/openldap1/buildlink2.mk
deleted file mode 100644
index 108caa1d5db..00000000000
--- a/databases/openldap1/buildlink2.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/10/09 12:19:28 wiz Exp $
-
-.if !defined(OPENLDAP_BUILDLINK2_MK)
-OPENLDAP_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		openldap
-BUILDLINK_DEPENDS.openldap?=	openldap-1.2.*
-BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap1
-
-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/ldap.h
-BUILDLINK_FILES.openldap+=	include/ldap_cdefs.h
-BUILDLINK_FILES.openldap+=	include/srchpref.h
-BUILDLINK_FILES.openldap+=	lib/liblber.*
-BUILDLINK_FILES.openldap+=	lib/libldap.*
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == SunOS
-.  include "../../databases/db/buildlink2.mk"
-.endif
-
-BUILDLINK_TARGETS+=	openldap-buildlink
-
-openldap-buildlink: _BUILDLINK_USE
-
-.endif	# OPENLDAP_BUILDLINK2_MK
diff --git a/databases/openldap1/buildlink3.mk b/databases/openldap1/buildlink3.mk
new file mode 100644
index 00000000000..ac139407cb8
--- /dev/null
+++ b/databases/openldap1/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/09 17:46:01 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+OPENLDAP_BUILDLINK3_MK:=	${OPENLDAP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	openldap
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nopenldap}
+BUILDLINK_PACKAGES+=	openldap
+
+.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.openldap+=	openldap>=1.2.0
+BUILDLINK_PKGSRCDIR.openldap?=	../../databases/openldap1
+.endif	# OPENLDAP_BUILDLINK3_MK
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == SunOS
+.  include "../../databases/db/buildlink3.mk"
+.endif
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile
index e4f8eff0480..542514a74cf 100644
--- a/www/web500gw/Makefile
+++ b/www/web500gw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:56:07 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/05/09 17:46:02 snj Exp $
 
 DISTNAME=	web500gw-2.1b3
 PKGREVISION=	1
@@ -9,8 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.tu-chemnitz.de/~fri/web500gw/
 COMMENT=	WWW to ldap gateway
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 
-.include "../../databases/openldap1/buildlink2.mk"
-#.include "../../databases/openldap/buildlink2.mk"
+.include "../../databases/openldap1/buildlink3.mk"
+#.include "../../databases/openldap/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"