buildlink1 -> buildlink2.

3 files changed, 13 insertions, 33 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 7d2b2755bd0..9a725f2517f 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2002/09/19 09:04:11 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2002/10/09 21:50:24 wiz Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 PKGREVISION=		1
@@ -11,7 +11,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		Cyrus IMAP server
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
 .include "../../mk/bsd.prefs.mk"
@@ -35,15 +35,15 @@ CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
 CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=/var/run
-CONFIGURE_ARGS+=	--with-dbdir=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_DIR}
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-dbdir=${BUILDLINK_PREFIX.db3}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
 CONFIGURE_ARGS+=	--without-ucdsnmp
 CONFIGURE_ARGS+=	--without-notify
 CONFIGURE_ARGS+=	--without-zephyr
 CONFIGURE_ARGS+=	--enable-netscapehack
 
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
 
 .if exists(/usr/include/krb5/com_err.h)
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--with-auth=unix
 CONFIGURE_ARGS+=	--without-krb
 .endif
 
-LIBS+=			`${SASL_CONFIG} --libs`
+LIBS+=			`sasl-config --libs`
 
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=			${PREFIX}/share/examples/cyrus-imapd
@@ -106,10 +106,10 @@ post-install:
 	${INSTALL_DATA_DIR} ${HTMLDIR}
 	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR}
 
-.include "../../databases/db3/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../security/cyrus-sasl/buildlink.mk"
-.include "../../security/openssl/buildlink.mk"
-.include "../../security/tcp_wrappers/buildlink.mk"
+.include "../../databases/db3/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../security/cyrus-sasl/buildlink2.mk"
+.include "../../security/openssl/buildlink2.mk"
+.include "../../security/tcp_wrappers/buildlink2.mk"
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index fc5edc22692..f6d941474dd 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2001/12/06 09:50:13 martti Exp $
+$NetBSD: distinfo,v 1.8 2002/10/09 21:50:25 wiz Exp $
 
 SHA1 (cyrus-imapd-2.0.16.tar.gz) = 7aa83f4b01d164f57cfd4cfe195f85551212b962
 Size (cyrus-imapd-2.0.16.tar.gz) = 1383996 bytes
@@ -12,4 +12,3 @@ SHA1 (patch-ag) = 08068d3d44a055237b208838def5e1ac4c4715b5
 SHA1 (patch-ah) = d6602de6b2105c97cef1005fb7883e6023184ef7
 SHA1 (patch-ai) = eb32cf0cf4c4007efc57530fa028b5336c22e26a
 SHA1 (patch-aj) = ca70e0a1e9d21cc5e4a2a01efcf6832e286df8a4
-SHA1 (patch-ak) = f03e5eb8afb8ecdaf37656c49ce75ed4701f3e36
diff --git a/mail/cyrus-imapd/patches/patch-ak b/mail/cyrus-imapd/patches/patch-ak
deleted file mode 100644
index 68365e5e899..00000000000
--- a/mail/cyrus-imapd/patches/patch-ak
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2001/11/24 20:49:43 jlam Exp $
-
---- configure.orig	Fri Jul 27 19:53:11 2001
-+++ configure
-@@ -1413,14 +1413,6 @@
- fi
- 
- echo "$ac_t""$andrew_runpath_switch" 1>&6
--CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
--
--  # this is CMU ADD LIBPATH
--  if test "$andrew_runpath_switch" = "none" ; then
--	LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
--  else
--	LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
--  fi
- 
- 
- for ac_hdr in unistd.h sys/select.h sys/param.h