3 files changed, 109 insertions, 7 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 8a412a83cb55..8ade8b4b3fc5 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -73,10 +73,10 @@ MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
 ELM_VERSION=	2.4
 ELM_REVISION=	99
-ELM_PATCHLEVEL=	b
+ELM_PATCHLEVEL=	f
 
 ELM_PATCHDONE=	false
-.for level in _ a b c d e f
+.for level in _ a b c d e f g h i j k l m n o p q r s t u v w x y z
 _level=${level}
 .if ${_level} != _ && ${ELM_PATCHDONE} == false
 PATCHFILES+=	${DISTNAME:S/+/+PL/}${level}.patch.gz
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index d4760e8bc3ed..b1e08066c771 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,3 +1,7 @@
 MD5 (elm-2.4ME+99.tar.gz) = 014e2a606fb1a7e80d048680c80dfb60
 MD5 (elm-2.4ME+PL99a.patch.gz) = d8898816793c0b46ce9779a86c5bda03
 MD5 (elm-2.4ME+PL99b.patch.gz) = d5c1a2a0293d208a1f9927cf96a7ad7f
+MD5 (elm-2.4ME+PL99c.patch.gz) = 10700bf9bacdfd420bff3328e287ef30
+MD5 (elm-2.4ME+PL99d.patch.gz) = 6104d4dae388d74e0c1a51fe4506e844
+MD5 (elm-2.4ME+PL99e.patch.gz) = f797ab1bf282e949e954d617cf61ea2e
+MD5 (elm-2.4ME+PL99f.patch.gz) = b3bdaaa996ad299590ce425d29be2541
diff --git a/mail/elm+ME/files/elm.mimetypes b/mail/elm+ME/files/elm.mimetypes
index d00ae7c0d3d4..c4da74ebab5d 100644
--- a/mail/elm+ME/files/elm.mimetypes
+++ b/mail/elm+ME/files/elm.mimetypes
@@ -909,12 +909,12 @@ smi		application/x-smil
 smil		application/x-smil
 vcd		application/x-cdlink
 pgn		application/x-chess-pgn
-#		application/x-compress		[-> encoding/x-compress]
+Z		application/x-compress
 dcr		application/x-director
 dir		application/x-director
 #		application/x-director		[-> application/vnd.dxr]
 spl		application/x-futuresplash
-#		application/x-gzip		[-> encoding/x-gzip]
+gz		application/x-gzip
 js		application/x-javascript
 #		application/x-koan		[-> application/vnd.koan]
 php3		application/x-httpd-php3
@@ -1216,7 +1216,7 @@ lws		image/x-lws
 psd		image/x-psd
 svg		image/x-svg
 #		image/x-tga			[-> image/x-targa]
-wmf		image/x-wmf
+#		image/x-wmf			[-> application/x-msmetafile]
 xcf		image/x-xcf
 fig		image/x-xfig
 
@@ -1250,8 +1250,6 @@ dat		video/mpeg
 anim		video/x-anim
 #		video/x-avi			[-> video/x-msvideo]
 #??		video/x-isivideo
-#		video/x-ms-asf			[-> video/vnd.ms-asf]
-asx		video/vnd.ms-asf
 #??		video/x-wavelet
 #		video/x-real-video		[-> video/vnd.rn-realvideo]
 
@@ -1414,6 +1412,105 @@ ra		audio/vnd.rn-realaudio
 rv		video/vnd.rn-realvideo
 
 # ======================================================================
+# Known unregistered MIME types from MS/IIS
+# ======================================================================
+
+# Text types
+# ----------
+
+323		text/h323
+bas		text/plain
+htc		text/x-component
+htt		text/webviewhtml
+sct		text/scriptlet
+uls		text/iuls
+
+# Application types
+# -----------------
+
+acx		application/internet-property-stream
+axs		application/olescript
+cat		application/vnd.ms-pkiseccat
+crt		application/x-x509-ca-cert
+clp		application/x-msclip
+crd		application/x-mscardfile
+dll		application/x-msdownload
+evy		application/enjoy
+hlp		application/winhlp
+hta		applcation/hta
+iii		application/x-iphone
+ins		application/x-internet-signup
+isp		application/x-internet-signup
+m13		application/x-msmediaview
+m14		application/x-msmediaview
+mny		application/x-msmoney
+mvb		application/x-msmediaview
+ods		application/oleobject
+p10		application/pkcs10
+p12		application/x-pkcs12
+pfx		application/x-pkcs12
+p7b		application/x-pkcs7-certificates
+spc		application/x-pkcs7-certificates
+p7r		application/x-pkcs7-certreqresp
+pko		application/vnd.ms-pkipko
+pma		application/x-perfmon
+pmc		application/x-perfmon
+pml		application/x-perfmon
+pmr		application/x-perfmon
+pmw		application/x-perfmon
+prf		application/pics-rules
+pub		application/x-mspublisher
+scd		application/x-msschedule
+setpay		application/set-payment-initiation
+setreg		application/set-registration-initiation
+sst		application/vnd.ms-pkicertstore
+stl		application/vnd.ms-pkistl
+trm		application/x-msterminal
+stl		application/vnd.ms-pkistl
+wcm		application/vnd.ms-works
+wcm		application/vnd.ms-works
+wdb		application/vnd.ms-works
+wps		application/vnd.ms-works
+wmf		application/x-msmetafile
+wri		application/x-mswrite
+
+# Image types
+# -----------
+
+cmx		image/x-cmx
+cod		image/cis-cod
+
+# Audio types
+# -----------
+
+rmi		audio/x-midi
+
+# Video types
+# -----------
+
+#		video/x-ms-asf			[-> video/vnd.ms-asf]
+asr		video/vnd.ms-asf
+asx		video/vnd.ms-asf
+ivf		video/x-ivf
+lsf		video/x-la-asf
+lsx		video/x-la-asf
+m1v		video/mpeg
+
+# Message types
+# -------------
+
+mht		message/rfc822
+mhtml		message/rfc822
+
+# Misc types
+# ----------
+
+flr		x-world/x-vrml
+wrz		x-world/x-vrml
+waf		x-world/x-vrml
+xof		x-world/x-vrml
+
+# ======================================================================
 # Known unregistered MIME types from ShockWave
 # ======================================================================
 
@@ -1515,6 +1612,7 @@ btm		application/octet-stream
 #		application/vnd.stardivision.mail	[-> application/x-smail]
 #		application/vnd.stardivision.writer	[-> application/x-swriter]
 awk		application/x-awk
+qi		application/x-cpan
 ofm		application/x-font-tex-ofm
 ovf		application/x-font-tex-ovf
 ovp		application/x-font-tex-ovp