Attachment #12537 for bug #24171




#

PORTNAME=	elm
PORTVERSION=    2.4ME+87
CATEGORIES=	mail

# here is the main repository, but the .tar.gz isn't available right now,
# there is only a .tar archive!
MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
		http://www.ozone.fmi.fi/KEH/

# 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+/

# the following repositories don't conform to the main repository.
# they have .tar.gz while the main repository have .tar ones.
# 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+/

# the following site have a broken .tar.gz archive,
# so, get rid of it until it is fixed.
# MASTER_SITES+=	ftp://ftp.lip6.fr/pub/unix/mail/elm-me/

# fetch doesn't work w/ ftp.lip6.fr and ftp doesn't work w/ the http protocol.
# FETCH_CMD=	/usr/bin/ftp

EXTRACT_SUFX=	.tar
EXTRACT_CMD=	${CAT}
EXTRACT_BEFORE_ARGS=

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}/${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

HAS_CONFIGURE=	yes

CONFIGURE_SCRIPT= Configure
CONFIGURE_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

DESTLIBDIR=	${PREFIX}/lib/${PORTNAME}
DESTMANDIR=	${PREFIX}/man

post-configure:
	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS

post-install: install-nls install-mime-types remove-catman-files

install-nls:
	@cd ${WRKSRC}/nls; ${MAKE} install

install-mime-types:
	@${INSTALL_DATA} \
		${FILESDIR}/elm.mimetypes ${DESTLIBDIR}/elm.mimetypes-dist; \
	if [ ! -f ${DESTLIBDIR}/elm.mimetypes ] ; then \
		${INSTALL_DATA} \
			${FILESDIR}/elm.mimetypes ${DESTLIBDIR}; \
	fi

remove-catman-files:
.for sect in 1
.for file in ${MAN${sect}}
	@${RM} -f ${DESTMANDIR}/cat${sect}/${file}
.endfor
.endfor

.include <bsd.port.mk>

Line 1 Link Here

(-)elm+ME/distinfo (-1 / +1 lines)
1	MD5 (elm-2.4ME+82.tar.gz) = eae2465a6ecd3399ad68d5b81f923e76	1	MD5 (elm-2.4ME+87.tar) = 667988e6f17f392409eb480fab7da578




# 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.

#gz	application/octet-stream
#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
#tar	application/octet-stream; type=tar
#Z	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]
pdf     application/pdf
ai      application/postscript
eps     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
pwz		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]
#			naplps					     [Ferber]
#			vnd.dwg					     [Moline]
#		image/vnd.dwg			[-> image/vnd.dxf]
#			vnd.svf					     [Moline]
#		image/vnd.svf			[-> image/vnd.dxf]
#			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
tex     application/x-tex
texi    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
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
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
aiff    audio/x-aiff
aifc    audio/x-aiff
aiff		audio/x-aiff
maca		audio/x-macaudio
#		audio/x-next
wav     audio/x-wav

# Image types
# -----------

jpe     image/jpeg
tiff    image/tiff
tif     image/tiff
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
# -----------

#       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

# ======================================================================
# Known unregistered MIME types from Apache
# ======================================================================

# Text types
# ----------

#		text/vnd.flatland.3dml

# Application types
# -----------------

cpt		application/mac-compactpro
smi		application/smil
smil		application/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]
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
kar		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
#		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

# Misc types
# ----------

#		archive/tar			[-> application/x-tar]

#		x-world/x-vrml			[-> model/vrml]

# ======================================================================
# 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
rpm		audio/x-pn-realaudio-plugin
#		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/pgp
#		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
info		application/x-info
java		application/x-java
class		application/x-java-vm
ser		application/x-java-serialized-object
jar		application/x-java-archive
ksh		application/x-ksh
lha		application/x-lha
lzh		application/x-lzh
#		application/x-lotus-notes	[-> application/vnd.lotus-notes]
#		application/x-patch		[-> text/x-patch]
#		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
mod		audio/x-mod
xm		audio/x-mod
s3m		audio/x-mod
stm		audio/x-mod
mtm		audio/x-mod
ult		audio/x-mod
uni		audio/x-mod
it		audio/x-mod
#		audio/x-mpeg			[-> audio/mpeg]
m3u		audio/x-scpls
#		audio/x-ulaw			[-> audio/basic]

# Video types
# -----------

flc		video/x-flc
fli     video/x-fli
iff		video/x-iff
#		video/x-qtc			[-> video/quicktime]
#		video/x-qtv			[-> video/quicktime]

# ======================================================================





--- 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)




--- nls/LANGS.orig	Fri Dec 29 20:56:45 2000
+++ nls/LANGS	Sun Jan  7 09:00:13 2001
@@ -1,5 +1,3 @@
*** 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/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




--- 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"
  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
+# 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 @@
--- 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 $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=''




--- 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))

Lines 1-10 Link Here

