Update to 2.4.ME+.78 + enable dotlocking besides fcntl-style locking, e)dit

	disabled.

Many bugfixes, most notable changes
- some locale definitions/aliases added (from GNU locale), many other
  locale-related changes
- added facility to convert character set of incoming messages to display
  character set
- added facility to convert character set of new message to outgoing character
  set (text-charset)
- added support for pgp5 and gpg !
- POP mailboxes can be accessed via username@hostname folder name
- added U command - mark e-mail as unread
- security (no effect on NetBSD, since elm is not installed sgid/suid):
  reset egid on couple of places where it was not and should be
- elm.mimecharsets is generated by Configure in batch mode, so it's not needed
  to ship our own
- dropped remailer stuff and g/c memory modes stuff from Configure
- e-mail address/aliases handling changes

4 files changed, 32 insertions, 69 deletions

diff --git a/mail/elm/files/config.sh b/mail/elm/files/config.sh
index e0ca75ee1f2..23c3685e1e4 100644
--- a/mail/elm/files/config.sh
+++ b/mail/elm/files/config.sh
@@ -10,10 +10,14 @@ cppstdin='/usr/bin/cpp'
 cppminus=''
 d_getopt='define'
 d_memcpy='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'
@@ -29,9 +33,13 @@ cat
 chgrp
 chmod
 cp
+dirname
 echo
 expr
+egrep
 grep
+fgrep
+head
 ln
 ls
 make
@@ -41,6 +49,7 @@ sed
 sleep
 touch
 tr
+cut
 '
 expr='/bin/expr'
 sed='/usr/bin/sed'
@@ -54,6 +63,8 @@ tr='/usr/bin/tr'
 sort=''
 uniq=''
 grep='/usr/bin/grep'
+fgrep='/usr/bin/fgrep'
+head='/usr/bin/head'
 trylist='
 Mcc
 compress
@@ -62,6 +73,7 @@ date
 emacs
 execmail
 finger
+gpg
 ispell
 line
 lint
@@ -91,10 +103,10 @@ uname
 uuname
 vi
 '
-test='/bin/test'
+test='test'
 inews=''
 ispell='ispell'
-egrep=''
+egrep='/usr/bin/egrep'
 more='/usr/bin/more'
 pg='pg'
 Mcc='Mcc'
@@ -135,9 +147,9 @@ col=''
 pack='pack'
 compress='/usr/bin/compress'
 execmail=''
-libswanted='intl nls'
+libswanted='sun intl nls c_s'
 noaddlib='yes'
-c_date='Tue Apr 13 17:07:42 GMT 1999'
+c_date='Sun Jun  4 16:46:03 CEST 2000'
 d_ascii='undef'
 d_broke_ctype='undef'
 d_calendar='define'
@@ -152,7 +164,7 @@ d_domname='define'
 d_usegetdom='define'
 d_errlst='undef'
 d_flock='define'
-d_dotlock='undef'
+d_dotlock='define'
 d_fcntlock='undef'
 has_flock='define'
 has_fcntl='define'
@@ -167,13 +179,13 @@ d_index='define'
 d_internet=''
 d_ispell='define'
 ispell_path='ispell'
-ispell_options=''
+ispell_options='-x'
 d_locale='define'
 d_nl_types='define'
 d_msgcat='define'
 d_usenls='undef'
 d_mallocvoid='define'
-d_mboxedit='define'
+d_mboxedit='undef'
 metamail_path='none'
 defencoding=''
 d_8bitmime='undef'
@@ -242,7 +254,7 @@ libc='/usr/lib/libc.so.12.40'
 linepr='/usr/bin/lp'
 maildir='/var/mail'
 mailer='/usr/sbin/sendmail'
-mailgrp='bin'
+mailgrp='wheel'
 mansrc="${PREFIX}/man/man1"
 catmansrc="${PREFIX}/man/cat1"
 manext='.1'
