bl3ify

9 files changed, 77 insertions, 29 deletions

diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile
index b7bc83138ee..f5ba0ca9965 100644
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 19:17:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/10 00:20:29 jlam Exp $
 #
 
 DISTNAME=		libidn-0.3.3
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnu.org/software/libidn/
 COMMENT=		Internationalized Domain Names command line tool
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
@@ -19,8 +19,8 @@ PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libidn.pc.in
 
 INFO_FILES=		libidn.info
 
-.include "../../converters/libiconv/buildlink2.mk"
-.include "../../devel/libgetopt/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libntlm/Makefile b/devel/libntlm/Makefile
index 96907d6e5ca..66e1c84ddc8 100644
--- a/devel/libntlm/Makefile
+++ b/devel/libntlm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 19:18:15 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/10 00:20:29 jlam Exp $
 #
 
 DISTNAME=		libntlm-0.3.2
@@ -10,11 +10,11 @@ HOMEPAGE=		http://josefsson.org/libntlm/
 COMMENT=		Library that implement Microsoft's NTLM authentication
 
 GNU_CONFIGURE=		yes
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
 LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libntlm.pc.in
 
-.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libntlm/buildlink3.mk b/devel/libntlm/buildlink3.mk
new file mode 100644
index 00000000000..6eabd46caca
--- /dev/null
+++ b/devel/libntlm/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBNTLM_BUILDLINK3_MK:=	${LIBNTLM_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libntlm
+.endif
+
+.if !empty(LIBNTLM_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libntlm
+BUILDLINK_DEPENDS.libntlm+=	libntlm>=0.3.2
+BUILDLINK_PKGSRCDIR.libntlm?=	../../devel/libntlm
+.endif # LIBNTLM_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 6212f3722a0..c71195984c3 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/12 22:57:38 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.10 2004/02/10 00:20:29 jlam Exp $
 
 DISTNAME=	gnutls-1.0.4
 CATEGORIES=	security devel
@@ -9,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	GNU Transport Layer Security library
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
@@ -25,10 +24,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/doc/examples && ${INSTALL_DATA} *.c ${EGDIR}
 
-.include "../../archivers/liblzo/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/libgcrypt/buildlink2.mk"
-.include "../../security/libtasn1/buildlink2.mk"
-.include "../../security/opencdk/buildlink2.mk"
+.include "../../archivers/liblzo/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libtasn1/buildlink3.mk"
+.include "../../security/opencdk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libksba/Makefile b/security/libksba/Makefile
index c1b474798df..ab2533e7404 100644
--- a/security/libksba/Makefile
+++ b/security/libksba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/25 22:29:50 kleink Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/10 00:20:29 jlam Exp $
 #
 
 DISTNAME=	libksba-0.9.1
@@ -10,7 +10,7 @@ MAINTAINER=	kleink@NetBSD.org
 HOMEPAGE=	http://www.g10code.com/p-libksba.html
 COMMENT=	X.509 library
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
@@ -19,6 +19,6 @@ TEST_TARGET=	check
 TEXINFO_REQD=	4.0
 INFO_FILES=	ksba.info
 
-.include "../../security/libgcrypt/buildlink2.mk"
-.include "../../security/libgpg-error/buildlink2.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index 6d6145cbae3..090223d79a8 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/05 23:16:20 xtraeme Exp $
-#
+# $NetBSD: Makefile,v 1.5 2004/02/10 00:20:29 jlam Exp $
 
 DISTNAME=	libtasn1-0.2.6
 CATEGORIES=	security devel
@@ -9,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	ASN.1 structure parser library
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/security/libtasn1/buildlink3.mk b/security/libtasn1/buildlink3.mk
new file mode 100644
index 00000000000..73ff4d13b71
--- /dev/null
+++ b/security/libtasn1/buildlink3.mk
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+LIBTASN1_BUILDLINK3_MK:=	${LIBTASN1_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libtasn1
+.endif
+
+.if !empty(LIBTASN1_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		libtasn1
+BUILDLINK_DEPENDS.libtasn1+=	libtasn1>=0.1.2
+BUILDLINK_PKGSRCDIR.libtasn1?=	../../security/libtasn1
+.endif # LIBTASN1_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index cba1ca7cdb9..1504cfed675 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/21 10:03:42 xtraeme Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/10 00:20:29 jlam Exp $
 #
 
 DISTNAME=	opencdk-0.5.3
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
 COMMENT=	Open Crypto Development Kit
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
@@ -29,8 +29,7 @@ pre-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${EGDIR}
 
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/zlib/buildlink2.mk"
-.include "../../security/libgcrypt/buildlink2.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/opencdk/buildlink3.mk b/security/opencdk/buildlink3.mk
new file mode 100644
index 00000000000..4c0db1555e3
--- /dev/null
+++ b/security/opencdk/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/10 00:20:29 jlam Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+OPENCDK_BUILDLINK3_MK:=	${OPENCDK_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	opencdk
+.endif
+
+.if !empty(OPENCDK_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=		opencdk
+BUILDLINK_DEPENDS.opencdk+=	opencdk>=0.5.3
+BUILDLINK_PKGSRCDIR.opencdk?=	../../security/opencdk
+
+.  include "../../devel/zlib/buildlink3.mk"
+.  include "../../security/libgcrypt/buildlink3.mk"
+.endif # OPENCDK_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}