Use buildlink2 instead of buildlink1.

4 files changed, 12 insertions, 39 deletions

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 78b64581094..b7ed51d5909 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2002/06/15 15:42:08 fredb Exp $
+# $NetBSD: Makefile,v 1.82 2002/08/25 23:06:15 jlam Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -12,7 +12,7 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		text-based MIME mail client with PGP support
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 
 BUILD_USES_MSGFMT=	YES
 
@@ -29,14 +29,14 @@ WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MUTT_USE_SLANG} == YES
-. include "../../devel/libslang/buildlink.mk"
-CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_DIR}
+. include "../../devel/libslang/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
 .else
 . if ${MUTT_USE_NCURSES} == YES
 USE_NCURSES=		YES
 . endif
-. include "../../devel/ncurses/buildlink.mk"
-CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_DIR}
+. include "../../devel/ncurses/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
 .endif
 
 # There seems to be a problem using NetBSD's /bin/sh, so use /bin/ksh instead.
@@ -45,8 +45,8 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 .endif
 
 .if ${MUTT_USE_SSL} == YES
-.include "../../security/openssl/buildlink.mk"
-CONFIGURE_ARGS+=	--with-ssl=${BUILDLINK_DIR}
+.include "../../security/openssl/buildlink2.mk"
+CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 .else
 CONFIGURE_ARGS+=	--without-ssl
 .endif
@@ -62,7 +62,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/share/doc/mutt/samples
 	${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/share/doc/mutt/samples
 
-.include "../../converters/libiconv/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../converters/libiconv/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/distinfo b/mail/mutt/distinfo
index 0cc5b62ea2c..2d5d5ce258c 100644
--- a/mail/mutt/distinfo
+++ b/mail/mutt/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.7 2002/05/29 12:13:52 tron Exp $
+$NetBSD: distinfo,v 1.8 2002/08/25 23:06:16 jlam Exp $
 
 SHA1 (mutt-1.4i.tar.gz) = 6b7fb8440de18f12ceb24a486a1bbe77fce93955
 Size (mutt-1.4i.tar.gz) = 2554158 bytes
 SHA1 (patch-aa) = 8325c09e6ab9b43786571548359fa0be4f94d14c
-SHA1 (patch-ab) = 24984804280b5db991a2a471eba39506369add70
 SHA1 (patch-ac) = 4aa38ccf5454e4d3e79b8ddc8aad610b1c1bd6c2
-SHA1 (patch-ad) = 919093aa2162d8f7fd52d476d0c6835447f236d5
 SHA1 (patch-ae) = 7a7bc491c9f58b6ba26d5619182fb812d0f5e94e
diff --git a/mail/mutt/patches/patch-ab b/mail/mutt/patches/patch-ab
deleted file mode 100644
index 10f4f6ac870..00000000000
--- a/mail/mutt/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2002/05/29 12:13:53 tron Exp $
-
---- doc/Makefile.in.orig	Mon Jun  4 19:14:32 2001
-+++ doc/Makefile.in	Sun Jul 22 15:09:17 2001
-@@ -29,7 +29,7 @@
- CPPFLAGS = @CPPFLAGS@
- 
- DEFS = -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DHAVE_CONFIG_H=1
--INCLUDES = -I. -I.. -I$(includedir) -I$(top_srcdir)
-+INCLUDES = -I. -I.. -I$(top_srcdir)
- 
- MAKEDOC_CPP = $(CPP) $(INCLUDES) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C 
- 
diff --git a/mail/mutt/patches/patch-ad b/mail/mutt/patches/patch-ad
deleted file mode 100644
index c72b833d0e5..00000000000
--- a/mail/mutt/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2002/05/29 12:13:53 tron Exp $
-
---- Makefile.in.orig	Wed Jan 30 17:50:34 2002
-+++ Makefile.in	Wed Jan 30 17:56:07 2002
-@@ -144,7 +144,7 @@
- 
- INCLUDES = -I. -I$(top_srcdir) $(IMAP_INCLUDES) -Iintl
- 
--CPPFLAGS = @CPPFLAGS@ -I$(includedir)
-+CPPFLAGS = @CPPFLAGS@
- 
- non_us_sources = pgp.c pgpinvoke.c pgpkey.c pgplib.c sha1.c 	pgpmicalg.c gnupgparse.c sha1.h 	doc/language.txt doc/language50.txt OPS.PGP doc/PGP-Notes.txt 	OPS.MIX remailer.c remailer.h pgpewrap.c		contrib/pgp2.rc contrib/pgp5.rc contrib/gpg.rc 	mutt_ssl.c mutt_ssl.h README.SSL mutt_ssl_nss.c 	pgppacket.c pgppacket.h
-