Convert to buildlink3.

4 files changed, 29 insertions, 9 deletions

diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 69fd090fd26..2c537fd1718 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/03/26 02:27:52 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2004/05/10 02:10:14 snj Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -21,7 +21,7 @@ CONFLICTS+=		libdes-[0-9]*
 
 CRYPTO=			yes
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
@@ -80,5 +80,5 @@ post-install:
 
 # Enable line below once it's needed
 #.include "../../mk/automake.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/kth-krb4/buildlink3.mk b/security/kth-krb4/buildlink3.mk
new file mode 100644
index 00000000000..75b71982e5e
--- /dev/null
+++ b/security/kth-krb4/buildlink3.mk
@@ -0,0 +1,20 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/10 02:10:14 snj Exp $
+# XXX	BUILDLINK_DEPMETHOD.kth-krb4?=	build
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+KTH_KRB4_BUILDLINK3_MK:=	${KTH_KRB4_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	kth-krb4
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nkth-krb4}
+BUILDLINK_PACKAGES+=	kth-krb4
+
+.if !empty(KTH_KRB4_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.kth-krb4+=	kth-krb4>=1.1.1
+BUILDLINK_RECOMMENDED.kth-krb4?=kth-krb4>=1.2.1nb4
+BUILDLINK_PKGSRCDIR.kth-krb4?=	../../security/kth-krb4
+.endif	# KTH_KRB4_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/qt3-docs/Makefile b/x11/qt3-docs/Makefile
index 66315cf13fd..9c67339373e 100644
--- a/x11/qt3-docs/Makefile
+++ b/x11/qt3-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/12/19 15:43:31 skrll Exp $
+# $NetBSD: Makefile,v 1.14 2004/05/10 02:10:14 snj Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -6,7 +6,7 @@
 PKGNAME=	qt3-docs-${QTVERSION}
 COMMENT=	Documentation for the QT C++ X GUI toolkit
 
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 BUILD_QT3=	yes
 
 NO_CONFIGURE=	yes
@@ -41,5 +41,5 @@ do-install:
 	    ${INSTALL_DATA} $${f} ${QTPREFIX}/$${f}; \
 	done)
 
-.include "../../x11/qt3-libs/buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index 0af7d6cade3..3ac15b15579 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/24 15:30:34 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/05/10 02:10:14 snj Exp $
 #
 
 DISTNAME=		qscintilla-1.54-x11-gpl-1.2
@@ -16,7 +16,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/qt
 BUILD_DEPENDS+=		qt3-tools-3.*:../../x11/qt3-tools
 
 USE_GNU_TOOLS+=		make
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
 MAKE_ENV+=	QTPREFIX=${QTDIR}
@@ -29,5 +29,5 @@ do-install:
 		${INSTALL_DATA} libqscintilla.la ${QTDIR}/lib)
 	(cd ${WRKSRC} && ${CP} qextscintilla*.h ${QTDIR}/include)
 
-.include "../../x11/qt3-libs/buildlink2.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"