5 files changed, 26 insertions, 45 deletions
diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile
index 3c3933e6986..6d817b63865 100644
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/04/16 18:41:00 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/25 03:47:44 snj Exp $
 #
 
 DISTNAME=		liboop-1.0
@@ -10,7 +10,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.liboop.org/
 COMMENT=		Event loop management library
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE+=	liboop.pc.in
diff --git a/devel/liboop/buildlink2.mk b/devel/liboop/buildlink2.mk
deleted file mode 100644
index d134564be35..00000000000
--- a/devel/liboop/buildlink2.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1.1.1 2003/09/27 08:14:50 grant Exp $
-#
-# This Makefile fragment is included by packages that use liboop.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(LIBOOP_BUILDLINK2_MK)
-LIBOOP_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			liboop
-BUILDLINK_DEPENDS.liboop?=		liboop>=0.9
-BUILDLINK_PKGSRCDIR.liboop?=		../../devel/liboop
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.liboop=liboop
-BUILDLINK_PREFIX.liboop_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.liboop+=	include/oop-adns.h
-BUILDLINK_FILES.liboop+=	include/oop-glib.h
-BUILDLINK_FILES.liboop+=	include/oop-read.h
-BUILDLINK_FILES.liboop+=	include/oop-rl.h
-BUILDLINK_FILES.liboop+=	include/oop-tcl.h
-BUILDLINK_FILES.liboop+=	include/oop-www.h
-BUILDLINK_FILES.liboop+=	include/oop.h
-BUILDLINK_FILES.liboop+=	lib/liboop-adns.*
-BUILDLINK_FILES.liboop+=	lib/liboop-glib.*
-BUILDLINK_FILES.liboop+=	lib/liboop-rl.*
-BUILDLINK_FILES.liboop+=	lib/liboop-tcl.*
-BUILDLINK_FILES.liboop+=	lib/liboop-www.*
-BUILDLINK_FILES.liboop+=	lib/liboop.*
-
-.include "../../devel/glib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	liboop-buildlink
-
-liboop-buildlink: _BUILDLINK_USE
-
-.endif	# LIBOOP_BUILDLINK2_MK
diff --git a/devel/liboop/buildlink3.mk b/devel/liboop/buildlink3.mk
new file mode 100644
index 00000000000..c017934a4fb
--- /dev/null
+++ b/devel/liboop/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 03:47:44 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBOOP_BUILDLINK3_MK:=	${LIBOOP_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	liboop
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nliboop}
+BUILDLINK_PACKAGES+=	liboop
+
+.if !empty(LIBOOP_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.liboop+=	liboop>=0.9
+BUILDLINK_PKGSRCDIR.liboop?=	../../devel/liboop
+.endif	# LIBOOP_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/math/xgap/Makefile b/math/xgap/Makefile
index e7e04d13fc8..f1aeaf95ff6 100644
--- a/math/xgap/Makefile
+++ b/math/xgap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:20:05 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/04/25 03:48:25 snj Exp $
 #
 
 DISTNAME=	xgap4r16
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.gap-system.org/Share/xgap.html
 COMMENT=	GUI for GAP
 
 WRKSRC=         ${WRKDIR}/${GAP_PKG_NAME}
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 ALL_TARGET=	default
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 90a6499aaa6..b2efbd385ed 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/14 22:41:17 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/04/25 03:47:56 snj Exp $
 #
 
 DISTNAME=		lsh-1.4.3
@@ -9,10 +9,10 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.lysator.liu.se/~nisse/lsh/
 COMMENT=		ssh2 client/server
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 
-.include "../../devel/gmp/buildlink2.mk"
-.include "../../devel/liboop/buildlink2.mk"
+.include "../../devel/gmp/buildlink3.mk"
+.include "../../devel/liboop/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"