3 files changed, 23 insertions, 22 deletions
diff --git a/math/ntl/Makefile b/math/ntl/Makefile
index 717ac41b023..fd45cf4aa62 100644
--- a/math/ntl/Makefile
+++ b/math/ntl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:20:05 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/04/14 00:00:19 snj Exp $
 
 DISTNAME=		ntl-5.3.1
 CATEGORIES=		math devel
@@ -12,7 +12,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/src
 NO_CONFIGURE=		# defined
 USE_LIBTOOL=		yes
 MAKEFILE=		makefile
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
-.include "../../devel/gmp/buildlink2.mk"
+.include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/ntl/buildlink2.mk b/math/ntl/buildlink2.mk
deleted file mode 100644
index c76bca0b35d..00000000000
--- a/math/ntl/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2003/03/02 09:04:03 jtb Exp $
-
-.if !defined(NTL_BUILDLINK2_MK)
-NTL_BUILDLINK2_MK=		# defined
-
-BUILDLINK_PACKAGES+=		ntl
-BUILDLINK_DEPENDS.ntl?=		ntl>=5.3.1
-BUILDLINK_PKGSRCDIR.ntl?=	../../math/ntl
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.ntl=ntl
-BUILDLINK_PREFIX.ntl_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ntl=		include/NTL/*
-BUILDLINK_FILES.ntl+=		lib/libntl.*
-
-BUILDLINK_TARGETS+=	ntl-buildlink
-
-ntl-buildlink: _BUILDLINK_USE
-
-.endif	# NTL_BUILDLINK2_MK
diff --git a/math/ntl/buildlink3.mk b/math/ntl/buildlink3.mk
new file mode 100644
index 00000000000..c192d878dab
--- /dev/null
+++ b/math/ntl/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/14 00:00:19 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+NTL_BUILDLINK3_MK:=	${NTL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	ntl
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nntl}
+BUILDLINK_PACKAGES+=	ntl
+
+.if !empty(NTL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.ntl+=	ntl>=5.3.1
+BUILDLINK_PKGSRCDIR.ntl?=	../../math/ntl
+.endif	# NTL_BUILDLINK3_MK
+
+.include "../../devel/gmp/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}