From 457d023fac0ccc710a6fa220b62427301e4ff6d9 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Tue, 6 Jan 2004 07:05:24 +0000
Subject: bl3ify

---
 mail/fetchmail/Makefile    | 10 ++++++----
 mail/spamassassin/Makefile |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'mail')

diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 72af084ad8d..597b722aa2a 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.136 2003/11/12 03:39:40 jschauma Exp $
+# $NetBSD: Makefile,v 1.137 2004/01/06 07:06:30 jlam Exp $
 
 DISTNAME=	fetchmail-6.2.5
 PKGREVISION=	1
@@ -10,9 +10,11 @@ MAINTAINER=	frueauf@NetBSD.org
 HOMEPAGE=	http://catb.org/~esr/fetchmail/
 COMMENT=	Batch mail retrieval/forwarding utility for pop2, pop3, apop, imap
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 BUILD_USES_MSGFMT=	YES
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
@@ -28,7 +30,7 @@ LDFLAGS+=		${CFLAGS}
 FETCHMAIL_USE_SSL?=	YES
 
 .if defined(FETCHMAIL_USE_SSL) && ${FETCHMAIL_USE_SSL} == YES
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE}
 .else
 CONFIGURE_ARGS+=	--without-ssl
@@ -79,5 +81,5 @@ post-install:
 	   fetchmail-FAQ.html fetchmail-features.html \
 	   design-notes.html ${FDOC}
 
-.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 7f4d94534bd..c766a379f05 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/12/27 19:16:04 heinz Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/06 07:08:13 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-${PKGVERSION}
 PKGNAME=	spamassassin-2.61
@@ -15,6 +15,8 @@ COMMENT=	Mail filter to identify spam
 
 CONFLICTS=	p5-Mail-SpamAssassin-[1-9]*
 
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
 .include "../../mk/bsd.prefs.mk"
 
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0  # MakeMaker >= 5.45 needed
@@ -30,7 +32,7 @@ DEPENDS+=	p5-DB_File-[0-9]*:../../databases/p5-DB_File
 SPAMASSASSIN_USE_SSL?=	YES
 
 .if !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
-.  include "../../security/openssl/buildlink2.mk"
+.  include "../../security/openssl/buildlink3.mk"
 DEPENDS+=		p5-IO-Socket-SSL>=0.92:../../security/p5-IO-Socket-SSL
 CONFIGURE_ARGS+=	--enable-ssl
 MAKE_PARAMS=		ENABLE_SSL=yes
@@ -41,7 +43,7 @@ MAKE_PARAMS=		ENABLE_SSL=no
 SA_SSLCERTS=		'$$LOCAL_RULES_DIR/certs'
 .endif
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR=	spamassassin
 
-- 
cgit v1.2.3