3 files changed, 21 insertions, 28 deletions
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 8b90939dfae..815b7857537 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:50 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.4 2004/04/12 20:50:27 snj Exp $
 
 DISTNAME=	beecrypt-3.0.0
 CATEGORIES=	security
@@ -10,10 +9,10 @@ HOMEPAGE=	http://www.virtualunlimited.com/products/beecrypt/
 COMMENT=	Multipurpose cryptographic library
 
 GNU_CONFIGURE=		YES
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 
 CONFIGURE_ARGS+=	--without-javaglue
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/beecrypt/buildlink2.mk b/security/beecrypt/buildlink2.mk
deleted file mode 100644
index 7c463e9079c..00000000000
--- a/security/beecrypt/buildlink2.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.2 2003/08/03 20:58:18 jmmv Exp $
-#
-# This Makefile fragment is included by packages that use beecrypt.
-#
-# This file was created automatically using createbuildlink 2.6.
-#
-
-.if !defined(BEECRYPT_BUILDLINK2_MK)
-BEECRYPT_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=			beecrypt
-BUILDLINK_DEPENDS.beecrypt?=		beecrypt>=3.0.0
-BUILDLINK_PKGSRCDIR.beecrypt?=		../../devel/beecrypt
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.beecrypt=beecrypt
-BUILDLINK_PREFIX.beecrypt_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.beecrypt+=	include/beecrypt/*
-BUILDLINK_FILES.beecrypt+=	lib/libbeecrypt.*
-
-BUILDLINK_TARGETS+=	beecrypt-buildlink
-
-beecrypt-buildlink: _BUILDLINK_USE
-
-.endif	# BEECRYPT_BUILDLINK2_MK
diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk
new file mode 100644
index 00000000000..62a935f609a
--- /dev/null
+++ b/security/beecrypt/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/04/12 20:50:27 snj Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+BEECRYPT_BUILDLINK3_MK:=	${BEECRYPT_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	beecrypt
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nbeecrypt}
+BUILDLINK_PACKAGES+=	beecrypt
+
+.if !empty(BEECRYPT_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.beecrypt+=	beecrypt>=3.0.0
+BUILDLINK_PKGSRCDIR.beecrypt?=	../../security/beecrypt
+.endif	# BEECRYPT_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}