update to 2.4ME+87.

o change package name elm-2.4ME+82 -> elm+ME-2.4.87. previous naming scheme violates our porting rule. o add PORTEPOCH not to confuse pkg_version. o change maintainer. o add more and more MASTER_SITES. PR: 24171 Submitted by: Cyrille Lefevre <clefevre@citeweb.net> (new maintainer)
author: FUJISHIMA Satsuki <sf@FreeBSD.org> 2001-01-31 17:16:07 +0000
committer: FUJISHIMA Satsuki <sf@FreeBSD.org> 2001-01-31 17:16:07 +0000
commit: ba75d40447b0ae425dbf278692a9429137d655dc (patch)
tree: 42fb93cb2c99da0ee4f0da21cf4e55036383282b /mail/elm+ME
parent: Update pspell version number. (diff)
15 files changed, 1754 insertions, 341 deletions
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 1c1ed9604f55..53963e885980 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -5,35 +5,102 @@
 # $FreeBSD$
 #
 
-PORTNAME=	elm
-PORTVERSION=	2.4ME+82
+PORTNAME=	elm+ME
+PORTVERSION=	2.4.87
+PORTEPOCH=	1
 CATEGORIES=	mail
+DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
+
+# here are the main repositories.
 MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
-		ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
-		ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
+		http://www.ozone.fmi.fi/KEH/
 
-MAINTAINER=	ports@FreeBSD.org
+# the following repositories conform to the main repository.
+MASTER_SITES+=	ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \
+		ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \
+		ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
+		ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
+		ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/
 
-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./}
-MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
-		frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
-		printmail.1 readmsg.1 elmcharset.1 elmterminal.1
-MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
+# the following repositories maybe conform to the main repository.
+MASTER_SITES+=	ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
+		ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
+		ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
+
+# fetch doesn't work w/ ftp.lip6.fr and ftp doesn't work w/ the http protocol.
+# MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/mail/elm-me/
+# FETCH_CMD=	/usr/bin/ftp
+
+MAINTAINER=	clefevre@citeweb.net
+
+# not needed since config.sh is generated by scripts/pre-configure.
+# BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
+# BUILD_DEPENDS=	metamail:${PORTSDIR}/mail/metamail
+# BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
+# BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
+
+#
+# Global variables
+#
 
 HAS_CONFIGURE=	yes