(-)elm+ME/files/patch-ae (-10 lines)
1	--- lib/charset.c.old Wed Aug 9 18:14:33 2000
2	+++ lib/charset.c Mon Aug 14 17:09:14 2000
3	@@ -52,6 +52,7 @@
4	{ &cs_ascii, NULL, SET_valid, "ISO-8859-14", ASCII, NULL },
5	{ &cs_ascii, NULL, SET_valid, "ISO-8859-15", ASCII, NULL },
6	{ &cs_ascii, &map_koi8r, SET_valid, "KOI8-R", ASCII, NULL },
7	+ { &cs_ascii, &map_cp1251, SET_valid, "WINDOWS-1251", ASCII, NULL },
8	{ &cs_utf8, &map_utf8, SET_valid, "UTF-8", NULL, &set_utf8 },
9	{ NULL, NULL, 0, NULL, NULL, NULL }
10

Lines 1-11 Link Here

(-)elm+ME/files/patch-af (-11 lines)
1	--- hdrs/cs_imp.h.old Wed Aug 9 18:14:33 2000
2	+++ hdrs/cs_imp.h Mon Aug 14 17:10:56 2000
3	@@ -155,7 +155,7 @@
4	uint16 iso646[12];
5	struct utfmap utfmap;
6	} b;
7	-} map_ascii, map_latin1, map_koi8r, map_invariant, map_utf8;
8	+} map_ascii, map_latin1, map_koi8r, map_cp1251, map_invariant, map_utf8;
9
10	extern unsigned char map_fallback_rev P_((unsigned int val, int *found));
11	extern uint16 map_fallback P_((unsigned int c));




--- 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) $@ ; \




--- 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

Lines 1-3 Link Here

(-)elm+ME/pkg-descr (-2 / +4 lines)
1	Elm is an interactive screen-oriented mailer program that	1	An interactive screen-oriented mailer program that supersedes mail
2	supersedes mail and mailx. This is unofficial clone.	2	and mailx. This version is an unofficial clone with enhanced MIME
		3	and character set support. others new features include PGP, IMAP.
		4
3	WWW: http://www.ozone.fmi.fi/KEH/	5	WWW: http://www.ozone.fmi.fi/KEH/




bin/elm
bin/answer
bin/checkalias
bin/elm
bin/elmalias
bin/fastmail
bin/frm
@exec ln -f %B/%f %B/nfrm
@unexec rm -f %B/nfrm
bin/listalias
bin/messages
bin/newalias
bin/newmail
@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




#!/bin/sh -
#
#       pre-configure script for Elm port to FreeBSD
#
# $FreeBSD: ports/mail/elm+ME/scripts/pre-configure,v 1.25 2000/08/14 13:27:17 ache Exp $

[ -r /usr/include/inttypes.h ] && has_inttypes=define || has_inttypes=undef
CurDir=$CURDIR
WrkSrc=$WRKSRC

	cat > ${WRKSRC}/config.sh << EOF
[ -r /usr/include/inttypes.h ] && has_inttypes=define

	cat > ${WrkSrc}/config.sh << EOF
#!/bin/sh
# config.sh
# This file was produced by running the Configure script.

Log='\$Log'
Header='\$Header'
install_prefix='${PREFIX}'
bin='${PREFIX}/bin'
contains='grep'
cppstdin='/usr/bin/cpp'
cppminus=''

c=''
orderlib='false'
ranlib=':'
package='elm2.4me+'
pager='builtin++'
startsh='#!/bin/sh'
define='define'

tbl
test
troff
gtroff
uname
uuname
vi
'
test='/bin/test'
inews=''
ispell='${PREFIX}/bin/ispell'
egrep='/usr/bin/egrep'
more='/usr/bin/more'
pg='pg'

mail=''
cpp='/usr/bin/cpp'
perl=''
emacs='${PREFIX}/bin/emacs'
ls='/bin/ls'
rmail='/bin/rmail'
sendmail='/usr/sbin/sendmail'

execmail=''
libswanted='sun nls c_s'
noaddlib='yes'
c_date='Sun Jan  7 05:51:19 CET 2001'
d_ascii='undef'
d_broke_ctype='undef'
d_calendar='define'

d_crypt='define'
cryptlib='-lcrypt'
d_cuserid='undef'
d_disphost='define'
d_domname='define'
d_usegetdom='undef'
d_errlst='define'

d_ftruncate='define'
d_gethname='define'
d_douname='undef'
ign_hname=''
ign_hname='n'
d_havetlib='define'
termlib='-ltermlib'
i_curses='undef'
i_term='define'
d_index='undef'
d_internet=''
d_ispell='define'
ispell_path='${PREFIX}/bin/ispell'
ispell_options='-x'
d_locale='define'
d_nl_types='define'
d_msgcat='define'
d_usenls=''
d_mallocvoid='define'
d_mboxedit='define'
metamail_path='${PREFIX}/bin/metamail'
defencoding=''
d_8bitmime='define'
d_binarymime='undef'
d_dsn='define'

