Update to elm-2.5.5 (the latest available official elm version).

Package provided by hiramatu@boreas.dti.ne.jp in PR pkg/13495.

This is no longer a ME extended version, which is now available as
pkgsrc/mail/elm-me.

12 files changed, 241 insertions, 309 deletions

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index cb876a69e3f..fb7eeb927c0 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,40 +1,28 @@
-# $NetBSD: Makefile,v 1.15 2001/02/17 18:24:44 wiz Exp $
-# FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
+# $NetBSD: Makefile,v 1.16 2001/07/18 20:04:11 martin Exp $
 #
 
-DISTNAME=		elm-2.4ME+78
-PKGNAME=		elm-2.4me78
+DISTNAME=		elm2.5.5
+PKGNAME=		elm-2.5.5
 CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.ozone.fmi.fi/KEH/ \
-			ftp://ftp.funet.fi/pub/unix/mail/elm/elm-2.4ME+/ \
-			ftp://ftp.ibp.fr/pub/unix/mail/elm-me/
+MASTER_SITES=		ftp://ftp.virginia.edu/pub/elm/
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.myxa.com/old/elm.html
-COMMENT=		ELM Mail User Agent
+HOMEPAGE=		http://www.instinct.org/elm/
+COMMENT=		ELM Mail User Agent (without ME extensions)
 
-CONFLICTS=		elm-*ME+*
+CONFLICTS=		elm-*
 
-HAS_CONFIGURE=		Yes
+HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
-CONFIGURE_ENV=		PREFIX="${PREFIX}" RUN_AS_BATCH=yes
-CONFIGURE_ARGS=		-S
-
-WRKSRC=			${WRKDIR}/elm2.4.ME+.78
+CONFIGURE_ARGS+=	-d
 
 pre-configure:
