Convert to buildlink3.

3 files changed, 25 insertions, 26 deletions

diff --git a/editors/pico/buildlink2.mk b/editors/pico/buildlink2.mk
deleted file mode 100644
index 800872c079f..00000000000
--- a/editors/pico/buildlink2.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.4 2003/07/31 09:31:04 jklos Exp $
-
-.if !defined(PICO_BUILDLINK2_MK)
-PICO_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		pico
-BUILDLINK_DEPENDS.pico?=	pico>=4.6
-BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
-
-EVAL_PREFIX+=	BUILDLINK_PREFIX.pico=pico
-BUILDLINK_PREFIX.pico_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.pico+=	include/pico/*
-BUILDLINK_FILES.pico+=	lib/libpico.*
-
-BUILDLINK_TARGETS+=	pico-buildlink
-
-pico-buildlink: _BUILDLINK_USE
-
-.endif	# PICO_BUILDLINK2_MK
diff --git a/editors/pico/buildlink3.mk b/editors/pico/buildlink3.mk
new file mode 100644
index 00000000000..b26a5de8de2
--- /dev/null
+++ b/editors/pico/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/05/02 00:22:20 snj Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+PICO_BUILDLINK3_MK:=	${PICO_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	pico
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npico}
+BUILDLINK_PACKAGES+=	pico
+
+.if !empty(PICO_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.pico+=	pico>=4.6
+BUILDLINK_PKGSRCDIR.pico?=	../../editors/pico
+.endif	# PICO_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index fa8895fef3e..138a182f835 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2004/04/21 21:09:31 cube Exp $
+# $NetBSD: Makefile,v 1.86 2004/05/02 00:22:20 snj Exp $
 
 DISTNAME=       pine4.58
 PKGNAME=        pine-4.58
@@ -15,7 +15,7 @@ COMMENT=	Program for Internet News and E-mail
 LICENSE=	pine-license
 
 BUILD_DEFS+=	USE_OPENLDAP
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 
 CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
@@ -37,7 +37,7 @@ BUILDFILE= neb
 .endif
 
 .if defined(USE_OPENLDAP) && (${USE_OPENLDAP} == "YES")
-.  include "../../databases/openldap/buildlink2.mk"
+.  include "../../databases/openldap/buildlink3.mk"
 LDAPCFLAGS=    LDAPCFLAGS="-DENABLE_LDAP"
 LDAPLIBS=      LDAPLIBS="-lldap -llber"
 .endif
@@ -88,9 +88,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
-.include "../../devel/ncurses/buildlink2.mk"
-.include "../../editors/pico/buildlink2.mk"
-.include "../../mail/imap-uw/buildlink2.mk"
-.include "../../security/openssl/buildlink2.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../editors/pico/buildlink3.mk"
+.include "../../mail/imap-uw/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"