d_pidcheck='define'
d_ptem='undef'
d_putenv='define'
d_remlock='undef'
maxattempts='6'
d_setgid='define'
d_savegrpmboxid='define'
mailermode='2755'
d_sigvec='undef'
d_sigvectr='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=''

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/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'
manext='.1'
manext_choice='.1'
catmanext='.1'

manroffopts=''
suffix=''
packer=''
optimize='${CFLAGS}'
ccflags=''
cppflags=''
ldflags='-s'

d_bsd='define'
locale='locale'
d_pgp='define'
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


Return to bug 24171

Lines 6-39 Link Here

(-)elm+ME/Makefile (-19 / +68 lines)
6	#	6	#
7		7
8	PORTNAME= elm	8	PORTNAME= elm
9	PORTVERSION= 2.4ME+82	9	PORTVERSION= 2.4ME+87
10	CATEGORIES= mail	10	CATEGORIES= mail
		11
		12	# here is the main repository, but the .tar.gz isn't available right now,
		13	# there is only a .tar archive!
11	MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \	14	MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
12	ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \	15	http://www.ozone.fmi.fi/KEH/
13	ftp://ftp.ibp.fr/pub/unix/mail/elm-me/	16
		17	# the following repositories conform to the main repository.
		18	MASTER_SITES+= ftp://ftp.tu-darmstadt.de/pub/networking/mail/elm+ME/ \
		19	ftp://ftp.cs.tu-berlin.de/pub/net/mail/elm-me-plus/ \
		20	ftp://ftp.ntua.gr/pub/net/mail/elm-me/ \
		21	ftp://ftp.eos.hokudai.ac.jp/pub/network/mail/elm-2.4ME+/ \
		22	ftp://ftp.win.ne.jp/pub/network/mail/elm-2.4ME+/
		23
		24	# the following repositories don't conform to the main repository.
		25	# they have .tar.gz while the main repository have .tar ones.
		26	# MASTER_SITES+= ftp://ftp.unina.it/pub/Unix/pkgs/network/mail/elm-me+/ \
		27	# ftp://ftp.rge.com/pub/mail/elm/elm-2.4ME+/ \
		28	# ftp://ftp.uni-trier.de/pub/unix/network/mail/elm-me+/
		29
		30	# the following site have a broken .tar.gz archive,
		31	# so, get rid of it until it is fixed.
		32	# MASTER_SITES+= ftp://ftp.lip6.fr/pub/unix/mail/elm-me/
		33
		34	# fetch doesn't work w/ ftp.lip6.fr and ftp doesn't work w/ the http protocol.
		35	# FETCH_CMD= /usr/bin/ftp
14		36
15	MAINTAINER= ache@FreeBSD.org	37	EXTRACT_SUFX= .tar
		38	EXTRACT_CMD= ${CAT}
		39	EXTRACT_BEFORE_ARGS=
		40
		41	MAINTAINER= clefevre@citeweb.net
		42
		43	# not needed since config.sh is generated by scripts/pre-configure.
		44	# BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
		45	# BUILD_DEPENDS= metamail:${PORTSDIR}/mail/metamail
		46	# BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp
		47	# BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
16		48
17	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./}	49	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./}
18	MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 \
19	frm.1 listalias.1 messages.1 newalias.1 newmail.1 \
20	printmail.1 readmsg.1 elmcharset.1 elmterminal.1
21	MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1
22		50
23	HAS_CONFIGURE= Yes	51	HAS_CONFIGURE= yes
		52
