3 files changed, 20 insertions, 22 deletions
diff --git a/net/dante/Makefile b/net/dante/Makefile
index 161e104fc19..c6977466745 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:46 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/12 21:54:27 snj Exp $
 #
 
 DISTNAME=		dante-1.1.14
@@ -11,7 +11,7 @@ COMMENT=		BSD-licensed socks 4/5 proxy suite
 
 CONFLICTS=		socks4-[0-9]*
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/net/dante/buildlink2.mk b/net/dante/buildlink2.mk
deleted file mode 100644
index 6d189fb88a9..00000000000
--- a/net/dante/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/09/10 06:10:04 jlam Exp $
-
-.if !defined(DANTE_BUILDLINK2_MK)
-DANTE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		dante
-BUILDLINK_DEPENDS.dante?=	dante>=1.1.13
-BUILDLINK_PKGSRCDIR.dante?=	../../net/dante
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.dante=dante
-BUILDLINK_PREFIX.dante_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.dante=	include/dante/*
-BUILDLINK_FILES.dante+=	lib/libdsocks.*
-BUILDLINK_FILES.dante+=	lib/libsocks.*
-
-BUILDLINK_TARGETS+=	dante-buildlink
-
-dante-buildlink: _BUILDLINK_USE
-
-.endif	# DANTE_BUILDLINK2_MK
diff --git a/net/dante/buildlink3.mk b/net/dante/buildlink3.mk
new file mode 100644
index 00000000000..c1993c135fa
--- /dev/null
+++ b/net/dante/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 21:54:27 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+DANTE_BUILDLINK3_MK:=	${DANTE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	dante
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ndante}
+BUILDLINK_PACKAGES+=	dante
+
+.if !empty(DANTE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.dante+=	dante>=1.1.13
+BUILDLINK_PKGSRCDIR.dante?=	../../net/dante
+.endif	# DANTE_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}