[pkgsrc/trunk]: pkgsrc/sysutils Convert to buildlink3.

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3e7726b54beb
branches:  trunk
changeset: 474696:3e7726b54beb
user:      snj <snj%pkgsrc.org@localhost>
date:      Tue May 04 03:40:50 2004 +0000

description:
Convert to buildlink3.

diffstat:

 sysutils/amanda-client/Makefile          |   8 ++++----
 sysutils/amanda-common/Makefile          |   4 ++--
 sysutils/amanda-common/buildlink2.mk     |  22 ----------------------
 sysutils/amanda-common/buildlink3.mk     |  18 ++++++++++++++++++
 sysutils/amanda-dev-client/Makefile      |   8 ++++----
 sysutils/amanda-dev-common/Makefile      |   4 ++--
 sysutils/amanda-dev-common/buildlink2.mk |  20 --------------------
 sysutils/amanda-dev-common/buildlink3.mk |  18 ++++++++++++++++++
 sysutils/amanda-dev-plot/Makefile        |   4 ++--
 sysutils/amanda-dev-server/Makefile      |   6 +++---
 sysutils/amanda-plot/Makefile            |   4 ++--
 sysutils/amanda-server/Makefile          |   6 +++---
 12 files changed, 58 insertions(+), 64 deletions(-)

diffs (267 lines):

diff -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-client/Makefile
--- a/sysutils/amanda-client/Makefile   Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-client/Makefile   Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 
 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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-common/Makefile
--- a/sysutils/amanda-common/Makefile   Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-common/Makefile   Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-common/buildlink2.mk
--- a/sysutils/amanda-common/buildlink2.mk      Tue May 04 02:59:53 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-common/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/amanda-common/buildlink3.mk      Tue May 04 03:40:50 2004 +0000
@@ -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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-client/Makefile
--- a/sysutils/amanda-dev-client/Makefile       Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-dev-client/Makefile       Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 
 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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-common/Makefile
--- a/sysutils/amanda-dev-common/Makefile       Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-dev-common/Makefile       Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 
 COMMENT=               Common libraries and binaries for Amanda
 
-USE_BUILDLINK2=                YES
+USE_BUILDLINK3=                YES
 USE_PKGINSTALL=                YES
 
 .include "../../mk/bsd.prefs.mk"
diff -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-common/buildlink2.mk
--- a/sysutils/amanda-dev-common/buildlink2.mk  Tue May 04 02:59:53 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-common/buildlink3.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/amanda-dev-common/buildlink3.mk  Tue May 04 03:40:50 2004 +0000
@@ -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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-plot/Makefile
--- a/sysutils/amanda-dev-plot/Makefile Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-dev-plot/Makefile Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-dev-server/Makefile
--- a/sysutils/amanda-dev-server/Makefile       Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-dev-server/Makefile       Tue May 04 03:40:50 2004 +0000
@@ -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 @@
        ${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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-plot/Makefile
--- a/sysutils/amanda-plot/Makefile     Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-plot/Makefile     Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 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 -r 3850243bb374 -r 3e7726b54beb sysutils/amanda-server/Makefile
--- a/sysutils/amanda-server/Makefile   Tue May 04 02:59:53 2004 +0000
+++ b/sysutils/amanda-server/Makefile   Tue May 04 03:40:50 2004 +0000
@@ -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 @@
 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 @@
        ${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"