24	CONFIGURE_SCRIPT= Configure	53	CONFIGURE_SCRIPT= Configure
25	CONFIGURE_ENV= PREFIX="${PREFIX}"	54	CONFIGURE_ENV= CFLAGS="${CFLAGS}" PREFIX="${PREFIX}"
26	CONFIGURE_ARGS= -S -d	55	CONFIGURE_ARGS= -S -d -P${PREFIX}
27		56
28	post-install:	57	MAN1= answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
29	perl -pi -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS	58	elmterminal.1 fastmail.1 frm.1 listalias.1 messages.1 \
30	cd ${WRKSRC}/nls; ${MAKE} install	59	newalias.1 newmail.1 printmail.1 readmsg.1
31	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \	60	MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1
32	${INSTALL_DATA} \	61
33	${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \	62	DESTLIBDIR= ${PREFIX}/lib/${PORTNAME}
34	else \	63	DESTMANDIR= ${PREFIX}/man
		64
		65	post-configure:
		66	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
		67
		68	post-install: install-nls install-mime-types remove-catman-files
		69
		70	install-nls:
		71	@cd ${WRKSRC}/nls; ${MAKE} install
		72
		73	install-mime-types:
		74	@${INSTALL_DATA} \
		75	${FILESDIR}/elm.mimetypes ${DESTLIBDIR}/elm.mimetypes-dist; \
		76	if [ ! -f ${DESTLIBDIR}/elm.mimetypes ] ; then \
35	${INSTALL_DATA} \	77	${INSTALL_DATA} \
36	${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \	78	${FILESDIR}/elm.mimetypes ${DESTLIBDIR}; \
37	fi	79	fi
		80
		81	remove-catman-files:
		82	.for sect in 1
		83	.for file in ${MAN${sect}}
		84	@${RM} -f ${DESTMANDIR}/cat${sect}/${file}
		85	.endfor
		86	.endfor
38		87
39	.include <bsd.port.mk>	88	.include <bsd.port.mk>

Line 0 Link Here

(-)elm+ME/files/patch-aa (+20 lines)
	1	--- nls/Makefile.orig Fri Dec 29 20:56:45 2000
	2	+++ nls/Makefile Sat Jan 6 23:21:16 2001
	3	@@ -3,7 +3,7 @@
	4	#
	5	LANGFILE=LANGS
	6	CATNAME=elm2.4me+.cat
	7	-GENCAT= nls/gencat
	8	+GENCAT= gencat
	9
	10	HDIR= ../hdrs
	11	SDIR= C/C/C
	12	@@ -44,7 +44,7 @@
	13	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
	14
	15	$(HFILES): $(MFILES)
	16	- gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
	17	+ $(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
	18
	19	clean: FRC
	20	/bin/rm -f $(MSGCAT)

Lines 1-49 Link Here

(-)elm+ME/files/patch-ab (-47 / +7 lines)
1	*** nls/Makefile.old Thu Mar 10 20:21:47 1994	1	--- nls/LANGS.orig Fri Dec 29 20:56:45 2000
2	--- nls/Makefile Fri Jul 28 06:55:04 1995	2	+++ nls/LANGS Sun Jan 7 09:00:13 2001
3	***************	3	@@ -1,5 +1,3 @@
4	* 1,6 **
5	LANGFILE=LANGS
6	CATNAME=elm2.4.cat
7	! GENCAT= nls/gencat
8
9	HDIR= ../hdrs
10	SDIR= C/C/C
11	--- 1,6 ----
12	LANGFILE=LANGS
13	CATNAME=elm2.4.cat
14	! GENCAT= gencat
15
16	HDIR= ../hdrs
17	SDIR= C/C/C
18	***************
19	* 39,45 **
20	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
21
22	$(HFILES): $(MFILES)
23	! gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
24
25	clean: FRC
26	/bin/rm -f $(MSGCAT)
27	--- 39,45 ----
28	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
29
30	$(HFILES): $(MFILES)
31	! $(GENCAT) $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
32
33	clean: FRC
34	/bin/rm -f $(MSGCAT)
35	*** nls/LANGS.old Sun Jun 28 04:32:25 1992
36	--- nls/LANGS Fri Jul 28 06:48:31 1995
37	***************
38	* 1,5 **
39	# LANGS file
40
41	! C/C/C /usr/local/nls/msg/C
42	! english/us/ascii /usr/local/nls/msg/english
43	! french/canada/8859 /usr/local/nls/msg/french
44	--- 1,5 ----
45	# LANGS file	4	# LANGS file
46		5
47	! C/C/C /usr/local/share/nls/C	6	-C/C/C /usr/local/nls/msg/C
48	! english/us/ascii /usr/local/share/nls/en_US.ISO_8859-1	7	-english/us/ascii /usr/local/nls/msg/english
49	! french/canada/8859 /usr/local/share/nls/fr_FR.ISO_8859-1	8	-french/canada/8859 /usr/local/nls/msg/french
		9	+C/C/C /usr/local/share/nls/C

Lines 1-36 Link Here

(-)elm+ME/files/patch-ac (-24 / +17 lines)
1	*** Configure.bak Mon Mar 11 18:47:43 1996	1	--- Configure.orig Fri Dec 29 20:57:04 2000
2	--- Configure Tue Mar 12 14:52:18 1996	2	+++ Configure Sat Jan 6 23:19:54 2001
3	***************	3	@@ -16,10 +16,10 @@
4	* 18,28 **	4	PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
5	PATH=".:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin:$PATH"
6	export PATH \|\| (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)	5	export PATH \|\| (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
7		6
8	- if test ! -t 0; then	7	-if test ! -t 0; then
9	- echo "Say 'sh Configure', not 'sh <Configure'"	8	- echo "Say 'sh Configure', not 'sh <Configure'"
10	- exit 1	9	- exit 1
11	- fi	10	-fi
12	-	11	+# if test ! -t 0; then
		12	+# echo "Say 'sh Configure', not 'sh <Configure'"
		13	+# exit 1
		14	+# fi
		15
13	(alias) >/dev/null 2>&1 && \	16	(alias) >/dev/null 2>&1 && \
14	echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \	17	echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
15	echo "especially on exotic machines. If yours does, try the Bourne shell instead.)"	18	@@ -1926,7 +1926,10 @@
16	--- 18,23 ----
17	***************
18	* 2278,2284 **
19
20	: see if crypt exists
21	echo " "
22	! if $contains '^crypt$' libc.list >/dev/null 2>&1; then
23	echo 'crypt() found.'
24	d_crypt="$define"
25	cryptlib=''
26	--- 2273,2282 ----
27		19
28	: see if crypt exists	20	: see if crypt exists
29	echo " "	21	echo " "
30	! if $test "$cryptlib" = -lcrypt; then	22	-if $contains '^crypt$' libc.list >/dev/null 2>&1; then
31	! echo 'crypt() found.'	23	+if $test "$cryptlib" = -lcrypt; then
32	! d_crypt="$define"	24	+ echo 'crypt() found.'
33	! elif $contains '^crypt$' libc.list >/dev/null 2>&1; then	25	+ d_crypt="$define"
		26	+elif $contains '^crypt$' libc.list >/dev/null 2>&1; then
34	echo 'crypt() found.'	27	echo 'crypt() found.'
35	d_crypt="$define"	28	d_crypt="$define"
36	cryptlib=''	29	cryptlib=''

Lines 1-63 Link Here

(-)elm+ME/files/patch-ad (-63 lines)
1	--- lib/cs_binary.c.old Wed Aug 9 18:14:34 2000
2	+++ lib/cs_binary.c Mon Aug 14 17:07:42 2000
3	@@ -274,6 +274,51 @@
4	&cs_ascii, "KOI8-R", 0, map_init_koi8r, 0 };
5
6
7	+/* CP1251 ------------------------------------------------------------ */
8	+
9	+/* Table compied from official Unicode mapping 2.01 */
10	+
11	+static uint16 cp12512unicode[128] = {
12	+ 0x0402,0x0403,0x201A,0x0453,0x201E,0x2026,0x2020,0x2021,
13	+ 0x20AC,0x2030,0x0409,0x2039,0x040A,0x040C,0x040B,0x040F,
14	+ 0x0452,0x2018,0x2019,0x201C,0x201D,0x2022,0x2013,0x2014,
15	+ 0x003F,0x2122,0x0459,0x203A,0x045A,0x045C,0x045B,0x045F,
16	+ 0x00A0,0x040E,0x045E,0x0408,0x00A4,0x0490,0x00A6,0x00A7,
17	+ 0x0401,0x00A9,0x0404,0x00AB,0x00AC,0x00AD,0x00AE,0x0407,
18	+ 0x00B0,0x00B1,0x0406,0x0456,0x0491,0x00B5,0x00B6,0x00B7,
19	+ 0x0451,0x2116,0x0454,0x00BB,0x0458,0x0405,0x0455,0x0457,
20	+ 0x0410,0x0411,0x0412,0x0413,0x0414,0x0415,0x0416,0x0417,
21	+ 0x0418,0x0419,0x041A,0x041B,0x041C,0x041D,0x041E,0x041F,
22	+ 0x0420,0x0421,0x0422,0x0423,0x0424,0x0425,0x0426,0x0427,
23	+ 0x0428,0x0429,0x042A,0x042B,0x042C,0x042D,0x042E,0x042F,
24	+ 0x0430,0x0431,0x0432,0x0433,0x0434,0x0435,0x0436,0x0437,
25	+ 0x0438,0x0439,0x043A,0x043B,0x043C,0x043D,0x043E,0x043F,
26	+ 0x0440,0x0441,0x0442,0x0443,0x0444,0x0445,0x0446,0x0447,
27	+ 0x0448,0x0449,0x044A,0x044B,0x044C,0x044D,0x044E,0x044F
28	+ };
29	+
30	+
31	+static void map_init_cp1251 P_((struct map_info *map));
32	+static void map_init_cp1251(map)
33	+ struct map_info *map;
34	+{
35	+ int i;
36	+
37	+ for (i = 0; i < 128; i++) {
38	+ map->b.ascii.map_ascii_upper[i] = cp12512unicode[i];
39	+ }
40	+
41	+ map_ascii_init_rev(map);
42	+ map->map_initialized = 1;
43	+
44	+ dprint(5,(debugfile,
45	+ "Map %s initialized\n",map->map_name));
46	+}
47	+
48	+struct map_info map_cp1251 = {
49	+ &cs_ascii, "WINDOWS-1251", 0, map_init_cp1251, 0 };
50	+
51	+
52	/* bytemap --------------------------------------------------------------- */
53
54	static void map_bytemap_init_rev P_((struct map_info *map));
55	@@ -2209,7 +2254,7 @@
56
57	int i;
58	static struct map_info * maps[] = { &map_ascii, &map_latin1,
59	- &map_koi8r, NULL };
60	+ &map_koi8r, &map_cp1251, NULL };
61
62	for (i = 0; maps[i]; i++)
63	if (0 == strcmp(map_name,maps[i]->map_name))

Line 0 Link Here

(-)elm+ME/files/patch-ag (+29 lines)
	1	--- doc/Makefile.SH.orig Fri Dec 29 20:56:43 2000
	2	+++ doc/Makefile.SH Sun Jan 7 04:39:50 2001
	3	@@ -145,6 +145,8 @@
	4	$(SED) 's"#LIB#"$(LIB)"g;' < elmterminal.1 > elmterminal.1.subs
	5	frm.1.subs: frm.1
	6	$(SED) 's"#LIB#"$(LIB)"g;' < frm.1 > frm.1.subs
	7	+newmail.1.subs: newmail.1
	8	+ $(SED) 's"#LIB#"$(LIB)"g;' < newmail.1 > newmail.1.subs
	9
	10	formatted_pages: catman $(FORMATTED_PAGES_LIST)
	11
	12	@@ -224,7 +226,7 @@
	13	$(CP) $? $@
	14	$(CHMOD) u=rw,go=r $@
	15
	16	-$(MAN)/newmail$(MANEXT): newmail.1
	17	+$(MAN)/newmail$(MANEXT): newmail.1.subs
	18	$(RM) $@
	19	$(CP) $? $@
	20	$(CHMOD) u=rw,go=r $@
	21	@@ -425,7 +427,7 @@
	22	true ; \
	23	fi
	24
	25	-catman/newmail$(CATMANEXT)$(SUFFIX): newmail.1
	26	+catman/newmail$(CATMANEXT)$(SUFFIX): newmail.1.subs
	27	$(MANROFF) $(MANROFF_OPTS) -man $? > catman/newmail$(CATMANEXT)
	28	@if $(TEST) "$(PACKED)" = y ; then \
	29	$(RM) $@ ; \

Line 0 Link Here

(-)elm+ME/files/patch-ah (+20 lines)
	1	--- doc/newalias.1.orig Fri Dec 29 20:56:44 2000
	2	+++ doc/newalias.1 Sun Jan 7 04:34:29 2001
	3	@@ -73,13 +73,13 @@
	4	.br
	5	$HOME/.elm/aliases alias data file for user
	6	.br
	7	-/usr/local/lib/aliases.text alias source for system
	8	+#LIB#/aliases.text alias source for system
	9	.br
	10	-/usr/local/lib/aliases.dir alias dbz directory for system
	11	+#LIB#/aliases.dir alias dbz directory for system
	12	.br
	13	-/usr/local/lib/aliases.pag alias data hash table for system
	14	+#LIB#/aliases.pag alias data hash table for system
	15	.br
	16	-/usr/local/lib/aliases alias data file for system
	17	+#LIB#/aliases alias data file for system
	18	.SH AUTHOR
	19	Elm Development Group
	20	.SH SEE ALSO

Lines 1-25 Link Here

(-)elm+ME/pkg-plist (-13 / +18 lines)
1	bin/elm
2	bin/answer	1	bin/answer
3	bin/checkalias	2	bin/checkalias
		3	bin/elm
4	bin/elmalias	4	bin/elmalias
5	bin/fastmail	5	bin/fastmail
6	bin/frm	6	bin/frm
7	@exec ln -f %D/%F %D/bin/nfrm	7	@exec ln -f %B/%f %B/nfrm
		8	@unexec rm -f %B/nfrm
8	bin/listalias	9	bin/listalias
9	bin/messages	10	bin/messages
10	bin/newalias	11	bin/newalias
11	bin/newmail	12	bin/newmail
12	@exec ln -f %D/%F %D/bin/wnewmail	13	@exec ln -f %B/%f %B/wnewmail
		14	@unexec rm -f %B/wnewmail
13	bin/printmail	15	bin/printmail
14	bin/readmsg	16	bin/readmsg
15	lib/prlong
16	lib/elm.mimecharsets
17	lib/elm.mimetypes
18	lib/elmcharset
19	lib/elmterminal
20	lib/elmrc-info
21	lib/elm-help.0
22	lib/elm-help.1
23	lib/elm-help.2
24	lib/elm-help.3
25	share/nls/C/elm2.4me+.cat	17	share/nls/C/elm2.4me+.cat
		18	lib/elm/elm-help.0
		19	lib/elm/elm-help.1
		20	lib/elm/elm-help.2
		21	lib/elm/elm-help.3
		22	lib/elm/elm.mimecharsets
		23	@unexec if cmp -s %D/lib/elm/elm.mimetypes %D/lib/elm/elm.mimetypes-dist; then rm -f %D/lib/elm/elm.mimetypes; fi
		24	lib/elm/elm.mimetypes-dist
		25	@exec [ ! -f %B/elm.mimetypes ] && cp %B/%f %B/elm.mimetypes
		26	lib/elm/elmcharset
		27	lib/elm/elmrc-info
		28	lib/elm/elmterminal
		29	lib/elm/prlong
		30	@dirrm lib/elm

Lines 1-23 Link Here

(-)elm+ME/scripts/pre-configure (-36 / +32 lines)
1	#!/bin/sh -	1	#!/bin/sh -
2	#	2	#
3	# pre-configure script for Elm port to FreeBSD	3	# pre-configure script for Elm port to FreeBSD
		4	#
4	# $FreeBSD: ports/mail/elm+ME/scripts/pre-configure,v 1.25 2000/08/14 13:27:17 ache Exp $	5	# $FreeBSD: ports/mail/elm+ME/scripts/pre-configure,v 1.25 2000/08/14 13:27:17 ache Exp $
5		6
6	PortsDir=$PORTSDIR	7	[ -r /usr/include/inttypes.h ] && has_inttypes=define \|\| has_inttypes=undef
7	CurDir=$CURDIR
8	WrkSrc=$WRKSRC
9		8
10	has_inttypes=undef	9	cat > ${WRKSRC}/config.sh << EOF
11	[ -r /usr/include/inttypes.h ] && has_inttypes=define
12
13	cat > ${WrkSrc}/config.sh << EOF
14	#!/bin/sh	10	#!/bin/sh
15	# config.sh	11	# config.sh
16	# This file was produced by running the Configure script.	12	# This file was produced by running the Configure script.
17		13
18	Log='\$Log'	14	Log='\$Log'
19	Header='\$Header'	15	Header='\$Header'
20	bin="${PREFIX}/bin"	16	install_prefix='${PREFIX}'
		17	bin='${PREFIX}/bin'
21	contains='grep'	18	contains='grep'
22	cppstdin='/usr/bin/cpp'	19	cppstdin='/usr/bin/cpp'
23	cppminus=''	20	cppminus=''
Lines 39-45 Link Here
39	c=''	36	c=''
40	orderlib='false'	37	orderlib='false'
41	ranlib=':'	38	ranlib=':'
42	package='elm2'	39	package='elm2.4me+'
43	pager='builtin++'	40	pager='builtin++'
44	startsh='#!/bin/sh'	41	startsh='#!/bin/sh'
45	define='define'	42	define='define'
Lines 114-126 Link Here
114	tbl	111	tbl
115	test	112	test
116	troff	113	troff
		114	gtroff
117	uname	115	uname
118	uuname	116	uuname
119	vi	117	vi
120	'	118	'
121	test='/bin/test'	119	test='/bin/test'
122	inews=''	120	inews=''
123	ispell="${PREFIX}/bin/ispell"	121	ispell='${PREFIX}/bin/ispell'
124	egrep='/usr/bin/egrep'	122	egrep='/usr/bin/egrep'
125	more='/usr/bin/more'	123	more='/usr/bin/more'
126	pg='pg'	124	pg='pg'
Lines 130-136 Link Here
130	mail=''	128	mail=''
131	cpp='/usr/bin/cpp'	129	cpp='/usr/bin/cpp'
132	perl=''	130	perl=''
133	emacs='emacs'	131	emacs='${PREFIX}/bin/emacs'
134	ls='/bin/ls'	132	ls='/bin/ls'
135	rmail='/bin/rmail'	133	rmail='/bin/rmail'
136	sendmail='/usr/sbin/sendmail'	134	sendmail='/usr/sbin/sendmail'
Lines 164-170 Link Here
164	execmail=''	162	execmail=''
165	libswanted='sun nls c_s'	163	libswanted='sun nls c_s'
166	noaddlib='yes'	164	noaddlib='yes'
167	c_date='Mon Aug 14 15:54:12 MSD 2000'	165	c_date='Sun Jan 7 05:51:19 CET 2001'
168	d_ascii='undef'	166	d_ascii='undef'
169	d_broke_ctype='undef'	167	d_broke_ctype='undef'
170	d_calendar='define'	168	d_calendar='define'
Lines 174-180 Link Here
174	d_crypt='define'	172	d_crypt='define'
175	cryptlib='-lcrypt'	173	cryptlib='-lcrypt'
176	d_cuserid='undef'	174	d_cuserid='undef'
177	d_disphost='undef'	175	d_disphost='define'
178	d_domname='define'	176	d_domname='define'
179	d_usegetdom='undef'	177	d_usegetdom='undef'
180	d_errlst='define'	178	d_errlst='define'
Lines 186-208 Link Here
186	d_ftruncate='define'	184	d_ftruncate='define'
187	d_gethname='define'	185	d_gethname='define'
188	d_douname='undef'	186	d_douname='undef'
189	d_host_comp='undef'	187	ign_hname=''
190	ign_hname='n'
191	d_havetlib='define'	188	d_havetlib='define'
192	termlib='-ltermlib'	189	termlib='-ltermlib'
		190	i_curses='undef'
		191	i_term='define'
193	d_index='undef'	192	d_index='undef'
194	d_internet='define'	193	d_internet=''
195	d_ispell='define'	194	d_ispell='define'
196	ispell_path="${PREFIX}/bin/ispell"	195	ispell_path='${PREFIX}/bin/ispell'
197	ispell_options=''	196	ispell_options='-x'
198	d_locale='define'	197	d_locale='define'
199	d_nl_types='define'	198	d_nl_types='define'
200	d_msgcat='define'	199	d_msgcat='define'
201	d_usenls='undef'	200	d_usenls=''
202	d_mallocvoid='define'	201	d_mallocvoid='define'
203	d_mboxedit='define'	202	d_mboxedit='define'
204	metamail_path='none'	203	metamail_path='${PREFIX}/bin/metamail'
205	defencoding=''
206	d_8bitmime='define'	204	d_8bitmime='define'
207	d_binarymime='undef'	205	d_binarymime='undef'
208	d_dsn='define'	206	d_dsn='define'
Lines 215-224 Link Here
215	d_pidcheck='define'	213	d_pidcheck='define'
216	d_ptem='undef'	214	d_ptem='undef'
217	d_putenv='define'	215	d_putenv='define'
218	d_remlock='undef'
219	maxattempts='6'	216	maxattempts='6'
220	d_setgid='define'	217	d_setgid='define'
221	d_savegrpmboxid='undef'	218	d_savegrpmboxid='define'
222	mailermode='2755'	219	mailermode='2755'
223	d_sigvec='undef'	220	d_sigvec='undef'
224	d_sigvectr='undef'	221	d_sigvectr='undef'
Lines 247-252 Link Here
247	d_termios='define'	244	d_termios='define'
248	d_utimbuf='define'	245	d_utimbuf='define'
249	d_vfork='define'	246	d_vfork='define'
		247	d_directory='define'
		248	d_directyry_type='USE_DIRENT'
250	defbatsub='no subject (file transmission)'	249	defbatsub='no subject (file transmission)'
251	defeditor='/usr/bin/vi'	250	defeditor='/usr/bin/vi'
252	editoropts=''	251	editoropts=''
Lines 255-276 Link Here
255	mydomain=''	254	mydomain=''
256	autohostname='define'	255	autohostname='define'
257	i_memory='define'	256	i_memory='define'
258	i_stdarg='define'
259	i_stdlib='define'
260	i_time='define'	257	i_time='define'
261	i_systime='define'	258	i_systime='define'
262	d_systimekernel='undef'	259	d_systimekernel='undef'
263	i_unistd='define'	260	i_unistd='define'
264	i_utime='define'	261	i_utime='define'
265	i_sysutime='undef'	262	i_sysutime='undef'
266	lib="${PREFIX}/lib"	263	lib='${PREFIX}/lib/elm'
267	libc='/usr/lib/libc.so'	264	libc='/usr/lib/libc.so'
268	linepr='/usr/bin/lp'	265	linepr='/usr/bin/lp'
269	maildir='/var/mail'	266	maildir='/var/mail'
270	mailer='/usr/sbin/sendmail'	267	mailer='/usr/sbin/sendmail'
271	mailgrp='mail'	268	mailgrp='mail'
272	mansrc="${PREFIX}/man/man1"	269	mansrc='${PREFIX}/man/man1'
273	catmansrc="${PREFIX}/man/cat1"	270	catmansrc='${PREFIX}/man/cat1'
274	manext='.1'	271	manext='.1'
275	manext_choice='.1'	272	manext_choice='.1'
276	catmanext='.1'	273	catmanext='.1'
Lines 280-286 Link Here
280	manroffopts=''	277	manroffopts=''
281	suffix=''	278	suffix=''
282	packer=''	279	packer=''
283	optimize="\$CFLAGS"	280	optimize='${CFLAGS}'
284	ccflags=''	281	ccflags=''
285	cppflags=''	282	cppflags=''
286	ldflags='-s'	283	ldflags='-s'
Lines 307-321 Link Here
307	d_bsd='define'	304	d_bsd='define'
308	locale='locale'	305	locale='locale'
309	d_pgp='define'	306	d_pgp='define'
310	pgp="${PREFIX}/bin/pgp"	307	pgp='${PREFIX}/bin/pgp'
311	pgp2_path="${PREFIX}/bin/pgp"	308	pgp2_path='${PREFIX}/bin/pgp'
312	pgp5_dir='none'	309	pgp5_dir='${PREFIX}/bin'
313	gpg_path='none'	310	gpg_path='${PREFIX}/bin/gpg'
314	special_path='${PREFIX}/bin'	311	special_path='/usr/bin'
		312	special_path2='${PREFIX}/bin'
315	locale_dir='/usr/share/locale'	313	locale_dir='/usr/share/locale'
316	CONFIG=true	314	CONFIG=true
317	EOF	315	EOF
318		316
319	exit 0	317	exit 0
320	# END
321