Convert to buildlink3.

5 files changed, 29 insertions, 31 deletions

diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index 8318e15af37..d87b85ecbe3 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/22 07:51:12 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/12 01:52:55 snj Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S/-/_/}.src
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.tomw.org/malsync/
 COMMENT=	Utility to synchronize Palm Pilots to the AvantGo.com service
 
 WRKSRC=		${WRKDIR}/malsync
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
 MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
 CPPFLAGS+=		-D__unix__=1
@@ -24,5 +24,5 @@ do-install:
 	${INSTALL_DATA} ${FILESDIR}/${doc} ${PREFIX}/share/doc/malsync
 .endfor
 
-.include "../../comms/pilot-link-libs/buildlink2.mk"
+.include "../../comms/pilot-link-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index 37e18a1b0ae..82dd6b4d652 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/08/09 10:35:48 seb Exp $
+# $NetBSD: Makefile,v 1.18 2004/04/12 01:50:32 snj Exp $
 #
 
 DISTNAME=		recode-3.6
@@ -10,7 +10,7 @@ MAINTAINER=		kleink@NetBSD.org
 HOMEPAGE=		http://www.gnu.org/software/recode/recode.html
 COMMENT=		Convert files between character sets and usages
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
@@ -18,5 +18,5 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 INFO_FILES=     	recode.info
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/recode/buildlink2.mk b/converters/recode/buildlink2.mk
deleted file mode 100644
index 11b95ddf5b1..00000000000
--- a/converters/recode/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/07/13 13:50:54 wiz Exp $
-
-.if !defined(RECODE_BUILDLINK2_MK)
-RECODE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		recode
-BUILDLINK_DEPENDS.recode?=	recode>=3.6nb1
-BUILDLINK_PKGSRCDIR.recode?=	../../databases/recode
-
-EVAL_PREFIX+=			BUILDLINK_PREFIX.recode=recode
-BUILDLINK_PREFIX.recode_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.recode=		include/recode.h
-BUILDLINK_FILES.recode+=	include/recodext.h
-BUILDLINK_FILES.recode+=	lib/librecode.*
-
-.include "../../devel/gettext-lib/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	recode-buildlink
-
-recode-buildlink: _BUILDLINK_USE
-
-.endif	# RECODE_BUILDLINK2_MK
diff --git a/converters/recode/buildlink3.mk b/converters/recode/buildlink3.mk
new file mode 100644
index 00000000000..8abe740dfba
--- /dev/null
+++ b/converters/recode/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 01:50:32 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RECODE_BUILDLINK3_MK:=	${RECODE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	recode
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nrecode}
+BUILDLINK_PACKAGES+=	recode
+
+.if !empty(RECODE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.recode+=	recode>=3.6nb1
+BUILDLINK_PKGSRCDIR.recode?=	../../converters/recode
+.endif	# RECODE_BUILDLINK3_MK
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index d6d7eedb8b8..f37799a1848 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/03/26 02:27:37 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/04/12 01:51:48 snj Exp $
 #
 
 DISTNAME=	adocman-0.10
@@ -13,7 +13,7 @@ COMMENT=	DocManager operation automation tool
 DEPENDS+=	p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-Crypt-SSLeay>=0.47:../../security/p5-SSLeay
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PERL5=	YES
 NO_BUILD=	YES
 
@@ -32,5 +32,5 @@ do-install:
 .endfor
 .undef f
 
-.include "../../lang/perl5/buildlink2.mk"
+.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"