buildlink1 -> buildlink2

3 files changed, 40 insertions, 16 deletions

diff --git a/editors/pico/Makefile b/editors/pico/Makefile
index 990d135a14a..3a1adfb3623 100644
--- a/editors/pico/Makefile
+++ b/editors/pico/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/07/28 05:39:40 schmonz Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/08 23:31:01 jlam Exp $
 #
 
 DISTNAME=	pine4.44
@@ -13,6 +13,7 @@ COMMENT=	Text editor (ships with Pine), and Pine's text editing lib
 
 LICENSE=	pine-license
 
+USE_BUILDLINK2=	# defined
 USE_LIBTOOL=	# defined
 
 .include "../../mk/bsd.prefs.mk"
@@ -28,13 +29,14 @@ BUILDNAME= neb
 MAKE_ENV+=	_STRIPFLAG_INSTALL=	# debug...
 
 do-build:
-	cd ${WRKSRC} && ./build ${BUILDNAME} CC="${LIBTOOL} ${CC}" \
-	    PREFIX=${PREFIX}
+	cd ${WRKSRC} && ./build ${BUILDNAME}				\
+		CC="${PKGLIBTOOL} ${BUILDLINK_CC}"			\
+		PREFIX=${PREFIX}
 
 do-install:
-	${LIBTOOL} --mode=install ${INSTALL_DATA} \
+	${PKGLIBTOOL} --mode=install ${INSTALL_DATA} \
 		${WRKSRC}/pico/libpico.la ${PREFIX}/lib/
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+	${PKGLIBTOOL} --mode=install ${INSTALL_PROGRAM} \
 		${WRKSRC}/pico/pico ${WRKSRC}/pico/pilot ${PREFIX}/bin/
 	${INSTALL_MAN}     ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1/
 	${INSTALL_MAN}     ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1/
diff --git a/editors/pico/buildlink2.mk b/editors/pico/buildlink2.mk
new file mode 100644
index 00000000000..b7ab17e64b3
--- /dev/null
+++ b/editors/pico/buildlink2.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink2.mk,v 1.1 2002/10/08 23:31:02 jlam Exp $
+
+.if !defined(PICO_BUILDLINK2_MK)
+PICO_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=		pico
+BUILDLINK_DEPENDS.pico?=	pico>=4.2
+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/mail/pine/Makefile b/mail/pine/Makefile
index 1f123339b71..802926a8e69 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2002/07/28 05:49:28 schmonz Exp $
+# $NetBSD: Makefile,v 1.63 2002/10/08 23:34:13 jlam Exp $
 # FreeBSD Id: Makefile,v 1.21 1997/03/26 02:12:07 ache Exp
 #
 
@@ -16,14 +16,12 @@ LICENSE=	pine-license
 
 BUILD_DEFS+=	PINE_USE_LDAP
 
-# This pkg doesn't build pico or libpico; the pico pkg does that part.
-DEPENDS+=	pico>=4.2:../../editors/pico
-DEPENDS+=	imap-uw>=2001.1:../../mail/imap-uw
-
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(PINE_USE_LDAP) && ${PINE_USE_LDAP} == YES
-.include "../../databases/openldap/buildlink.mk"
+USE_BUILDLINK2=	# defined
+
+.if defined(PINE_USE_LDAP) && (${PINE_USE_LDAP} == "YES")
+.  include "../../databases/openldap/buildlink2.mk"
 LDAPCFLAGS=    LDAPCFLAGS="-DENABLE_LDAP"
 LDAPLIBS=      LDAPLIBS="-lldap -llber"
 .endif
@@ -40,11 +38,12 @@ do-configure:
 		-e 's@DEFAULT_DEBUG.*2@DEFAULT_DEBUG 0@' \
 		<${WRKSRC}/pine/osdep/os-${BUILDFILE}.h.orig >${WRKSRC}/pine/osdep/os-${BUILDFILE}.h
 	@${RM} -rf ${WRKSRC}/pico
-	@${LN} -sf ${LOCALBASE}/include/pico ${WRKSRC}/pico
+	@${LN} -sf ${BUILDLINK_DIR}/include/pico ${WRKSRC}/pico
 
 do-build:
-	cd ${WRKSRC} && ./build ${BUILDNAME} ${LDAPCFLAGS} ${LDAPLIBS} PREFIX=${PREFIX} \
-		CC="${CC} ${CFLAGS} ${LDFLAGS}"
+	cd ${WRKSRC} && ./build ${BUILDNAME} ${LDAPCFLAGS} ${LDAPLIBS}	\
+		PREFIX=${PREFIX}					\
+		CC="${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin/
@@ -73,8 +72,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/utils/* ${PREFIX}/share/pine/contrib/utils
 	${CHMOD} +x ${PREFIX}/share/pine/contrib/utils/*.sh
 
-.include "../../security/openssl/buildlink.mk"
+.include "../../editors/pico/buildlink2.mk"
+.include "../../mail/imap-uw/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
+
 .if ${OPSYS} == "SunOS"
 BUILDNAME= gs5
 BUILDFILE= gs5