4 files changed, 88 insertions, 26 deletions

diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index 800d5365c81a..5bb9a35fdf98 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	elm+ME
-PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL}
+PORTVERSION=	${ELM_VERSION}.${ELM_REVISION}${ELM_PATCHLEVEL:S/_//}
 CATEGORIES=	mail
 DISTNAME=	elm-${ELM_VERSION}ME+${ELM_REVISION}
 
@@ -45,6 +45,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
 
 HAS_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 CONFIGURE_SCRIPT=	Configure
 SCRIPTS_ENV=	CFLAGS="${CFLAGS}" ${PLIST_SUB} PREFIX="${PREFIX}" \
@@ -61,21 +62,22 @@ PLIST_SUB=	SO_REV="${SO_REV}" DOC_SUBDIR="${DOC_SUBDIR}" \
 		LIB_SUBDIR="${LIB_SUBDIR}" SHLIB_SUBDIR="${SHLIB_SUBDIR}"
 
 MAN1=		answer.1 checkalias.1 elm.1 elmalias.1 elmcharset.1 \
-		elmrc-write.1 elmterminal.1 elmunidata.1 fastmail.1 frm.1 \
-		listalias.1 messages.1 newalias.1 newmail.1 printmail.1 \
-		readmsg.1
+		elmrc-write.1 elmstringconvert.1 elmterminal.1 \
+		elmunidata.1 fastmail.1 frm.1 listalias.1 messages.1 \
+		newalias.1 newmail.1 printmail.1 readmsg.1
 MLINKS=		frm.1 nfrm.1	newmail.1 wnewmail.1
 
 # Local variables
 #
 
 ELM_VERSION=	2.4
-ELM_REVISION=	98
-ELM_PATCHLEVEL=	b
+ELM_REVISION=	99
+ELM_PATCHLEVEL=	_
 
 ELM_PATCHDONE=	false
-.for level in a b c d e f
-.if ${ELM_PATCHDONE} == false
+.for level in _ a b c d e f
+_level=${level}
+.if ${_level} != _ && ${ELM_PATCHDONE} == false
 PATCHFILES+=	${DISTNAME:S/+/+PL/}${level}.patch.gz
 .endif
 .if ${ELM_PATCHLEVEL} == ${level}
@@ -121,12 +123,12 @@ patch-install-script:
 # will probably be fixed in a next release, for instance, fake a patch.
 # the alternative would be to disable this option in pre-configure script.
 patch-setgid:
-	@${PERL} -pi.fbsd -e 's,setgid,setegid,' \
+	@${REINPLACE_CMD} -e 's|setgid|setegid|' \
 		${WRKSRC}/lib/localmbx.c \
 		${WRKSRC}/src/init.c ${WRKSRC}/src/lock.c
 
 patch-nls-files:
-	@${PERL} -pi.fbsd -e 's,/usr/local,${PREFIX},' ${WRKSRC}/nls/LANGS
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/nls/LANGS
 
 # Pre-install
 #
diff --git a/mail/elm+ME/distinfo b/mail/elm+ME/distinfo
index 42e1a6a64e31..7d2a7b6f7fb8 100644
--- a/mail/elm+ME/distinfo
+++ b/mail/elm+ME/distinfo
@@ -1,3 +1 @@
-MD5 (elm-2.4ME+98.tar.gz) = fa75d7ce8cf6fbbba864a029b846a2c5
-MD5 (elm-2.4ME+PL98a.patch.gz) = fe7b89436aae9cb8d82ccb304d432ebe
-MD5 (elm-2.4ME+PL98b.patch.gz) = 8f2aed9d2b27259203038adb16134882
+MD5 (elm-2.4ME+99.tar.gz) = 014e2a606fb1a7e80d048680c80dfb60
diff --git a/mail/elm+ME/files/patch-mailmsg2.c b/mail/elm+ME/files/patch-mailmsg2.c
new file mode 100644
index 000000000000..6000f3b28d3b
--- /dev/null
+++ b/mail/elm+ME/files/patch-mailmsg2.c
@@ -0,0 +1,61 @@
+--- src/mailmsg2.c.orig	Wed Mar 20 08:04:47 2002
++++ src/mailmsg2.c	Fri May 10 10:21:54 2002
+@@ -259,6 +259,7 @@
+ 
+     } else if (copy_msg && ! retransmit) {  /* if retransmit we have it! */
+ 	struct string * From_buffer = NULL;
++	struct string * Date_buffer = NULL;
+ 	struct addr_item *p;
+ 	    
+ 	if (current_header->from) {
+@@ -277,7 +278,23 @@
+ 		}
+ 	    }
+ 	}
+-	    
++
++	if (current_header->time_sent) {
++	    char date_buf[SLEN];
++
++	    Date_buffer = new_string(display_charset);
++	    add_ascii_to_string(Date_buffer,
++				s2us(elm_date_str(date_buf,
++						  current_header->time_sent +
++						  current_header->tz_offset,
++						  sizeof date_buf)));
++	    if (current_header->time_zone[0]) {
++		add_ascii_to_string(Date_buffer, s2us(" "));
++		add_ascii_to_string(Date_buffer,
++				    s2us(current_header->time_zone));
++	    }
++	}
++
+ 	if (!cur_editcharset)
+ 	    cur_editcharset = display_charset;
+ 
+@@ -296,12 +313,14 @@
+ 				 current_header->env_from);
+ 		
+ 	    } else if (attribution[0] && current_header) {
++		char * date = us2s(stream_from_string(Date_buffer,1,NULL));
+ 		if (From_buffer) {
+ 		    char * str = us2s(stream_from_string(From_buffer,1,NULL));
+-		    fprintf(reply, attribution, str);
++		    fprintf(reply, attribution, str, date);
+ 		    free(str);
+ 		} else
+-		    fprintf(reply, attribution, current_header->env_from);
++		    fprintf(reply, attribution, current_header->env_from, date);
++		free(date);
+ 		fputc('\n', reply);
+ 	    }
+ 	    if (edit_message && current_folder) {
+@@ -389,6 +408,8 @@
+ 	}
+ 	if (From_buffer)
+ 	    free_string(&From_buffer);
++	if (Date_buffer)
++	    free_string(&Date_buffer);
+     }
+     
+     if (!cur_editcharset)
diff --git a/mail/elm+ME/pkg-plist b/mail/elm+ME/pkg-plist
index 292d166ee58d..5188ab38ed4d 100644
--- a/mail/elm+ME/pkg-plist
+++ b/mail/elm+ME/pkg-plist
@@ -3,6 +3,7 @@ bin/answer
 bin/checkalias
 bin/elm
 bin/elmalias
