Convert to buildlink3.

3 files changed, 28 insertions, 37 deletions

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/+$//}