Convert to buildlink3.

4 files changed, 23 insertions, 28 deletions

diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 790ff8232e9..da925da7957 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/09 11:24:04 seb Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/11 04:07:52 snj Exp $
 #
 
 DISTNAME=	freeWAIS-sf-2.2.12
@@ -11,6 +11,7 @@ MAINTAINER=	bad@NetBSD.org
 HOMEPAGE=	http://ls6-www.informatik.uni-dortmund.de/ir/projects/freeWAIS-sf/index.html
 COMMENT=	Enhanced Wide Area Information Server
 
+USE_BUILDLINK3=	yes
 USE_PERL5=	build
 USE_LIBTOOL=	# defined
 
diff --git a/net/freewais-sf/buildlink2.mk b/net/freewais-sf/buildlink2.mk
deleted file mode 100644
index 5ff18a8382d..00000000000
--- a/net/freewais-sf/buildlink2.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/26 18:45:14 seb Exp $
-#
-# This Makefile fragment is included by packages that use freewais-sf.
-#
-# This file was created automatically using createbuildlink 2.2.
-#
-
-.if !defined(FREEWAIS_SF_BUILDLINK2_MK)
-FREEWAIS_SF_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			freewais-sf
-BUILDLINK_DEPENDS.freewais-sf?=		freewais-sf>=2.2.12
-BUILDLINK_PKGSRCDIR.freewais-sf?=	../../net/freewais-sf
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.freewais-sf=freewais-sf
-BUILDLINK_PREFIX.freewais-sf_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.freewais-sf+=	include/wais.h
-BUILDLINK_FILES.freewais-sf+=	lib/libwais.*
-
-BUILDLINK_TARGETS+=	freewais-sf-buildlink
-
-freewais-sf-buildlink: _BUILDLINK_USE
-
-.endif	# FREEWAIS_SF_BUILDLINK2_MK
diff --git a/net/freewais-sf/buildlink3.mk b/net/freewais-sf/buildlink3.mk
new file mode 100644
index 00000000000..39a089a778c
--- /dev/null
+++ b/net/freewais-sf/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/11 04:07:52 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+FREEWAIS_SF_BUILDLINK3_MK:=	${FREEWAIS_SF_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	freewais-sf
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfreewais-sf}
+BUILDLINK_PACKAGES+=	freewais-sf
+
+.if !empty(FREEWAIS_SF_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.freewais-sf+=	freewais-sf>=2.2.12
+BUILDLINK_PKGSRCDIR.freewais-sf?=	../../net/freewais-sf
+.endif	# FREEWAIS_SF_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/net/p5-Wais/Makefile b/net/p5-Wais/Makefile
index 453173ae112..80bf7d93d99 100644
--- a/net/p5-Wais/Makefile
+++ b/net/p5-Wais/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/21 17:11:06 martti Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/11 04:07:52 snj Exp $
 #
 
 DISTNAME=	Wais-2.311
@@ -12,12 +12,12 @@ COMMENT=	Perl5 module for accessing WAIS servers
 
 DEPENDS+=	p5-Curses>=1.02:../../devel/p5-Curses
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/Wais/.packlist
 
 post-patch:
 	${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \;
 
 .include "../../lang/perl5/module.mk"
-.include "../../net/freewais-sf/buildlink2.mk"
+.include "../../net/freewais-sf/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"