+bin/elmstringconvert
 bin/fastmail
 bin/frm
 @exec ln -f %B/%f %B/nfrm
@@ -31,19 +32,6 @@ etc/rc.d/00elm.sh
 %%LIB_SUBDIR%%/elm.map.txt/8859-7.TXT
 %%LIB_SUBDIR%%/elm.map.txt/8859-8.TXT
 %%LIB_SUBDIR%%/elm.map.txt/8859-9.TXT
-@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimecharsets %D/%%LIB_SUBDIR%%/elm.mimecharsets-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimecharsets; fi
-%%LIB_SUBDIR%%/elm.mimecharsets-dist
-@exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets
-@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi
-%%LIB_SUBDIR%%/elm.mimetypes-dist
-@exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes
-@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi
-%%LIB_SUBDIR%%/elm.rc-dist
-@exec if [ -f %B/elm.rc ]; then %D/%%LIB_SUBDIR%%/elmrc-write -G -I; fi
-@exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
-@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.terminalinfo %D/%%LIB_SUBDIR%%/elm.terminalinfo-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.terminalinfo; fi
-%%LIB_SUBDIR%%/elm.terminalinfo-dist
-@exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
 %%LIB_SUBDIR%%/elmcharset
 %%LIB_SUBDIR%%/elmrc-info
 %%LIB_SUBDIR%%/elmrc-write
@@ -65,6 +53,19 @@ etc/rc.d/00elm.sh
 %%PORTDOCS%%%%DOC_SUBDIR%%/Ref.fmtd.gz
 %%PORTDOCS%%%%DOC_SUBDIR%%/Users.fmtd.gz
 share/nls/C/elm2.4me+.cat
+@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimecharsets %D/%%LIB_SUBDIR%%/elm.mimecharsets-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimecharsets; fi
+%%LIB_SUBDIR%%/elm.mimecharsets-dist
+@exec [ -f %B/elm.mimecharsets ] || cp %B/%f %B/elm.mimecharsets
+@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.mimetypes %D/%%LIB_SUBDIR%%/elm.mimetypes-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.mimetypes; fi
+%%LIB_SUBDIR%%/elm.mimetypes-dist
+@exec [ -f %B/elm.mimetypes ] || cp %B/%f %B/elm.mimetypes
+@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.rc %D/%%LIB_SUBDIR%%/elm.rc-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.rc; fi
+%%LIB_SUBDIR%%/elm.rc-dist
+@exec if [ -f %B/elm.rc ]; then %D/%%LIB_SUBDIR%%/elmrc-write -G -I; fi
+@exec [ -f %B/elm.rc ] || cp %B/%f %B/elm.rc
+@unexec if cmp -s %D/%%LIB_SUBDIR%%/elm.terminalinfo %D/%%LIB_SUBDIR%%/elm.terminalinfo-dist; then rm -f %D/%%LIB_SUBDIR%%/elm.terminalinfo; fi
+%%LIB_SUBDIR%%/elm.terminalinfo-dist
+@exec [ -f %B/elm.terminalinfo ] || cp %B/%f %B/elm.terminalinfo
 %%PORTDOCS%%@dirrm %%DOC_SUBDIR%%
 @dirrm %%SHLIB_SUBDIR%%
 @dirrm %%LIB_SUBDIR%%/elm.map.txt