+
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ENV=	PREFIX="${PREFIX}"
-CONFIGURE_ARGS=	-S -d
-
-post-install:
-	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
-	cd ${WRKSRC}/nls; ${MAKE} install
-	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
-		${INSTALL_DATA} \
-			${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \
-	else \
-		${INSTALL_DATA} \
-			${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \
+SCRIPTS_ENV=		CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
+CONFIGURE_ARGS=		-S -d -P${PREFIX}
+
+MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
+		elmterminal.1 fastmail.1 frm.1 listalias.1 messages.1 \
+		newalias.1 newmail.1 printmail.1 readmsg.1
+MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
+
+#
+# Local variables
+#
+
+DESTLIBDIR=	${PREFIX}/lib/${PORTNAME:S/+ME//}
+MIMETYPES=	elm.mimetypes
+
+#
+# Post-configure
+#
+
+post-configure:
+	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
+
+#
+# Post-install
+#
+
+post-install: install-nls install-mime-types \
+	      remove-catman-files remove-catman-links
+
+install-nls:
+	@cd ${WRKSRC}/nls; ${MAKE} install
+
+install-mime-types:
+	@${INSTALL_DATA} \
+		${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}/${MIMETYPES}-dist
+	@if [ ! -f ${DESTLIBDIR}/${MIMETYPES} ]; then \
+		${INSTALL_DATA} ${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}; \
 	fi
 
+remove-catman-files:
+.for sect in 1
+.for page in ${MAN${sect}}
+	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
+.endfor
+.endfor
+
+remove-catman-links:
+.for sect in 1
+.for page in ${MLINKS}
+.if ${MAN${sect}:M${page}} == ""
+	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
+.endif
+.endfor
+.endfor
+
 .include <bsd.port.mk>
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 0e5bd2aaefee..34ce4cf2d3da 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1 +1 @@
-MD5 (elm-2.4ME+82.tar.gz) = eae2465a6ecd3399ad68d5b81f923e76
+MD5 (elm-2.4ME+87.tar.gz) = 26d6cac03fdb6ba5cd3385d77695acb6
diff --git a/mail/elm+ME/files/elm.mimetypes b/mail/elm+ME/files/elm.mimetypes
index f121812d6ec9..2889bbcf0bbc 100644
--- a/mail/elm+ME/files/elm.mimetypes
+++ b/mail/elm+ME/files/elm.mimetypes
@@ -1,98 +1,1481 @@
-#       application/activemessage
-#       application/andrew-inset
-#       application/applefile
-#       application/atomicmail
-#       application/dca-rft
-#       application/dec-dx
-#       application/mac-binhex40
-#       application/macwriteii
-doc     application/msword
-#       application/news-message-id
-#       application/news-transmission
-bin     application/octet-stream
-exe     application/octet-stream
-oda     application/oda
-pdf     application/pdf
-ai      application/postscript
-eps     application/postscript
-ps      application/postscript
-#       application/remote-printing
-rtf     application/rtf
-#       application/slate
-mif     application/x-mif
-#       application/wita
-#       application/wordperfect5.1
-csh     application/x-csh
-dvi     application/x-dvi
-gz      application/x-gzip
-hdf     application/x-hdf
-latex   application/x-latex
-nc      application/x-netcdf
-cdf     application/x-netcdf
-sh      application/x-sh
-tcl     application/x-tcl
-tex     application/x-tex
-texi    application/x-texinfo
-texinfo application/x-texinfo
-t       application/x-troff
-tr      application/x-troff
-roff    application/x-troff
-man     application/x-troff-man
-me      application/x-troff-me
-ms      application/x-troff-ms
-src     application/x-wais-source
-zip     application/zip
-bcpio   application/x-bcpio
-cpio    application/x-cpio
-tgz     application/x-gtar
-shar    application/x-shar
-#       application/x-sv4cpio
-#       application/x-sv4crc
-tar     application/x-tar
-ustar   application/x-ustar
-au      audio/basic
-snd     audio/basic
-aif     audio/x-aiff
-aiff    audio/x-aiff
-aifc    audio/x-aiff
-wav     audio/x-wav
-gif     image/gif
-ief     image/ief
-jpeg    image/jpeg
-jpg     image/jpeg
-jpe     image/jpeg
-tiff    image/tiff
-tif     image/tiff
-ras     image/x-cmu-raster
-pnm     image/x-portable-anymap
-pbm     image/x-portable-bitmap
-pgm     image/x-portable-graymap
-ppm     image/x-portable-pixmap
-rgb     image/x-rgb
-xbm     image/x-xbitmap
-xpm     image/x-xpixmap
-xwd     image/x-xwindowdump
-#       message/external-body
-#       message/news
-#       message/partial
-#       message/rfc822
-#       multipart/alternative
-#       multipart/appledouble
-#       multipart/digest
-#       multipart/mixed
-#       multipart/parallel
-html    text/html
-htm     text/html
-txt     text/plain
-rtx     text/richtext
-tsv     text/tab-separated-values
-etx     text/x-setext
-mpeg    video/mpeg
-mpg     video/mpeg
-mpe     video/mpeg
-qt      video/quicktime
-mov     video/quicktime
-avi     video/x-msvideo
-movie   video/x-sgi-movie
-dl      video/x-dl
-fli     video/x-fli
+# mime.types for Elm 2.4PL24 ME8 (or greater)
+#
+# Format of this file:
+# <suffix> <content-type>
+#
+# Elm already has the following "builtin" definitions:
+# ps	application/postscript
+# gif	image/gif
+# tiff	image/tiff
+# jpeg	image/jpeg
+#
+# NOTE: data which is declared "application/octet-stream" will automatically
+# have the "name=<default_filename>" option added to it, so you should not
+# put it in your definitions.
+
+#pbm	image/pbm
+#pgm	image/pgm
+#ppm	image/ppm
+taz	application/octet-stream; type=tar; conversions=x-compress
+tgz	application/octet-stream; type=tar; conversions=x-gzip
+tbz	application/octet-stream; type=tar; conversions=x-bzip
+tbz2	application/octet-stream; type=tar; conversions=x-bzip2
+#tar	application/octet-stream; type=tar
+#Z	application/octet-stream
+#gz	application/octet-stream
+#bz2	application/octet-stream
+#zip	application/octet-stream; type=zip
+
+# PGP users might want the following
+#pgp	application/pgp
+
+# ======================================================================
+# Registered MIME types from IIANA
+#
+# URL : ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/media-types
+# DATE : Sun Jan  7 21:11:33 CET 2001
+# ======================================================================
+#
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	text		plain				    [RFC2646,RFC2046]
+text		text/plain
+txt		text/plain
+#			richtext			    [RFC2045,RFC2046]
+rtx		text/richtext
+#			enriched				    [RFC1896]
+#			tab-separated-values		       [Paul Lindner]
+tsv		text/tab-separated-values
+#			html					    [RFC2854]
+htm		text/html
+html		text/html
+shtml		text/html
+#			sgml					    [RFC1874]
+sgm		text/sgml
+sgml		text/sgml
+#			vnd.latex-z				      [Lubos]
+#			vnd.fmi.flexstor			     [Hurtta]
+flx		text/vnd.fmi.flexstor
+#			uri-list				    [RFC2483]
+uris		text/uri-list
+uri		text/uri-list
+#			vnd.abc					      [Allen]
+abc		text/vnd.abc
+#			rfc822-headers				    [RFC1892]
+#			vnd.in3d.3dml				     [Powers]
+3dml		text/vnd.in3d.3dml
+3dm		text/vnd.in3d.3dml
+#			prs.lines.tag				      [Lines]
+tag		text/prs.lines.tag
+#			vnd.in3d.spot				     [Powers]
+spot		text/vnd.in3d.spot
+spo		text/vnd.in3d.spot
+#			css					    [RFC2318]
+css		text/css
+#			xml					    [RFC2376]
+dtd		text/xml
+xml		text/xml
+#			rtf					    [Lindner]
+rtf		text/rtf
+#			directory				    [RFC2425]
+#			calendar				    [RFC2445]
+#			vnd.wap.wml				      [Stark]
+wml		text/vnd.wap.wml
+#		text/vnd.wap.wml		[-> text/xml]
+#			vnd.wap.wmlscript			      [Stark]
+wmls		text/vnd.wap.wmlscript
+#			vnd.motorola.reflex			     [Patton]
+#			vnd.fly					     [Gurney]
+fly		text/vnd.fly
+#			vnd.wap.sl				  [WAP-Forum]
+sl		text/vnd.wap.sl
+#		text/vnd.wap.sl			[-> text/xml]
+#			vnd.wap.si				  [WAP-Forum]
+si		text/vnd.wap.si
+#		text/vnd.wap.si			[-> text/xml]
+#			t140					    [RFC2793]
+#			vnd.ms-mediapackage			     [Nelson]
+mpf		text/vnd.ms-mediapackage
+#			vnd.IPTC.NewsML				       [IPTC]
+#		text/vnd.IPTC.NewsML		[-> text/xml]
+#			vnd.IPTC.NITF				       [IPTC]
+#		text/vnd.IPTC.NITF		[-> text/xml]
+#			vnd.curl				      [Hodge]
+curl		text/vnd.curl
+#			vnd.DMClientScript			    [Bradley]
+dms		text/vnd.DMClientScript
+#			parityfec				    [RFC3009]
+#
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	multipart	mixed				    [RFC2045,RFC2046]
+#			alternative			    [RFC2045,RFC2046]
+#			digest				    [RFC2045,RFC2046]
+#			parallel			    [RFC2045,RFC2046]
+#			appledouble		   [MacMime,Patrik Faltstrom]
+#			header-set			       [Dave Crocker]
+#			form-data				    [RFC2388]
+#			related					    [RFC2387]
+#			report					    [RFC1892]
+#			voice-message			    [RFC2421,RFC2423]
+#			signed					    [RFC1847]
+#			encrypted				    [RFC1847]
+#			byteranges				    [RFC2068]
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	message		rfc822				    [RFC2045,RFC2046]
+#			partial				    [RFC2045,RFC2046]
+#			external-body			    [RFC2045,RFC2046]
+#			news			    [RFC 1036, Henry Spencer]
+#			http					    [RFC2616]
+#			delivery-status				    [RFC1894]
+#			disposition-notification		    [RFC2298]
+#			s-http					    [RFC2660]
+#
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	application	octet-stream			    [RFC2045,RFC2046]
+bin		application/octet-stream
+exe		application/octet-stream
+#			postscript			    [RFC2045,RFC2046]
+ai		application/postscript
+eps		application/postscript
+epsf		application/postscript
+epsi		application/postscript
+ps		application/postscript
+#			oda				    [RFC2045,RFC2046]
+oda		application/oda
+#			atomicmail		      [atomicmail,Borenstein]
+am		application/atomicmail
+#			andrew-inset		    [andrew-inset,Borenstein]
+ez		application/andrew-inset
+#			slate				[slate,terry crowley]
+#			wita		  [Wang Info Transfer,Larry Campbell]
+#			dec-dx		  [Digital Doc Trans, Larry Campbell]
+#			dca-rft	       [IBM Doc Content Arch, Larry Campbell]
+dca		application/dca-rtf
+#			activemessage			       [Ehud Shapiro]
+#			rtf				       [Paul Lindner]
+#		application/rtf			[-> text/rtf]
+#			applefile		   [MacMime,Patrik Faltstrom]
+#			mac-binhex40		   [MacMime,Patrik Faltstrom]
+hqx		application/mac-binhex40
+#			news-message-id		     [RFC1036, Henry Spencer]
+#			news-transmission	     [RFC1036, Henry Spencer]
+#			wordperfect5.1			       [Paul Lindner]
+wp6		application/wordperfect5.1
+wpd		application/wordperfect5.1
+#			pdf				       [Paul Lindner]
+pdf		application/pdf
+#			zip				       [Paul Lindner]
+zip		application/zip
+#			macwriteii			       [Paul Lindner]
+#			msword				       [Paul Lindner]
+doc		application/msword
+dot		application/msword
+#			remote-printing			       [RFC1486,Rose]
+#			mathematica				[Van Nostern]
+nb		application/mathematica
+ma		application/mathematica
+mb		application/mathematica
+#			cybercash				   [Eastlake]
+#			commonground				     [Glazer]
+#			iges					      [Parks]
+igs		application/iges
+iges		application/iges
+#			riscos					      [Smith]
+#			eshop					       [Katz]
+#			x400-bp					    [RFC1494]
+#			sgml					    [RFC1874]
+#		application/sgml		[-> text/sgml]
+#			cals-1840				    [RFC1895]
+#			pgp-encrypted				    [RFC2015]
+#			pgp-signature				    [RFC2015]
+#			pgp-keys				    [RFC2015]
+asc		application/pgp-keys
+#			vnd.framemaker				     [Wexler]
+fm		application/vnd.framemaker
+#			vnd.mif					     [Wexler]
+mif		application/vnd.mif
+#			vnd.ms-excel				       [Gill]
+xla		application/vnd.ms-excel
+xlc		application/vnd.ms-excel
+xld		application/vnd.ms-excel
+xll		application/vnd.ms-excel
+xlm		application/vnd.ms-excel
+xls		application/vnd.ms-excel
+xlt		application/vnd.ms-excel
+xlw		application/vnd.ms-excel
+#			vnd.ms-powerpoint			       [Gill]
+pot		application/vnd.ms-powerpoint
+ppa		application/vnd.ms-powerpoint
+pps		application/vnd.ms-powerpoint
+ppt		application/vnd.ms-powerpoint
+ppz		application/vnd.ms-powerpoint
+#			vnd.ms-project				       [Gill]
+mpc		application/vnd.ms-project
+mpt		application/vnd.ms-project
+mpx		application/vnd.ms-project
+mpw		application/vnd.ms-project
+mpp		application/vnd.ms-project
+#			vnd.ms-works				       [Gill]
+#			vnd.ms-tnef				       [Gill]
+#			vnd.svd					     [Becker]
+#			vnd.music-niff				     [Butler]
+#			vnd.ms-artgalry				    [Slawson]
+cil		application/vnd.ms-artgalry
+#			vnd.truedoc				      [Chase]
+#			vnd.koan				       [Cole]
+skd		application/vnd.koan
+skp		application/vnd.koan
+skm		application/vnd.koan
+skt		application/vnd.koan
+#			vnd.street-stream			     [Levitt]
+#			vnd.fdf					     [Zilles]
+#			set-payment-initiation			     [Korver]
+#			set-payment				     [Korver]
+#			set-registration-initiation		     [Korver]
+#			set-registration			     [Korver]
+#			vnd.seemail				       [Webb]
+see		application/vnd.seemail
+#			vnd.businessobjects			    [Imoucha]
+rep		application/vnd.businessobjects
+#			vnd.meridian-slingshot			      [Wedel]
+#			vnd.xara				 [Matthewman]
+xar		application/vnd.xara
+#			sgml-open-catalog			     [Grosso]
+#			vnd.rapid				    [Szekely]
+zrp		application/vnd.rapid
+#			vnd.enliven				 [Santinelli]
+nml		application/vnd.enliven
+#			vnd.japannet-registration-wakeup	      [Fujii]
+#			vnd.japannet-verification-wakeup	      [Fujii]
+#			vnd.japannet-payment-wakeup		      [Fujii]
+#			vnd.japannet-directory-service		      [Fujii]
+#			vnd.intertrust.digibox			  [Tomasello]
+#			vnd.intertrust.nncp			  [Tomasello]
+#			prs.alvestrand.titrax-sheet		 [Alvestrand]
+#			vnd.noblenet-web			    [Solomon]
+nnw		application/vnd.noblenet-web
+#			vnd.noblenet-sealer			    [Solomon]
+nns		application/vnd.noblenet-sealer
+#			vnd.noblenet-directory			    [Solomon]
+nnd		application/vnd.noblenet-directory
+#			prs.nprend				    [Doggett]
+rnd		application/prs.nprend
+rct		application/prs.nprend
+#			vnd.webturbo				      [Rehem]
+wtb		application/vnd.webturbo
+#			hyperstudio				     [Domino]
+#			vnd.shana.informed.formtemplate		    [Selzler]
+itp		application/vnd.shana.informed.formtemplate
+#			vnd.shana.informed.formdata		    [Selzler]
+ifm		application/vnd.shana.informed.formdata
+#			vnd.shana.informed.package		    [Selzler]
+ipk		application/vnd.shana.informed.package
+#			vnd.shana.informed.interchange		    [Selzler]
+iif		application/vnd.shana.informed.interchange
+#			vnd.commerce-battelle			  [Applebaum]
+ica		application/vnd.commerce-battelle
+icf		application/vnd.commerce-battelle
+icd		application/vnd.commerce-battelle
+icc		application/vnd.commerce-battelle
+ic0		application/vnd.commerce-battelle
+ic1		application/vnd.commerce-battelle
+ic2		application/vnd.commerce-battelle
+ic3		application/vnd.commerce-battelle
+ic4		application/vnd.commerce-battelle
+ic5		application/vnd.commerce-battelle
+ic6		application/vnd.commerce-battelle
+ic7		application/vnd.commerce-battelle
+ic8		application/vnd.commerce-battelle
+#			vnd.osa.netdeploy			       [Klos]
+ndc		application/vnd.osa.netdeploy
+#			vnd.ibm.MiniPay				   [Herzberg]
+mpy		application/vnd.ibm.MiniPay
+#			vnd.japannet-jpnstore-wakeup		  [Yoshitake]
+#			vnd.japannet-setstore-wakeup		  [Yoshitake]
+#			vnd.japannet-verification		  [Yoshitake]
+#			vnd.japannet-registration		  [Yoshitake]
+#			vnd.hp-HPGL				  [Pentecost]
+#			vnd.hp-PCL				  [Pentecost]
+#			vnd.hp-PCLXL				  [Pentecost]
+#			vnd.musician				      [Adams]
+mus		application/vnd.musician
+#			vnd.FloGraphIt				   [Floersch]
+gph		application/vnd.FloGraphIt
+#			vnd.intercon.formnet			      [Gurak]
+xpw		application/vnd.intercon.formnet
+xpx		application/vnd.intercon.formnet
+#			vemmi					    [RFC2122]
+#			vnd.ms-asf				 [Fleischman]
+asf		application/vnd.ms-asf
+#			vnd.ecdis-update		       [Buettgenbach]
+#			vnd.powerbuilder6				[Guy]
+pbd		application/vnd.powerbuilder6
+#			vnd.powerbuilder6-s				[Guy]
+#		application/vnd.powerbuilder6-s [-> application/vnd.powerbuilder6]
+#			vnd.lotus-wordpro		       [Wattenberger]
+lwp		application/vnd.lotus-wordpro
+sam		application/vnd.lotus-wordpro
+#			vnd.lotus-approach		       [Wattenberger]
+apr		application/vnd.lotus-approach
+vew		application/vnd.lotus-approach
+#			vnd.lotus-1-2-3			       [Wattenberger]
+123		application/vnd.lotus-1-2-3
+wk1		application/vnd.lotus-1-2-3
+wk3		application/vnd.lotus-1-2-3
+wk4		application/vnd.lotus-1-2-3
+#			vnd.lotus-organizer		       [Wattenberger]
+or3		application/vnd.lotus-organizer
+or2		application/vnd.lotus-organizer
+org		application/vnd.lotus-organizer
+#			vnd.lotus-screencam		       [Wattenberger]
+scm		application/vnd.lotus-screencam
+#			vnd.lotus-freelance		       [Wattenberger]
+pre		application/vnd.lotus-freelance
+prz		application/vnd.lotus-freelance
+#			vnd.fujitsu.oasys			    [Togashi]
+oas		application/vnd.fujitsu.oasys
+#			vnd.fujitsu.oasys2			    [Togashi]
+oa2		application/vnd.fujitsu.oasys2
+#			vnd.swiftview-ics			    [Widener]
+#			vnd.dna					     [Searcy]
+dna		application/vnd.dna
+#			prs.cww				     [Rungchavalnont]
+cw		application/prs.cww
+cww		application/prs.cww
+#			vnd.wt.stf				     [Wohler]
+stf		application/vnd.wt.stf
+#			vnd.dxr					      [Duffy]
+dxr		application/vnd.dxr
+#			vnd.mitsubishi.misty-guard.trustweb	     [Tanaka]
+#			vnd.ibm.modcap				   [Hohensee]
+list3820	application/vnd.ibm.modcap
+listafp		application/vnd.ibm.modcap
+afp		application/vnd.ibm.modcap
+pseg3820	application/vnd.ibm.modcap
+#			vnd.acucobol				      [Lubin]
+acu		application/vnd.acucobol
+#			vnd.fujitsu.oasys3			   [Okudaira]
+oa3		application/vnd.fujitsu.oasys3
+#			marc					    [RFC2220]
+mrc		application/marc
+#			vnd.fujitsu.oasysprs			      [Ogita]
+bh2		application/vnd.fujitsu.oasysprs
+#			vnd.fujitsu.oasysgp			   [Sugimoto]
+fg5		application/vnd.fujitsu.oasysgp
+#			vnd.visio				     [Sandal]
+vsd		application/vnd.visio
+vst		application/vnd.visio
+vsw		application/vnd.visio
+vss		application/vnd.visio
+#			vnd.netfpx				       [Mutz]
+fpx		application/vnd.netfpx
+#			vnd.audiograph				 [Slusanschi]
+aep		application/vnd.audiograph
+#			vnd.epson.salt				   [Nagatomo]
+slt		application/vnd.epson.salt
+#			vnd.3M.Post-it-Notes			    [O'Brien]
+pwn		application/vnd.3M.Post-it-Notes
+#			vnd.novadigm.EDX			    [Swenson]
+edx		application/vnd.novadigm.EDX
+#			vnd.novadigm.EXT			    [Swenson]
+ext		application/vnd.novadigm.EXT
+#			vnd.novadigm.EDM			    [Swenson]
+edm		application/vnd.novadigm.EDM
+#			vnd.claymore				    [Simpson]
+cla		application/vnd.claymore
+#			vnd.cosmocaller				   [Dellutri]
+cmc		application/vnd.cosmocaller
+#			pkcs7-mime				    [RFC2311]
+p7m		application/pkcs7-mime
+p7c		application/pkcs7-mime
+#			pkcs7-signature				    [RFC2311]
+p7s		application/pkcs7-signature
+#			pkcs10					    [RFC2311]
+#			vnd.yellowriver-custom-menu		     [Yellow]
+cmp		application/vnd.yellowriver-custom-menu
+#			vnd.ecowin.chart			     [Olsson]
+mag		application/vnd.ecowin.chart
+#			vnd.ecowin.series			     [Olsson]
+#			vnd.ecowin.filerequest			     [Olsson]
+#			vnd.ecowin.fileupdate			     [Olsson]
+#			vnd.ecowin.seriesrequest		     [Olsson]
+#			vnd.ecowin.seriesupdate			     [Olsson]
+#			EDIFACT					    [RFC1767]
+#			EDI-X12					    [RFC1767]
+#			EDI-Consent				    [RFC1767]
+#			vnd.wrq-hp3000-labelled			    [Bartram]
+#			vnd.minisoft-hp3000-save		    [Bartram]
+#			vnd.ffsns				   [Holstage]
+#			vnd.hp-hps				     [Aubrey]
+hps		application/vnd.hp-hps
+#			vnd.fujixerox.docuworks			    [Taguchi]
+xdw		application/vnd.fujixerox.docuworks
+#			xml					    [RFC2376]
+#		application/xml			[-> text/xml]
+#			vnd.anser-web-funds-transfer-initiation	       [Mori]
+fti		application/vnd.anser-web-funds-transfer-initiation
+#			vnd.anser-web-certificate-issue-initiation     [Mori]
+cii		application/vnd.anser-web-certificate-issue-initiation
+#			vnd.is-xpr				  [Natarajan]
+xpr		application/vnd.is-xpr
+#			vnd.intu.qbo				 [Scratchley]
+qbo		application/vnd.intu.qbo
+#			vnd.publishare-delta-tree		   [Ben-Kiki]
+qps		application/vnd.publishare-delta-tree
+#			vnd.cybank				     [Helmee]
+#			batch-SMTP				    [RFC2442]
+#			vnd.uplanet.alert			     [Martin]
+#			vnd.uplanet.cacheop			     [Martin]
+#			vnd.uplanet.list			     [Martin]
+#			vnd.uplanet.listcmd			     [Martin]
+#			vnd.uplanet.channel			     [Martin]
+#			vnd.uplanet.bearer-choice		     [Martin]
+#			vnd.uplanet.signal			     [Martin]
+#			vnd.uplanet.alert-wbxml			     [Martin]
+#			vnd.uplanet.cacheop-wbmxl		     [Martin]
+#			vnd.uplanet.list-wbxml			     [Martin]
+#			vnd.uplanet.listcmd-wbxml		     [Martin]
+#			vnd.uplanet.channel-wbxml		     [Martin]
+#			vnd.uplanet.bearer-choice-wbxml		     [Martin]
+#			vnd.epson.quickanime				 [Gu]
+qam		application/vnd.epson.quickanime
+#			vnd.commonspace				   [Chandhok]
+csp		application/vnd.commonspace
+cst		application/vnd.commonspace
+#			vnd.fut-misnet				  [Pruulmann]
+#			vnd.xfdl				    [Manning]
+xfdl		application/vnd.xfdl
+xfd		application/vnd.xfdl
+frm		application/vnd.xfdl
+#			vnd.intu.qfx				 [Scratchley]
+qfx		application/vnd.intu.qfx
+#			vnd.epson.ssf				    [Hoshina]
+ssf		application/vnd.epson.ssf
+#			vnd.epson.msf				    [Hoshina]
+msf		application/vnd.epson.msf
+#			vnd.powerbuilder7			     [Shilts]
+#		application/vnd.powerbuilder7	[-> application/vnd.powerbuilder6]
+#			vnd.powerbuilder7-s			     [Shilts]
+#		application/vnd.powerbuilder7-s [-> application/vnd.powerbuilder6-s]
+#			vnd.lotus-notes				    [Laramie]
+nsf		application/vnd.lotus-notes
+ntf		application/vnd.lotus-notes
+ndl		application/vnd.lotus-notes
+ns4		application/vnd.lotus-notes
+ns3		application/vnd.lotus-notes
+ns2		application/vnd.lotus-notes
+nsh		application/vnd.lotus-notes
+nsg		application/vnd.lotus-notes
+#			pkixcmp					    [RFC2510]
+pki		application/pkixcmp
+#			vnd.wap.wmlc				      [Stark]
+wmlc		application/vnd.wap.wmlc
+#		application/vnd.wap.wmlc	[-> application/vnd.wap.wbxml]
+#			vnd.wap.wmlscriptc			      [Stark]
+wmlsc		application/vnd.wap.wmlscriptc
+#			vnd.motorola.flexsuite			     [Patton]
+#			vnd.wap.wbxml				      [Stark]
+wbxml		application/vnd.wap.wbxml
+#			vnd.motorola.flexsuite.wem		     [Patton]
+#			vnd.motorola.flexsuite.kmr		     [Patton]
+#			vnd.motorola.flexsuite.adsi		     [Patton]
+#			vnd.motorola.flexsuite.fis		     [Patton]
+#			vnd.motorola.flexsuite.gotap		     [Patton]
+#			vnd.motorola.flexsuite.ttc		     [Patton]
+#			vnd.ufdl				    [Manning]
+ufdl		application/vnd.ufdl
+ufd		application/vnd.ufdl
+#		application/vnd.ufdl		[-> application/vnd.xfdl]
+#			vnd.accpac.simply.imp			       [Leow]
+imp		application/vnd.accpac.simply.imp
+#			vnd.accpac.simply.aso			       [Leow]
+aso		application/vnd.accpac.simply.aso
+#			vnd.vcx					 [T.Sugimoto]
+vcx		application/vnd.vcx
+#			ipp					    [RFC2910]
+#			ocsp-request				    [RFC2560]
+orq		application/ocsp-request
+#			ocsp-response				    [RFC2560]
+ors		application/ocsp-request
+#			vnd.previewsystems.box			 [Smolgovsky]
+box		application/vnd.previewsystems.box
+vbox		application/vnd.previewsystems.box
+#			vnd.mediastation.cdkey			     [Flurry]
+cdkey		application/vnd.mediastation.cdkey
+#			vnd.pg.format				    [Gandert]
+str		application/vnd.pg.format
+#			vnd.pg.osasli				    [Gandert]
+ei6		application/vnd.pg.osasli
+#			vnd.hp-hpid				      [Gupta]
+hpi		application/vnd.hp-hpid
+hpid		application/vnd.hp-hpid
+#			pkix-cert				    [RFC2585]
+cer		application/pkix-cert
+#			pkix-crl				    [RFC2585]
+crl		application/pkix-crl
+#			vnd.Mobius.TXF				   [Kabayama]
+txf		application/vnd.Mobius.TXF
+#			vnd.Mobius.PLC				   [Kabayama]
+plc		application/vnd.Mobius.PLC
+#			vnd.Mobius.DIS				   [Kabayama]
+dis		application/vnd.Mobius.DIS
+#			vnd.Mobius.DAF				   [Kabayama]
+daf		application/vnd.Mobius.DAF
+#			vnd.Mobius.MSL				   [Kabayama]
+msl		application/vnd.Mobius.MSL
+#			vnd.cups-raster				      [Sweet]
+#			vnd.cups-postscript			      [Sweet]
+#			vnd.cups-raw				      [Sweet]
+#			index					    [RFC2652]
+#			index.cmd				    [RFC2652]
+#			index.response				    [RFC2652]
+#			index.obj				    [RFC2652]
+#			index.vnd				    [RFC2652]
+#			vnd.triscape.mxs			   [Simonoff]
+mxs		application/vnd.triscape.mxs
+#			vnd.powerbuilder75			     [Shilts]
+#		application/vnd.powerbuilder75	[-> application/vnd.powerbuilder6]
+#			vnd.powerbuilder75-s			     [Shilts]
+#	alias	application/vnd.powerbuilder75-s application/vnd.powerbuilder6-s
+#			vnd.dpgraph				     [Parker]
+dpg		application/vnd.dpgraph
+mwc		application/vnd.dpgraph
+dpgraph		application/vnd.dpgraph
+#			http					    [RFC2616]
+#			sdp					    [RFC2327]
+sdp		application/sdp
+#			vnd.eudora.data				    [Resnick]
+#			vnd.fujixerox.docuworks.binder		  [Matsumoto]
+xbd		application/vnd.fujixerox.docuworks
+#			vnd.vectorworks				      [Pharr]
+#		application/vnd.vectorworks	[-> application/vnd.mcd]
+#			vnd.grafeq				     [Tupper]
+gqf		application/vnd.grafeq
+gqs		application/vnd.grafeq
+#			vnd.bmi					      [Gotoh]
+bmi		application/vnd.bmi
+#			vnd.ericsson.quickcall			    [Tidwell]
+qcall		application/vnd.ericsson.quickcall
+qca		application/vnd.ericsson.quickcall
+#			vnd.hzn-3d-crossword			     [Minnis]
+x3d		application/vnd.hzn-3d-crossword
+#			vnd.wap.slc				  [WAP-Forum]
+slc		application/vnd.wap.slc
+#		application/vnd.wap.slc		[-> application/vnd.wap.wbxml]
+#			vnd.wap.sic				  [WAP-Forum]
+sic		application/vnd.wap.sic
+#		application/vnd.wap.sic		[-> application/vnd.wap.wbxml]
+#			vnd.groove-injector			     [Joseph]
+grv		application/vnd.groove-injector
+#			vnd.fujixerox.ddd			       [Onda]
+ddd		application/vnd.fujixerox.ddd
+#			vnd.groove-account			     [Joseph]
+gac		application/vnd.groove-account
+#			vnd.groove-identity-message		     [Joseph]
+gim		application/vnd.groove-identity-message
+#			vnd.groove-tool-message			     [Joseph]
+gtm		application/vnd.groove-tool-message
+#			vnd.groove-tool-template		     [Joseph]
+tpl		application/vnd.groove-tool-template
+#			vnd.groove-vcard			     [Joseph]
+vcg		application/vnd.groove-vcard
+#			vnd.ctc-posml				   [Kohlhepp]
+pml		application/vnd.ctc-posml
+#			vnd.canon-lips				       [Muto]
+#			vnd.canon-cpdl				       [Muto]
+#			vnd.trueapp				     [Hepler]
+tra		application/vnd.trueapp
+#			vnd.s3sms				   [Tarkkala]
+#			iotp					    [RFC2935]
+#			vnd.mcd					      [Gotoh]
+mcd		application/vnd.mcd
+#			vnd.httphone				    [Lefevre]
+#			vnd.informix-visionary			      [Gales]
+vis		application/vnd.informix-visionary
+#			vnd.msign				[Borcherding]
+#			vnd.ms-lrm				     [Ledoux]
+lrm		application/vnd.ms-lrm
+#			vnd.contact.cmsg			       [Patz]
+cdbcmsg		application/vnd.contact.cmsg
+#			vnd.epson.esf				    [Hoshina]
+esf		application/vnd.epson.esf
+#			whoispp-query				    [RFC2957]
+#			whoispp-response			    [RFC2958]
+#			vnd.mozilla.xul+xml			   [McDaniel]
+xul		application/vnd.mozilla.xul+xml
+#			parityfec				    [RFC3009]
+#			vnd.palm				    [Peacock]
+prc		application/vnd.palm
+pdb		application/vnd.palm
+pqa		application/vnd.palm
+oprc		application/vnd.palm
+#			vnd.fsc.weblaunch			    [D.Smith]
+fsc		application/vnd.fsc.weblaunch
+#			vnd.tve-trigger				      [Welsh]
+#			dvcs					  [Sylvester]
+dvc		application/dvcs
+#			sieve					  [Showalter]
+siv		application/sieve
+#			vnd.vividence.scriptfile		     [Risher]
+vsf		application/vnd.vividence.scriptfile
+vtd		application/vnd.vividence.scriptfile
+vd		application/vnd.vividence.scriptfile
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	image		jpeg				    [RFC2045,RFC2046]
+jpe		image/jpeg
+jpeg		image/jpeg
+jpg		image/jpeg
+jfif		image/jpeg
+pjp		image/jpeg
+pjpeg		image/jpeg
+#			gif				    [RFC2045,RFC2046]
+gif		image/gif
+#			ief		Image Exchange Format	    [RFC1314]
+ief		image/ief
+#			g3fax					    [RFC1494]
+g3		image/g3fax
+fax		image/g3fax
+#			tiff		Tag Image File Format	    [RFC2302]
+tif		image/tiff
+tiff		image/tiff
+#			cgm		Computer Graphics Metafile  [Francis]
+cgm		image/cgm
+#			naplps					     [Ferber]
+#			vnd.dwg					     [Moline]
+dwg		image/vnd.dwg
+#			vnd.svf					     [Moline]
+svf		image/vnd.svf
+#			vnd.dxf					     [Moline]
+dxf		image/vnd.dxf
+#			png				    [Randers-Pehrson]
+png		image/png
+#			vnd.fpx					    [Spencer]
+#		image/vnd.fpx			[-> application/vnd.netfpx]
+#			vnd.netfpx				    [Spencer]
+#		image/vnd.netfpx		[-> application/vnd.netfpx]
+#			vnd.xiff				    [SMartin]
+xif		image/vnd.xiff
+#			prs.btif				      [Simon]
+btif		image/prs.btif
+btf		image/prs.btif
+#			vnd.fastbidsheet			     [Becker]
+fbs		image/vnd.fastbidsheet
+#			vnd.wap.wbmp				      [Stark]
+wbmp		image/vnd.wap.wbmp
+#			prs.pti					       [Laun]
+pti		image/prs.pti
+#			vnd.cns.inf2				 [McLaughlin]
+#			vnd.mix					      [Reddy]
+#			vnd.fujixerox.edmics-rlc		       [Onda]
+rlc		image/vnd.fujixerox.edmics-rlc
+#			vnd.fujixerox.edmics-mmr		       [Onda]
+mmr		image/vnd.fujixerox.edmics-mmr
+#			vnd.fst					   [Fuldseth]
+fst		image/vnd.fst
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	audio		basic				    [RFC2045,RFC2046]
+au		audio/basic
+snd		audio/basic
+#			32kadpcm			    [RFC2421,RFC2422]
+#			vnd.qcelp				  [Lundblade]
+qcp		audio/vnd.qcelp
+#			vnd.digital-winds			    [Strazds]
+eol		audio/vnd.digital-winds
+#			vnd.lucent.voice			  [Vaudreuil]
+lvp		audio/vnd.lucent.voice
+#			vnd.octel.sbc				  [Vaudreuil]
+#			vnd.rhetorex.32kadpcm			  [Vaudreuil]
+#			vnd.vmx.cvsd				  [Vaudreuil]
+#			vnd.nortel.vbk				    [Parsons]
+vbk		audio/vnd.nortel.vbk
+#			vnd.cns.anp1				 [McLaughlin]
+#			vnd.cns.inf1				 [McLaughlin]
+#			L16					    [RFC2586]
+#			vnd.everad.plj				   [Cicelsky]
+plj		audio/vnd.everad.plj
+#			telephone-event				    [RFC2833]
+#			tone					    [RFC2833]
+#			prs.sid					    [Walleij]
+sid		audio/prs.sid
+psid		audio/prs.sid
+#			vnd.nuera.ecelp4800				[Fox]
+ecelp4800	audio/vnd.nuera.ecelp4800
+#			vnd.nuera.ecelp7470				[Fox]
+ecelp7470	audio/vnd.nuera.ecelp7470
+#			mpeg					    [RFC3003]
+abs		audio/mpeg
+mp2		audio/mpeg
+mp3		audio/mpeg
+mpa		audio/mpeg
+mpga		audio/mpeg
+mpega		audio/mpeg
+#			parityfec				    [RFC3009]
+#			MP4A-LATM				    [RFC3016]
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	video		mpeg				    [RFC2045,RFC2046]
+mpe		video/mpeg
+mpeg		video/mpeg
+mpegv		video/mpeg
+mpg		video/mpeg
+mpv		video/mpeg
+vbs		video/mpeg
+#			quicktime			       [Paul Lindner]
+moov		video/quicktime
+mov		video/quicktime
+qt		video/quicktime
+#			vnd.vivo				      [Wolfe]
+#			vnd.motorola.video			    [McGinty]
+#			vnd.motorola.videop			    [McGinty]
+#			vnd.fvt					   [Fuldseth]
+fvt		video/vnd.fvt
+#			pointer					    [RFC2862]
+#			parityfec				    [RFC3009]
+#			vnd.mpegurl				[Recktenwald]
+mgu		video/vnd.mpegurl
+#			MP4V-ES					    [RFC3016]
+
+#	Type		Subtype		Description		    Reference
+#	----		-------		-----------		    ---------
+#
+#	model							    [RFC2077]
+#			iges					      [Parks]
+#			vrml					    [RFC2077]
+vrml		model/vrml
+wrl		model/vrml
+#			mesh					    [RFC2077]
+msh		model/mesh
+mesh		model/mesh
+silo		model/mesh
+#			vnd.dwf					      [Pratt]
+#			vnd.gtw					      [Ozaki]
+#			vnd.flatland.3dml			     [Powers]
+#			vnd.vtu					[Rabinovitch]
+#			vnd.mts					[Rabinovitch]
+#			vnd.gdl					     [Babits]
+#			vnd.gs-gdl				     [Babits]
+#			vnd.parasolid.transmit.text	   [Dearnaley,Juckes]
+#			vnd.parasolid.transmit.binary	   [Dearnaley,Juckes]
+
+# ======================================================================
+# Known unregistered MIME types from Mime-FAQ
+#
+# URL : ftp://[no more available online!]/mail/mime-faq/part3
+# ======================================================================
+
+# Text types
+# ----------
+
+#		text/unknown
+#		text/x-html			[-> text/html]
+etx		text/x-setext
+faq		text/x-usenet-faq
+
+# Application types
+# -----------------
+
+#		application/x-aiff		[-> audio/x-aiff]
+bcpio		application/x-bcpio
+#		application/x-bitmap		[-> image/x-xbitmap]
+cpio		application/x-cpio
+csh		application/x-csh
+dvi		application/x-dvi
+#		application/x-framemaker	[-> application/vnd.framemaker]
+gtar		application/x-gtar
+hdf		application/x-hdf
+#		application/x-inventor
+#		application/x-island-draw
+#		application/x-island-paint
+#		application/x-island-write
+#		application/x-jot
+latex		application/x-latex
+#		application/x-macbinhex40
+#		application/x-metamail-patch
+#		application/x-mif		[-> application/vnd.mif]
+#		application/x-movie
+#		application/x-ms-tnef		[-> application/vnd.ms-tnef]
+cdf		application/x-netcdf
+nc		application/x-netcdf
+#		application/x-sgi
+sh		application/x-sh
+shar		application/x-shar
+#		application/x-showcase
+sv4cpio		application/x-sv4cpio
+sv4crc		application/x-sv4crc
+tar		application/x-tar
+tcl		application/x-tcl
+tk		application/x-tcl
+cls		application/x-tex
+ltx		application/x-tex
+sty		application/x-tex
+tex		application/x-tex
+texi		application/x-texinfo
+texinfo		application/x-texinfo
+t		application/x-troff
+tr		application/x-troff
+roff		application/x-troff
+troff		application/x-troff
+man		application/x-troff-man
+me		application/x-troff-me
+ms		application/x-troff-ms
+ustar		application/x-ustar
+src		application/x-wais-source
+wsrc		application/x-wais-source
+wkz		application/x-wingz
+#		application/x-wt-stf
+#		application/x-xpm1		[-> image/x-xpixmap]
+#		application/x-zm-fax
+
+# Audio types
+# -----------
+
+af		audio/x-aiff
+aif		audio/x-aiff
+aifc		audio/x-aiff
+aiff		audio/x-aiff
+maca		audio/x-macaudio
+#		audio/x-next
+wav		audio/x-wav
+
+# Image types
+# -----------
+
+ras		image/x-cmu-raster
+fits		image/x-fits
+pict		image/x-macpict
+#		image/x-pbm			[-> image/x-portable-bitmap]
+#		image/x-pgm			[-> image/x-portable-graymap]
+#		image/x-pict			[-> image/x-macpict]
+#		image/x-pnm			[-> image/x-portable-anymap]
+pbm		image/x-portable-bitmap
+pgm		image/x-portable-graymap
+pnm		image/x-portable-anymap
+ppm		image/x-portable-pixmap
+#		image/x-ppm			[-> image/x-portable-pixmap]
+rgb		image/x-rgb
+xbm		image/x-xbitmap
+#		image/x-xbm			[-> image/x-xbitmap]
+xpm		image/x-xpixmap
+#		image/x-xpm			[-> image/x-xpixmap]
+#		image/x-xwd			[-> image/x-xwindowdump]
+xwd		image/x-xwindowdump
+
+# Video types
+# -----------
+
+avi		video/x-msvideo
+movie		video/x-sgi-movie
+
+# ======================================================================
+# Known unregistered MIME types from Apache
+# ======================================================================
+
+# Text types
+# ----------
+
+#		text/vnd.flatland.3dml
+
+# Application types
+# -----------------
+
+#		application/mac-compactpro	[-> application/x-mac-compactpro]
+cpt		application/x-mac-compactpro
+#		application/smil		[-> application/x-smil]
+smi		application/x-smil
+smil		application/x-smil
+vcd		application/x-cdlink
+pgn		application/x-chess-pgn
+#		application/x-compress		[-> encoding/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]
+js		application/x-javascript
+#		application/x-koan		[-> application/vnd.koan]
+php3		application/x-httpd-php3
+php3s		application/x-httpd-php3-source
+php		application/x-httpd-php4
+php4		application/x-httpd-php4
+php4s		application/x-httpd-php4-source
+sit		application/x-stuffit
+
+# Image types
+# -----------
+
+#		image/bmp			[-> image/x-ms-bmp]
+
+# Audio types
+# -----------
+
+#		audio/midi			[-> audio/x-midi]
+mid		audio/x-midi
+midi		audio/x-midi
+
+# Misc types
+# ----------
+
+#		chemical/x-pdb			[-> application/vnd.palm]
+xyz		chemical/x-pdb
+
+ice		x-conference/x-cooltalk
+
+# ======================================================================
+# Known unregistered MIME types from Netscape
+# ======================================================================
+
+# Text types
+# ----------
+
+vcf		text/x-vcard
+
+# Application types
+# -----------------
+
+fif		application/fractals
+depot		application/hp_depot
+#		application/java-archive	[-> application/x-java-archive]
+enc		application/pre-encrypted
+mda		application/vnd.ms-access
+mdb		application/vnd.ms-access
+mde		application/vnd.ms-access
+sc2		application/vnd.ms-schedule
+scd		application/vnd.ms-schedule
+sch		application/vnd.ms-schedule
+mocha		application/x-javascript
+jsc		application/x-javascript-config
+pac		application/x-ns-proxy-autoconfig
+#proxy		application/x-ns-proxy-autoconfig
+pl		application/x-perl
+perl		application/x-perl
+#		application/x-pkcs7-crl		[-> application/pkix-crl]
+#		application/x-pkcs7-mime	[-> application/pkcs7-mime]
+#		application/x-pkcs7-signature	[-> application/pkcs7-signature]
+#		application/x-sdp		[-> application/sdp]
+#		application/x-zip-compressed	[-> application/zip]
+
+# Image types
+# -----------
+
+bmp		image/x-ms-bmp
+pcd		image/x-photo-cd
+
+# Audio types
+# -----------
+
+#		audio/aiff			[-> audio/x-aiff]
+#		audio/wav			[-> audio/x-wav]
+
+# Video types
+# -----------
+
+mp2v		video/x-mpeg2
+mpv2		video/x-mpeg2
+
+# ======================================================================
+# Known unregistered MIME types from Xemacs
+# ======================================================================
+
+# Text types
+# ----------
+
+diff		text/x-patch
+patch		text/x-patch
+udiff		text/x-patch
+
+# Application types
+# -----------------
+
+#		application/emacs-lisp		[-> application/x-emacs-lisp]
+el		application/x-emacs-lisp
+#		application/mif			[-> application/vnd.mif]
+#		application/texinfo		[-> application/x-texinfo]
+ano		application/x-annotator
+
+# Image types
+# -----------
+
+#		image/pict			[-> image/x-macpict]
+#		image/portable-graymap		[-> image/x-portable-graymap]
+#		image/portable-pixmap		[-> image/x-portable-pixmap]
+#		image/windowdump		[-> image/x-windowdump]
+#		image/x11-dump			[-> image/x-windowdump]
+#		image/x-fax			[-> image/g3fax]
+icon		image/x-icon
+macp		image/x-macpaint
+#		image/x-pixmap			[-> image/x-xpixmap]
+#		image/x-raster			[-> image/x-cmu-taster]
+tga		image/x-targa
+#		image/xbm			[-> image/x-xbitmap]
+#		image/xpm			[-> image/x-xpixmap]
+
+# Audio types
+# -----------
+
+#		audio/ulaw			[-> audio/basic]
+mp2a		audio/x-mpeg2
+mpa2		audio/x-mpeg2
+
+# Message types
+# -------------
+
+#		message/x-gnus-rmail
+
+# Misc types
+# ----------
+
+#		archive/tar			[-> application/x-tar]
+
+#		x-world/x-vrml			[-> model/vrml]
+
+# ======================================================================
+# Known unregistered MIME types from Gnome
+# ======================================================================
+
+# Text types
+# ----------
+
+#		text/abiword			[-> text/x-abiword]
+#		text/bib			[-> text/x-bib]
+#		text/calendar			[-> text/x-calendar]
+#		text/directory			[-> text/x-directory]
+#		text/htmlh			[-> text/x-htmlh]
+#		text/mathml			[-> text/x-mathml]
+#		text/x-abiword			[-> application/x-abiword]
+#		text/x-applix-word		[-> application/x-applix-word]
+#??		text/x-authors
+bib		text/x-bib
+#		text/x-c			[-> text/x-csrc]
+#		text/x-c++			[-> text/x-c++src]
+#??		text/x-calendar
+csv		text/x-comma-separated-values
+#??		text/x-copying
+#??		text/x-credits
+#		text/x-csh			[-> application/x-csh]
+#		text/x-dcl			[-> text/x-sgml-declaration]
+#??		text/x-directory
+dsl		text/x-dsl
+#		text/x-dtd			[-> text/xml]
+f		text/x-fortran
+#??		text/x-gtkrc
+idl		text/x-idl
+#??		text/x-install
+#		text/x-java			[-> application/x-java]
+#??		text/x-htmlh
+#		text/x-makefile			[-> application/x-makefile]
+mml		text/x-mathml
+#		text/x-perl			[-> application/x-perl]
+#		text/x-python			[-> application/x-python]
+#??		text/x-readme
+#		text/x-scheme			[-> application/vnd.lotus-screencam]
+stx		text/x-setext
+#		text/x-sh			[-> application/x-sh]
+#??		text/x-speech
+sql		text/x-sql
+#		text/x-tcl			[-> application/x-tcl]
+#		text/x-tex			[-> application/x-tex]
+#		text/x-texinfo			[-> application/x-texinfo]
+#		text/x-troff			[-> application/x-troff]
+#		text/x-troff-man		[-> application/x-troff-man]
+#		text/x-troff-man-compressed	[-> application/x-troff-man-compressed]
+#		text/x-troff-me			[-> application/x-troff-me]
+#		text/x-troff-mm			[-> application/x-troff-mm]
+#		text/x-troff-ms			[-> application/x-troff-ms]
+vcs		text/x-vcalendar
+vct		text/x-vcard
+gcrd		text/x-vcard
+
+# Application types
+# -----------------
+
+#		application/msexcel		[-> application/vnd.ms-excel]
+#		application/mspowerpoint	[-> application/vnd.ms-powerpoint]
+pgp		application/pgp
+awb		application/x-abiword
+as		application/x-applix-spreadsheet
+aw		application/x-applix-word
+arj		application/x-arj
+asp		application/x-asp
+bak		application/x-backup
+bz2		application/x-bzip2
+cgi		application/x-cgi
+#		application/x-class-file	[-> application/x-java-vm]
+#		application/x-compressed-tar	[-> application/octet-stream]
+#		application/x-bzip-compressed-tar	[-> application/octet-stream]
+#??		application/x-cpio-compressed
+core		application/x-core-file
+deb		application/x-deb
+etheme		application/x-e-theme
+#??		application/x-executable-file	[-> application/octet-stream]
+afm		application/x-font-afm
+bdf		application/x-font-bdf
+fon		application/x-font-dos
+#?? 		application/x-font-framemaker
+#??		application/x-font-libgrx
+psf		application/x-font-linux-psf
+pcf		application/x-font-pcf
+spd		application/x-font-speedo
+#??		application/x-font-sunos-news
+mf		application/x-font-tex
+tfm		application/x-font-tex-tfm
+ttf		application/x-font-ttf
+pfa		application/x-font-type1
+pfb		application/x-font-type1
+#??		application/x-font-vfont
+desktop		application/x-gnome-app-info
+caves		application/x-gnome-stones
+gnumeric	application/x-gnumeric
+#??		application/x-java-byte-code
+lha		application/x-lha
+lzh		application/x-lzh
+#		application/x-kde-app-info	[-> application/x-desktop]
+#??		application/x-ms-dos-executable
+o		application/x-object-file
+#		application/x-ogg		[-> audio/x-ogg]
+#		application/x-palm-database	[-> application/vnd.palm]
+#??		application/x-pef-executable
+#		application/x-php		[-> application/x-httpd-php4]
+#??		application/x-profile
+rar		application/x-rar
+rej		application/x-reject
+rpm		application/x-rpm
+so		application/x-shared-library
+la		application/x-shared-library-la
+slp		application/x-slp
+#		application/x-staroffice-presentation	[-> application/x-sdraw]
+#		application/x-staroffice-spreadsheet	[-> application/x-scalc]
+#		application/x-staroffice-words		[-> application/x-swriter]
+theme		application/x-theme
+#??		application/x-troff-man-compressed
+a		application/x-unix-archive
+#		application/x-wordperfect	[-> application/wordperfect5.1]
+zoo		application/x-zoo
+
+# Image types
+# -----------
+
+#		image/svg			[-> image/x-svg]
+3ds		image/x-3ds
+ag		image/x-applix-graphic
+#		image/x-bmp			[-> image/x-ms-bmp]
+#		image/x-compressed-gimp		[-> image/x-compressed-xcf]
+#??		image/x-compressed-xcf
+#		image/x-gimp			[-> image/x-xcf]
+ico		image/x-ico
+#		image/x-iff			[-> video/x-iff]
+ilbm		image/x-ilbm
+lwo		image/x-lwo
+lws		image/x-lws
+psd		image/x-psd
+svg		image/x-svg
+#		image/x-tga			[-> image/x-targa]
+xcf		image/x-xcf
+fig		image/x-xfig
+
+# Audio types
+# -----------
+
+it		audio/x-it
+#		audio/x-mp3			[-> audio/mpeg]
+#??		audio/x-mp3-playlist
+m3u		audio/x-mpegurl
+ogg		audio/x-ogg
+#??		audio/x-riff
+#		audio/x-s3m			[-> audio/x-mod]
+#		audio/x-stm			[-> audio/x-mod]
+#		audio/x-ulaw			[-> audio/basic]
+voc		audio/x-voc
+xi		audio/x-xi
+#		audio/x-xm			[-> audio/x-mod]
+
+# Video types
+# -----------
+
+#		video/isivideo			[-> video/x-isivideo]
+#		video/vivo			[-> video/vnd.vivo]
+#		video/wavelet			[-> video/x-wavelet]
+anim		video/x-anim
+#		video/x-avi			[-> video/x-msvideo]
+#??		video/x-isivideo
+#??		video/x-wavelet
+#		video/x-real-video		[-> video/vnd.rn-realvideo]
+
+# Misc types
+# ----------
+
+#		font/afm			[-> application/x-font-afm]
+#		font/ttf			[-> application/x-font-ttf]
+#		font/x-pcf			[-> application/x-font-pcf]
+
+#??		x-directory/normal
+#??		x-directory/search
+#??		x-directory/webdav
+
+#??		x-special/device-block
+#??		x-special/device-char
+#??		x-special/fifo
+#??		x-special/socket
+#??		x-special/symlink
+
+#??		x-url/http
+#??		x-url/ftp
+#??		x-url/news
+
+# ======================================================================
+# Known unregistered MIME types from KDE
+# ======================================================================
+
+# Text types
+# ----------
+
+#		text/english			[-> text/plain]
+#??		text/xmcd
+hh		text/x-c++hdr
+C		text/x-c++src
+cc		text/x-c++src
+cpp		text/x-c++src
+cxx		text/x-c++src
+h		text/x-chdr
+c		text/x-csrc
+#		text/x-csv			[-> text/x-comma-separated-values]
+#		text/x-diff			[-> text/x-patch]
+moc		text/x-moc
+p		text/x-pascal
+pas		text/x-pascal
+
+# Application types
+# -----------------
+
+#		application/wordperfect		[-> application/x-wordperfect]
+#		application/x-applix		[-> application/x-applix-*]
+#		application/x-archive		[-> application/x-unix-archive]
+bz		application/x-bzip
+#		application/x-core		[-> application/x-core-file]
+kdelnk		application/x-kde-app-info
+#		application/x-executable	[-> application/x-executable-file]
+#		application/x-font		[-> application/x-font-*]
+gsf		application/x-font-gsf
+#		application/x-jar		[-> application/x-java-archive]
+chrt		application/x-kchart
+kil		application/x-killustrator
+shell		application/x-konsole
+kpr		application/x-kpresenter
+kpt		application/x-kpresenter
+ksp		application/x-kspread
+kwd		application/x-kword
+kwt		application/x-kword
+lzo		application/x-lzop
+#		application/x-object		[-> application/x-object-file]
+py		application/x-python
+pyc		application/x-python-bytecode
+#		application/x-sharedlib		[-> application/x-shared-library]
+#		application/x-shellscript	[-> application/x-sh]
+gf		application/x-tex-gf
+pk		application/x-tex-pk
+old		application/x-trash
+sik		application/x-trash
+#		application/x-truetype-font	[-> application/x-font-type1]
+tzo		application/x-tzo
+
+# Image types
+# -----------
+
+#		image/fax-g3			[-> image/g3fax]
+#		image/x-eps			[-> application/postscript]
+
+# Audio types
+# -----------
+
+kar		audio/x-karaoke
+669		audio/x-mod
+mod		audio/x-mod
+m15		audio/x-mod
+mtm		audio/x-mod
+s3m		audio/x-mod
+stm		audio/x-mod
+ult		audio/x-mod
+uni		audio/x-mod
+pls		audio/x-scpls
+
+# Misc types
+# ----------
+
+#??		inode/blockdevice
+#??		inode/chardevice
+#??		inode/directory-locked
+#??		inode/directory
+#??		inode/fifo
+#??		inode/socket
+
+# ======================================================================
+# Known unregistered MIME types from RealAudio
+# ======================================================================
+
+# Text types
+# ----------
+
+rt		text/vnd.rn-realtext
+
+# Application types
+# -----------------
+
+rm		application/vnd.rn-realmedia
+
+# Image types
+# -----------
+
+#		image/vnd.rn-realflash		[-> application/x-shockwave-flash2-preview]
+#		image/vnd.rn-realflash		[-> application/x-shockwave-flash]
+rp		image/vnd.rn-realpix
+#		image/x-realaudio		[-> audio/vnd.rn-realaudio]
+
+# Audio types
+# -----------
+
+#		audio/x-pn-aiff			[-> audio/x-aiff]
+#		audio/x-pn-au			[-> audio/basic]
+ram		audio/x-pn-realaudio
+rmm		audio/x-pn-realaudio
+#		audio/x-pn-realaudio-plugin	[-> application/x-rpm]
+#		audio/x-pn-wav			[-> audio/x-wav]
+#		audio/x-pn-windows-acm		[-> audio/x-wav]
+#		audio/x-realaudio		[-> audio/vnd.rn-realaudio]
+ra		audio/vnd.rn-realaudio
+
+# Video types
+# -----------
+
+rv		video/vnd.rn-realvideo
+
+# ======================================================================
+# Known unregistered MIME types from ShockWave
+# ======================================================================
+
+# Application types
+# -----------------
+
+swf		application/x-shockwave-flash
+rf		application/x-shockwave-flash2-preview
+
+# ======================================================================
+# Known unregistered MIME types from StarDivision
+# ======================================================================
+
+# Application types
+# -----------------
+
+sdc		application/x-scalc
+sda		application/x-sda
+sdf		application/x-sdf
+sdd		application/x-sdraw
+sds		application/x-sds
+sgl		application/x-sgl
+smf		application/x-smf
+sdw		application/x-swriter
+
+# ======================================================================
+# Known unregistered MIME types from Anywhere
+# ======================================================================
+
+# Text types
+# ----------
+
+ent		text/x-sgml-document-entity
+dcl		text/x-sgml-declaration
+
+# Application types
+# -----------------
+
+#		application/dvi			[-> application/x-dvi]
+#		application/excel		[-> application/vnd.ms-excel]
+mf1		application/i-deas
+mf2		application/i-deas
+#		application/macbinary
+#		application/macbinhex40		[-> application/x-macbinhex40]
+#		application/futuresplash	[-> application/x-futuresplash]
+#		application/latex		[-> application/x-latex]
+#		application/ms-tnef		[-> application/vnd.ms-tnef]
+com		application/octet-stream
+bat		application/octet-stream
+cmd		application/octet-stream
+btm		application/octet-stream
+#		application/powerpoint		[-> application/vnd.ms-powerpoint]
+#		application/safe-tcl		[-> application/x-safe-tcl]
+#		application/tex			[-> application/x-tex]
+#		application/word		[-> application/msword]
+#		application/vnd.stardivision.calc	[-> application/x-scalc]
+#		application/vnd.stardivision.writer	[-> application/x-swriter]
+awk		application/x-awk
+ofm		application/x-font-tex-ofm
+ovf		application/x-font-tex-ovf
+ovp		application/x-font-tex-ovp
+pfm		application/x-font-tex-pfm
+vf		application/x-font-tex-tfm
+info		application/x-info
+java		application/x-java
+jar		application/x-java-archive
+class		application/x-java-vm
+ser		application/x-java-serialized-object
+ksh		application/x-ksh
+#		application/x-lotus-notes	[-> application/vnd.lotus-notes]
+mk		application/x-makefile
+#		application/x-patch		[-> text/x-patch]
+ph		application/x-perl-header
+pm		application/x-perl-module
+pod		application/x-perl-old-documentation
+#		application/x-pdf		[-> application/pdf]
+#		application/x-rtf		[-> application/rtf]
+#		application/x-safe-tcl
+mm		application/x-troff-mm
+#		application/x-uuencode		[-> encoding/x-uuencode]
+cert		application/x-x509-ca-cert
+#		application/x-zip		[-> application/zip]
+
+# Image types
+# -----------
+
+#		image/cmu-raster		[-> image/x-cmu-raster]
+#		image/portable-anymap		[-> image/x-portable-anymap]
+#		image/portable-bitmap		[-> image/x-portable-bitmap]
+#		image/targa			[-> image/x-targa]
+#		image/x-bitmap			[-> image/x-xbitmap]
+#		image/x-jpeg			[-> image/jpeg]
+#		image/x-mswindows-bmp		[-> image/x-ms-bmp]
+#		image/x-mswindows-bitmap	[-> image/x-ms-bmp]
+#		image/x-tiff			[-> image/tiff]
+#		image/x-win-bmp			[-> image/x-ms-bmp]
+
+# Audio types
+# -----------
+
+vox		audio/basic
+#		audio/x-mpeg			[-> audio/mpeg]
+
+# Video types
+# -----------
+
+flc		video/x-flc
+fli		video/x-fli
+iff		video/x-iff
+#		video/x-qtc			[-> video/quicktime]
+#		video/x-qtv			[-> video/quicktime]
+
+# ======================================================================
diff --git a/mail/elm+ME/files/patch-aa b/mail/elm+ME/files/patch-aa
new file mode 100644
index 000000000000..6470e39f1606
--- /dev/null
+++ b/mail/elm+ME/files/patch-aa
@@ -0,0 +1,20 @@
+--- nls/Makefile.orig	Fri Dec 29 20:56:45 2000
++++ nls/Makefile	Sat Jan  6 23:21:16 2001
+@@ -3,7 +3,7 @@
+ #
+ LANGFILE=LANGS
+ CATNAME=elm2.4me+.cat
+-GENCAT=	nls/gencat
++GENCAT=	gencat
+ 
+ HDIR=	../hdrs
+ SDIR=	C/C/C
+@@ -44,7 +44,7 @@
+ 	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
+ 
+ $(HFILES): $(MFILES)
+-	gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
++	$(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
+ 
+ clean: FRC
+ 	/bin/rm -f $(MSGCAT)
diff --git a/mail/elm+ME/files/patch-ab b/mail/elm+ME/files/patch-ab
index 42fd950579dd..a499a0158942 100644
--- a/mail/elm+ME/files/patch-ab
+++ b/mail/elm+ME/files/patch-ab
@@ -1,49 +1,9 @@
-*** nls/Makefile.old	Thu Mar 10 20:21:47 1994
---- nls/Makefile	Fri Jul 28 06:55:04 1995
-***************
-*** 1,6 ****
-  LANGFILE=LANGS
-  CATNAME=elm2.4.cat
-! GENCAT=	nls/gencat
-  
-  HDIR=	../hdrs
-  SDIR=	C/C/C
---- 1,6 ----
-  LANGFILE=LANGS
-  CATNAME=elm2.4.cat
-! GENCAT= gencat
-  
-  HDIR=	../hdrs
-  SDIR=	C/C/C
-***************
-*** 39,45 ****
-  	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
-  
-  $(HFILES): $(MFILES)
-! 	gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
-  
-  clean: FRC
-  	/bin/rm -f $(MSGCAT)
---- 39,45 ----
-  	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
-  
-  $(HFILES): $(MFILES)
-! 	$(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
-  
-  clean: FRC
-  	/bin/rm -f $(MSGCAT)
-*** nls/LANGS.old	Sun Jun 28 04:32:25 1992
---- nls/LANGS	Fri Jul 28 06:48:31 1995
-***************
-*** 1,5 ****
-  # LANGS file
-  
-! C/C/C			/usr/local/nls/msg/C
-! english/us/ascii	/usr/local/nls/msg/english
-! french/canada/8859	/usr/local/nls/msg/french
---- 1,5 ----
-  # LANGS file
-  
-! C/C/C                   /usr/local/share/nls/C
-! english/us/ascii        /usr/local/share/nls/en_US.ISO_8859-1
-! french/canada/8859      /usr/local/share/nls/fr_FR.ISO_8859-1
+--- nls/LANGS.orig	Fri Dec 29 20:56:45 2000
++++ nls/LANGS	Sun Jan  7 09:00:13 2001
+@@ -1,5 +1,3 @@
+ # LANGS file
+ 
+-C/C/C			/usr/local/nls/msg/C
+-english/us/ascii	/usr/local/nls/msg/english
+-french/canada/8859	/usr/local/nls/msg/french
++C/C/C			/usr/local/share/nls/C
diff --git a/mail/elm+ME/files/patch-ac b/mail/elm+ME/files/patch-ac
index e4e265215fff..76684c18becd 100644
--- a/mail/elm+ME/files/patch-ac
+++ b/mail/elm+ME/files/patch-ac
@@ -1,36 +1,29 @@
-*** Configure.bak	Mon Mar 11 18:47:43 1996
---- Configure	Tue Mar 12 14:52:18 1996
-***************
-*** 18,28 ****
-  PATH=".:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
-  export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
-  
-- if test ! -t 0; then
--     echo "Say 'sh Configure', not 'sh <Configure'"
--     exit 1
-- fi
-- 
-  (alias) >/dev/null 2>&1 && \
-      echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
-      echo "especially on exotic machines.  If yours does, try the Bourne shell instead.)"
---- 18,23 ----
-***************
-*** 2278,2284 ****
-  
-  : see if crypt exists
-  echo " "
-! if $contains '^crypt$' libc.list >/dev/null 2>&1; then
-      echo 'crypt() found.'
-      d_crypt="$define"
-      cryptlib=''
---- 2273,2282 ----
-  
-  : see if crypt exists
-  echo " "
-! if $test "$cryptlib" = -lcrypt; then
-!     echo 'crypt() found.'
-!     d_crypt="$define"
-! elif $contains '^crypt$' libc.list >/dev/null 2>&1; then
-      echo 'crypt() found.'
-      d_crypt="$define"
-      cryptlib=''
+--- Configure.orig	Fri Dec 29 20:57:04 2000
++++ Configure	Sat Jan  6 23:19:54 2001
+@@ -16,10 +16,10 @@
+ PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
+ export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
+ 
+-if test ! -t 0; then
+-    echo "Say 'sh Configure', not 'sh <Configure'"
+-    exit 1
+-fi
++# if test ! -t 0; then
++#     echo "Say 'sh Configure', not 'sh <Configure'"
++#     exit 1
++# fi
+ 
+ (alias) >/dev/null 2>&1 && \
+     echo "(I see you are using the Korn shell.  Some ksh's blow up on Configure," && \
+@@ -1926,7 +1926,10 @@
+ 
+ : see if crypt exists
+ echo " "
+-if $contains '^crypt$' libc.list >/dev/null 2>&1; then
++if $test "$cryptlib" = -lcrypt; then
++    echo 'crypt() found.'
++    d_crypt="$define"
++elif $contains '^crypt$' libc.list >/dev/null 2>&1; then
+     echo 'crypt() found.'
+     d_crypt="$define"
+     cryptlib=''
diff --git a/mail/elm+ME/files/patch-ad b/mail/elm+ME/files/patch-ad
deleted file mode 100644
index ae2f5ac41ef0..000000000000
--- a/mail/elm+ME/files/patch-ad
+++ /dev/null
@@ -1,63 +0,0 @@
---- lib/cs_binary.c.old	Wed Aug  9 18:14:34 2000
-+++ lib/cs_binary.c	Mon Aug 14 17:07:42 2000
-@@ -274,6 +274,51 @@
-     &cs_ascii, "KOI8-R", 0, map_init_koi8r, 0 };
- 
- 
-+/* CP1251 ------------------------------------------------------------ */
-+
-+/* Table compied from official Unicode mapping 2.01 */
-+
-+static uint16 cp12512unicode[128] = {
-+     0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021,
-+     0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F,
-+     0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
-+     0x003F,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F,
-+     0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7,
-+     0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407,
-+     0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7,
-+     0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457,
-+     0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
-+     0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
-+     0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
-+     0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
-+     0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
-+     0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
-+     0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
-+     0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F
-+   };
-+
-+
-+static void map_init_cp1251 P_((struct  map_info *map));
-+static void map_init_cp1251(map)
-+     struct  map_info *map;
-+{
-+    int i;
-+    
-+    for (i = 0; i < 128; i++) {
-+	map->b.ascii.map_ascii_upper[i] = cp12512unicode[i];
-+    }
-+
-+    map_ascii_init_rev(map);
-+    map->map_initialized = 1;
-+    
-+    dprint(5,(debugfile,
-+	      "Map %s initialized\n",map->map_name));
-+}
-+
-+struct  map_info map_cp1251 = {
-+    &cs_ascii, "WINDOWS-1251", 0, map_init_cp1251, 0 };
-+
-+
- /* bytemap --------------------------------------------------------------- */
- 
- static void map_bytemap_init_rev P_((struct map_info *map)); 
-@@ -2209,7 +2254,7 @@
- 
-     int i;
-     static struct  map_info * maps[] = { &map_ascii, &map_latin1, 
--					 &map_koi8r, NULL };
-+					 &map_koi8r, &map_cp1251, NULL };
- 
-     for (i = 0; maps[i]; i++)
- 	if (0 == strcmp(map_name,maps[i]->map_name))
diff --git a/mail/elm+ME/files/patch-ae b/mail/elm+ME/files/patch-ae
deleted file mode 100644
index abf3fdf108b2..000000000000
--- a/mail/elm+ME/files/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/charset.c.old	Wed Aug  9 18:14:33 2000
-+++ lib/charset.c	Mon Aug 14 17:09:14 2000
-@@ -52,6 +52,7 @@
-     { &cs_ascii, NULL, SET_valid,  "ISO-8859-14", ASCII, NULL },
-     { &cs_ascii, NULL, SET_valid,  "ISO-8859-15", ASCII, NULL },
-     { &cs_ascii, &map_koi8r, SET_valid,  "KOI8-R", ASCII, NULL },
-+    { &cs_ascii, &map_cp1251, SET_valid, "WINDOWS-1251", ASCII, NULL },
-     { &cs_utf8,  &map_utf8,  SET_valid,  "UTF-8",  NULL, &set_utf8 },
-     { NULL, NULL, 0,       NULL, NULL, NULL }
- 
diff --git a/mail/elm+ME/files/patch-af b/mail/elm+ME/files/patch-af
deleted file mode 100644
index f9c60663f91c..000000000000
--- a/mail/elm+ME/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdrs/cs_imp.h.old	Wed Aug  9 18:14:33 2000
-+++ hdrs/cs_imp.h	Mon Aug 14 17:10:56 2000
-@@ -155,7 +155,7 @@
- 	uint16                 iso646[12];
- 	struct utfmap          utfmap;
-     } b;
--} map_ascii, map_latin1, map_koi8r, map_invariant, map_utf8;
-+} map_ascii, map_latin1, map_koi8r, map_cp1251, map_invariant, map_utf8;
- 
- extern unsigned char map_fallback_rev P_((unsigned int val, int *found));
- extern uint16 map_fallback P_((unsigned int c));
diff --git a/mail/elm+ME/files/patch-ag b/mail/elm+ME/files/patch-ag
new file mode 100644
index 000000000000..9832540a67bc
--- /dev/null
+++ b/mail/elm+ME/files/patch-ag
@@ -0,0 +1,29 @@
+--- doc/Makefile.SH.orig	Fri Dec 29 20:56:43 2000
++++ doc/Makefile.SH	Sun Jan  7 04:39:50 2001
+@@ -145,6 +145,8 @@
+ 	$(SED) 's"#LIB#"$(LIB)"g;' < elmterminal.1 > elmterminal.1.subs
+ frm.1.subs: frm.1
+ 	$(SED) 's"#LIB#"$(LIB)"g;' < frm.1 > frm.1.subs
++newmail.1.subs: newmail.1
++	$(SED) 's"#LIB#"$(LIB)"g;' < newmail.1 > newmail.1.subs
+ 
+ formatted_pages: catman $(FORMATTED_PAGES_LIST)
+ 
+@@ -224,7 +226,7 @@
+ 				$(CP) $? $@
+ 				$(CHMOD) u=rw,go=r $@
+ 
+-$(MAN)/newmail$(MANEXT):	newmail.1
++$(MAN)/newmail$(MANEXT):	newmail.1.subs
+ 				$(RM) $@
+ 				$(CP) $? $@
+ 				$(CHMOD) u=rw,go=r $@
+@@ -425,7 +427,7 @@
+ 		true ; \
+ 	fi
+ 
+-catman/newmail$(CATMANEXT)$(SUFFIX):		newmail.1
++catman/newmail$(CATMANEXT)$(SUFFIX):		newmail.1.subs
+ 	$(MANROFF) $(MANROFF_OPTS) -man $? > catman/newmail$(CATMANEXT)
+ 	@if $(TEST) "$(PACKED)" = y ; then \
+ 		$(RM) $@ ; \
diff --git a/mail/elm+ME/files/patch-ah b/mail/elm+ME/files/patch-ah
new file mode 100644
index 000000000000..bfec9b6a440e
--- /dev/null
+++ b/mail/elm+ME/files/patch-ah
@@ -0,0 +1,20 @@
+--- doc/newalias.1.orig	Fri Dec 29 20:56:44 2000
++++ doc/newalias.1	Sun Jan  7 04:34:29 2001
+@@ -73,13 +73,13 @@
+ .br
+ $HOME/.elm/aliases              alias data file for user
+ .br
+-/usr/local/lib/aliases.text     alias source for system
++#LIB#/aliases.text     alias source for system
+ .br
+-/usr/local/lib/aliases.dir      alias dbz directory for system
++#LIB#/aliases.dir      alias dbz directory for system
+ .br
+-/usr/local/lib/aliases.pag      alias data hash table for system
++#LIB#/aliases.pag      alias data hash table for system
+ .br
+-/usr/local/lib/aliases          alias data file for system
++#LIB#/aliases          alias data file for system
+ .SH AUTHOR
+ Elm Development Group
+ .SH SEE ALSO
diff --git a/mail/elm+ME/files/patch-ai b/mail/elm+ME/files/patch-ai
new file mode 100644
index 000000000000..28c3eec4f415
--- /dev/null
+++ b/mail/elm+ME/files/patch-ai
@@ -0,0 +1,22 @@
+--- lib/headers.c.orig	Fri Dec 29 20:56:44 2000
++++ lib/headers.c	Mon Jan 29 00:52:39 2001
+@@ -347,8 +347,18 @@
+      */
+ 
+     if (NULL != (tmphdr = locate_header_by_name(result,"MIME-Version"))) {
++	/* RFC 1521 says:
+ 
+-	if (0 == strcmp(tmphdr->body,"1.0"))
++	   NOTE TO IMPLEMENTORS: All header fields defined in this document,
++	   including MIME-Version, Content-type, etc., are subject to the
++	   general syntactic rules for header fields specified in RFC 822.  In
++	   particular, all can include comments, which means that the following
++	   two MIME-Version fields are equivalent:
++   
++                    MIME-Version: 1.0
++                    MIME-Version: 1.0 (Generated by GBD-killer 3.7)
++	*/
++	if (0 == strncmp(tmphdr->body,"1.0", 3))
+ 	    entry->status |= MIME_MESSAGE;
+ 	else {
+ 	    entry->status |= MIME_MESSAGE|MIME_UNSUPPORTED;
diff --git a/mail/elm+ME/pkg-descr b/mail/elm+ME/pkg-descr
index 6a7ff44a681c..98d1110f019c 100644
--- a/mail/elm+ME/pkg-descr
+++ b/mail/elm+ME/pkg-descr
@@ -1,3 +1,5 @@
-       Elm is an interactive screen-oriented mailer program  that
-       supersedes mail and mailx. This is unofficial clone.
+An interactive screen-oriented mailer program that supersedes mail
+and mailx. This version is an unofficial clone with enhanced MIME
+and character set support.  others new features include PGP, IMAP.
+
 WWW: http://www.ozone.fmi.fi/KEH/
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 655a9f4bf1b1..ab4af39a22c0 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -1,25 +1,30 @@
-bin/elm
 bin/answer
 bin/checkalias
+bin/elm
 bin/elmalias
 bin/fastmail
 bin/frm
-@exec ln -f %D/%F %D/bin/nfrm
+@exec ln -f %B/%f %B/nfrm
+@unexec rm -f %B/nfrm
 bin/listalias
 bin/messages
 bin/newalias
 bin/newmail
-@exec ln -f %D/%F %D/bin/wnewmail
+@exec ln -f %B/%f %B/wnewmail
+@unexec rm -f %B/wnewmail
 bin/printmail
 bin/readmsg
-lib/prlong
-lib/elm.mimecharsets
-lib/elm.mimetypes
-lib/elmcharset
-lib/elmterminal
-lib/elmrc-info
-lib/elm-help.0
-lib/elm-help.1
-lib/elm-help.2
-lib/elm-help.3
 share/nls/C/elm2.4me+.cat
+lib/elm/elm-help.0
+lib/elm/elm-help.1
+lib/elm/elm-help.2
+lib/elm/elm-help.3
+lib/elm/elm.mimecharsets
+@unexec if cmp -s %D/lib/elm/elm.mimetypes %D/lib/elm/elm.mimetypes-dist; then rm -f %D/lib/elm/elm.mimetypes; fi
+lib/elm/elm.mimetypes-dist
+@exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes
+lib/elm/elmcharset
+lib/elm/elmrc-info
+lib/elm/elmterminal
+lib/elm/prlong
+@dirrm lib/elm
diff --git a/mail/elm+ME/scripts/pre-configure b/mail/elm+ME/scripts/pre-configure
index ef46f51f7d19..cb08e2570302 100644
--- a/mail/elm+ME/scripts/pre-configure
+++ b/mail/elm+ME/scripts/pre-configure
@@ -1,23 +1,20 @@
 #!/bin/sh -
 #
 #       pre-configure script for Elm port to FreeBSD
+#
 # $FreeBSD$
 
-PortsDir=$PORTSDIR
-CurDir=$CURDIR
-WrkSrc=$WRKSRC
-
-has_inttypes=undef
-[ -r /usr/include/inttypes.h ] && has_inttypes=define
+[ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
 
-	cat > ${WrkSrc}/config.sh << EOF
+	cat > ${WRKSRC}/config.sh << EOF
 #!/bin/sh
 # config.sh
 # This file was produced by running the Configure script.
 
 Log='\$Log'
 Header='\$Header'
-bin="${PREFIX}/bin"
+install_prefix='${PREFIX}'
+bin='${PREFIX}/bin'
 contains='grep'
 cppstdin='/usr/bin/cpp'
 cppminus=''
@@ -39,7 +36,7 @@ n='-n'
 c=''
 orderlib='false'
 ranlib=':'
-package='elm2'
+package='elm2.4me+'
 pager='builtin++'
 startsh='#!/bin/sh'
 define='define'
@@ -114,13 +111,14 @@ tar
 tbl
 test
 troff
+gtroff
 uname
 uuname
 vi
 '
 test='/bin/test'
 inews=''
-ispell="${PREFIX}/bin/ispell"
+ispell='${PREFIX}/bin/ispell'
 egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
@@ -130,7 +128,7 @@ mailx='mailx'
 mail=''
 cpp='/usr/bin/cpp'
 perl=''
-emacs='emacs'
+emacs='${PREFIX}/bin/emacs'
 ls='/bin/ls'
 rmail='/bin/rmail'
 sendmail='/usr/sbin/sendmail'
@@ -164,7 +162,7 @@ compress='/usr/bin/compress'
 execmail=''
 libswanted='sun nls c_s'
 noaddlib='yes'
-c_date='Mon Aug 14 15:54:12 MSD 2000'
+c_date='Sun Jan  7 05:51:19 CET 2001'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -174,7 +172,7 @@ d_content='undef'
 d_crypt='define'
 cryptlib='-lcrypt'
 d_cuserid='undef'
-d_disphost='undef'
+d_disphost='define'
 d_domname='define'
 d_usegetdom='undef'
 d_errlst='define'
@@ -186,23 +184,23 @@ has_fcntl='define'
 d_ftruncate='define'
 d_gethname='define'
 d_douname='undef'
-d_host_comp='undef'
-ign_hname='n'
+ign_hname=''
 d_havetlib='define'
 termlib='-ltermlib'
+i_curses='undef'
+i_term='define'
 d_index='undef'
-d_internet='define'
+d_internet=''
 d_ispell='define'
-ispell_path="${PREFIX}/bin/ispell"
-ispell_options=''
+ispell_path='${PREFIX}/bin/ispell'
+ispell_options='-x'
 d_locale='define'
 d_nl_types='define'
 d_msgcat='define'
-d_usenls='undef'
+d_usenls=''
 d_mallocvoid='define'
 d_mboxedit='define'
-metamail_path='none'
-defencoding=''
+metamail_path='${PREFIX}/bin/metamail'
 d_8bitmime='define'
 d_binarymime='undef'
 d_dsn='define'
@@ -215,10 +213,9 @@ d_noxheader='undef'
 d_pidcheck='define'
 d_ptem='undef'
 d_putenv='define'
-d_remlock='undef'
 maxattempts='6'
 d_setgid='define'
-d_savegrpmboxid='undef'
+d_savegrpmboxid='define'
 mailermode='2755'
 d_sigvec='undef'
 d_sigvectr='undef'
@@ -247,6 +244,8 @@ d_termio='undef'
 d_termios='define'
 d_utimbuf='define'
 d_vfork='define'
+d_directory='define'
+d_directyry_type='USE_DIRENT'
 defbatsub='no subject (file transmission)'
 defeditor='/usr/bin/vi'
 editoropts=''
@@ -255,22 +254,20 @@ phostname='hostname'
 mydomain=''
 autohostname='define'
 i_memory='define'
-i_stdarg='define'
-i_stdlib='define'
 i_time='define'
 i_systime='define'
 d_systimekernel='undef'
 i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
-lib="${PREFIX}/lib"
+lib='${PREFIX}/lib/elm'
 libc='/usr/lib/libc.so'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='mail'
-mansrc="${PREFIX}/man/man1"
-catmansrc="${PREFIX}/man/cat1"
+mansrc='${PREFIX}/man/man1'
+catmansrc='${PREFIX}/man/cat1'
 manext='.1'
 manext_choice='.1'
 catmanext='.1'
@@ -280,7 +277,7 @@ manroff='/usr/bin/nroff'
 manroffopts=''
 suffix=''
 packer=''
-optimize="\$CFLAGS"
+optimize='${CFLAGS}'
 ccflags=''
 cppflags=''
 ldflags='-s'
@@ -307,15 +304,14 @@ d_xenix='undef'
 d_bsd='define'
 locale='locale'
 d_pgp='define'
-pgp="${PREFIX}/bin/pgp"
-pgp2_path="${PREFIX}/bin/pgp"
-pgp5_dir='none'
-gpg_path='none'
-special_path='${PREFIX}/bin'
+pgp='${PREFIX}/bin/pgp'
+pgp2_path='${PREFIX}/bin/pgp'
+pgp5_dir='${PREFIX}/bin'
+gpg_path='${PREFIX}/bin/gpg'
+special_path='/usr/bin'
+special_path2='${PREFIX}/bin'
 locale_dir='/usr/share/locale'
 CONFIG=true
 EOF
 
 exit 0
-# END
-
author	FUJISHIMA Satsuki <sf@FreeBSD.org>	2001-01-31 17:16:07 +0000
committer	FUJISHIMA Satsuki <sf@FreeBSD.org>	2001-01-31 17:16:07 +0000
commit	ba75d40447b0ae425dbf278692a9429137d655dc (patch)
tree	42fb93cb2c99da0ee4f0da21cf4e55036383282b /mail/elm+ME
parent	Update pspell version number. (diff)