-	${CP} ${FILESDIR}/config.sh ${WRKSRC}/
+	${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
+	${SED} -e 's:PREFIX:'${PREFIX}':g' \
+		${WRKSRC}/config.sh.orig > ${WRKSRC}/config.sh.tmp
+	${SED} -e 's:LOCALBASE:'${LOCALBASE}':g' \
+		${WRKSRC}/config.sh.tmp > ${WRKSRC}/config.sh
 	${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
-	${SED} -e 's:__PREFIX:'${PREFIX}':g'< ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
-
-post-install:
-	cd ${WRKSRC}/nls; ${MAKE} install
-	if [ -f ${PREFIX}/lib/elm.mimetypes ] ; then \
-		${INSTALL_DATA} \
-			${FILESDIR}/elm.mimetypes ${PREFIX}/lib/elm.mimetypes-dist; \
-	else \
-		${INSTALL_DATA} \
-			${FILESDIR}/elm.mimetypes ${PREFIX}/lib; \
-	fi
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' < ${WRKSRC}/nls/LANGS.tmpl > ${WRKSRC}/nls/LANGS
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index aba819215a6..762050ca2ad 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/20 13:09:56 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/07/18 20:04:11 martin Exp $
 
-SHA1 (elm-2.4ME+78.tar.gz) = 614e93c880a90995466535a1c9aa44c8b1a28fe6
-Size (elm-2.4ME+78.tar.gz) = 814957 bytes
-SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
-SHA1 (patch-ab) = 288893a202522d3197cd5092273c1dfbcd31f3da
-SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
-SHA1 (patch-ad) = ba58d8ca684d16e165f45ccb08ac76e560bf293e
+SHA1 (elm2.5.5.tar.gz) = 608f46d80a259eb3439b624d2947eede201a157d
+Size (elm2.5.5.tar.gz) = 605728 bytes
+SHA1 (patch-aa) = 496848b87b31bdfa688cbf09f67f29428e2805b4
+SHA1 (patch-ab) = 0d3a39f6fb0179bf75095ed7aa1910d94506fbe8
+SHA1 (patch-ac) = 3216e1f8a00200efd93ada37c8250c5277abfbfe
+SHA1 (patch-ad) = de6e99072ad6379126bb1e6d798bc2cd851a92ed
+SHA1 (patch-ae) = c72dedb41a4a777af81a2351a7c7cd4d2c3b6137
+SHA1 (patch-af) = 7e08a1595ff31bcb1f45433d20693b4e0c5bf824
diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index 23c3685e1e4..47c4c22a4f8 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -4,52 +4,44 @@
 
 Log='$Log'
 Header='$Header'
-bin="${PREFIX}/bin"
 contains='grep'
 cppstdin='/usr/bin/cpp'
 cppminus=''
 d_getopt='define'
 d_memcpy='define'
+d_mkdir='define'
+d_rename='define'
 d_symlink='define'
 d_whoami='undef'
-d_poll='define'
-d_select='define'
-d_mmap='define'
-d_socket='define'
-d_netdb='define'
-d_netinet_in='define'
-d_inttypes='define'
-d_nointtypes='undef'
 n='-n'
 c=''
 orderlib='false'
 ranlib=':'
-package='elm2'
-pager='builtin++'
+package='elm2.5'
+pager='builtin+'
+prefshell='/bin/ksh'
 startsh='#!/bin/sh'
+d_eunice='undef'
 define='define'
+eunicefix=':'
+build_dir=''
+source_dir=''
 loclist='
 cat
 chgrp
 chmod
 cp
-dirname
 echo
 expr
-egrep
 grep
-fgrep
-head
 ln
 ls
-make
 mv
 rm
 sed
 sleep
 touch
 tr
-cut
 '
 expr='/bin/expr'
 sed='/usr/bin/sed'
@@ -60,11 +52,10 @@ mv='/bin/mv'
 cp='/bin/cp'
 tail=''
 tr='/usr/bin/tr'
+mkdir=''
 sort=''
 uniq=''
 grep='/usr/bin/grep'
-fgrep='/usr/bin/fgrep'
-head='/usr/bin/head'
 trylist='
 Mcc
 compress
@@ -72,23 +63,16 @@ cpp
 date
 emacs
 execmail
-finger
-gpg
 ispell
 line
 lint
 lp
-locale
 lpr
-mailx
-metamail
 mips
 more
 nroff
 pack
 pg
-pgp
-pmake
 pr
 rmail
 sendmail
@@ -106,12 +90,12 @@ vi
 test='test'
 inews=''
 ispell='ispell'
-egrep='/usr/bin/egrep'
+egrep=''
 more='/usr/bin/more'
 pg='pg'
 Mcc='Mcc'
 vi='/usr/bin/vi'
-mailx='/usr/bin/mailx'
+mailx=''
 mail=''
 cpp='/usr/bin/cpp'
 perl=''
@@ -120,7 +104,7 @@ ls='/bin/ls'
 rmail='/bin/rmail'
 sendmail='/usr/sbin/sendmail'
 shar='/usr/bin/shar'
-smail='smail'
+smail=''
 submit=''
 tbl='/usr/bin/tbl'
 troff='/usr/bin/troff'
@@ -138,61 +122,59 @@ ln='/bin/ln'
 lpr='/usr/bin/lpr'
 lp='/usr/bin/lp'
 touch='/usr/bin/touch'
-make='/usr/bin/make'
+make=''
 date='/bin/date'
 csh=''
-pmake='pmake'
+pmake=''
 mips='false'
 col=''
 pack='pack'
+bld=''
 compress='/usr/bin/compress'
 execmail=''
-libswanted='sun intl nls c_s'
-noaddlib='yes'
-c_date='Sun Jun  4 16:46:03 CEST 2000'
+libswanted='intl nls'
+bin='PREFIX/bin'
+installbin='PREFIX/bin'
+c_date='Sun Jul  1 03:59:18 JST 2001'
 d_ascii='undef'
-d_broke_ctype='undef'
+d_broke_ctype='define'
+d_broke_fflush='undef'
 d_calendar='define'
 calendar='calendar'
 d_chown_neg1='define'
 d_content='undef'
 d_crypt='define'
-cryptlib='-lcrypt'
+cryptlib='/usr/lib/libcrypt.a'
 d_cuserid='undef'
 d_disphost='undef'
 d_domname='define'
-d_usegetdom='define'
-d_errlst='undef'
-d_flock='define'
+d_usegetdom='undef'
+d_errlst='define'
+d_flock='undef'
 d_dotlock='define'
-d_fcntlock='undef'
-has_flock='define'
+d_fcntlock='define'
+lock_dir='/var/spool/lock'
+has_flock='undef'
 has_fcntl='define'
+d_fsync='define'
 d_ftruncate='define'
 d_gethname='define'
 d_douname='undef'
 d_host_comp='undef'
 ign_hname='n'
-d_havetlib='define'
-termlib='-ltermlib'
 d_index='define'
-d_internet=''
+d_internet='define'
 d_ispell='define'
-ispell_path='ispell'
-ispell_options='-x'
+ispell_path='LOCALBASE/bin/ispell'
+ispell_options=''
 d_locale='define'
 d_nl_types='define'
 d_msgcat='define'
-d_usenls='undef'
-d_mallocvoid='define'
+d_usenls='define'
 d_mboxedit='undef'
-metamail_path='none'
-defencoding=''
-d_8bitmime='undef'
-d_binarymime='undef'
-d_dsn='define'
-defcharset='DISPLAY'
-defdispcharset='ISO-8859-1'
+d_mime='define'
+defcharset='iso-8859-1'
+defdispcharset='iso-8859-1'
 d_mmdf='undef'
 d_newauto='define'
 d_noaddfrom='define'
@@ -203,17 +185,18 @@ d_ptem='undef'
 d_putenv='define'
 d_remlock='undef'
 maxattempts='6'
-d_setgid='undef'
-d_savegrpmboxid='undef'
-mailermode='755'
+d_setegid='define'
+d_setgid='define'
+d_savegrpmboxid='define'
+mailermode='2755'
 d_sigvec='undef'
 d_sigvectr='undef'
 d_sigset='undef'
 d_sighold='undef'
 d_sigprocmask='define'
 d_sigblock='undef'
-d_waitpid='define'
 d_sigaction='define'
+d_statuschg='define'
 d_strcspn='define'
 d_strspn='define'
 d_strpbrk='define'
@@ -231,17 +214,18 @@ tempnamo=''
 tempnamc=''
 d_termio='undef'
 d_termios='define'
+d_useembed='define'
 d_utimbuf='define'
 d_vfork='define'
 defbatsub='no subject (file transmission)'
 defeditor='/usr/bin/vi'
 editoropts=''
-hostname="${Hostname}"
+hostname=''
 phostname='hostname'
-mydomain="${Domain}"
+mydomain=''
 autohostname='define'
 i_memory='define'
-i_stdarg=''
+i_stdarg='define'
 i_stdlib='define'
 i_time='define'
 i_systime='define'
@@ -249,34 +233,41 @@ d_systimekernel='undef'
 i_unistd='define'
 i_utime='define'
 i_sysutime='undef'
-lib="${PREFIX}/lib"
-libc='/usr/lib/libc.so.12.40'
+lib='PREFIX/lib/elm'
+installlib='PREFIX/lib/elm'
+libc='/usr/lib/libc.so'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
 mailgrp='wheel'
-mansrc="${PREFIX}/man/man1"
-catmansrc="${PREFIX}/man/cat1"
+mansrc='PREFIX/man/man1'
+catmansrc='PREFIX/man/cat1'
 manext='.1'
 manext_choice='.1'
-catmanext='.0'
-catmanext_choice='.0'
+catmanext='.1'
+catmanext_choice='.1'
 packed='n'
 manroff='/usr/bin/nroff'
 manroffopts=''
 suffix=''
 packer=''
-optimize='-O'
-ccflags=''
-cppflags=''
-ldflags='-s'
-cc='cc'
-libs=''
+models='none'
+split=''
+small=''
+medium=''
+large=''
+huge=''
+optimize='-O2'
+ccflags='-ILOCALBASE/include'
+cppflags=' -ILOCALBASE/include'
+ldflags='-LLOCALBASE/lib'
+cc='cc -MD'
+libs='-lintl'
 nametype='bsd'
 d_passnames='define'
 d_berknames='define'
 d_usgnames='undef'
-# passcat=''
+passcat='cat /etc/passwd'
 rmttape='unknown-remote-tape-unit'
 roff='/usr/bin/troff'
 roffopts=''
@@ -284,19 +275,11 @@ sigtype='void'
 spitshell='cat'
 shsharp='true'
 sharpbang='#!'
+termlib=''
 tmpdir='/tmp'
-tzname_handling='TM_ZONE'
-use_pmake='n'
+tzname_handling='UNKNOWN'
 xencf=''
 xenlf=''
 d_xenix='undef'
 d_bsd='define'
-locale='locale'
-d_pgp='define'
-pgp='pgp'
-pgp2_path="${PREFIX}/bin/pgp"
-pgp5_dir='none'
-gpg_path='none'
-special_path="${PREFIX}/bin"
-locale_dir='/usr/share/locale'
 CONFIG=true
diff --git a/mail/elm/files/elm.mimetypes b/mail/elm/files/elm.mimetypes
deleted file mode 100644
index f121812d6ec..00000000000
--- a/mail/elm/files/elm.mimetypes
+++ /dev/null
@@ -1,98 +0,0 @@
-#       application/activemessage
-#       application/andrew-inset
-#       application/applefile
-#       application/atomicmail
-#       application/dca-rft
-#       application/dec-dx
-#       application/mac-binhex40
-#       application/macwriteii
-doc     application/msword
-#       application/news-message-id
-#       application/news-transmission
-bin     application/octet-stream
-exe     application/octet-stream
-oda     application/oda
-pdf     application/pdf
-ai      application/postscript
-eps     application/postscript
-ps      application/postscript
-#       application/remote-printing
-rtf     application/rtf
-#       application/slate
-mif     application/x-mif
-#       application/wita
-#       application/wordperfect5.1
-csh     application/x-csh
-dvi     application/x-dvi
-gz      application/x-gzip
-hdf     application/x-hdf
-latex   application/x-latex
-nc      application/x-netcdf
-cdf     application/x-netcdf
-sh      application/x-sh
-tcl     application/x-tcl
-tex     application/x-tex
-texi    application/x-texinfo
-texinfo application/x-texinfo
-t       application/x-troff
-tr      application/x-troff
-roff    application/x-troff
-man     application/x-troff-man
-me      application/x-troff-me
-ms      application/x-troff-ms
-src     application/x-wais-source
-zip     application/zip
-bcpio   application/x-bcpio
-cpio    application/x-cpio
-tgz     application/x-gtar
-shar    application/x-shar
-#       application/x-sv4cpio
-#       application/x-sv4crc
-tar     application/x-tar
-ustar   application/x-ustar
-au      audio/basic
-snd     audio/basic
-aif     audio/x-aiff
-aiff    audio/x-aiff
-aifc    audio/x-aiff
-wav     audio/x-wav
-gif     image/gif
-ief     image/ief
-jpeg    image/jpeg
-jpg     image/jpeg
-jpe     image/jpeg
-tiff    image/tiff
-tif     image/tiff
-ras     image/x-cmu-raster
-pnm     image/x-portable-anymap
-pbm     image/x-portable-bitmap
-pgm     image/x-portable-graymap
-ppm     image/x-portable-pixmap
-rgb     image/x-rgb
-xbm     image/x-xbitmap
-xpm     image/x-xpixmap
-xwd     image/x-xwindowdump
-#       message/external-body
-#       message/news
-#       message/partial
-#       message/rfc822
-#       multipart/alternative
-#       multipart/appledouble
-#       multipart/digest
-#       multipart/mixed
-#       multipart/parallel
-html    text/html
-htm     text/html
-txt     text/plain
-rtx     text/richtext
-tsv     text/tab-separated-values
-etx     text/x-setext
-mpeg    video/mpeg
-mpg     video/mpeg
-mpe     video/mpeg
-qt      video/quicktime
-mov     video/quicktime
-avi     video/x-msvideo
-movie   video/x-sgi-movie
-dl      video/x-dl
-fli     video/x-fli
diff --git a/mail/elm/patches/patch-aa b/mail/elm/patches/patch-aa
index 55e74cb7ecf..0a8a77f519c 100644
--- a/mail/elm/patches/patch-aa
+++ b/mail/elm/patches/patch-aa
@@ -1,17 +1,23 @@
-$NetBSD: patch-aa,v 1.1 1999/11/18 14:54:51 agc Exp $
-
-*** 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                   __PREFIX/share/nls/C
-! english/us/ascii        __PREFIX/share/nls/en_US.ISO_8859-1
-! french/canada/8859      __PREFIX/share/nls/fr_FR.ISO_8859-1
+$NetBSD: patch-aa,v 1.2 2001/07/18 20:04:13 martin Exp $
+--- Configure.orig	Sun Jul 15 23:32:27 2001
++++ Configure	Sun Jul 15 23:34:48 2001
+@@ -490,8 +490,8 @@
+     n=''
+     c='\c'
+ fi
+-echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
+-read ans
++#echo $n "Type carriage return to continue.  Your cursor should be here-->$c"
++#read ans
+ rm -f .echotmp
+ 
+ : now set up to do reads with possible shell escape and default assignment
+@@ -5496,7 +5496,7 @@
+ echo "If you didn't make any mistakes, then just type a carriage return here."
+ rp="If you need to edit config.sh, do it as a shell escape here:"
+ $echo $n "$rp $c"
+-. UU/myread
++#. UU/myread
+ case "$ans" in
+ '') ;;
+ *) : in case they cannot read
diff --git a/mail/elm/patches/patch-ab b/mail/elm/patches/patch-ab
index d36f5da8693..dddac841182 100644
--- a/mail/elm/patches/patch-ab
+++ b/mail/elm/patches/patch-ab
@@ -1,13 +1,10 @@
-$NetBSD: patch-ab,v 1.4 1999/11/18 14:54:51 agc Exp $
-
---- nls/Makefile.orig	Thu Nov 18 14:41:07 1999
-+++ nls/Makefile	Thu Nov 18 14:46:27 1999
-@@ -3,7 +3,7 @@
- #
- LANGFILE=LANGS
- CATNAME=elm2.4me+.cat
--GENCAT=	nls/gencat
-+GENCAT=	gencat
+$NetBSD: patch-ab,v 1.5 2001/07/18 20:04:13 martin Exp $
+--- nls/LANGS.orig	Thu Apr 20 05:38:33 1995
++++ nls/LANGS	Wed Jul 18 06:58:32 2001
+@@ -1,5 +1,3 @@
+ # LANGS file
  
