Convert to buildlink3.

12 files changed, 58 insertions, 64 deletions

diff --git a/sysutils/amanda-client/Makefile b/sysutils/amanda-client/Makefile
index c083d7c602c..a7e715b860f 100644
--- a/sysutils/amanda-client/Makefile
+++ b/sysutils/amanda-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/07/17 22:53:25 grant Exp $
+# $NetBSD: Makefile,v 1.33 2004/05/04 03:40:50 snj Exp $
 #
 
 DISTNAME=		amanda-2.4.2p2
@@ -13,13 +13,13 @@ COMMENT=		Client part of Amanda, a network backup system
 
 DEPENDS+=		amanda-common-2.4.2p2:../../sysutils/amanda-common
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
-.include "../../sysutils/amanda-common/buildlink2.mk"
-#.include "../../devel/readline/buildlink2.mk"
+.include "../../sysutils/amanda-common/buildlink3.mk"
+#.include "../../devel/readline/buildlink3.mk"
 
 .if ${OPSYS} != "Linux"
 DEPENDS+=		{gtar,gtar-base}>=1.12:../../archivers/gtar-base
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 517e095c168..79e6e021cc8 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/07/17 22:53:25 grant Exp $
+# $NetBSD: Makefile,v 1.28 2004/05/04 03:40:50 snj Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Common libraries and binaries for Amanda
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/amanda-common/buildlink2.mk b/sysutils/amanda-common/buildlink2.mk
deleted file mode 100644
index 638795e81da..00000000000
--- a/sysutils/amanda-common/buildlink2.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/10/25 18:59:42 wiz Exp $
-#
-
-.if !defined(AMANDA_COMMON_BUILDLINK2_MK)
-AMANDA_COMMON_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			amanda-common
-BUILDLINK_DEPENDS.amanda-common?=	amanda-common>=2.4.2p2
-BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.amanda-common=amanda-common
-BUILDLINK_PREFIX.amanda-common_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.amanda-common+=	lib/libamanda-2.4.2p2.*
-BUILDLINK_FILES.amanda-common+=	lib/libamanda.*
-BUILDLINK_FILES.amanda-common+=	lib/libamtape-2.4.2p2.*
-BUILDLINK_FILES.amanda-common+=	lib/libamtape.*
-
-BUILDLINK_TARGETS+=	amanda-common-buildlink
-
-amanda-common-buildlink: _BUILDLINK_USE
-
-.endif	# AMANDA_COMMON_BUILDLINK2_MK
diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk
new file mode 100644
index 00000000000..6febc5c6fb3
--- /dev/null
+++ b/sysutils/amanda-common/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 03:40:50 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	amanda-common
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
+BUILDLINK_PACKAGES+=	amanda-common
+
+.if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.2p2
+BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-common
+.endif	# AMANDA_COMMON_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/amanda-dev-client/Makefile b/sysutils/amanda-dev-client/Makefile
index eb021a04f23..a26cb2a7f68 100644
--- a/sysutils/amanda-dev-client/Makefile
+++ b/sysutils/amanda-dev-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/25 18:59:46 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 03:40:50 snj Exp $
 #
 
 PKGNAME=		amanda-client-${VERS}
@@ -8,13 +8,13 @@ COMMENT=		Client part of Amanda, a network backup system
 
 DEPENDS+=		amanda-common-${VERS}:../../sysutils/amanda-dev-common
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-dev-common/Makefile.common"
-.include "../../sysutils/amanda-dev-common/buildlink2.mk"
-#.include "../../devel/readline/buildlink2.mk"
+.include "../../sysutils/amanda-dev-common/buildlink3.mk"
+#.include "../../devel/readline/buildlink3.mk"
 
 .if ${OPSYS} != "Linux"
 DEPENDS+=		{gtar,gtar-base}>=1.12:../../archivers/gtar
