aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authoroliver <oliver@FreeBSD.org>2005-05-08 16:37:36 +0800
committeroliver <oliver@FreeBSD.org>2005-05-08 16:37:36 +0800
commit5d92334c6f45cba062639ee0504bc8ade4e38db5 (patch)
treeb3512dd538049b1cb19c8f03f812a0d942c34d20 /mail
parente472df642d45521a41687c4f18ec1a7e78c56203 (diff)
downloadfreebsd-ports-gnome-5d92334c6f45cba062639ee0504bc8ade4e38db5.tar.gz
freebsd-ports-gnome-5d92334c6f45cba062639ee0504bc8ade4e38db5.tar.zst
freebsd-ports-gnome-5d92334c6f45cba062639ee0504bc8ade4e38db5.zip
- Use mime.types from misc/mime-support
- Bump PORTREVISION
Diffstat (limited to 'mail')
-rw-r--r--mail/mutt/Makefile6
-rw-r--r--mail/mutt/pkg-plist3
-rw-r--r--mail/mutt14/Makefile6
-rw-r--r--mail/mutt14/pkg-plist3
4 files changed, 6 insertions, 12 deletions
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
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index a5555c38f88f..29817493e003 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/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/mutt14/pkg-plist b/mail/mutt14/pkg-plist
index 7420fade3608..28f0c9f55b73 100644
--- a/mail/mutt14/pkg-plist
+++ b/mail/mutt14/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