@@ -254,13 +266,7 @@ manroff='/usr/bin/nroff'
 manroffopts=''
 suffix=''
 packer=''
-models='none'
-split=''
-small=''
-medium=''
-large=''
-huge=''
-optimize="$CFLAGS"
+optimize='-O'
 ccflags=''
 cppflags=''
 ldflags='-s'
@@ -288,9 +294,9 @@ d_bsd='define'
 locale='locale'
 d_pgp='define'
 pgp='pgp'
-pgp_path="${PREFIX}/bin/pgp"
-special_path='/sbin'
-d_remailer='undef'
-finger='/usr/bin/finger'
-finger_path=''
+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.mimecharsets b/mail/elm/files/elm.mimecharsets
deleted file mode 100644
index 654a6617735..00000000000
--- a/mail/elm/files/elm.mimecharsets
+++ /dev/null
@@ -1,42 +0,0 @@
-# Mapping from LC_CTYPE locale to MIME's charset values
-# Format is:
-#	LC_CTYPE	charset
-# LC_CTYPE is on form
-#	LL_cc.encoding
-# then also following formats are available:
-#	LL_cc		charset
-#	LL		charset
-#	*.encoding	charset
-de		ISO-8859-1
-de_DE		ISO-8859-1
-de_AT		ISO-8859-1
-de_CH		ISO-8859-1
-el		ISO-8859-7
-el_GR		ISO-8859-7
-es		ISO-8859-1
-es_ES		ISO-8859-1
-es_AR		ISO-8859-1
-es_MX		ISO-8859-1
-fr		ISO-8859-1
-fr_BE		ISO-8859-1
-fr_CA		ISO-8859-1
-fr_CH		ISO-8859-1
-fr_FR		ISO-8859-1
-ko              (unsupported)
-ko_KR           (unsupported)
-ko_KR.euc       (unsupported)
-nl		ISO-8859-1
-nl_BE		ISO-8859-1
-nl_NL		ISO-8859-1
-no		ISO-8859-1
-no_NO		ISO-8859-1
-pl		ISO-8859-2
-pl_PL		ISO-8859-2
-ru		ISO-8859-5
-ru_SU		ISO-8859-5
-sl		ISO-8859-2
-sl_CS		ISO-8859-2
-sv		ISO-8859-1
-sv_SE		ISO-8859-1
-#
-iso_8859_1	ISO-8859-1
diff --git a/mail/elm/files/md5 b/mail/elm/files/md5
index e507f87624f..4ed8334835c 100644
--- a/mail/elm/files/md5
+++ b/mail/elm/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/10/25 14:38:39 hubertf Exp $
+$NetBSD: md5,v 1.4 2000/06/04 16:28:23 jdolecek Exp $
 
-MD5 (elm-2.4ME+54.tar.gz) = 189b1bd3ed6f1c8c0e8a116a201ab49e
+MD5 (elm-2.4ME+78.tar.gz) = 3c027363ada4529fcea97b42343f87bd
diff --git a/mail/elm/files/patch-sum b/mail/elm/files/patch-sum
index 21c4036cbdb..3e68011c174 100644
--- a/mail/elm/files/patch-sum
+++ b/mail/elm/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.4 2000/05/02 17:11:49 kim Exp $
+$NetBSD: patch-sum,v 1.5 2000/06/04 16:28:23 jdolecek Exp $
 
 MD5 (patch-aa) = d54d6460531cf84d5845d858ef14ef5c
 MD5 (patch-ab) = b20a89a01b99c2bfe5dc21abe15b557a
-MD5 (patch-ac) = 9e92f0eba5fcd5b03272e8712195a4d9
-MD5 (patch-ad) = 3d90d8158227eeca1c55d918cb2d72d1
-MD5 (patch-ae) = 8fa282d8a5fb7e8934f24b3e00b01570
+MD5 (patch-ac) = f89b6c12f623fb9563fa71cda3cde0d8
+MD5 (patch-ad) = 83b4a03b8b1d4f720cfe55301d64633e