3 files changed, 38 insertions, 7 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index def87bee17bd..66a1c1014245 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -6,9 +6,13 @@
 #
 
 PORTNAME=	elm+ME
-PORTVERSION=	2.4.94
+PORTVERSION=	2.4.94.0c
 CATEGORIES=	mail
+.if ${PORTVERSION:M*[a-z]} == ""
 DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
+.else
+DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R:R}ME+${PORTVERSION:R:E}
+.endif
 
 # here are the main repositories.
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
@@ -26,7 +30,8 @@ MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
 		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
 PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	${DISTNAME:S/+/+PL/}a.patch.gz \
-		${DISTNAME:S/+/+PL/}b.patch.gz
+		${DISTNAME:S/+/+PL/}b.patch.gz \
+		${DISTNAME:S/+/+PL/}c.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	clefevre@citeweb.net
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index e193a3b3a2bd..6ba5d07b403b 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,3 +1,4 @@
 MD5 (elm-2.4ME+94.tar.gz) = 51e17fea6a2bd8fa49633d07f4047b12
 MD5 (elm-2.4ME+PL94a.patch.gz) = 2f9dafa7e0bfaa8b56566bc876f556ec
 MD5 (elm-2.4ME+PL94b.patch.gz) = 6db19ead83eafc7f6449fbbb9e20ee4c
+MD5 (elm-2.4ME+PL94c.patch.gz) = ca1a71e15b3fcbfc1c782407b8232751
diff --git a/mail/elm+ME/files/elm.mimetypes b/mail/elm+ME/files/elm.mimetypes
index 64446f2932ca..d00ae7c0d3d4 100644
--- a/mail/elm+ME/files/elm.mimetypes
+++ b/mail/elm+ME/files/elm.mimetypes
@@ -1366,6 +1366,15 @@ pls		audio/x-scpls
 #??		inode/socket
 
 # ======================================================================
+# Known unregistered MIME types from Cult3D
+# ======================================================================
+
+# Application types
+# -----------------
+
+co		application/x-cult3d-object
+
+# ======================================================================
 # Known unregistered MIME types from RealAudio
 # ======================================================================
 
@@ -1422,13 +1431,24 @@ swf		application/x-shockwave-flash
 # -----------------
 
 sdc		application/x-scalc
-sda		application/x-sda
+sda		application/x-sdraw
+sdb		application/x-sdb
 sdf		application/x-sdf
-sdd		application/x-sdraw
-sds		application/x-sds
-sgl		application/x-sgl
-smf		application/x-smf
+sdd		application/x-simpress
+sdm		application/x-smail
+sds		application/x-schart
 sdw		application/x-swriter
+sgl		application/x-sgl
+smf		application/x-smath
+vor		application/x-stemplate
+
+#		application/x-starclac		[-> application/x-sclac]
+#		application/x-starchart		[-> application/x-schart]
+#		application/x-stardraw		[-> application/x-sdraw]
+#		application/x-starimpress	[-> application/x-simpress]
+#		application/x-starmath		[-> application/x-smath]
+#		application/x-starmail		[-> application/x-smail]
+#		application/x-starwriter	[-> application/x-swriter]
 
 # ======================================================================
 # Known unregistered MIME types from Links
@@ -1488,6 +1508,11 @@ btm		application/octet-stream
 #		application/tex			[-> application/x-tex]
 #		application/word		[-> application/msword]
 #		application/vnd.stardivision.calc	[-> application/x-scalc]
+#		application/vnd.stardivision.chart	[-> application/x-schart]
+#		application/vnd.stardivision.draw	[-> application/x-sdraw]
+#		application/vnd.stardivision.impress	[-> application/x-simpress]
+#		application/vnd.stardivision.math	[-> application/x-smath]
+#		application/vnd.stardivision.mail	[-> application/x-smail]
 #		application/vnd.stardivision.writer	[-> application/x-swriter]
 awk		application/x-awk
 ofm		application/x-font-tex-ofm