6 files changed, 77 insertions, 11 deletions
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 20ccc36ba2b..f6be6636038 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2003/08/09 10:29:56 seb Exp $
+# $NetBSD: Makefile,v 1.44 2004/02/22 16:51:07 minskim Exp $
 #
 
 DISTNAME=	rplay-3.3.2
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://rplay.doit.org/
 COMMENT=	Network audio player
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
@@ -39,8 +39,8 @@ post-install:
 .endfor
 .undef f
 
-.include "../../audio/gsm/buildlink2.mk"
-.include "../../devel/readline/buildlink2.mk"
-.include "../../devel/rx/buildlink2.mk"
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/rx/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/buildlink3.mk b/audio/rplay/buildlink3.mk
new file mode 100644
index 00000000000..2cd8b61aace
--- /dev/null
+++ b/audio/rplay/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:51:07 minskim Exp $
+#
+# This Makefile fragment is included by packages that use rplay.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RPLAY_BUILDLINK3_MK:=	${RPLAY_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	rplay
+.endif
+
+.if !empty(RPLAY_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			rplay
+BUILDLINK_DEPENDS.rplay+=		rplay>=3.3.2nb1
+BUILDLINK_PKGSRCDIR.rplay?=		../../audio/rplay
+
+.include "../../audio/gsm/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/rx/buildlink3.mk"
+
+.endif # RPLAY_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/rx/Makefile b/devel/rx/Makefile
index d8f1e8f4a16..4823870b5a7 100644
--- a/devel/rx/Makefile
+++ b/devel/rx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 10:44:49 seb Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/22 16:48:11 minskim Exp $
 
 DISTNAME=	rx-1.5
 CATEGORIES=	devel
@@ -9,7 +9,7 @@ MAINTAINER=	jlam@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/rx/rx.html
 COMMENT=	Fast replacement for the GNU regex library
 
-USE_BUILDLINK2=	# defined
+USE_BUILDLINK3=	# defined
 USE_LIBTOOL=	# defined
 GNU_CONFIGURE=	# defined
 
diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk
new file mode 100644
index 00000000000..b7da5268914
--- /dev/null
+++ b/devel/rx/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:48:11 minskim Exp $
+#
+# This Makefile fragment is included by packages that use rx.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RX_BUILDLINK3_MK:=	${RX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	rx
+.endif
+
+.if !empty(RX_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		rx
+BUILDLINK_DEPENDS.rx+=		rx>=1.5
+BUILDLINK_PKGSRCDIR.rx?=	../../devel/rx
+
+.endif # RX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 00c00a945ff..7516b34c275 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:46 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/22 16:51:23 minskim Exp $
 
 DISTNAME=	netatalk-1.6.2
 CATEGORIES=	net print
@@ -10,7 +10,7 @@ HOMEPAGE=	http://sourceforge.net/projects/netatalk/
 COMMENT=	Netatalk appletalk file and print services
 
 GNU_CONFIGURE=	YES
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 USE_LIBTOOL=		YES
@@ -52,7 +52,7 @@ pre-install:
 					${PREFIX}/share/examples/netatalk/
 .endfor
 
-#.include "../../databases/db3/buildlink2.mk"
-.include "../../devel/rx/buildlink2.mk"
+#.include "../../databases/db3/buildlink3.mk"
+.include "../../devel/rx/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/netatalk/buildlink3.mk b/net/netatalk/buildlink3.mk
new file mode 100644
index 00000000000..ad2b8f21d15
--- /dev/null
+++ b/net/netatalk/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/22 16:51:23 minskim Exp $
+#
+# This Makefile fragment is included by packages that use netatalk.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+NETATALK_BUILDLINK3_MK:=	${NETATALK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	netatalk
+.endif
+
+.if !empty(NETATALK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			netatalk
+BUILDLINK_DEPENDS.netatalk+=		netatalk>=1.6.2
+BUILDLINK_PKGSRCDIR.netatalk?=		../../net/netatalk
+
+.include "../../devel/rx/buildlink3.mk"
+
+.endif # NETATALK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}