From 6ff48e076b5261684ded790542fdc5ae50976bc6 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 5 Jan 2004 11:53:39 +0000
Subject: bl3ify

---
 mail/metamail/Makefile | 10 +++++++---
 mail/procmail/Makefile |  8 +++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'mail')

diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 0ba48f942c6..08f8dc417da 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/10/19 21:05:35 bouyer Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/05 12:00:10 jlam Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
@@ -13,7 +13,9 @@ COMMENT=	Implementation of MIME, the Multipurpose Internet Mail Extensions
 
 CONFLICTS+=	elm>=2.5.5 mm-2.7
 
-USE_BUILDLINK2=		YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_X11=		YES
 
@@ -23,10 +25,12 @@ MAKE_ENV+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 EGDIR=		${PREFIX}/share/examples/metamail
 CONF_FILES=	${EGDIR}/mailcap ${PKG_SYSCONFDIR}/mailcap
 
+INSTALLATION_DIRS=	bin man/man1 man/man4
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-CFLAGS+=		-DSYSV
+CFLAGS+=	-DSYSV
 .endif
 
 post-patch:
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 3c0e0e4e08c..ca59607c882 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2003/11/03 22:43:38 kim Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/05 12:01:14 jlam Exp $
 #
 
 DISTNAME=	procmail-3.22
@@ -9,7 +9,9 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://www.procmail.org/
 COMMENT=	Local mail delivery agent
 
-USE_BUILDLINK2=	YES
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_BUILDLINK3=	YES
 MAKE_ENV+=	SHELL=${SH} CHMOD=${CHMOD}
 INSTALL_TARGET=	install-suid install.man
 
@@ -29,7 +31,7 @@ pre-configure:
 	>> ${WRKSRC}/config.h
 	${ECHO} "#define ETCRCS \"${PKG_SYSCONFDIR}/procmailrcs/\""	\
 	>> ${WRKSRC}/config.h
-.ifdef(PROCMAIL_MAILSPOOLHOME)
+.if defined(PROCMAIL_MAILSPOOLHOME)
 	${ECHO} "#define MAILSPOOLHOME \"/${PROCMAIL_MAILSPOOLHOME}\""	\
 	>> ${WRKSRC}/src/authenticate.h
 .endif
-- 
cgit v1.2.3