diff --git a/sysutils/amanda-dev-common/Makefile b/sysutils/amanda-dev-common/Makefile
index 141147f0d72..7c909b5466a 100644
--- a/sysutils/amanda-dev-common/Makefile
+++ b/sysutils/amanda-dev-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/06/07 14:47:19 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/04 03:40:50 snj Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -7,7 +7,7 @@ SVR4_PKGNAME=		amaco
 
 COMMENT=		Common libraries and binaries for Amanda
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/amanda-dev-common/buildlink2.mk b/sysutils/amanda-dev-common/buildlink2.mk
deleted file mode 100644
index dc4e5cf36ae..00000000000
--- a/sysutils/amanda-dev-common/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.1 2002/10/25 18:59:25 wiz Exp $
-#
-
-.if !defined(AMANDA_COMMON_BUILDLINK2_MK)
-AMANDA_COMMON_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			amanda-common
-BUILDLINK_DEPENDS.amanda-common?=	amanda-common>=2.4.3b3
-BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-dev-common
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.amanda-common=amanda-common
-BUILDLINK_PREFIX.amanda-common_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.amanda-common+=	lib/libamanda.*
-BUILDLINK_FILES.amanda-common+=	lib/libamtape.*
-
-BUILDLINK_TARGETS+=	amanda-common-buildlink
-
-amanda-common-buildlink: _BUILDLINK_USE
-
-.endif	# AMANDA_COMMON_BUILDLINK2_MK
diff --git a/sysutils/amanda-dev-common/buildlink3.mk b/sysutils/amanda-dev-common/buildlink3.mk
new file mode 100644
index 00000000000..edb61711246
--- /dev/null
+++ b/sysutils/amanda-dev-common/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/04 03:40:50 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+AMANDA_COMMON_BUILDLINK3_MK:=	${AMANDA_COMMON_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	amanda-common
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Namanda-common}
+BUILDLINK_PACKAGES+=	amanda-common
+
+.if !empty(AMANDA_COMMON_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.amanda-common+=	amanda-common>=2.4.3b3
+BUILDLINK_PKGSRCDIR.amanda-common?=	../../sysutils/amanda-dev-common
+.endif	# AMANDA_COMMON_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/amanda-dev-plot/Makefile b/sysutils/amanda-dev-plot/Makefile
index 388c0195d52..e6aff66c452 100644
--- a/sysutils/amanda-dev-plot/Makefile
+++ b/sysutils/amanda-dev-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/25 19:36:08 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/04 03:40:50 snj Exp $
 #
 
 PKGNAME=		amanda-plot-${VERS}
@@ -9,7 +9,7 @@ COMMENT=		Visualizes the behavior of Amanda, a network backup system
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=		amanda-server-${VERS}:../../sysutils/amanda-dev-server
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-dev-common/Makefile.common"
diff --git a/sysutils/amanda-dev-server/Makefile b/sysutils/amanda-dev-server/Makefile
index dda96e75e72..f69d5d4f48f 100644
--- a/sysutils/amanda-dev-server/Makefile
+++ b/sysutils/amanda-dev-server/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/05/04 03:40:50 snj Exp $
 #
 
 PKGNAME=		amanda-server-${VERS}
 
 COMMENT=		Server part of Amanda, a network backup system
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_PERL5=		yes
 USE_GNU_TOOLS+=		make
 
@@ -48,5 +48,5 @@ pre-install:
 	${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-.include "../../sysutils/amanda-dev-common/buildlink2.mk"
+.include "../../sysutils/amanda-dev-common/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/amanda-plot/Makefile b/sysutils/amanda-plot/Makefile
index 86a9b3e1b13..8f1cb1bfaf5 100644
--- a/sysutils/amanda-plot/Makefile
+++ b/sysutils/amanda-plot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 22:53:26 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/04 03:40:50 snj Exp $
 #
 
 DISTNAME=		amanda-2.4.2p2
@@ -14,7 +14,7 @@ COMMENT=		Visualizes the behavior of Amanda, a network backup system
 DEPENDS+=		gnuplot>=3.7:../../graphics/gnuplot
 DEPENDS+=		amanda-server-2.4.2p2:../../sysutils/amanda-server
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index 278104416a3..f50792493d7 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.27 2004/05/04 03:40:50 snj Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.amanda.org/
 COMMENT=		Server part of Amanda, a network backup system
 
 USE_PERL5=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
@@ -55,5 +55,5 @@ pre-install:
 	${SED} -e 's|^libexec/chg-scsi$$|@comment libexec/chg-scsi needs headers...|' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .endif
 
-.include "../../sysutils/amanda-common/buildlink2.mk"
+.include "../../sysutils/amanda-common/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"