Attachment #12542 for bug #24171

Lines 5-13 Link Here

(-)elm+ME/Makefile (-12 / +38 lines)
5	# $FreeBSD: ports/mail/elm+ME/Makefile,v 1.62 2001/01/10 07:59:15 ache Exp $	5	# $FreeBSD: ports/mail/elm+ME/Makefile,v 1.62 2001/01/10 07:59:15 ache Exp $
6	#	6	#
7		7
8	PORTNAME= elm	8	PORTNAME= elm+ME
9	PORTVERSION= 2.4ME+87	9	PORTVERSION= 2.4.87
10	CATEGORIES= mail	10	CATEGORIES= mail
		11	DISTNAME= ${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
11		12
12	# here are the main repositories.	13	# here are the main repositories.
13	MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \	14	MASTER_SITES= ftp://ftp.ozone.fmi.fi/KEH/ \
Lines 37-43 Link Here
37	# BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp	38	# BUILD_DEPENDS= pgp:${PORTSDIR}/security/pgp
38	# BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg	39	# BUILD_DEPENDS= gpg:${PORTSDIR}/security/gnupg
39		40
40	WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./}	41	WRKSRC= ${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
		42
		43	#
		44	# Global variables
		45	#
41		46
42	HAS_CONFIGURE= yes	47	HAS_CONFIGURE= yes
43		48
Lines 50-78 Link Here
50	newalias.1 newmail.1 printmail.1 readmsg.1	55	newalias.1 newmail.1 printmail.1 readmsg.1
51	MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1	56	MLINKS= frm.1 nfrm.1 newmail.1 wnewmail.1
52		57
53	DESTLIBDIR= ${PREFIX}/lib/${PORTNAME}	58	#
54	DESTMANDIR= ${PREFIX}/man	59	# Local variables
		60	#
		61
		62	DESTLIBDIR= ${PREFIX}/lib/${PORTNAME:S/+ME//}
		63	MIMETYPES= elm.mimetypes
		64
		65	#
		66	# Post-configure
		67	#
55		68
56	post-configure:	69	post-configure:
57	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS	70	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
58		71
59	post-install: install-nls install-mime-types remove-catman-files	72	#
		73	# Post-install
		74	#
		75
		76	post-install: install-nls install-mime-types \
		77	remove-catman-files remove-catman-links
60		78
61	install-nls:	79	install-nls:
62	@cd ${WRKSRC}/nls; ${MAKE} install	80	@cd ${WRKSRC}/nls; ${MAKE} install
63		81
64	install-mime-types:	82	install-mime-types:
65	@${INSTALL_DATA} \	83	@${INSTALL_DATA} \
66	${FILESDIR}/elm.mimetypes ${DESTLIBDIR}/elm.mimetypes-dist; \	84	${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}/${MIMETYPES}-dist
67	if [ ! -f ${DESTLIBDIR}/elm.mimetypes ] ; then \	85	@if [ ! -f ${DESTLIBDIR}/${MIMETYPES} ]; then \
68	${INSTALL_DATA} \	86	${INSTALL_DATA} ${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}; \
69	${FILESDIR}/elm.mimetypes ${DESTLIBDIR}; \
70	fi	87	fi
71		88
72	remove-catman-files:	89	remove-catman-files:
73	.for sect in 1	90	.for sect in 1
74	.for file in ${MAN${sect}}	91	.for page in ${MAN${sect}}
75	@${RM} -f ${DESTMANDIR}/cat${sect}/${file}	92	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
		93	.endfor
		94	.endfor
		95
		96	remove-catman-links:
		97	.for sect in 1
		98	.for page in ${MLINKS}
		99	.if ${MAN${sect}:M${page}} == ""
		100	@${RM} -f ${MAN${sect}PREFIX}/cat${sect}/${page}
		101	.endif
76	.endfor	102	.endfor
77	.endfor	103	.endfor
78		104

Lines 13-26 Link Here

(-)elm+ME/files/elm.mimetypes (-23 / +320 lines)
13	# have the "name=<default_filename>" option added to it, so you should not	13	# have the "name=<default_filename>" option added to it, so you should not
14	# put it in your definitions.	14	# put it in your definitions.
15		15
16	#gz application/octet-stream
17	#pbm image/pbm	16	#pbm image/pbm
18	#pgm image/pgm	17	#pgm image/pgm
19	#ppm image/ppm	18	#ppm image/ppm
20	taz application/octet-stream; type=tar; conversions=x-compress	19	taz application/octet-stream; type=tar; conversions=x-compress
21	tgz application/octet-stream; type=tar; conversions=x-gzip	20	tgz application/octet-stream; type=tar; conversions=x-gzip
		21	tbz application/octet-stream; type=tar; conversions=x-bzip
		22	tbz2 application/octet-stream; type=tar; conversions=x-bzip2
22	#tar application/octet-stream; type=tar	23	#tar application/octet-stream; type=tar
23	#Z application/octet-stream	24	#Z application/octet-stream
		25	#gz application/octet-stream
		26	#bz2 application/octet-stream
24	#zip application/octet-stream; type=zip	27	#zip application/octet-stream; type=zip
25		28
26	# PGP users might want the following	29	# PGP users might want the following
Lines 144-149 Link Here
144	# postscript [RFC2045,RFC2046]	147	# postscript [RFC2045,RFC2046]
145	ai application/postscript	148	ai application/postscript
146	eps application/postscript	149	eps application/postscript
		150	epsf application/postscript
		151	epsi application/postscript
147	ps application/postscript	152	ps application/postscript
148	# oda [RFC2045,RFC2046]	153	# oda [RFC2045,RFC2046]
149	oda application/oda	154	oda application/oda
Lines 213-219 Link Here
213	ppa application/vnd.ms-powerpoint	218	ppa application/vnd.ms-powerpoint
214	pps application/vnd.ms-powerpoint	219	pps application/vnd.ms-powerpoint
215	ppt application/vnd.ms-powerpoint	220	ppt application/vnd.ms-powerpoint
216	pwz application/vnd.ms-powerpoint	221	ppz application/vnd.ms-powerpoint
217	# vnd.ms-project [Gill]	222	# vnd.ms-project [Gill]
218	mpc application/vnd.ms-project	223	mpc application/vnd.ms-project
219	mpt application/vnd.ms-project	224	mpt application/vnd.ms-project
Lines 647-657 Link Here
647	tif image/tiff	652	tif image/tiff
648	tiff image/tiff	653	tiff image/tiff
649	# cgm Computer Graphics Metafile [Francis]	654	# cgm Computer Graphics Metafile [Francis]
		655	cgm image/cgm
650	# naplps [Ferber]	656	# naplps [Ferber]
651	# vnd.dwg [Moline]	657	# vnd.dwg [Moline]
652	# image/vnd.dwg [-> image/vnd.dxf]	658	dwg image/vnd.dwg
653	# vnd.svf [Moline]	659	# vnd.svf [Moline]
654	# image/vnd.svf [-> image/vnd.dxf]	660	svf image/vnd.svf
655	# vnd.dxf [Moline]	661	# vnd.dxf [Moline]
656	dxf image/vnd.dxf	662	dxf image/vnd.dxf
657	# png [Randers-Pehrson]	663	# png [Randers-Pehrson]
Lines 816-821 Link Here
816	sv4crc application/x-sv4crc	822	sv4crc application/x-sv4crc
817	tar application/x-tar	823	tar application/x-tar
818	tcl application/x-tcl	824	tcl application/x-tcl
		825	tk application/x-tcl
		826	cls application/x-tex
		827	ltx application/x-tex
		828	sty application/x-tex
819	tex application/x-tex	829	tex application/x-tex
820	texi application/x-texinfo	830	texi application/x-texinfo
821	texinfo application/x-texinfo	831	texinfo application/x-texinfo
Lines 886-894 Link Here
886	# Application types	896	# Application types
887	# -----------------	897	# -----------------
888		898
889	cpt application/mac-compactpro	899	# application/mac-compactpro [-> application/x-mac-compactpro]
890	smi application/smil	900	cpt application/x-mac-compactpro
891	smil application/smil	901	# application/smil [-> application/x-smil]
		902	smi application/x-smil
		903	smil application/x-smil
892	vcd application/x-cdlink	904	vcd application/x-cdlink
893	pgn application/x-chess-pgn	905	pgn application/x-chess-pgn
894	# application/x-compress [-> encoding/x-compress]	906	# application/x-compress [-> encoding/x-compress]
Lines 899-904 Link Here
899	# application/x-gzip [-> encoding/x-gzip]	911	# application/x-gzip [-> encoding/x-gzip]
900	js application/x-javascript	912	js application/x-javascript
901	# application/x-koan [-> application/vnd.koan]	913	# application/x-koan [-> application/vnd.koan]
		914	php3 application/x-httpd-php3
		915	php3s application/x-httpd-php3-source
		916	php application/x-httpd-php4
		917	php4 application/x-httpd-php4
		918	php4s application/x-httpd-php4-source
902	sit application/x-stuffit	919	sit application/x-stuffit
903		920
904	# Image types	921	# Image types
Lines 912-918 Link Here
912	# audio/midi [-> audio/x-midi]	929	# audio/midi [-> audio/x-midi]
913	mid audio/x-midi	930	mid audio/x-midi
914	midi audio/x-midi	931	midi audio/x-midi
915	kar audio/x-midi
916		932
917	# Misc types	933	# Misc types
918	# ----------	934	# ----------
Lines 949-954 Link Here
949	pac application/x-ns-proxy-autoconfig	965	pac application/x-ns-proxy-autoconfig
950	#proxy application/x-ns-proxy-autoconfig	966	#proxy application/x-ns-proxy-autoconfig
951	pl application/x-perl	967	pl application/x-perl
		968	perl application/x-perl
952	# application/x-pkcs7-crl [-> application/pkix-crl]	969	# application/x-pkcs7-crl [-> application/pkix-crl]
953	# application/x-pkcs7-mime [-> application/pkcs7-mime]	970	# application/x-pkcs7-mime [-> application/pkcs7-mime]
954	# application/x-pkcs7-signature [-> application/pkcs7-signature]	971	# application/x-pkcs7-signature [-> application/pkcs7-signature]
Lines 1017-1022 Link Here
1017	mp2a audio/x-mpeg2	1034	mp2a audio/x-mpeg2
1018	mpa2 audio/x-mpeg2	1035	mpa2 audio/x-mpeg2
1019		1036
		1037	# Message types
		1038	# -------------
		1039
		1040	# message/x-gnus-rmail
		1041
1020	# Misc types	1042	# Misc types
1021	# ----------	1043	# ----------
1022		1044
Lines 1025-1030 Link Here
1025	# x-world/x-vrml [-> model/vrml]	1047	# x-world/x-vrml [-> model/vrml]
1026		1048
1027	# ======================================================================	1049	# ======================================================================
		1050	# Known unregistered MIME types from Gnome
		1051	# ======================================================================
		1052
		1053	# Text types
		1054	# ----------
		1055
		1056	# text/abiword [-> text/x-abiword]
		1057	# text/bib [-> text/x-bib]
		1058	# text/calendar [-> text/x-calendar]
		1059	# text/directory [-> text/x-directory]
		1060	# text/htmlh [-> text/x-htmlh]
		1061	# text/mathml [-> text/x-mathml]
		1062	# text/x-abiword [-> application/x-abiword]
		1063	# text/x-applix-word [-> application/x-applix-word]
		1064	#?? text/x-authors
		1065	bib text/x-bib
		1066	# text/x-c [-> text/x-csrc]
		1067	# text/x-c++ [-> text/x-c++src]
		1068	#?? text/x-calendar
		1069	csv text/x-comma-separated-values
		1070	#?? text/x-copying
		1071	#?? text/x-credits
		1072	# text/x-csh [-> application/x-csh]
		1073	# text/x-dcl [-> text/x-sgml-declaration]
		1074	#?? text/x-directory
		1075	dsl text/x-dsl
		1076	# text/x-dtd [-> text/xml]
		1077	f text/x-fortran
		1078	#?? text/x-gtkrc
		1079	idl text/x-idl
		1080	#?? text/x-install
		1081	# text/x-java [-> application/x-java]
		1082	#?? text/x-htmlh
		1083	# text/x-makefile [-> application/x-makefile]
		1084	mml text/x-mathml
		1085	# text/x-perl [-> application/x-perl]
		1086	# text/x-python [-> application/x-python]
		1087	#?? text/x-readme
		1088	# text/x-scheme [-> application/vnd.lotus-screencam]
		1089	stx text/x-setext
		1090	# text/x-sh [-> application/x-sh]
		1091	#?? text/x-speech
		1092	sql text/x-sql
		1093	# text/x-tcl [-> application/x-tcl]
		1094	# text/x-tex [-> application/x-tex]
		1095	# text/x-texinfo [-> application/x-texinfo]
		1096	# text/x-troff [-> application/x-troff]
		1097	# text/x-troff-man [-> application/x-troff-man]
		1098	# text/x-troff-man-compressed [-> application/x-troff-man-compressed]
		1099	# text/x-troff-me [-> application/x-troff-me]
		1100	# text/x-troff-mm [-> application/x-troff-mm]
		1101	# text/x-troff-ms [-> application/x-troff-ms]
		1102	vcs text/x-vcalendar
		1103	vct text/x-vcard
		1104	gcrd text/x-vcard
		1105
		1106	# Application types
		1107	# -----------------
		1108
		1109	# application/msexcel [-> application/vnd.ms-excel]
		1110	# application/mspowerpoint [-> application/vnd.ms-powerpoint]
		1111	pgp application/pgp
		1112	awb application/x-abiword
		1113	as application/x-applix-spreadsheet
1114	aw application/x-applix-word
1115	arj application/x-arj
1116	asp application/x-asp
1117	bak application/x-backup
1118	bz2 application/x-bzip2
1119	cgi application/x-cgi
1120	# application/x-class-file [-> application/x-java-vm]
1121	# application/x-compressed-tar [-> application/octet-stream]
1122	# application/x-bzip-compressed-tar [-> application/octet-stream]
1123	#?? application/x-cpio-compressed
1124	core application/x-core-file
1125	deb application/x-deb
1126	etheme application/x-e-theme
1127	#?? application/x-executable-file [-> application/octet-stream]
1128	afm application/x-font-afm
1129	bdf application/x-font-bdf
1130	fon application/x-font-dos
1131	#?? application/x-font-framemaker
1132	#?? application/x-font-libgrx
1133	psf application/x-font-linux-psf
1134	pcf application/x-font-pcf
1135	spd application/x-font-speedo
1136	#?? application/x-font-sunos-news
1137	mf application/x-font-tex
1138	tfm application/x-font-tex-tfm
1139	ttf application/x-font-ttf
1140	pfa application/x-font-type1
1141	pfb application/x-font-type1
1142	#?? application/x-font-vfont
1143	desktop application/x-gnome-app-info
1144	caves application/x-gnome-stones
1145	gnumeric application/x-gnumeric
1146	#?? application/x-java-byte-code
1147	lha application/x-lha
1148	lzh application/x-lzh
1149	# application/x-kde-app-info [-> application/x-desktop]
1150	#?? application/x-ms-dos-executable
1151	o application/x-object-file
1152	# application/x-ogg [-> audio/x-ogg]
1153	# application/x-palm-database [-> application/vnd.palm]
1154	#?? application/x-pef-executable
1155	# application/x-php [-> application/x-httpd-php4]
1156	#?? application/x-profile
1157	rar application/x-rar
1158	rej application/x-reject
1159	rpm application/x-rpm
1160	so application/x-shared-library
1161	la application/x-shared-library-la
1162	slp application/x-slp
1163	# application/x-staroffice-presentation [-> application/x-sdraw]
1164	# application/x-staroffice-spreadsheet [-> application/x-scalc]
1165	# application/x-staroffice-words [-> application/x-swriter]
1166	theme application/x-theme
1167	#?? application/x-troff-man-compressed
1168	a application/x-unix-archive
1169	# application/x-wordperfect [-> application/wordperfect5.1]
1170	zoo application/x-zoo
1171
1172	# Image types
1173	# -----------
1174
1175	# image/svg [-> image/x-svg]
1176	3ds image/x-3ds
1177	ag image/x-applix-graphic
1178	# image/x-bmp [-> image/x-ms-bmp]
1179	# image/x-compressed-gimp [-> image/x-compressed-xcf]
1180	#?? image/x-compressed-xcf
1181	# image/x-gimp [-> image/x-xcf]
1182	ico image/x-ico
1183	# image/x-iff [-> video/x-iff]
1184	ilbm image/x-ilbm
1185	lwo image/x-lwo
1186	lws image/x-lws
1187	psd image/x-psd
1188	svg image/x-svg
1189	# image/x-tga [-> image/x-targa]
1190	xcf image/x-xcf
1191	fig image/x-xfig
1192
1193	# Audio types
1194	# -----------
1195
1196	it audio/x-it
1197	# audio/x-mp3 [-> audio/mpeg]
1198	#?? audio/x-mp3-playlist
1199	m3u audio/x-mpegurl
1200	ogg audio/x-ogg
1201	#?? audio/x-riff
1202	# audio/x-s3m [-> audio/x-mod]
1203	# audio/x-stm [-> audio/x-mod]
1204	# audio/x-ulaw [-> audio/basic]
1205	voc audio/x-voc
1206	xi audio/x-xi
1207	# audio/x-xm [-> audio/x-mod]
1208
1209	# Video types
1210	# -----------
1211
1212	# video/isivideo [-> video/x-isivideo]
1213	# video/vivo [-> video/vnd.vivo]
1214	# video/wavelet [-> video/x-wavelet]
1215	anim video/x-anim
1216	# video/x-avi [-> video/x-msvideo]
1217	#?? video/x-isivideo
1218	#?? video/x-wavelet
1219	# video/x-real-video [-> video/vnd.rn-realvideo]
1220
1221	# Misc types
1222	# ----------
1223
1224	# font/afm [-> application/x-font-afm]
1225	# font/ttf [-> application/x-font-ttf]
1226	# font/x-pcf [-> application/x-font-pcf]
1227
1228	#?? x-directory/normal
1229	#?? x-directory/search
1230	#?? x-directory/webdav
1231
1232	#?? x-special/device-block
1233	#?? x-special/device-char
1234	#?? x-special/fifo
1235	#?? x-special/socket
1236	#?? x-special/symlink
1237
1238	#?? x-url/http
1239	#?? x-url/ftp
1240	#?? x-url/news
1241
1242	# ======================================================================
1243	# Known unregistered MIME types from KDE
1244	# ======================================================================
1245
1246	# Text types
1247	# ----------
1248
1249	# text/english [-> text/plain]
1250	#?? text/xmcd
1251	hh text/x-c++hdr
1252	C text/x-c++src
1253	cc text/x-c++src
1254	cpp text/x-c++src
1255	cxx text/x-c++src
1256	h text/x-chdr
1257	c text/x-csrc
1258	# text/x-csv [-> text/x-comma-separated-values]
1259	# text/x-diff [-> text/x-patch]
1260	moc text/x-moc
1261	p text/x-pascal
1262	pas text/x-pascal
1263
1264	# Application types
1265	# -----------------
1266
1267	# application/wordperfect [-> application/x-wordperfect]
1268	# application/x-applix [-> application/x-applix-*]
1269	# application/x-archive [-> application/x-unix-archive]
1270	bz application/x-bzip
1271	# application/x-core [-> application/x-core-file]
1272	kdelnk application/x-kde-app-info
1273	# application/x-executable [-> application/x-executable-file]
1274	# application/x-font [-> application/x-font-*]
1275	gsf application/x-font-gsf
1276	# application/x-jar [-> application/x-java-archive]
1277	chrt application/x-kchart
1278	kil application/x-killustrator
1279	shell application/x-konsole
1280	kpr application/x-kpresenter
1281	kpt application/x-kpresenter
1282	ksp application/x-kspread
1283	kwd application/x-kword
1284	kwt application/x-kword
1285	lzo application/x-lzop
1286	# application/x-object [-> application/x-object-file]
1287	py application/x-python
1288	pyc application/x-python-bytecode
1289	# application/x-sharedlib [-> application/x-shared-library]
1290	# application/x-shellscript [-> application/x-sh]
1291	gf application/x-tex-gf
1292	pk application/x-tex-pk
1293	old application/x-trash
1294	sik application/x-trash
1295	# application/x-truetype-font [-> application/x-font-type1]
1296	tzo application/x-tzo
1297
1298	# Image types
1299	# -----------
1300
1301	# image/fax-g3 [-> image/g3fax]
1302	# image/x-eps [-> application/postscript]
1303
1304	# Audio types
1305	# -----------
1306
1307	kar audio/x-karaoke
1308	669 audio/x-mod
1309	mod audio/x-mod
1310	m15 audio/x-mod
1311	mtm audio/x-mod
1312	s3m audio/x-mod
1313	stm audio/x-mod
1314	ult audio/x-mod
1315	uni audio/x-mod
1316	pls audio/x-scpls
1317
1318	# Misc types
1319	# ----------
1320
1321	#?? inode/blockdevice
1322	#?? inode/chardevice
1323	#?? inode/directory-locked
1324	#?? inode/directory
1325	#?? inode/fifo
1326	#?? inode/socket
1327
1328	# ======================================================================
1028	# Known unregistered MIME types from RealAudio	1329	# Known unregistered MIME types from RealAudio
1029	# ======================================================================	1330	# ======================================================================
1030		1331
Lines 1053-1059 Link Here
1053	# audio/x-pn-au [-> audio/basic]	1354	# audio/x-pn-au [-> audio/basic]
1054	ram audio/x-pn-realaudio	1355	ram audio/x-pn-realaudio
1055	rmm audio/x-pn-realaudio	1356	rmm audio/x-pn-realaudio
1056	rpm audio/x-pn-realaudio-plugin	1357	# audio/x-pn-realaudio-plugin [-> application/x-rpm]
1057	# audio/x-pn-wav [-> audio/x-wav]	1358	# audio/x-pn-wav [-> audio/x-wav]
1058	# audio/x-pn-windows-acm [-> audio/x-wav]	1359	# audio/x-pn-windows-acm [-> audio/x-wav]
1059	# audio/x-realaudio [-> audio/vnd.rn-realaudio]	1360	# audio/x-realaudio [-> audio/vnd.rn-realaudio]
Lines 1116-1122 Link Here
1116	bat application/octet-stream	1417	bat application/octet-stream
1117	cmd application/octet-stream	1418	cmd application/octet-stream
1118	btm application/octet-stream	1419	btm application/octet-stream
1119	# application/pgp
1120	# application/powerpoint [-> application/vnd.ms-powerpoint]	1420	# application/powerpoint [-> application/vnd.ms-powerpoint]
1121	# application/safe-tcl [-> application/x-safe-tcl]	1421	# application/safe-tcl [-> application/x-safe-tcl]
1122	# application/tex [-> application/x-tex]	1422	# application/tex [-> application/x-tex]
Lines 1124-1139 Link Here
1124	# application/vnd.stardivision.calc [-> application/x-scalc]	1424	# application/vnd.stardivision.calc [-> application/x-scalc]
1125	# application/vnd.stardivision.writer [-> application/x-swriter]	1425	# application/vnd.stardivision.writer [-> application/x-swriter]
1126	awk application/x-awk	1426	awk application/x-awk
		1427	ofm application/x-font-tex-ofm
		1428	ovf application/x-font-tex-ovf
		1429	ovp application/x-font-tex-ovp
		1430	pfm application/x-font-tex-pfm
		1431	vf application/x-font-tex-tfm
1127	info application/x-info	1432	info application/x-info
1128	java application/x-java	1433	java application/x-java
		1434	jar application/x-java-archive
1129	class application/x-java-vm	1435	class application/x-java-vm
1130	ser application/x-java-serialized-object	1436	ser application/x-java-serialized-object
1131	jar application/x-java-archive
1132	ksh application/x-ksh	1437	ksh application/x-ksh
1133	lha application/x-lha
1134	lzh application/x-lzh
1135	# application/x-lotus-notes [-> application/vnd.lotus-notes]	1438	# application/x-lotus-notes [-> application/vnd.lotus-notes]
		1439	mk application/x-makefile
1136	# application/x-patch [-> text/x-patch]	1440	# application/x-patch [-> text/x-patch]
		1441	ph application/x-perl-header
		1442	pm application/x-perl-module
		1443	pod application/x-perl-old-documentation
1137	# application/x-pdf [-> application/pdf]	1444	# application/x-pdf [-> application/pdf]
1138	# application/x-rtf [-> application/rtf]	1445	# application/x-rtf [-> application/rtf]
1139	# application/x-safe-tcl	1446	# application/x-safe-tcl
Lines 1160-1176 Link Here
1160	# -----------	1467	# -----------
1161		1468
1162	vox audio/basic	1469	vox audio/basic
1163	mod audio/x-mod
1164	xm audio/x-mod
1165	s3m audio/x-mod
1166	stm audio/x-mod
1167	mtm audio/x-mod
1168	ult audio/x-mod
1169	uni audio/x-mod
1170	it audio/x-mod
1171	# audio/x-mpeg [-> audio/mpeg]	1470	# audio/x-mpeg [-> audio/mpeg]
1172	m3u audio/x-scpls
1173	# audio/x-ulaw [-> audio/basic]
1174		1471
1175	# Video types	1472	# Video types
1176	# -----------	1473	# -----------




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

Return to bug 24171

Line 0 Link Here

(-)elm+ME/files/patch-ai (+22 lines)
	1	--- lib/headers.c.orig Fri Dec 29 20:56:44 2000
	2	+++ lib/headers.c Mon Jan 29 00:52:39 2001
	3	@@ -347,8 +347,18 @@
	4	*/
	5
	6	if (NULL != (tmphdr = locate_header_by_name(result,"MIME-Version"))) {
	7	+ /* RFC 1521 says:
	8
	9	- if (0 == strcmp(tmphdr->body,"1.0"))
	10	+ NOTE TO IMPLEMENTORS: All header fields defined in this document,
	11	+ including MIME-Version, Content-type, etc., are subject to the
	12	+ general syntactic rules for header fields specified in RFC 822. In
	13	+ particular, all can include comments, which means that the following
	14	+ two MIME-Version fields are equivalent:
	15	+
	16	+ MIME-Version: 1.0
	17	+ MIME-Version: 1.0 (Generated by GBD-killer 3.7)
	18	+ */
	19	+ if (0 == strncmp(tmphdr->body,"1.0", 3))
	20	entry->status \|= MIME_MESSAGE;
	21	else {
	22	entry->status \|= MIME_MESSAGE\|MIME_UNSUPPORTED;