Attachment 12542 Details for Bug 24171 – elm-2.4ME+87-4.patch

[patch] elm-2.4ME+87-4.patch

elm-2.4ME+87-4.patch (text/x-patch), 16.84 KB, created by Cyrille Lefevre on 2001-01-29 03:55:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Cyrille Lefevre

Created: 2001-01-29 03:55:08 UTC

Size: 16.84 KB

patch

obsolete

>diff -BurN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ elm+ME.new3/Makefile elm+ME/Makefile
>--- elm+ME.new3/Makefile	Mon Jan 29 04:35:02 2001
>+++ elm+ME/Makefile	Mon Jan 29 04:41:36 2001
>@@ -5,9 +5,10 @@
> # $FreeBSD: ports/mail/elm+ME/Makefile,v 1.62 2001/01/10 07:59:15 ache Exp $
> #
> 
>-PORTNAME=	elm
>-PORTVERSION=    2.4ME+87
>+PORTNAME=	elm+ME
>+PORTVERSION=    2.4.87
> CATEGORIES=	mail
>+DISTNAME=	${PORTNAME:S/+ME//}-${PORTVERSION:R}ME+${PORTVERSION:E}
> 
> # here are the main repositories.
> MASTER_SITES=	ftp://ftp.ozone.fmi.fi/KEH/ \
>@@ -37,7 +38,11 @@
> # BUILD_DEPENDS=	pgp:${PORTSDIR}/security/pgp
> # BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION:S/ME+/\.ME+\./}
>+WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
>+
>+#
>+# Global variables
>+#
> 
> HAS_CONFIGURE=	yes
> 
>@@ -50,29 +55,50 @@
> 		newalias.1 newmail.1 printmail.1 readmsg.1
> MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
> 
>-DESTLIBDIR=	${PREFIX}/lib/${PORTNAME}
>-DESTMANDIR=	${PREFIX}/man
>+#
>+# Local variables
>+#
>+
>+DESTLIBDIR=	${PREFIX}/lib/${PORTNAME:S/+ME//}
>+MIMETYPES=	elm.mimetypes
>+
>+#
>+# Post-configure
>+#
> 
> post-configure:
> 	@${PERL} -pi.bsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
> 
>-post-install: install-nls install-mime-types remove-catman-files
>+#
>+# Post-install
>+#
>+
>+post-install: install-nls install-mime-types \
>+	      remove-catman-files remove-catman-links
> 
> install-nls:
> 	@cd ${WRKSRC}/nls; ${MAKE} install
> 
> install-mime-types:
> 	@${INSTALL_DATA} \
>-		${FILESDIR}/elm.mimetypes ${DESTLIBDIR}/elm.mimetypes-dist; \
>-	if [ ! -f ${DESTLIBDIR}/elm.mimetypes ] ; then \
>-		${INSTALL_DATA} \
>-			${FILESDIR}/elm.mimetypes ${DESTLIBDIR}; \
>+		${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}/${MIMETYPES}-dist
>+	@if [ ! -f ${DESTLIBDIR}/${MIMETYPES} ]; then \
>+		${INSTALL_DATA} ${FILESDIR}/${MIMETYPES} ${DESTLIBDIR}; \
> 	fi
> 
> remove-catman-files:
> .for sect in 1
>-.for file in ${MAN${sect}}
>-	@${RM} -f ${DESTMANDIR}/cat${sect}/${file}
>+.for page in ${MAN${sect}}
>+	@${RM} -f ${MAN${sect}PREFIX}/man/cat${sect}/${page}
>+.endfor
>+.endfor
>+
>+remove-catman-links:
>+.for sect in 1
>+.for page in ${MLINKS}
>+.if ${MAN${sect}:M${page}} == ""
>+	@${RM} -f ${MAN${sect}PREFIX}/cat${sect}/${page}
>+.endif
> .endfor
> .endfor
> 
>diff -BurN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ elm+ME.new3/files/elm.mimetypes elm+ME/files/elm.mimetypes
>--- elm+ME.new3/files/elm.mimetypes	Mon Jan 29 04:35:02 2001
>+++ elm+ME/files/elm.mimetypes	Mon Jan 29 04:12:02 2001
>@@ -13,14 +13,17 @@
> # 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
>+tbz	application/octet-stream; type=tar; conversions=x-bzip
>+tbz2	application/octet-stream; type=tar; conversions=x-bzip2
> #tar	application/octet-stream; type=tar
> #Z	application/octet-stream
>+#gz	application/octet-stream
>+#bz2	application/octet-stream
> #zip	application/octet-stream; type=zip
> 
> # PGP users might want the following
>@@ -144,6 +147,8 @@
> #			postscript			    [RFC2045,RFC2046]
> ai		application/postscript
> eps		application/postscript
>+epsf		application/postscript
>+epsi		application/postscript
> ps		application/postscript
> #			oda				    [RFC2045,RFC2046]
> oda		application/oda
>@@ -213,7 +218,7 @@
> ppa		application/vnd.ms-powerpoint
> pps		application/vnd.ms-powerpoint
> ppt		application/vnd.ms-powerpoint
>-pwz		application/vnd.ms-powerpoint
>+ppz		application/vnd.ms-powerpoint
> #			vnd.ms-project				       [Gill]
> mpc		application/vnd.ms-project
> mpt		application/vnd.ms-project
>@@ -647,11 +652,12 @@
> tif		image/tiff
> tiff		image/tiff
> #			cgm		Computer Graphics Metafile  [Francis]
>+cgm		image/cgm
> #			naplps					     [Ferber]
> #			vnd.dwg					     [Moline]
>-#		image/vnd.dwg			[-> image/vnd.dxf]
>+dwg		image/vnd.dwg
> #			vnd.svf					     [Moline]
>-#		image/vnd.svf			[-> image/vnd.dxf]
>+svf		image/vnd.svf
> #			vnd.dxf					     [Moline]
> dxf		image/vnd.dxf
> #			png				    [Randers-Pehrson]
>@@ -816,6 +822,10 @@
> sv4crc		application/x-sv4crc
> tar		application/x-tar
> tcl		application/x-tcl
>+tk		application/x-tcl
>+cls		application/x-tex
>+ltx		application/x-tex
>+sty		application/x-tex
> tex		application/x-tex
> texi		application/x-texinfo
> texinfo		application/x-texinfo
>@@ -886,9 +896,11 @@
> # Application types
> # -----------------
> 
>-cpt		application/mac-compactpro
>-smi		application/smil
>-smil		application/smil
>+#		application/mac-compactpro	[-> application/x-mac-compactpro]
>+cpt		application/x-mac-compactpro
>+#		application/smil		[-> application/x-smil]
>+smi		application/x-smil
>+smil		application/x-smil
> vcd		application/x-cdlink
> pgn		application/x-chess-pgn
> #		application/x-compress		[-> encoding/x-compress]
>@@ -899,6 +911,11 @@
> #		application/x-gzip		[-> encoding/x-gzip]
> js		application/x-javascript
> #		application/x-koan		[-> application/vnd.koan]
>+php3		application/x-httpd-php3
>+php3s		application/x-httpd-php3-source
>+php		application/x-httpd-php4
>+php4		application/x-httpd-php4
>+php4s		application/x-httpd-php4-source
> sit		application/x-stuffit
> 
> # Image types
>@@ -912,7 +929,6 @@
> #		audio/midi			[-> audio/x-midi]
> mid		audio/x-midi
> midi		audio/x-midi
>-kar		audio/x-midi
> 
> # Misc types
> # ----------
>@@ -949,6 +965,7 @@
> pac		application/x-ns-proxy-autoconfig
> #proxy		application/x-ns-proxy-autoconfig
> pl		application/x-perl
>+perl		application/x-perl
> #		application/x-pkcs7-crl		[-> application/pkix-crl]
> #		application/x-pkcs7-mime	[-> application/pkcs7-mime]
> #		application/x-pkcs7-signature	[-> application/pkcs7-signature]
>@@ -1017,6 +1034,11 @@
> mp2a		audio/x-mpeg2
> mpa2		audio/x-mpeg2
> 
>+# Message types
>+# -------------
>+
>+#		message/x-gnus-rmail
>+
> # Misc types
> # ----------
> 
>@@ -1025,6 +1047,285 @@
> #		x-world/x-vrml			[-> model/vrml]
> 
> # ======================================================================
>+# Known unregistered MIME types from Gnome
>+# ======================================================================
>+
>+# Text types
>+# ----------
>+
>+#		text/abiword			[-> text/x-abiword]
>+#		text/bib			[-> text/x-bib]
>+#		text/calendar			[-> text/x-calendar]
>+#		text/directory			[-> text/x-directory]
>+#		text/htmlh			[-> text/x-htmlh]
>+#		text/mathml			[-> text/x-mathml]
>+#		text/x-abiword			[-> application/x-abiword]
>+#		text/x-applix-word		[-> application/x-applix-word]
>+#??		text/x-authors
>+bib		text/x-bib
>+#		text/x-c			[-> text/x-csrc]
>+#		text/x-c++			[-> text/x-c++src]
>+#??		text/x-calendar
>+csv		text/x-comma-separated-values
>+#??		text/x-copying
>+#??		text/x-credits
>+#		text/x-csh			[-> application/x-csh]
>+#		text/x-dcl			[-> text/x-sgml-declaration]
>+#??		text/x-directory
>+dsl		text/x-dsl
>+#		text/x-dtd			[-> text/xml]
>+f		text/x-fortran
>+#??		text/x-gtkrc
>+idl		text/x-idl
>+#??		text/x-install
>+#		text/x-java			[-> application/x-java]
>+#??		text/x-htmlh
>+#		text/x-makefile			[-> application/x-makefile]
>+mml		text/x-mathml
>+#		text/x-perl			[-> application/x-perl]
>+#		text/x-python			[-> application/x-python]
>+#??		text/x-readme
>+#		text/x-scheme			[-> application/vnd.lotus-screencam]
>+stx		text/x-setext
>+#		text/x-sh			[-> application/x-sh]
>+#??		text/x-speech
>+sql		text/x-sql
>+#		text/x-tcl			[-> application/x-tcl]
>+#		text/x-tex			[-> application/x-tex]
>+#		text/x-texinfo			[-> application/x-texinfo]
>+#		text/x-troff			[-> application/x-troff]
>+#		text/x-troff-man		[-> application/x-troff-man]
>+#		text/x-troff-man-compressed	[-> application/x-troff-man-compressed]
>+#		text/x-troff-me			[-> application/x-troff-me]
>+#		text/x-troff-mm			[-> application/x-troff-mm]
>+#		text/x-troff-ms			[-> application/x-troff-ms]
>+vcs		text/x-vcalendar
>+vct		text/x-vcard
>+gcrd		text/x-vcard
>+
>+# Application types
>+# -----------------
>+
>+#		application/msexcel		[-> application/vnd.ms-excel]
>+#		application/mspowerpoint	[-> application/vnd.ms-powerpoint]
>+pgp		application/pgp
>+awb		application/x-abiword
>+as		application/x-applix-spreadsheet
>+aw		application/x-applix-word
>+arj		application/x-arj
>+asp		application/x-asp
>+bak		application/x-backup
>+bz2		application/x-bzip2
>+cgi		application/x-cgi
>+#		application/x-class-file	[-> application/x-java-vm]
>+#		application/x-compressed-tar	[-> application/octet-stream]
>+#		application/x-bzip-compressed-tar	[-> application/octet-stream]
>+#??		application/x-cpio-compressed
>+core		application/x-core-file
>+deb		application/x-deb
>+etheme		application/x-e-theme
>+#??		application/x-executable-file	[-> application/octet-stream]
>+afm		application/x-font-afm
>+bdf		application/x-font-bdf
>+fon		application/x-font-dos
>+#?? 		application/x-font-framemaker
>+#??		application/x-font-libgrx
>+psf		application/x-font-linux-psf
>+pcf		application/x-font-pcf
>+spd		application/x-font-speedo
>+#??		application/x-font-sunos-news
>+mf		application/x-font-tex
>+tfm		application/x-font-tex-tfm
>+ttf		application/x-font-ttf
>+pfa		application/x-font-type1
>+pfb		application/x-font-type1
>+#??		application/x-font-vfont
>+desktop		application/x-gnome-app-info
>+caves		application/x-gnome-stones
>+gnumeric	application/x-gnumeric
>+#??		application/x-java-byte-code
>+lha		application/x-lha
>+lzh		application/x-lzh
>+#		application/x-kde-app-info	[-> application/x-desktop]
>+#??		application/x-ms-dos-executable
>+o		application/x-object-file
>+#		application/x-ogg		[-> audio/x-ogg]
>+#		application/x-palm-database	[-> application/vnd.palm]
>+#??		application/x-pef-executable
>+#		application/x-php		[-> application/x-httpd-php4]
>+#??		application/x-profile
>+rar		application/x-rar
>+rej		application/x-reject
>+rpm		application/x-rpm
>+so		application/x-shared-library
>+la		application/x-shared-library-la
>+slp		application/x-slp
>+#		application/x-staroffice-presentation	[-> application/x-sdraw]
>+#		application/x-staroffice-spreadsheet	[-> application/x-scalc]
>+#		application/x-staroffice-words		[-> application/x-swriter]
>+theme		application/x-theme
>+#??		application/x-troff-man-compressed
>+a		application/x-unix-archive
>+#		application/x-wordperfect	[-> application/wordperfect5.1]
>+zoo		application/x-zoo
>+
>+# Image types
>+# -----------
>+
>+#		image/svg			[-> image/x-svg]
>+3ds		image/x-3ds
>+ag		image/x-applix-graphic
>+#		image/x-bmp			[-> image/x-ms-bmp]
>+#		image/x-compressed-gimp		[-> image/x-compressed-xcf]
>+#??		image/x-compressed-xcf
>+#		image/x-gimp			[-> image/x-xcf]
>+ico		image/x-ico
>+#		image/x-iff			[-> video/x-iff]
>+ilbm		image/x-ilbm
>+lwo		image/x-lwo
>+lws		image/x-lws
>+psd		image/x-psd
>+svg		image/x-svg
>+#		image/x-tga			[-> image/x-targa]
>+xcf		image/x-xcf
>+fig		image/x-xfig
>+
>+# Audio types
>+# -----------
>+
>+it		audio/x-it
>+#		audio/x-mp3			[-> audio/mpeg]
>+#??		audio/x-mp3-playlist
>+m3u		audio/x-mpegurl
>+ogg		audio/x-ogg
>+#??		audio/x-riff
>+#		audio/x-s3m			[-> audio/x-mod]
>+#		audio/x-stm			[-> audio/x-mod]
>+#		audio/x-ulaw			[-> audio/basic]
>+voc		audio/x-voc
>+xi		audio/x-xi
>+#		audio/x-xm			[-> audio/x-mod]
>+
>+# Video types
>+# -----------
>+
>+#		video/isivideo			[-> video/x-isivideo]
>+#		video/vivo			[-> video/vnd.vivo]
>+#		video/wavelet			[-> video/x-wavelet]
>+anim		video/x-anim
>+#		video/x-avi			[-> video/x-msvideo]
>+#??		video/x-isivideo
>+#??		video/x-wavelet
>+#		video/x-real-video		[-> video/vnd.rn-realvideo]
>+
>+# Misc types
>+# ----------
>+
>+#		font/afm			[-> application/x-font-afm]
>+#		font/ttf			[-> application/x-font-ttf]
>+#		font/x-pcf			[-> application/x-font-pcf]
>+
>+#??		x-directory/normal
>+#??		x-directory/search
>+#??		x-directory/webdav
>+
>+#??		x-special/device-block
>+#??		x-special/device-char
>+#??		x-special/fifo
>+#??		x-special/socket
>+#??		x-special/symlink
>+
>+#??		x-url/http
>+#??		x-url/ftp
>+#??		x-url/news
>+
>+# ======================================================================
>+# Known unregistered MIME types from KDE
>+# ======================================================================
>+
>+# Text types
>+# ----------
>+
>+#		text/english			[-> text/plain]
>+#??		text/xmcd
>+hh		text/x-c++hdr
>+C		text/x-c++src
>+cc		text/x-c++src
>+cpp		text/x-c++src
>+cxx		text/x-c++src
>+h		text/x-chdr
>+c		text/x-csrc
>+#		text/x-csv			[-> text/x-comma-separated-values]
>+#		text/x-diff			[-> text/x-patch]
>+moc		text/x-moc
>+p		text/x-pascal
>+pas		text/x-pascal
>+
>+# Application types
>+# -----------------
>+
>+#		application/wordperfect		[-> application/x-wordperfect]
>+#		application/x-applix		[-> application/x-applix-*]
>+#		application/x-archive		[-> application/x-unix-archive]
>+bz		application/x-bzip
>+#		application/x-core		[-> application/x-core-file]
>+kdelnk		application/x-kde-app-info
>+#		application/x-executable	[-> application/x-executable-file]
>+#		application/x-font		[-> application/x-font-*]
>+gsf		application/x-font-gsf
>+#		application/x-jar		[-> application/x-java-archive]
>+chrt		application/x-kchart
>+kil		application/x-killustrator
>+shell		application/x-konsole
>+kpr		application/x-kpresenter
>+kpt		application/x-kpresenter
>+ksp		application/x-kspread
>+kwd		application/x-kword
>+kwt		application/x-kword
>+lzo		application/x-lzop
>+#		application/x-object		[-> application/x-object-file]
>+py		application/x-python
>+pyc		application/x-python-bytecode
>+#		application/x-sharedlib		[-> application/x-shared-library]
>+#		application/x-shellscript	[-> application/x-sh]
>+gf		application/x-tex-gf
>+pk		application/x-tex-pk
>+old		application/x-trash
>+sik		application/x-trash
>+#		application/x-truetype-font	[-> application/x-font-type1]
>+tzo		application/x-tzo
>+
>+# Image types
>+# -----------
>+
>+#		image/fax-g3			[-> image/g3fax]
>+#		image/x-eps			[-> application/postscript]
>+
>+# Audio types
>+# -----------
>+
>+kar		audio/x-karaoke
>+669		audio/x-mod
>+mod		audio/x-mod
>+m15		audio/x-mod
>+mtm		audio/x-mod
>+s3m		audio/x-mod
>+stm		audio/x-mod
>+ult		audio/x-mod
>+uni		audio/x-mod
>+pls		audio/x-scpls
>+
>+# Misc types
>+# ----------
>+
>+#??		inode/blockdevice
>+#??		inode/chardevice
>+#??		inode/directory-locked
>+#??		inode/directory
>+#??		inode/fifo
>+#??		inode/socket
>+
>+# ======================================================================
> # Known unregistered MIME types from RealAudio
> # ======================================================================
> 
>@@ -1053,7 +1354,7 @@
> #		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-realaudio-plugin	[-> application/x-rpm]
> #		audio/x-pn-wav			[-> audio/x-wav]
> #		audio/x-pn-windows-acm		[-> audio/x-wav]
> #		audio/x-realaudio		[-> audio/vnd.rn-realaudio]
>@@ -1116,7 +1417,6 @@
> 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]
>@@ -1124,16 +1424,23 @@
> #		application/vnd.stardivision.calc	[-> application/x-scalc]
> #		application/vnd.stardivision.writer	[-> application/x-swriter]
> awk		application/x-awk
>+ofm		application/x-font-tex-ofm
>+ovf		application/x-font-tex-ovf
>+ovp		application/x-font-tex-ovp
>+pfm		application/x-font-tex-pfm
>+vf		application/x-font-tex-tfm
> info		application/x-info
> java		application/x-java
>+jar		application/x-java-archive
> class		application/x-java-vm
> ser		application/x-java-serialized-object
>-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]
>+mk		application/x-makefile
> #		application/x-patch		[-> text/x-patch]
>+ph		application/x-perl-header
>+pm		application/x-perl-module
>+pod		application/x-perl-old-documentation
> #		application/x-pdf		[-> application/pdf]
> #		application/x-rtf		[-> application/rtf]
> #		application/x-safe-tcl
>@@ -1160,17 +1467,7 @@
> # -----------
> 
> 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
> # -----------
>diff -BurN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ elm+ME.new3/files/patch-ai elm+ME/files/patch-ai
>--- elm+ME.new3/files/patch-ai	Thu Jan  1 01:00:00 1970
>+++ elm+ME/files/patch-ai	Mon Jan 29 00:54:00 2001
>@@ -0,0 +1,22 @@
>+--- lib/headers.c.orig	Fri Dec 29 20:56:44 2000
>++++ lib/headers.c	Mon Jan 29 00:52:39 2001
>+@@ -347,8 +347,18 @@
>+      */
>+ 
>+     if (NULL != (tmphdr = locate_header_by_name(result,"MIME-Version"))) {
>++	/* RFC 1521 says:
>+ 
>+-	if (0 == strcmp(tmphdr->body,"1.0"))
>++	   NOTE TO IMPLEMENTORS: All header fields defined in this document,
>++	   including MIME-Version, Content-type, etc., are subject to the
>++	   general syntactic rules for header fields specified in RFC 822.  In
>++	   particular, all can include comments, which means that the following
>++	   two MIME-Version fields are equivalent:
>++   
>++                    MIME-Version: 1.0
>++                    MIME-Version: 1.0 (Generated by GBD-killer 3.7)
>++	*/
>++	if (0 == strncmp(tmphdr->body,"1.0", 3))
>+ 	    entry->status |= MIME_MESSAGE;
>+ 	else {
>+ 	    entry->status |= MIME_MESSAGE|MIME_UNSUPPORTED;

Actions: View | Diff

Attachments on bug 24171: 12537 | 12538 | 12539 | 12540 | 12541 | 12542