- HDIR=	../hdrs
- SDIR=	C/C/C
+-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			__PREFIX/share/nls/C
diff --git a/mail/elm/patches/patch-ac b/mail/elm/patches/patch-ac
index db688b53a48..1870eb34eb6 100644
--- a/mail/elm/patches/patch-ac
+++ b/mail/elm/patches/patch-ac
@@ -1,13 +1,24 @@
-$NetBSD: patch-ac,v 1.4 2000/06/04 16:28:23 jdolecek Exp $
-
---- Configure.orig	Sun Jun  4 17:21:26 2000
-+++ Configure	Sun Jun  4 17:22:17 2000
-@@ -15,7 +15,7 @@
- PATH=".:$PATH:/bin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/ucb:/usr/local:/usr/lbin:/etc:/usr/new:/usr/new/bin:/usr/nbin"
- export PATH || (echo "OOPS, this isn't sh.  Desperation time.  I will feed myself to sh."; sh $0; kill $$)
+$NetBSD: patch-ac,v 1.5 2001/07/18 20:04:13 martin Exp $
+--- nls/Makefile.orig	Mon Jul 16 00:30:02 2001
++++ nls/Makefile	Wed Jul 18 06:56:10 2001
+@@ -1,6 +1,6 @@
+ LANGFILE=LANGS
+ CATNAME=elm2.5.cat
+-GENCAT=	gencat/gencat
++GENCAT=	./gencat/gencat
  
