buildlink1 -> buildlink2

3 files changed, 10 insertions, 20 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 83e2ebc0767..32f00b3ee08 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/19 09:04:10 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2002/10/08 23:15:58 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION?=	1
@@ -8,7 +8,6 @@ COMMENT=	authentication modules for Courier mail packages
 CONFLICTS=	courier-imap<=1.4.0
 CONFLICTS+=	courier-imap-ldap-*
 
-USE_BUILDLINK_ONLY=	yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
@@ -30,12 +29,6 @@ RCD_SCRIPTS=		authdaemond
 
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
-do-install:
-.for DIR in ${WRKSRC_SUBDIRS}
-	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${INSTALL_TARGET}
-.endfor
-
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL}
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index b4aaa50119c..960cd72e369 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.authdaemond,v 1.3 2002/02/05 15:03:19 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.4 2002/10/08 23:15:58 jlam Exp $
 
 .include "../../mail/courier-auth/Makefile.common"
 
 PERL5_REQD=		5.6.0
-BUILD_DEPENDS+=		perl>=${PERL5_REQD}:../../lang/perl5
+USE_PERL5?=		build
 
 WRKSRC_FILES=		config.guess config.sub configure		\
 			install-sh mkinstalldirs
@@ -22,17 +22,13 @@ SYSCONFTOOL=		${PREFIX}/sbin/authdaemon.sysconftool
 DISTINFO_FILE=		${.CURDIR}/../../mail/courier-auth/distinfo
 PATCHDIR=		${.CURDIR}/../../mail/courier-auth/patches
 
+BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
+
 FILES_SUBST+=		SYSCONFTOOL=${SYSCONFTOOL:Q}
 
 .if defined(USE_PAM)
 BUILD_DEFS+=		USE_PAM
-.include "../../security/PAM/buildlink.mk"
+.  include "../../security/PAM/buildlink2.mk"
 .endif
 
 pre-configure: configure-init
-
-do-build:
-.for DIR in ${WRKSRC_SUBDIRS}
-	@cd ${WRKSRC}/${DIR} && ${SETENV} ${MAKE_ENV}			\
-		${MAKE_PROGRAM} ${ALL_TARGET}
-.endfor
diff --git a/mail/courier-auth/Makefile.common b/mail/courier-auth/Makefile.common
index 9777d45894a..d465dac9956 100644
--- a/mail/courier-auth/Makefile.common
+++ b/mail/courier-auth/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/02/05 15:03:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/08 23:15:58 jlam Exp $
 
 DISTNAME?=	courier-${DIST_VERS}
 CATEGORIES+=	mail
@@ -26,6 +26,7 @@ EGDIR=			${PREFIX}/share/examples/courier
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--datadir=${DATADIR}
 CONFIGURE_ARGS+=	--libexecdir=${LIBEXECDIR}
@@ -53,8 +54,8 @@ CONFIGURE_ARGS+=	--without-authpgsql
 CONFIGURE_ENV+=		EXPECT="${LOCALBASE}/bin/expect"
 
 .if ${OPSYS} == "SunOS"
-.include "../../databases/db/buildlink.mk"
-CPPFLAGS+=		-I${BUILDLINK_DIR}/include/db2
+.  include "../../databases/db/buildlink2.mk"
+CPPFLAGS+=		${BUILDLINK_CPPFLAGS.db}
 .endif
 
 configure-init: