From 28b5c7b520a2c15c8f517a8da9f467f0e9543fde Mon Sep 17 00:00:00 2001
From: Oliver Lehmann <oliver@FreeBSD.org>
Date: Sun, 8 May 2005 08:37:36 +0000
Subject: - Use mime.types from misc/mime-support - Bump PORTREVISION

---
 mail/mutt/Makefile  | 6 +++---
 mail/mutt/pkg-plist | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

(limited to 'mail/mutt')

diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index a5555c38f88f..29817493e003 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mutt
 PORTVERSION=	1.4.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	mail ipv6
 MASTER_SITES=	ftp://ftp.mutt.org/mutt/ \
 		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \
@@ -34,7 +34,8 @@ CONFLICTS=	mutt-devel-*
 WITH_SLANG=	yes
 BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
-		urlview:${PORTSDIR}/textproc/urlview
+		urlview:${PORTSDIR}/textproc/urlview \
+		${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 .endif
 .if ${MACHINE_ARCH} != "alpha"
 #  coredump in sgmls
@@ -160,7 +161,6 @@ pre-install:
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist
-	${INSTALL_DATA} ${WRKSRC}/mime.types ${PREFIX}/etc/mime.types.dist
 .if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing Mutt documentation"
 	@${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR}
diff --git a/mail/mutt/pkg-plist b/mail/mutt/pkg-plist
index 7420fade3608..28f0c9f55b73 100644
--- a/mail/mutt/pkg-plist
+++ b/mail/mutt/pkg-plist
@@ -4,11 +4,8 @@ bin/mutt_dotlock
 bin/pgpewrap
 bin/pgpring
 @unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi
-@unexec if cmp -s %D/etc/mime.types.dist %D/etc/mime.types; then rm -f %D/etc/mime.types; fi
 etc/Muttrc.dist
-etc/mime.types.dist
 @exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi
-@exec if [ ! -f %D/etc/mime.types ]; then cp %D/etc/mime.types.dist %D/etc/mime.types; fi
 %%DOCSDIR%%/COPYRIGHT
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/GPL
-- 
cgit v1.2.3