--if test ! -t 0; then
-+if test "X$RUN_AS_BATCH" = "X" -a ! -t 0; then
-     echo "Say 'sh Configure', not 'sh <Configure'"
-     exit 1
- fi
+ HDIR=	../hdrs
+ SDIR=	C/C/C
+@@ -35,8 +35,11 @@
+ # same basename, so wait until install to put them somewhere.
+ all:
+ 
+-install:
++install: $(GENCAT)
+ 	./Install $(LANGFILE) $(GENCAT) $(CATNAME)
++
++$(GENCAT):
++	cd gencat && $(MAKE) $(MFLAGS) $(MJ)
+ 
+ $(HFILES): $(MFILES)
+ 	gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
diff --git a/mail/elm/patches/patch-ad b/mail/elm/patches/patch-ad
index f6a6be7e318..945a085d970 100644
--- a/mail/elm/patches/patch-ad
+++ b/mail/elm/patches/patch-ad
@@ -1,22 +1,19 @@
-$NetBSD: patch-ad,v 1.5 2000/06/04 16:28:23 jdolecek Exp $
-
---- src/pgp.c.orig	Wed May 24 16:48:24 2000
-+++ src/pgp.c	Sun Jun  4 17:59:58 2000
-@@ -145,7 +145,7 @@
- 		char *path;
- 	    case pgp2:	
- 		
--		execl(pgp2_path, 
-+		execlp(pgp2_path, 
- 		      pgp2_path,"+verbose=0", "+language=en", "-kv", c, 
- 		      (char *)0);
- 		tmp = errno;
-@@ -160,7 +160,7 @@
- 		perror(path);
- 		break;
- 	    case gpg:
--		execl(gpg_path, 
-+		execlp(gpg_path, 
- 		      gpg_path,"--list-public-keys",c,(char *)0);
- 		tmp = errno;
- 		perror(path);
+$NetBSD: patch-ad,v 1.6 2001/07/18 20:04:13 martin Exp $
+--- Make.defs.SH.orig	Mon Jul 16 01:59:07 2001
++++ Make.defs.SH	Mon Jul 16 02:02:02 2001
+@@ -113,6 +113,7 @@
+ RM		= $rm
+ TEST		= $test
+ TOUCH		= $touch
++MKDIR		= mkdir
+ 
+ DESTBIN		= $installbin
+ DESTLIB		= $installlib
+@@ -143,6 +144,7 @@
+ 	$(RM) -f $@.old ; \
+ 	$(TEST) ! -f $@ || $(MV) $@ $@.old ; \
+ 	$(RM) -f $@.old ; \
++	$(MKDIR) -p `dirname $@` ; \
+ 	$(CP) $? $@ ; \
+ 	$(TEST) $(MAILERMODE) -lt 999 || $(CHGRP) $(MAILGRP) $@ ; \
+ 	$(CHMOD) $(MAILERMODE) $@
diff --git a/mail/elm/patches/patch-ae b/mail/elm/patches/patch-ae
new file mode 100644
index 00000000000..8943898a70c
--- /dev/null
+++ b/mail/elm/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.3 2001/07/18 20:04:14 martin Exp $
+--- doc/Makefile.SH.orig	Wed Mar 24 23:13:56 1999
++++ doc/Makefile.SH	Mon Jul 16 02:12:05 2001
+@@ -101,6 +101,7 @@
+ SUFFIX		=	$suffix
+ PACKED		=	$packed
+ PACKER		=	$packer
++MKDIR		=	mkdir
+ 
+ !GROK!THIS!
+ 
+@@ -277,8 +278,8 @@
+ 	fi
+ 
+ I_DELETE = $(TEST) ! -f $@ || $(RM) $@
+-INST_444 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 444 $@
+-INST_644 = $(I_DELETE) ; $(CP) $? $@ ; $(CHMOD) 644 $@
++INST_444 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 444 $@
++INST_644 = $(I_DELETE) ; $(MKDIR) -p `dirname $@` ; $(CP) $? $@ ; $(CHMOD) 644 $@
+ INST_LINK = $(I_DELETE) ; $(LN) $? $@
+ 
+ #	Dependencies and rules for installing man pages and lib files
diff --git a/mail/elm/patches/patch-af b/mail/elm/patches/patch-af
new file mode 100644
index 00000000000..5a12b1d1640
--- /dev/null
+++ b/mail/elm/patches/patch-af
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.1 2001/07/18 20:04:14 martin Exp $
+--- Makefile.SH.orig	Fri Mar 15 02:27:09 1996
++++ Makefile.SH	Mon Jul 16 02:25:23 2001
+@@ -87,6 +87,7 @@
+ 	cd src && $(MAKE) $(MFLAGS) $(MJ) $@
+ 	cd utils && $(MAKE) $(MFLAGS) $(MJ) $@
+ 	cd doc && $(MAKE) $(MFLAGS) $(MJ) $@
++	cd nls && $(MAKE) $(MFLAGS) $(MJ) $@
+ 
+ #
+ # Ensure required subdirectories and their Makefiles exist.
diff --git a/mail/elm/pkg/DESCR b/mail/elm/pkg/DESCR
index 489b59b72c5..dbadb5df05f 100644
--- a/mail/elm/pkg/DESCR
+++ b/mail/elm/pkg/DESCR
@@ -1,2 +1,11 @@
-       Elm is an interactive screen-oriented mailer program  that
-       supersedes mail and mailx.
+Elm is an interactive screen-oriented mailer program that 
+needed no documentation for the casual user, but was still
+powerful enough and sophisticated enough for a mail expert.
+
+It is superseeded by mutt, in the view of many people.
+
+This package is the standard version of elm. Older versions
+of this package installed the ME extended version of elm, but
+this extensions are not available for the latest elm versions.
+There is another package now providing this extended, but older
+version in mail/elm-me.
diff --git a/mail/elm/pkg/PLIST b/mail/elm/pkg/PLIST
index e7c4f8a24ab..189d85cd8ce 100644
--- a/mail/elm/pkg/PLIST
+++ b/mail/elm/pkg/PLIST
@@ -1,53 +1,57 @@
-@comment $NetBSD: PLIST,v 1.6 2000/06/04 16:28:24 jdolecek Exp $
-bin/elm
+@comment $NetBSD: PLIST,v 1.7 2001/07/18 20:04:15 martin Exp $
 bin/answer
 bin/checkalias
+bin/elm
 bin/elmalias
 bin/fastmail
 bin/frm
 bin/listalias
 bin/messages
+bin/mmencode
 bin/newalias
 bin/newmail
 bin/nfrm
 bin/printmail
+bin/prlong
 bin/readmsg
 bin/wnewmail
-lib/elmcharset
-lib/elm-help.0
-lib/elm-help.1
-lib/elm-help.2
-lib/elm-help.3
-lib/elm.mimecharsets
-lib/elm.mimetypes
-lib/elmrc-info
-lib/prlong
-man/cat1/answer.0
-man/cat1/checkalias.0
-man/cat1/elm.0
-man/cat1/elmalias.0
-man/cat1/elmcharset.0
-man/cat1/fastmail.0
-man/cat1/frm.0
-man/cat1/listalias.0
-man/cat1/messages.0
-man/cat1/newalias.0
-man/cat1/newmail.0
-man/cat1/printmail.0
-man/cat1/readmsg.0
-man/cat1/wnewmail.0
+lib/elm/elmrc-info
+lib/elm/help-alias
+lib/elm/help-attach
+lib/elm/help-fbrowser
+lib/elm/help-main
+lib/elm/help-options
+lib/elm/help-pager
+lib/elm/help-selfolder
+lib/elm/help-status
+lib/elm/mime-types
+lib/elm/mlists.eg
 man/man1/answer.1
 man/man1/checkalias.1
 man/man1/elm.1
 man/man1/elmalias.1
-man/man1/elmcharset.1
 man/man1/fastmail.1
 man/man1/frm.1
 man/man1/listalias.1
 man/man1/messages.1
+man/man1/mmencode.1
 man/man1/newalias.1
 man/man1/newmail.1
 man/man1/printmail.1
 man/man1/readmsg.1
 man/man1/wnewmail.1
-share/nls/C/elm2.4me+.cat
+man/cat1/answer.1
+man/cat1/checkalias.1
+man/cat1/elm.1
+man/cat1/elmalias.1
+man/cat1/fastmail.1
+man/cat1/frm.1
+man/cat1/listalias.1
+man/cat1/messages.1
+man/cat1/mmencode.1
+man/cat1/newalias.1
+man/cat1/newmail.1
+man/cat1/printmail.1
+man/cat1/readmsg.1
+man/cat1/wnewmail.1
+share/nls/C/elm2.5.cat