Convert to buildlink3.

10 files changed, 81 insertions, 101 deletions

diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile
index 20b0ee7ace4..6e4dc328152 100644
--- a/security/libnasl/Makefile
+++ b/security/libnasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/05/03 05:52:55 snj Exp $
 
 DISTNAME=	libnasl-${VERS}
 PKGREVISION=	1
@@ -8,7 +8,7 @@ COMMENT=	Nessus Attack Scripting Language library
 
 WRKSRC=		${WRKDIR}/libnasl
 GNU_CONFIGURE=	yes
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../nessus-libraries/buildlink2.mk"
+.include "../nessus-libraries/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libnasl/buildlink2.mk b/security/libnasl/buildlink2.mk
deleted file mode 100644
index fcec63a3d8b..00000000000
--- a/security/libnasl/buildlink2.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/26 02:27:52 wiz Exp $
-#
-
-.if !defined(LIBNASL_BUILDLINK2_MK)
-LIBNASL_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			libnasl
-BUILDLINK_DEPENDS.libnasl?=		libnasl>=2.0.9
-BUILDLINK_RECOMMENDED.libnasl?=		libnasl>=2.0.9nb1
-BUILDLINK_PKGSRCDIR.libnasl?=		../../security/libnasl
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.libnasl=libnasl
-BUILDLINK_PREFIX.libnasl_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libnasl+=	include/nessus/nasl.h
-BUILDLINK_FILES.libnasl+=	lib/libnasl.*
-
-BUILDLINK_TARGETS+=	libnasl-buildlink
-
-libnasl-buildlink: _BUILDLINK_USE
-
-.endif	# LIBNASL_BUILDLINK2_MK
diff --git a/security/libnasl/buildlink3.mk b/security/libnasl/buildlink3.mk
new file mode 100644
index 00000000000..f1ce3d8fd2b
--- /dev/null
+++ b/security/libnasl/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $
+# XXX	BUILDLINK_DEPMETHOD.libnasl?=	build
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBNASL_BUILDLINK3_MK:=	${LIBNASL_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libnasl
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibnasl}
+BUILDLINK_PACKAGES+=	libnasl
+
+.if !empty(LIBNASL_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libnasl+=	libnasl>=2.0.9
+BUILDLINK_RECOMMENDED.libnasl?=	libnasl>=2.0.9nb1
+BUILDLINK_PKGSRCDIR.libnasl?=	../../security/libnasl
+.endif	# LIBNASL_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index bd3d5dcebef..a54e005848c 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/05/03 05:52:55 snj Exp $
 #
 
 DISTNAME=	nessus-core-${VERS}
@@ -8,7 +8,7 @@ PKGREVISION=	1
 COMMENT=	Core module of the Nessus Network Security Scanner
 
 WRKSRC=		${WRKDIR}/nessus-core
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_PKGINSTALL=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--enable-gtk \
 
 RCD_SCRIPTS=	nessusd
 
-.include "../../security/libnasl/buildlink2.mk"
-.include "../../security/nessus-libraries/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
+.include "../../security/libnasl/buildlink3.mk"
+.include "../../security/nessus-libraries/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-core/buildlink2.mk b/security/nessus-core/buildlink2.mk
deleted file mode 100644
index a5470bb2a9c..00000000000
--- a/security/nessus-core/buildlink2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.8 2004/03/26 02:27:52 wiz Exp $
-#
-
-.if !defined(NESSUS_CORE_BUILDLINK2_MK)
-NESSUS_CORE_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			nessus-core
-BUILDLINK_DEPENDS.nessus-core?=		nessus-core>=2.0.9
-BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.0.9nb1
-BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.nessus-core=nessus-core
-BUILDLINK_PREFIX.nessus-core_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.nessus-core+=	include/nessus/config.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/includes.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessus-devel.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessusicmp.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessusip.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessusraw.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessustcp.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/nessusudp.h
-BUILDLINK_FILES.nessus-core+=	include/nessus/ntcompat.h
-
-.include "../../security/libnasl/buildlink2.mk"
-.include "../../security/nessus-libraries/buildlink2.mk"
-.include "../../x11/gtk/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	nessus-core-buildlink
-
-nessus-core-buildlink: _BUILDLINK_USE
-
-.endif	# NESSUS_CORE_BUILDLINK2_MK
diff --git a/security/nessus-core/buildlink3.mk b/security/nessus-core/buildlink3.mk
new file mode 100644
index 00000000000..a10adc60316
--- /dev/null
+++ b/security/nessus-core/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+NESSUS_CORE_BUILDLINK3_MK:=	${NESSUS_CORE_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	nessus-core
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-core}
+BUILDLINK_PACKAGES+=	nessus-core
+
+.if !empty(NESSUS_CORE_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.nessus-core+=	nessus-core>=2.0.9
+BUILDLINK_RECOMMENDED.nessus-core?=	nessus-core>=2.0.9nb1
+BUILDLINK_PKGSRCDIR.nessus-core?=	../../security/nessus-core
+.endif	# NESSUS_CORE_BUILDLINK3_MK
+
+.include "../../security/libnasl/buildlink3.mk"
+.include "../../security/nessus-libraries/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index ad733b6e25b..19e29a78d43 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/05/03 05:52:55 snj Exp $
 #
 
 DISTNAME=	nessus-libraries-${VERS}
@@ -8,7 +8,7 @@ PKGREVISION=	2
 COMMENT=	Libs required by the Nessus Network security scanner
 
 WRKSRC=		${WRKDIR}/nessus-libraries
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
@@ -18,6 +18,6 @@ CONFIGURE_ENV+=	CPP=${CPP}
 CONFIGURE_ARGS+=--enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \
 		--localstatedir=/var
 
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-libraries/buildlink2.mk b/security/nessus-libraries/buildlink2.mk
deleted file mode 100644
index 9e8d6053282..00000000000
--- a/security/nessus-libraries/buildlink2.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/26 02:27:53 wiz Exp $
-#
-
-.if !defined(NESSUS_LIBRARIES_BUILDLINK2_MK)
-NESSUS_LIBRARIES_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			nessus-libraries
-BUILDLINK_DEPENDS.nessus-libraries?=		nessus-libraries>=2.0.9
-BUILDLINK_RECOMMENDED.nessus-libraries?=		nessus-libraries>=2.0.9nb2
-BUILDLINK_PKGSRCDIR.nessus-libraries?=		../../security/nessus-libraries
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.nessus-libraries=nessus-libraries
-BUILDLINK_PREFIX.nessus-libraries_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/getopt.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/harglists.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/libnessus.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/libvers.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/net/bpf.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/pcap-namedb.h
-BUILDLINK_FILES.nessus-libraries+=	include/nessus/pcap.h
-BUILDLINK_FILES.nessus-libraries+=	lib/libhosts_gatherer.*
-BUILDLINK_FILES.nessus-libraries+=	lib/libnessus.*
-BUILDLINK_FILES.nessus-libraries+=	lib/libpcap-nessus.*
-
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
-
-BUILDLINK_TARGETS+=	nessus-libraries-buildlink
-
-nessus-libraries-buildlink: _BUILDLINK_USE
-
-.endif	# NESSUS_LIBRARIES_BUILDLINK2_MK
diff --git a/security/nessus-libraries/buildlink3.mk b/security/nessus-libraries/buildlink3.mk
new file mode 100644
index 00000000000..454d751bfa9
--- /dev/null
+++ b/security/nessus-libraries/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 05:52:55 snj Exp $
+
+BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
+NESSUS_LIBRARIES_BUILDLINK3_MK:=	${NESSUS_LIBRARIES_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	nessus-libraries
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nnessus-libraries}
+BUILDLINK_PACKAGES+=	nessus-libraries
+
+.if !empty(NESSUS_LIBRARIES_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.nessus-libraries+=	nessus-libraries>=2.0.9
+BUILDLINK_RECOMMENDED.nessus-libraries?=nessus-libraries>=2.0.9nb2
+BUILDLINK_PKGSRCDIR.nessus-libraries?=	../../security/nessus-libraries
+.endif	# NESSUS_LIBRARIES_BUILDLINK3_MK
+
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile
index 9236d9c21f6..8eec953e3fb 100644
--- a/security/nessus-plugins/Makefile
+++ b/security/nessus-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/26 02:27:53 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/05/03 05:52:55 snj Exp $
 #
 
 DISTNAME=	nessus-plugins-${VERS}
@@ -10,9 +10,9 @@ COMMENT=	Plugins for the Nessus Network Security Scanner
 DEPENDS+=	nmap>=2.0:../../net/nmap
 
 WRKSRC=		${WRKDIR}/nessus-plugins
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 GNU_CONFIGURE=	yes
 
-.include "../../security/nessus-core/buildlink2.mk"
-.include "../../devel/libnet/buildlink2.mk"
+.include "../../security/nessus-core/buildlink3.mk"
+.include "../../devel/libnet/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"